ruva 1.0.0 → 1.0.1

data/README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://secure.travis-ci.org/ssmm/ruva.png)](http://travis-ci.org/ssmm/ruva) 
 [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/ssmm/ruva)
 
-Ruva is a simple utility to write conditions in a human readable manner.
+A library to write plain text conditions.
 
 Assume you have an object called `person` with an attribute `age = 23`:
 
@@ -27,7 +27,7 @@ You can also define more complex conditions:
       all
         city matches zurich
         profession matches /application engineer/
-        age is greater than or equal to 18      
+        age is greater than or equal to 18
 
 In plain ruby, the above condition translates to
 
@@ -69,9 +69,9 @@ You may define larger conditions like this:
 ```ruby
 person.if "
   any
-    name matches lisa or simon or samuel
+    name matches daniel or jonas or samuel
     age is between 18 and 28
-    city matches zurich or /st. gallen/
+    city matches zurich or /new york/
 " do
   stuff
 end
@@ -87,9 +87,9 @@ Currently supported are the keywords `all`, `any` and `none`.
 You can define the same condition in a file with ".ruva" as extension:
 
     any
-      name matches lisa or simon or samuel
+      name matches daniel or jonas or samuel
       age is between 18 and 28
-      city matches zurich or /st. gallen/
+      city matches zurich or /new york/
 
 Then you load it:
 

data/lib/ruva/expression/expression_leaf_spec.rb

@@ -3,38 +3,37 @@ class ExpressionLeafSpec < LeafSpec
     if (args.size == 1)
       obj = args[0]
       if (obj.is_a? Hash)
-        get_hash_value @name.split(".").reverse, obj
-      else
-        get_object_value @name.split(".").reverse, obj
+        obj = OpenStruct.new obj
       end
+      get_object_value @name.split(".").reverse, obj
     else
       raise "Unexpected input"
     end   
   end
-  
-  def get_hash_value key_array, hash
-    if (key_array.size > 1)
-      obj = hash[key_array.pop.to_sym]
-      if (obj.is_a?(Hash)) 
-        get_hash_value(key_array, obj)
-      else
-        get_object_value(key_array, obj)
-      end
-    else
-      hash[key_array.pop.to_sym]
-    end
-  end
+
+  # def get_hash_value key_array, hash
+  #   if (key_array.size > 1)
+  #     obj = hash[key_array.pop.to_sym]
+  #     if (obj.is_a?(Hash)) 
+  #       get_hash_value(key_array, obj)
+  #     else
+  #       get_object_value(key_array, obj)
+  #     end
+  #   else
+  #     obj = OpenStruct.new hash
+  #     obj.instance_eval(key_array.pop)
+  #   end
+  # end
   
   def get_object_value key_array, obj
     if (key_array.size > 1)
-      obj = obj.send key_array.pop
+      obj = obj.instance_eval(key_array.pop)
       if (obj.is_a?(Hash)) 
-        get_hash_value(key_array, obj)
-      else
-        get_object_value(key_array, obj)
+        obj = OpenStruct.new obj
       end
+      get_object_value(key_array, obj)      
     else
-      obj.send key_array.pop
+      obj.instance_eval(key_array.pop)
     end
   end
   

data/lib/ruva/expression/is_between.rb

@@ -38,7 +38,11 @@ module IsBetween
     comparables = [from.value, to.value]
     spec = ExpressionLeafSpec.new(identifier.value, comparables) 
     spec.set_validator { |value, *args|
-      value.between? @comparable[0], @comparable[1]      
+      if value
+        value.between? @comparable[0], @comparable[1]
+      else
+        false
+      end
     }
     spec.set_reporting { |satisfied, value, *args|
       comparable_string = "#{@comparable[0]} and #{@comparable[1]}" 

data/lib/ruva/expression/ruva_expression.citrus

@@ -17,6 +17,10 @@ grammar RuvaExpression
 		|
 		(identifier is less than comparable) <Less>
 		|
+		(identifier is comparable or more) <GreaterOrEqual>
+		|
+		(identifier is comparable or less) <LessOrEqual>
+		|
 		(identifier is comparables:(or_comparables)) <OrIs>
 		|
 		(identifier is comparable) <Is>
@@ -41,7 +45,11 @@ grammar RuvaExpression
 	rule less
 		'less' space
 	end
-		
+	
+	rule more
+		'more' space
+	end
+
 	rule than
 		'than' space
 	end
@@ -62,8 +70,8 @@ grammar RuvaExpression
 		'or' space
 	end		
 		
-  	rule identifier
-		([a-zA-Z.]+ space) <Identifier>
+	rule identifier
+		([a-zA-Z0-9_.\[\]]+ space) <Identifier>
 	end
 
 	rule comparable

data/lib/ruva/specification/specification.rb

@@ -18,18 +18,28 @@ class Spec
     end
   end
   
+  def report satisfied, *args
+    # report = SpecReport.new false, name
+    # @specs.each do |spec|
+    #   subreport = create_subreport spec, *args
+    #   report.add_subreport subreport
+    #   if condition_change? subreport.satisfied
+    #     passed = !initial_condition
+    #   end
+    # end
+    # report.satisfied = passed
+    # report
+  end
+
   def evaluate *args
     passed = initial_condition
-    report = SpecReport.new false, name
     @specs.each do |spec|
-      subreport = create_subreport spec, *args
-      report.add_subreport subreport
-      if condition_change? subreport.satisfied
+      result = spec.evaluate *args
+      if condition_change? result
         passed = !initial_condition
       end
     end
-    report.satisfied = passed
-    report
+    passed
   end
 end
 

data/lib/ruva/version.rb

@@ -1,3 +1,3 @@
 module Ruva
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/ruva.rb

@@ -8,8 +8,8 @@ class Object
     raise unless block_given?
     spec = Ruva.interpret(Ruva.normalize_indentation condition)
     result = spec.evaluate self
-    yield if result.satisfied
-    Ruva::Else.new result.satisfied
+    yield if result
+    Ruva::Else.new result
   end
 end
 
@@ -60,6 +60,18 @@ module Ruva
     str.gsub!(/^#{first_indentation}/, "")
     str
   end
+
+  def self.hash_to_ostruct hash
+    ostruct = OpenStruct.new
+    hash.each do |key, value|
+      if value.is_a? Hash
+        ostruct.send("#{key}=", hash_to_ostruct(value))
+      else
+        ostruct.send("#{key}=", value)
+      end
+    end
+    ostruct
+  end
   
   class Else
     def initialize satisfied

data/ruva.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
 
   gem.authors       = ["Samuel Mueller"]
   gem.email         = ["mueller.samu@gmail.com"]
-  gem.description   = %q{Ruva is a simple utility to write conditions in a human readable manner.}
+  gem.description   = %q{A library to write plain text conditions.}
   gem.summary       = gem.description
   gem.homepage      = "https://github.com/ssmm/ruva"
 

data/spec/expression_spec.rb

@@ -6,16 +6,42 @@ RSpec.configure do |c|
 end
 
 describe Ruva do
-  
-  before :all do 
-    
-  end
-  
-  describe "greater/less/equal expressions" do
+
+  describe "is/between expressions" do
     it "handles numerics" do
       test_expression "age is 23", {:age => 23}, true
       test_expression "age is 23", {:age => 24}, false
+      test_expression "age is 23 or 24 or 25", {:age => 24}, true
+
+      test_expression "age is between 18 and 28", {:age => 23}, true
+      
+      test_expression "age is between 18 and 28", {:age => 28}, true
+      test_expression "age is between 18 and 28", {:age => 18}, true
       
+      test_expression "age is between 18 and 28", {:age => 50}, false
+      test_expression "age is between 18 and 28", {:age => 17}, false
+    end
+
+    it "handles strings" do
+      test_expression "name is samuel", {:name => "samuel"}, true
+      test_expression "name is samuel", {:name => "melchior"}, false
+      test_expression "name is sam", {:name => "samuel"}, false
+
+      test_expression "letter is between a and c", {:letter => "b"}, true
+      test_expression "letter is between a and c", {:letter => "d"}, false
+      test_expression "city is between zue and zur", {:city => "zuf"}, true
+      test_expression "city is between zue and zur", {:city => "zua"}, false
+    end
+
+    it "handles dates" do
+      test_expression "date is 02.02.2002", {:date => Date.parse("2.2.2002")}, true
+      test_expression "date is between 01.01.2000 and 31.12.2000", {:date => Date.parse("1.7.2000")}, true
+      test_expression "date is between 01.01.2000 and 31.12.2000", {:date => Date.parse("1.7.2001")}, false
+    end
+  end
+
+  describe "greater/less/equal expressions" do
+    it "handles numerics" do
       test_expression "age is greater than 23", {:age => 24}, true
       test_expression "age is greater than 23", {:age => 23}, false
       
@@ -27,12 +53,17 @@ describe Ruva do
       
       test_expression "age is less than or equal to 23", {:age => 23}, true
       test_expression "age is less than or equal to 23", {:age => 24}, false
+
+      test_expression "age is 23 or more", {:age => 23}, true
+      test_expression "age is 23 or more", {:age => 22}, false
+      test_expression "age is 23 or more", {:age => 24}, true
+      
+      test_expression "age is 23 or less", {:age => 23}, true
+      test_expression "age is 23 or less", {:age => 24}, false
+      test_expression "age is 23 or less", {:age => 22}, true
     end
     
-    it "handles strings" do
-      test_expression "name is samuel", {:name => "samuel"}, true
-      test_expression "name is samuel", {:name => "melchior"}, false
-      
+    it "handles strings" do      
       test_expression "name is greater than samuel", {:name => "simon"}, true
       test_expression "name is greater than samuel", {:name => "samantha"}, false
       
@@ -47,19 +78,17 @@ describe Ruva do
     end
     
     it "handes dates" do
-      #TODO!!
-    end
-  end
-  
-  describe "between expressions" do
-    it "handles numerics" do
-      test_expression "age is between 18 and 28", {:age => 23}, true
-      
-      test_expression "age is between 18 and 28", {:age => 28}, true
-      test_expression "age is between 18 and 28", {:age => 18}, true
-      
-      test_expression "age is between 18 and 28", {:age => 50}, false
-      test_expression "age is between 18 and 28", {:age => 17}, false
+      test_expression "date is greater than 01.01.2011", {:date => Date.parse("1.1.2012")}, true
+      test_expression "date is greater than 01.01.2011", {:date => Date.parse("1.1.2010")}, false
+
+      test_expression "date is less than 01.01.2011", {:date => Date.parse("1.1.2010")}, true
+      test_expression "date is less than 01.01.2011", {:date => Date.parse("1.1.2012")}, false
+
+      test_expression "date is greater than or equal to 01.01.2011", {:date => Date.parse("1.1.2012")}, true
+      test_expression "date is greater than or equal to 01.01.2011", {:date => Date.parse("1.1.2010")}, false
+
+      test_expression "date is less than or equal to 01.01.2011", {:date => Date.parse("1.1.2010")}, true
+      test_expression "date is less than or equal to 01.01.2011", {:date => Date.parse("1.1.2012")}, false
     end
   end
   
@@ -81,5 +110,46 @@ describe Ruva do
       test_expression "name matches /regex\\/with escaping/", {:name => "regex/with escaping"}, true
     end
   end
-  
+
+  describe "misc functions" do
+    it "handles deep attributes" do
+      obj = {
+        :person => {
+          :address => {
+            :zip => 12345
+          }
+        }
+      }
+      test_expression "person.address.zip is 12345", obj, true
+
+      obj = OpenStruct.new
+      person = OpenStruct.new
+      person.address = {
+        :zip => 12345
+      }
+      obj.person = person
+      test_expression "person.address.zip is 12345", obj, true
+    end
+
+    it "handles arrays" do
+      obj = OpenStruct.new
+      obj.ary = [10, 11, 12]
+      test_expression "ary[1] is 11", obj, true
+
+      obj = OpenStruct.new
+      map = {:ary => [10, 11, 12]}
+      obj.map = map
+      test_expression "map.ary[2] is 12", obj, true
+
+      obj = OpenStruct.new
+      map = {:list => [
+        {:first => 1},
+        {:second => 2},
+        {:third => 3}
+      ]}
+      obj.map = map
+      puts obj
+      test_expression "map.list[1].second is 2", obj, true
+    end
+  end
 end

data/spec/hash_to_ostruct_spec.rb

@@ -0,0 +1,23 @@
+require 'ruva'
+
+describe Ruva do
+  it "turns a hash into an ostruct" do
+    person = OpenStruct.new
+    person.name = "sam"
+    person.age = 23
+    hash = {
+      :this => {
+        :ostruct => person,
+        :is => {
+          :a => {
+            :test => "works!"
+          }
+        }
+      }
+    }
+    ostruct = Ruva.hash_to_ostruct hash
+    ostruct.this.is.a.test.should eq "works!"
+    ostruct.this.ostruct.name.should eq "sam"
+    ostruct.this.ostruct.age.should eq 23
+  end
+end

data/spec/ruva_spec.rb

@@ -12,9 +12,8 @@ describe Ruva do
     input.profession = "application engineer"
     input.city = "zurich"
     
-    result = spec.evaluate(input)
+    result = spec.evaluate input
     
-    result.satisfied.should be true
-    #puts result
+    result.should be true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruva
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -59,7 +59,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-description: Ruva is a simple utility to write conditions in a human readable manner.
+description: A library to write plain text conditions.
 email:
 - mueller.samu@gmail.com
 executables: []
@@ -86,6 +86,7 @@ files:
 - ruva.gemspec
 - spec/conditions/simple_condition.ruva
 - spec/expression_spec.rb
+- spec/hash_to_ostruct_spec.rb
 - spec/helpers/expression_helper.rb
 - spec/inline_ruva_spec.rb
 - spec/normalize_indentation_spec.rb
@@ -113,10 +114,11 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Ruva is a simple utility to write conditions in a human readable manner.
+summary: A library to write plain text conditions.
 test_files:
 - spec/conditions/simple_condition.ruva
 - spec/expression_spec.rb
+- spec/hash_to_ostruct_spec.rb
 - spec/helpers/expression_helper.rb
 - spec/inline_ruva_spec.rb
 - spec/normalize_indentation_spec.rb