ruva 1.0.1 → 1.0.2

data/lib/ruva/expression/is_between.rb

@@ -1,53 +1,57 @@
-def create_is_spec identifier, comparable
-  spec = ExpressionLeafSpec.new(identifier.value, comparable.value) 
-  spec.set_validator { |value, *args|
-    @comparable == value
-  }
-  spec.set_reporting { |satisfied, value, *args|
-    comparable_string = @comparable.to_s
-    create_report_string "is #{comparable_string}", "is not #{comparable_string}", satisfied, value
-  }
-  spec
-end
+module Ruva
+  module Expression
+    def self.create_is_spec identifier, comparable
+      spec = ExpressionLeafSpec.new(identifier.value, comparable.value)
+      spec.set_validator { |value, *args|
+        @comparable == value
+      }
+      spec.set_reporting { |satisfied, value, *args|
+        comparable_string = @comparable.to_s
+        create_report_string "is #{comparable_string}", "is not #{comparable_string}", satisfied, value
+      }
+      spec
+    end
 
-module Is
-  def value
-    create_is_spec identifier, comparable
-  end
-end
+    module Is
+      def value
+        Ruva::Expression.create_is_spec identifier, comparable
+      end
+    end
 
-module ManyIs
-  def value
-    spec = create_spec
-    comparables.value.reverse.each do |comparable|
-      new_spec = create_is_spec identifier, comparable
-      spec.append(new_spec)
+    module ManyIs
+      def value
+        spec = create_spec
+        comparables.value.reverse.each do |comparable|
+          new_spec = Ruva::Expression.create_is_spec identifier, comparable
+          spec.append(new_spec)
+        end
+        spec
+      end
     end
-    spec
-  end
-end
 
-module OrIs include ManyIs
-  def create_spec
-    OrSpec.new
-  end
-end
+    module OrIs include ManyIs
+      def create_spec
+        Ruva::Specification::OrSpec.new
+      end
+    end
 
-module IsBetween
-  def value
-    comparables = [from.value, to.value]
-    spec = ExpressionLeafSpec.new(identifier.value, comparables) 
-    spec.set_validator { |value, *args|
-      if value
-        value.between? @comparable[0], @comparable[1]
-      else
-        false
+    module IsBetween
+      def value
+        comparables = [from.value, to.value]
+        spec = ExpressionLeafSpec.new(identifier.value, comparables)
+        spec.set_validator { |value, *args|
+          if value
+            value.between? @comparable[0], @comparable[1]
+          else
+            false
+          end
+        }
+        spec.set_reporting { |satisfied, value, *args|
+          comparable_string = "#{@comparable[0]} and #{@comparable[1]}"
+          create_report_string "is between #{comparable_string}", "is not between #{comparable_string}", satisfied, value
+        }
+        spec
       end
-    }
-    spec.set_reporting { |satisfied, value, *args|
-      comparable_string = "#{@comparable[0]} and #{@comparable[1]}" 
-      create_report_string "is between #{comparable_string}", "is not between #{comparable_string}", satisfied, value
-    }
-    spec
+    end
   end
 end

data/lib/ruva/expression/matches.rb

@@ -1,42 +1,46 @@
-def create_matches_spec identifier, comparable
-  comparable = comparable.value
-  regex = comparable.is_a?(Regexp) ? comparable : Regexp.new(comparable)
-  spec = ExpressionLeafSpec.new(identifier.value, regex)
-  spec.set_validator { |value, *args|
-    (@comparable =~ value) != nil
-  }
-  spec.set_reporting { |satisfied, value, *args|
-    comparable_string = "/#{@comparable.source}/"
-    create_report_string "matches #{comparable_string}", "does not match #{comparable_string}", satisfied, value
-  }
-  spec
-end
+module Ruva
+  module Expression
+    def self.create_matches_spec identifier, comparable
+      comparable = comparable.value
+      regex = comparable.is_a?(Regexp) ? comparable : Regexp.new(comparable)
+      spec = ExpressionLeafSpec.new(identifier.value, regex)
+      spec.set_validator { |value, *args|
+        (@comparable =~ value) != nil
+      }
+      spec.set_reporting { |satisfied, value, *args|
+        comparable_string = "/#{@comparable.source}/"
+        create_report_string "matches #{comparable_string}", "does not match #{comparable_string}", satisfied, value
+      }
+      spec
+    end
 
-module Matches
-  def value
-    create_matches_spec identifier, comparable
-  end
-end
+    module Matches
+      def value
+        Ruva::Expression.create_matches_spec identifier, comparable
+      end
+    end
 
