claus 0.2.0 → 0.3.0

data/README.md

@@ -6,19 +6,25 @@ Simple rule expression using a combination of Array and Hash.
 
 ```ruby
 
-require 'claus'
-claus = Claus.new(foo: 1, bar: 2)
-claus.match(foo: 1, bar: 2)           #=> true
-claus.match(foo: 1, bar: 3)           #=> false
-claus.match(foo: 1, bar: 2, baz: 3)   #=> true
-
-claus = Claus.new(foo: 1, bar: 1..2)
-claus.match(foo: 1, bar: 2)           #=> true
-
-claus = Claus.new([{foo:1}, {bar:2}])
-claus.match?(foo: 1)                  #=> true
-claus.match?(bar: 2)                  #=> true
-claus.match?(baz: 3)                  #=> false
+  require 'claus'
+  claus = Claus.new(foo: 1, bar: 2)
+  claus.match(foo: 1, bar: 2)           #=> true
+  claus.match(foo: 1, bar: 3)           #=> false
+  claus.match(foo: 1, bar: 2, baz: 3)   #=> true
+
+  claus = Claus.new(foo: 1, bar: 1..2)
+  claus.match(foo: 1, bar: 2)           #=> true
+
+  claus = Claus.new([{foo:1}, {bar:2}])
+  claus.match?(foo: 1)                  #=> true
+  claus.match?(bar: 2)                  #=> true
+  claus.match?(baz: 3)                  #=> false
+
+  # Chaining AST nodes - same as above.
+  claus = Claus.new [{foo: 1}, Claus.new(bar: 2)]
+  claus.match?(foo: 1)                  #=> true
+  claus.match?(bar: 2)                  #=> true
+  claus.match?(baz: 3)                  #=> false
 ```
 
 # License

data/lib/claus.rb

@@ -15,6 +15,8 @@
 #   claus.match?(baz: 3)                  #=> false
 #
 class Claus
+  attr_reader :ast
+
   def initialize expression
     @ast = compile(expression)
   end
@@ -26,9 +28,10 @@ class Claus
   protected
     def compile expression
       case expression
-        when Hash  then AST::Hash.new(expression)
-        when Array then AST::List.new(expression)
-        else       raise ArgumentError, "invalid expression at #{expression}"
+        when Hash      then AST::Hash.new(expression)
+        when Array     then AST::List.new(expression)
+        when AST::Node then expression
+        else           raise ArgumentError, "invalid expression at #{expression}"
       end
     end
 
@@ -56,7 +59,8 @@ class Claus
             when ::Hash   then h[k] = Hash.new(v)
             when ::Array  then h[k] = List.new(v)
             when ::Range  then h[k] = List.new(v)
-            else               h[k] = Node.new(v)
+            when Claus    then h[k] = v.ast
+            else               h[k] = v.kind_of?(Node) ? v : Node.new(v)
           end
         end
       end
@@ -74,10 +78,11 @@ class Claus
       def compile expression
         expression.map do |v|
           case v
-            when ::Hash   then Hash.new(v)
-            when ::Array  then List.new(v)
-            when ::Range  then List.new(v)
-            else               Node.new(v)
+            when ::Hash     then Hash.new(v)
+            when ::Array    then List.new(v)
+            when ::Range    then List.new(v)
+            when Claus      then v.ast
+            else            v.kind_of?(Node) ? v : Node.new(v)
           end
         end
       end

data/test/test_claus.rb

@@ -48,4 +48,12 @@ describe 'claus' do
     assert_equal false, claus.match?(foo: 1)
     assert_equal false, claus.match?(foo: 2)
   end
+
+  it 'should allow ast chaining' do
+    claus = Claus.new([Claus.new(foo: 1), Claus.new(bar: 2).ast])
+    assert_equal true,  claus.match?(foo: 1)
+    assert_equal true,  claus.match?(bar: 2)
+    assert_equal false, claus.match?(foo: 2)
+    assert_equal false, claus.match?(bar: 1)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: claus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors: