piece 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6a7526736094521b146d63d9483aa5aa2b01a2f
-  data.tar.gz: 2a9102a633868f9f05258390129cbada6226e82d
+  metadata.gz: 4ab088dfe0e66ffc1450fc9eab486b2c10ca6d19
+  data.tar.gz: a0ec38dcea8530a04e2088a8364e7a80e2552a06
 SHA512:
-  metadata.gz: bdde9cf422140e520832f9ce56e151977d69f570413cd6ca640fcf2888c6cf7780d1527e1be4be4c12e39a5f5441a60284199373e589d7972dc72e57cef1a5c7
-  data.tar.gz: ae8d17cc64bcfb582a253b7845d1614dc4d97c5194b0626fc5c05a0dd014612863b4370c2be1e761b78319dc4e4e04201b36065612711d75727949315af1c01b
+  metadata.gz: d54d5a7e9bcdb09df0264b9bb50bd52cdfc5b0ad5fd8cc7f4096a3b188595671e1bd85d06b39257f8e206a1b3f9181dca9c1ce66b1afaa14b1576b8769513e74
+  data.tar.gz: e9ac20ef0b1a3643ddcf861e9a448ebc968d56a78f04b213de6f5eb8d264d3d8bcbb2dc9eb11a08a6964d710cb38c3946ca2c90d6aea33f31db46d416ea0160a

data/.travis.yml

@@ -5,12 +5,10 @@ gemfile:
   - Gemfile
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2.1
-  - jruby-18mode
   - jruby-19mode
   - jruby-head
   - rbx-2

data/TODO

@@ -1,4 +1,3 @@
 * serialize to yaml
 * save to DB
-* print reason: why match? respond true / false
 * print all matching rules given an action

data/lib/piece/rules.rb

@@ -1,7 +1,13 @@
 require 'piece/expression.tab'
 
 module Piece
-  class InvalidAction < StandardError
+  class RulesError < StandardError
+  end
+
+  class InvalidAction < RulesError
+  end
+
+  class UnknownRuleGroupName < RulesError
   end
 
   class Rules
@@ -38,11 +44,13 @@ module Piece
     end
 
     def match?(*action)
-      !!self[*action]
+      self[*action][:match]
     end
 
     def [](*action)
-      get(@data, action_parts(action))
+      ret = []
+      m = eval(@data, action_parts(action), ret)
+      {:match => m == :match, :reason => ret}
     end
 
     private
@@ -71,41 +79,64 @@ module Piece
       str =~ /^[\['"](.*)[\]'"]$/ ? $1 : str
     end
 
-    def apply(group, actions)
+    def apply(group, actions, backtrace)
       case group
       when ExpressionParser::Exp
+        validate_rule_names(group)
         case group.op
         when '+'
-          apply(group.left, actions) || apply(group.right, actions)
+          sub = []
+          if r = apply(group.left, actions, sub)
+            backtrace.concat(sub)
+            r
+          else
+            apply(group.right, actions, backtrace)
+          end
         when '-'
-          apply(group.left, actions) && apply(group.right, actions).nil?
+          sub1, sub2 = [], []
+          if r = apply(group.left, actions, sub1)
+            if apply(group.right, actions, sub2).nil?
+              backtrace.concat(sub1)
+              r
+            else
+              backtrace.concat(sub2)
+              nil
+            end
+          else
+            backtrace.concat(sub1)
+            nil
+          end
         else
           raise "Unknown operator: #{group.op}"
         end
       when ExpressionParser::Id
         if @data.has_key?(group.val)
-          get(@data[group.val], actions)
+          backtrace << group.val
+          eval(@data[group.val], actions, backtrace)
         else
-          get(group, actions)
+          eval(group, actions, backtrace)
         end
       else
         raise "Unknown type: #{group.inspect}"
       end
     end
 
-    def get(data, actions)
-      return data.nil? ? nil : Array(data) if actions.empty?
+    def eval(data, actions, backtrace=[])
+      return data.nil? ? nil : :match if actions.empty?
       case data
       when Hash
-        get(data[actions.first], actions[1..-1])
+        backtrace << actions.first
+        eval(data[actions.first], actions[1..-1], backtrace)
       when Array
-        get(data.first, actions) || get(data[1..-1], actions)
+        backtrace << data
+        eval(data.first, actions) || eval(data[1..-1], actions)
       when NilClass
         nil
       when ExpressionParser::Id
-        _match_?(data.val, actions.first) ? '*' : nil
+        _match_?(data.val, actions.first) ? :match : nil
       when String
-        apply(ExpressionParser.new.parse(data), actions)
+        backtrace << data
+        apply(ExpressionParser.new.parse(data), actions, backtrace)
       else
         raise "Unknown type: #{group.inspect}"
       end
@@ -114,5 +145,18 @@ module Piece
     def _match_?(a, b)
       a == b || a.nil? || a == '*' || b == '*'
     end
+
+    def validate_rule_names(exp)
+      case exp
+      when ExpressionParser::Exp
+        validate_rule_names(exp.left)
+        validate_rule_names(exp.right)
+      when ExpressionParser::Id
+        if exp.val != '*' && !@data.has_key?(exp.val)
+          raise UnknownRuleGroupName,
+                "Expecting '#{exp.val}' in expression to be a root rule group name(root group names: #{@data.keys.inspect}) you defined. "
+        end
+      end
+    end
   end
 end

data/lib/piece/version.rb

@@ -1,3 +1,3 @@
 module Piece
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piece
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Xiao Li
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2015-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler