ruva 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6c530bba26d5669fea221b939d1417aeeaec623e
+  data.tar.gz: 028fee7187edc8839720c561e6faf534416b651e
+SHA512:
+  metadata.gz: 14deefe0790aabea2980c6bfe4bc6a805fbcdce6ebed0b4570f4879d732b23c27a89774acfa0e91f45d35be2881c2e184651fd3c2d295be0eedbb4f83f6883df
+  data.tar.gz: cf9a259f1e92df62934d8156b11e83fc2edd09e17e91b2ee6556722a89670ae6ed7fb709d80b51cc148950821bb7e50e8ab2fb7cc43c8468d965736cda9d8317

data/.gitignore

@@ -17,3 +17,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.sublime*

data/README.md

@@ -1,9 +1,9 @@
 # Ruva
 
-[![Build Status](https://secure.travis-ci.org/ssmm/ruva.png)](http://travis-ci.org/ssmm/ruva) 
+[![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)
 
-A library to write plain text conditions.
+Write plain text conditions.
 
 Assume you have an object called `person` with an attribute `age = 23`:
 
@@ -12,10 +12,10 @@ person = OpenStruct.new
 person.age = 23
 ```
 
-You write 
+You write
 
 ```ruby
-person.if "age is 23" do 
+person.if "age is 23" do
   stuff
 end
 ```
@@ -77,7 +77,7 @@ person.if "
 end
 ```
 
-The above definition says, that the condition is met if any of the three conditions defined under the 
+The above definition says, that the condition is met if any of the three conditions defined under the
 `any` keyword meet.
 
 Currently supported are the keywords `all`, `any` and `none`.
@@ -97,8 +97,8 @@ Then you load it:
 condition = Ruva.read "your_condition"
 ```
 
-At this point, ruva loads the condition into some kind of hirarchy, according to the 
-[Specification pattern](http://en.wikipedia.org/wiki/Specification_pattern), and you can invoke its 
+At this point, ruva loads the condition into some kind of hirarchy, according to the
+[Specification pattern](http://en.wikipedia.org/wiki/Specification_pattern), and you can invoke its
 `evaluate` method to test any object you want against that condition:
 
 ```ruby

data/lib/ruva.rb

@@ -1,7 +1,25 @@
+require 'date'
+require "ruva/version"
+require "ruva/util"
+require 'ruva/specification/specification'
+require 'ruva/expression/expression_leaf_spec'
+require 'ruva/expression/equal_greater_less'
+require 'ruva/expression/identifier_comparable'
+require 'ruva/expression/is_between'
+require 'ruva/expression/matches'
+
 require 'indentation-parser'
+require 'citrus'
+require 'ostruct'
 
-require "ruva/version"
-require "ruva/expression"
+Citrus.require 'ruva/expression/ruva_expression'
+
+module Ruva::Expression::RuvaExpression
+  def self.parse expression
+    result = super expression
+    result.value
+  end
+end
 
 class Object
   def if condition
@@ -18,39 +36,39 @@ module Ruva
   def self.read file
     interpret IO.read("#{file}.ruva")
   end
-  
+
   def self.interpret text
-    
+
     parser = IndentationParser.new do |p|
-      p.on /^all$/ do |parent, source, captures| 
-        node = AndSpec.new
+      p.on /^all$/ do |parent, source, captures|
+        node = Specification::AndSpec.new
         parent.append node
         node
       end
-      
-      p.on /^any$/ do |parent, source, captures| 
-        node = OrSpec.new
+
+      p.on /^any$/ do |parent, source, captures|
+        node = Specification::OrSpec.new
         parent.append node
         node
       end
-      
-      p.on /^none$/ do |parent, source, captures| 
-        node = NotSpec.new
+
+      p.on /^none$/ do |parent, source, captures|
+        node = Specification::NotSpec.new
         parent.append node
         node
       end
-      
+
       p.else do |parent, source|
-        node = RuvaExpression.parse(source)
+        node = Ruva::Expression::RuvaExpression.parse(source)
         parent.append node
         node
       end
     end
-    
-    spec = parser.read(text, AndSpec.new)
+
+    spec = parser.read(text, Specification::AndSpec.new)
     spec.value
   end
-  
+
   def self.normalize_indentation str
     if str.index(/^[ ]*$\n/) == 0
       str.sub!(/^[ ]*$\n/, "")
@@ -61,23 +79,23 @@ module Ruva
     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
-  
+  # 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
       @satisfied = satisfied
     end
-    def else 
+    def else
       raise unless block_given?
       yield unless @satisfied
     end

data/lib/ruva/expression/equal_greater_less.rb

@@ -1,61 +1,65 @@
-class GreaterSpec < ExpressionLeafSpec
-  def compare (comparable, value) value > comparable end
-  def satisfied_text() "greater than" end
-  def unsatisfied_text() "less than" end
-end
-
-class LessSpec < ExpressionLeafSpec
-  def compare (comparable, value) value < comparable end
-  def satisfied_text() "less than" end
-  def unsatisfied_text() "greater than" end
-end
-
-class GreaterEqualSpec < ExpressionLeafSpec
-  def compare (comparable, value) value >= comparable end
-  def satisfied_text() "greater than or equal to" end
-  def unsatisfied_text() "less than" end
-end
-
-class LessEqualSpec < ExpressionLeafSpec
-  def compare (comparable, value) value <= comparable end
-  def satisfied_text() "less than or equal to" end
-  def unsatisfied_text() "greater than" end
-end
-
-module EqualGreaterLess
-  def value
-    spec = create_spec
-    spec.set_validator { |value, *args| 
-      compare @comparable, value
-    }
-    spec.set_reporting { |satisfied, value, *args|
-      comparable_string = @comparable.to_s
-      create_report_string "is #{satisfied_text} #{comparable_string}", "is #{unsatisfied_text} #{comparable_string}", satisfied, value
-    }
-    spec
-  end
-end
+module Ruva
+  module Expression
+    class GreaterSpec < ExpressionLeafSpec
+      def compare (comparable, value) value > comparable end
+      def satisfied_text() "greater than" end
+      def unsatisfied_text() "less than" end
+    end
 
-module Greater include EqualGreaterLess
-  def create_spec
-    GreaterSpec.new(identifier.value, comparable.value) 
-  end
-end
+    class LessSpec < ExpressionLeafSpec
+      def compare (comparable, value) value < comparable end
+      def satisfied_text() "less than" end
+      def unsatisfied_text() "greater than" end
+    end
 
-module Less include EqualGreaterLess
-  def create_spec
-    LessSpec.new(identifier.value, comparable.value) 
-  end
-end
+    class GreaterEqualSpec < ExpressionLeafSpec
+      def compare (comparable, value) value >= comparable end
+      def satisfied_text() "greater than or equal to" end
+      def unsatisfied_text() "less than" end
+    end
 
-module GreaterOrEqual include EqualGreaterLess
-  def create_spec
-    GreaterEqualSpec.new(identifier.value, comparable.value) 
-  end
-end
+    class LessEqualSpec < ExpressionLeafSpec
+      def compare (comparable, value) value <= comparable end
+      def satisfied_text() "less than or equal to" end
+      def unsatisfied_text() "greater than" end
+    end
+
+    module EqualGreaterLess
+      def value
+        spec = create_spec
+        spec.set_validator { |value, *args|
+          compare @comparable, value
+        }
+        spec.set_reporting { |satisfied, value, *args|
+          comparable_string = @comparable.to_s
+          create_report_string "is #{satisfied_text} #{comparable_string}", "is #{unsatisfied_text} #{comparable_string}", satisfied, value
+        }
+        spec
+      end
+    end
+
+    module Greater include EqualGreaterLess
+      def create_spec
+        GreaterSpec.new(identifier.value, comparable.value)
+      end
+    end
+
+    module Less include EqualGreaterLess
+      def create_spec
+        LessSpec.new(identifier.value, comparable.value)
+      end
+    end
+
+    module GreaterOrEqual include EqualGreaterLess
+      def create_spec
+        GreaterEqualSpec.new(identifier.value, comparable.value)
+      end
+    end
 
-module LessOrEqual include EqualGreaterLess
-  def create_spec
-    LessEqualSpec.new(identifier.value, comparable.value) 
+    module LessOrEqual include EqualGreaterLess
+      def create_spec
+        LessEqualSpec.new(identifier.value, comparable.value)
+      end
+    end
   end
 end

data/lib/ruva/expression/expression_leaf_spec.rb

@@ -1,51 +1,42 @@
-class ExpressionLeafSpec < LeafSpec
-  def get_value *args
-    if (args.size == 1)
-      obj = args[0]
-      if (obj.is_a? Hash)
-        obj = OpenStruct.new obj
+module Ruva
+  module Expression
+    class ExpressionLeafSpec
+      def get_value value
+        Ruva::Util::DeepCall.init_deep_call(@name, value)
       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
-  #     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.instance_eval(key_array.pop)
-      if (obj.is_a?(Hash)) 
-        obj = OpenStruct.new obj
+      def initialize name, args
+        @name = name
+        @comparable = args
       end
-      get_object_value(key_array, obj)      
-    else
-      obj.instance_eval(key_array.pop)
-    end
-  end
-  
-  def create_typed_value value
-    case value
-      when Numeric then value
-      when String then "'#{value}'"
-      else value
+
+      def set_validator &block
+        @validator = block
+      end
+
+      def set_reporting &block
+        @reporting = block
+      end
+
+      def evaluate *args
+        instance_exec(get_value(*args), *args, &@validator)
+      end
+
+      # def report satisfied, *args
+      #   instance_exec(satisfied, get_value(*args), *args, &@reporting)
+      # end
+
+      # def create_typed_value value
+      #   case value
+      #     when Numeric then value
+      #     when String then "'#{value}'"
+      #     else value
+      #   end
+      # end
+
+      # def create_report_string positive, negative, satisfied, value
+      #   @name.to_s + " #{create_typed_value value} " + (satisfied ? positive : negative)
+      # end
     end
   end
-  
-  def create_report_string positive, negative, satisfied, value  
-    @name.to_s + " #{create_typed_value value} " + (satisfied ? positive : negative)
-  end
-end
+end

data/lib/ruva/expression/identifier_comparable.rb

@@ -1,53 +1,57 @@
-module Identifier
-  def value
-    to_s.strip
-  end
-end
-
-module Comparable
-  def value
-    to_s
-  end
-end
-
-module LastComparable
-  def value   
-    Array.new << comparable
-  end
-end
-
-module IntComparable
-  def value
-    to_i
-  end
-end
-
-module FloatComparable
-  def value
-    to_f
-  end
-end
-
-module DateComparable
-  def value
-    Date.parse to_s
-  end
-end
-
-module RegexComparable
-  def value
-    Regexp.new regex.value
-  end
-end
-
-module TextComparable
-  def value
-    return to_s.strip
-  end
-end
-
-module Comparables
-  def value
-    subresult.value << comparable
+module Ruva
+  module Expression
+    module Identifier
+      def value
+        to_s.strip
+      end
+    end
+
+    module Comparable
+      def value
+        to_s
+      end
+    end
+
+    module LastComparable
+      def value
+        Array.new << comparable
+      end
+    end
+
+    module IntComparable
+      def value
+        to_i
+      end
+    end
+
+    module FloatComparable
+      def value
+        to_f
+      end
+    end
+
+    module DateComparable
+      def value
+        Date.parse to_s
+      end
+    end
+
+    module RegexComparable
+      def value
+        Regexp.new regex.value
+      end
+    end
+
+    module TextComparable
+      def value
+        return to_s.strip
+      end
+    end
+
+    module Comparables
+      def value
+        subresult.value << comparable
+      end
+    end
   end
 end