-module ManyMatches
-  def value
-    spec = create_spec
-    comparables.value.reverse.each do |comparable|
-      new_spec = create_matches_spec identifier, comparable
-      spec.append(new_spec)
+    module ManyMatches
+      def value
+        spec = create_spec
+        comparables.value.reverse.each do |comparable|
+          new_spec = Ruva::Expression.create_matches_spec identifier, comparable
+          spec.append(new_spec)
+        end
+        spec
+      end
     end
-    spec
-  end
-end
 
-module AndMatches include ManyMatches
-  def create_spec
-    AndSpec.new
-  end
-end
+    module AndMatches include ManyMatches
+      def create_spec
+        AndSpec.new
+      end
+    end
 
-module OrMatches include ManyMatches
-  def create_spec
-    OrSpec.new
+    module OrMatches include ManyMatches
+      def create_spec
+        OrSpec.new
+      end
+    end
   end
 end

data/lib/ruva/expression/ruva_expression.citrus

@@ -1,51 +1,51 @@
-grammar RuvaExpression
-	
+grammar Ruva::Expression::RuvaExpression
+
 	rule root
-		(identifier matches comparables:(and_comparables)) <AndMatches>
+		(identifier matches comparables:(and_comparables)) <Ruva::Expression::AndMatches>
 		|
-		(identifier matches comparables:(or_comparables)) <OrMatches>
+		(identifier matches comparables:(or_comparables)) <Ruva::Expression::OrMatches>
 		|
-		(identifier matches comparable) <Matches>
+		(identifier matches comparable) <Ruva::Expression::Matches>
 		|
-		(identifier is between from:(comparable) and to:(comparable)) <IsBetween>
+		(identifier is between from:(comparable) and to:(comparable)) <Ruva::Expression::IsBetween>
 		|
-		(identifier is greater than or equal to comparable) <GreaterOrEqual>
+		(identifier is greater than or equal to comparable) <Ruva::Expression::GreaterOrEqual>
 		|
-		(identifier is less than or equal to comparable) <LessOrEqual>
+		(identifier is less than or equal to comparable) <Ruva::Expression::LessOrEqual>
 		|
-		(identifier is greater than comparable) <Greater>
+		(identifier is greater than comparable) <Ruva::Expression::Greater>
 		|
-		(identifier is less than comparable) <Less>
+		(identifier is less than comparable) <Ruva::Expression::Less>
 		|
-		(identifier is comparable or more) <GreaterOrEqual>
+		(identifier is comparable or more) <Ruva::Expression::GreaterOrEqual>
 		|
-		(identifier is comparable or less) <LessOrEqual>
+		(identifier is comparable or less) <Ruva::Expression::LessOrEqual>
 		|
-		(identifier is comparables:(or_comparables)) <OrIs>
+		(identifier is comparables:(or_comparables)) <Ruva::Expression::OrIs>
 		|
-		(identifier is comparable) <Is>
+		(identifier is comparable) <Ruva::Expression::Is>
 	end
 
 	rule matches
 		'matches' space
 	end
-		
+
 	rule is
 		'is' space
 	end
-	
+
 	rule between
 		'between' space
 	end
-	
+
 	rule greater
 		'greater' space
 	end
-	
+
 	rule less
 		'less' space
 	end
-	
+
 	rule more
 		'more' space
 	end
@@ -53,68 +53,68 @@ grammar RuvaExpression
 	rule than
 		'than' space
 	end
-	
+
 	rule equal
 		'equal' space
 	end
-	
+
 	rule to
 		'to' space
 	end
-		
+
 	rule and
 		'and' space
 	end
-		
+
 	rule or
 		'or' space
-	end		
-		
+	end
+
 	rule identifier
-		([a-zA-Z0-9_.\[\]]+ space) <Identifier>
+		([a-zA-Z0-9_.\[\]]+ space) <Ruva::Expression::Identifier>
 	end
 
 	rule comparable
 		(number_comparable | date_comparable | regex_comparable | text_comparable)
 	end
-	
+
 	rule last_comparable
-		(comparable '') <LastComparable>
+		(comparable '') <Ruva::Expression::LastComparable>
 	end
 
 	rule number_comparable
 		(int_comparable | float_comparable)
 	end
-	
+
 	rule int_comparable
-		([0-9]+ space) <IntComparable>
+		([0-9]+ space) <Ruva::Expression::IntComparable>
 	end
-		
+
 	rule float_comparable
-		([0-9]* '.' [0-9]+ space) <FloatComparable>
+		([0-9]* '.' [0-9]+ space) <Ruva::Expression::FloatComparable>
 	end
-	
+
 	rule date_comparable
-		([0-9]2*2 '.' [0-9]2*2 '.' [0-9]4*4 space) <DateComparable>
+		([0-9]2*2 '.' [0-9]2*2 '.' [0-9]4*4 space) <Ruva::Expression::DateComparable>
 	end
