Simplify code

Author: Kenneth Geerts

json_logic.gemspec

@@ -4,32 +4,31 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'json_logic/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "json_logic"
+  spec.name          = 'json_logic'
   spec.version       = JSONLogic::VERSION
-  spec.authors       = ["Kenneth Geerts"]
-  spec.email         = ["Kenneth.Geerts@up-nxt.com"]
+  spec.authors       = ['Kenneth Geerts']
+  spec.email         = ['Kenneth.Geerts@gmail.com']
 
-  spec.summary       = %q{See http://jsonlogic.com}
-  spec.description   = %q{JSONLogic parser in ruby.}
-  spec.license       = "MIT"
+  spec.summary       = 'Build complex rules, serialize them as JSON, and execute them in ruby'
+  spec.description   = 'See http://jsonlogic.com'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
     spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency 'bundler',  '~> 1.13'
+  spec.add_development_dependency 'rake',     '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
 end

lib/json_logic.rb

@@ -1,12 +1,16 @@
 require 'core_ext/deep_fetch'
-
 require 'json_logic/truthy'
 require 'json_logic/operation'
-require 'json_logic/rule_set'
-require 'json_logic/version'
 
 module JSONLogic
-  def self.apply(logic, data = {})
-    RuleSet.new(logic, data).evaluate
+  def self.apply(logic, data)
+    return logic unless logic.is_a?(Hash)             # pass-thru
+    operator, values = logic.first                    # unwrap single-key hash
+    values = [values] unless values.is_a?(Array)      # syntactic sugar
+    values.map! { |value| apply(value, data) }        # recursion step
+    values.flatten!(1) if values.size == 1            # [['A']] => ['A']
+    Operation.perform(operator, values, data || {})   # perform operation
   end
 end
+
+require 'json_logic/version'

lib/json_logic/rule_set.rb

@@ -1,4 +1,5 @@
-# http://jsonlogic.com/truthy.html
+# JsonLogic truthy / falsy logic
+# Cf. http://jsonlogic.com/truthy.html
 
 class Object
   def truthy?

lib/json_logic/truthy.rb

@@ -1,3 +1,3 @@
 module JSONLogic
-  VERSION = '0.1'
+  VERSION = '0.0.1'
 end

lib/json_logic/version.rb

@@ -7,7 +7,8 @@
 require 'json_logic'
 
 class JSONLogicTest < Minitest::Test
-  tests = JSON.parse(open('http://jsonlogic.com/tests.json').read)
+  test_suite_url = 'http://jsonlogic.com/tests.json'
+  tests = JSON.parse(open(test_suite_url).read)
   count = 1
   tests.each do |pattern|
     next unless pattern.is_a?(Array)