-		
+
 	rule regex_comparable
-		('/' regex:((!'/'!'\\' .) | '\\/' | '\\\\')* '/' space) <RegexComparable>
+		('/' regex:((!'/'!'\\' .) | '\\/' | '\\\\')* '/' space) <Ruva::Expression::RegexComparable>
 	end
-	
+
 	rule text_comparable
-		([^ ]+ space) <TextComparable>
+		([^ ]+ space) <Ruva::Expression::TextComparable>
 	end
 
 	rule and_comparables
-		(comparable and subresult:(and_comparables | last_comparable)) <Comparables>
+		(comparable and subresult:(and_comparables | last_comparable)) <Ruva::Expression::Comparables>
 	end
 
 	rule or_comparables
-		(comparable or subresult:(or_comparables | last_comparable)) <Comparables>
+		(comparable or subresult:(or_comparables | last_comparable)) <Ruva::Expression::Comparables>
 	end
-	
+
 	rule space
 		[ \t]+ | /$/
 	end
-end
+end

data/lib/ruva/specification/specification.rb

@@ -1,110 +1,93 @@
-class Spec
-  def initialize
-    @specs = Array.new
-  end
-  
-  def append spec
-    @specs << spec
-    spec
-  end
-  
-  def create_subreport spec, *args
-    if spec.is_a? Spec
-      spec.evaluate *args
-    else
-      result = spec.evaluate *args
-      message = spec.report result, *args
-      SpecReport.new result, message
-    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
+module Ruva
+  module Specification
+    class Spec
+      def initialize
+        @specs = Array.new
+      end
 
-  def evaluate *args
-    passed = initial_condition
-    @specs.each do |spec|
-      result = spec.evaluate *args
-      if condition_change? result
-        passed = !initial_condition
+      def append spec
+        @specs << spec
+        spec
       end
-    end
-    passed
-  end
-end
 
-class AndSpec < Spec
-  def initial_condition() return true end
-  def name() "all" end
-  def condition_change?(satisfied) !satisfied end
-end
+      # def create_subreport spec, *args
+      #   if spec.is_a? Spec
+      #     spec.evaluate *args
+      #   else
+      #     result = spec.evaluate *args
+      #     message = spec.report result, *args
+      #     SpecReport.new result, message
+      #   end
+      # end
 
-class OrSpec < Spec
-  def initial_condition() return false end
-  def name() "any" end
-  def condition_change?(satisfied) satisfied 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
 
-class NotSpec < Spec
-  def initial_condition() return true end
-  def name() "none" end
-  def condition_change?(satisfied) satisfied end
-end
+      def evaluate value
+        passed = initial_condition
+        @specs.each do |spec|
+          result = spec.evaluate value
+          if condition_change? result
+            passed = !initial_condition
+          end
+        end
+        passed
+      end
+    end
 
-class LeafSpec
-  def initialize name, args
-    @name = name
-    @comparable = args
-  end
-  
-  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  
-end
+    class AndSpec < Spec
+      def initial_condition() return true end
+      def name() "all" end
+      def condition_change?(satisfied) !satisfied end
+    end
 
-class SpecReport
-  
-  attr_accessor :satisfied, :name, :input
-  
-  def initialize satisfied, message
-    @satisfied = satisfied
-    @message = message
-    @subreports = Array.new
-  end
-  
-  def add_subreport subreport
-    @subreports << subreport
-  end
-  
-  def to_s s = ''
-    met = @satisfied ? "[+] " : "[-] "
-    output = s + met + @message
-    output += "\n"
-    @subreports.each do |subreport|
-      output += subreport.to_s(s + '  ')
+    class OrSpec < Spec
+      def initial_condition() return false end
+      def name() "any" end
+      def condition_change?(satisfied) satisfied end
+    end
+
+    class NotSpec < Spec
+      def initial_condition() return true end
+      def name() "none" end
+      def condition_change?(satisfied) satisfied end
     end
-    output
+
+
+
+    # class SpecReport
+
+    #   attr_accessor :satisfied, :name, :input
+
+    #   def initialize satisfied, message
+    #     @satisfied = satisfied
+    #     @message = message
+    #     @subreports = Array.new
+    #   end
+
+    #   def add_subreport subreport
+    #     @subreports << subreport
+    #   end
+
+    #   def to_s s = ''
+    #     met = @satisfied ? "[+] " : "[-] "
+    #     output = s + met + @message
+    #     output += "\n"
+    #     @subreports.each do |subreport|
+    #       output += subreport.to_s(s + '  ')
+    #     end
+    #     output
+    #   end
+    # end
   end
 end