machete 0.3.0 → 0.4.0

data/.gitignore

@@ -2,3 +2,4 @@ lib/machete/parser.rb
 doc/
 .yardoc
 *.rbc
+Gemfile.lock

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.4.0 (2011-10-18)
+------------------
+* Support for "true", "false" and "nil" literals.
+* New "*=" operator matching part of a string.
+* Bundler support.
+
 0.3.0 (2011-09-27)
 ------------------
 

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/README.md

@@ -70,18 +70,20 @@ If you want to match a specific attribute of a node, specify its value inside `<
     Machete.matches?('42'.to_ast, 'FixnumLiteral<value = 42>') # => true
     Machete.matches?('45'.to_ast, 'FixnumLiteral<value = 42>') # => false
 
-The attribute value can be an integer, string, symbol, array or other pattern. The last option means you can easily match nested nodes recursively. You can also specify multiple attributes:
+The attribute value can be `true`, `false`, `nil`, integer, string, symbol, array or other pattern. The last option means you can easily match nested nodes recursively. You can also specify multiple attributes:
 
     Machete.matches?('foo.bar'.to_ast, 'Send<receiver = Send<receiver = Self, name = :foo>, name = :bar>') # => true
 
 #### String Attributes
 
-When matching string attributes values, you don't have to do a whole-string match using the `=` operator. You can also match the beginning or the end of a string attribute value using the `^=` or `$=` operators:
+When matching string attributes values, you don't have to do a whole-string match using the `=` operator. You can also match the beginning, the end or a part of a string attribute value using the `^=`, `$=` and `*=` operators:
 
     Machete.matches?('"abcd"'.to_ast, 'StringLiteral<string ^= "ab">') # => true
     Machete.matches?('"efgh"'.to_ast, 'StringLiteral<string ^= "ab">') # => false
     Machete.matches?('"abcd"'.to_ast, 'StringLiteral<string $= "cd">') # => true
     Machete.matches?('"efgh"'.to_ast, 'StringLiteral<string $= "cd">') # => false
+    Machete.matches?('"abcd"'.to_ast, 'StringLiteral<string *= "bc">') # => true
+    Machete.matches?('"efgh"'.to_ast, 'StringLiteral<string *= "bc">') # => false
 
 #### Array Attributes
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/lib/machete/matchers.rb

@@ -137,36 +137,19 @@ module Machete
     end
 
     # @private
-    class StartsWithMatcher
-      attr_reader :prefix
+    class StringRegexpMatcher
+      attr_reader :regexp
 
-      def initialize(prefix)
-        @prefix = prefix
+      def initialize(regexp)
+        @regexp = regexp
       end
 
       def ==(other)
-        other.instance_of?(self.class) && @prefix == other.prefix
+        other.instance_of?(self.class) && @regexp == other.regexp
       end
 
       def matches?(node)
-        node.is_a?(String) && node.start_with?(@prefix)
-      end
-    end
-
-    # @private
-    class EndsWithMatcher
-      attr_reader :suffix
-
-      def initialize(suffix)
-        @suffix = suffix
-      end
-
-      def ==(other)
-        other.instance_of?(self.class) && @suffix == other.suffix
-      end
-
-      def matches?(node)
-        node.is_a?(String) && node.end_with?(@suffix)
+        node.is_a?(String) && node =~ @regexp
       end
     end
 

data/lib/machete/parser.y

@@ -1,5 +1,8 @@
 class Machete::Parser
 
+token TRUE
+token FALSE
+token NIL
 token INTEGER
 token STRING
 token ANY
@@ -40,12 +43,23 @@ attrs : attr
 attr : method_name "=" expression { result = { val[0].to_sym => val[2] } }
      | method_name "^=" STRING {
          result = {
-           val[0].to_sym => StartsWithMatcher.new(string_value(val[2]))
+           val[0].to_sym => StringRegexpMatcher.new(
+             Regexp.new("^" + Regexp.escape(string_value(val[2])))
+           )
          }
        }
      | method_name "$=" STRING {
          result = {
-           val[0].to_sym => EndsWithMatcher.new(string_value(val[2]))
+           val[0].to_sym => StringRegexpMatcher.new(
+             Regexp.new(Regexp.escape(string_value(val[2])) + "$")
+           )
+         }
+       }
+     | method_name "*=" STRING {
+         result = {
+           val[0].to_sym => StringRegexpMatcher.new(
+             Regexp.new(Regexp.escape(string_value(val[2])))
+           )
          }
        }
 
@@ -53,6 +67,9 @@ attr : method_name "=" expression { result = { val[0].to_sym => val[2] } }
 # METHOD_NAME tokens, and that "reserved words" will lex as separate kinds of
 # tokens.
 method_name : METHOD_NAME
+            | TRUE
+            | FALSE
+            | NIL
             | ANY
             | EVEN
             | ODD
@@ -95,6 +112,9 @@ quantifier : "*" { result = [0, nil, 1] }
 literal : SYMBOL  { result = LiteralMatcher.new(val[0][1..-1].to_sym) }
         | INTEGER { result = LiteralMatcher.new(integer_value(val[0])) }
         | STRING  { result = LiteralMatcher.new(string_value(val[0])) }
+        | TRUE	  { result = LiteralMatcher.new(true) }
+        | FALSE   { result = LiteralMatcher.new(false) }
+        | NIL     { result = LiteralMatcher.new(nil) }
 
 any : ANY { result = AnyMatcher.new }
 
@@ -166,6 +186,7 @@ SIMPLE_TOKENS = [
   "$=",
   "[",
   "]",
+  "*=",
   "*",
   "+",
   "?",
@@ -174,6 +195,9 @@ SIMPLE_TOKENS = [
 ]
 
 COMPLEX_TOKENS = [
+  [:TRUE,  /^true/],
+  [:FALSE, /^false/],
+  [:NIL,   /^nil/],
   # INTEGER needs to be before METHOD_NAME, otherwise e.g. "+1" would be
   # recognized as two tokens.
   [

data/spec/machete/matchers_spec.rb

@@ -409,14 +409,14 @@ module Machete::Matchers
     end
   end
 
-  describe StartsWithMatcher do
+  describe StringRegexpMatcher do
     before :each do
-      @matcher = StartsWithMatcher.new("abcd")
+      @matcher = StringRegexpMatcher.new(/abcd/)
     end
 
     describe "initialize" do
       it "sets attributes correctly" do
-        @matcher.prefix.should == "abcd"
+        @matcher.regexp.should == /abcd/
       end
     end
 
@@ -426,7 +426,7 @@ module Machete::Matchers
       end
 
       it "returns true when passed a StartsWithMatcher initialized with the same parameters" do
-        @matcher.should == StartsWithMatcher.new("abcd")
+        @matcher.should == StringRegexpMatcher.new(/abcd/)
       end
 
       it "returns false when passed some random object" do
@@ -434,23 +434,23 @@ module Machete::Matchers
       end
 
       it "returns false when passed a subclass of StartsWithMatcher initialized with the same parameters" do
-        class SubclassedStartsWithMatcher < StartsWithMatcher
+        class SubclassedStringRegexpMatcher < StringRegexpMatcher
         end
 
-        @matcher.should_not == SubclassedStartsWithMatcher.new("abcd")
+        @matcher.should_not == SubclassedStringRegexpMatcher.new(/abcd/)
       end
 
       it "returns false when passed a StartsWithMatcher initialized with different parameters" do
-        @matcher.should_not == StartsWithMatcher.new("efgh")
+        @matcher.should_not == StringRegexpMatcher.new(/efgh/)
       end
     end
 
     describe "matches?" do
-      it "matches a string starting with the prefix" do
-        @matcher.matches?("abcdefgh").should be_true
+      it "matches a string matching the regexp" do
+        @matcher.matches?("efghabcdijkl").should be_true
       end
 
-      it "does not match a string not starting with the prefix" do
+      it "does not match a string not matching the regexp" do
         @matcher.matches?("efghijkl").should be_false
       end
 
@@ -460,57 +460,6 @@ module Machete::Matchers
     end
   end
 
-  describe EndsWithMatcher do
-    before :each do
-      @matcher = EndsWithMatcher.new("abcd")
-    end
-
-    describe "initialize" do
-      it "sets attributes correctly" do
-        @matcher.suffix.should == "abcd"
-      end
-    end
-
-    describe "==" do
-      it "returns true when passed the same object" do
-        @matcher.should == @matcher
-      end
-
-      it "returns true when passed a EndsWithMatcher initialized with the same parameters" do
-        @matcher.should == EndsWithMatcher.new("abcd")
-      end
-
-      it "returns false when passed some random object" do
-        @matcher.should_not == Object.new
-      end
-
-      it "returns false when passed a subclass of EndsWithMatcher initialized with the same parameters" do
-        class SubclassedEndsWithMatcher < EndsWithMatcher
-        end
-
-        @matcher.should_not == SubclassedEndsWithMatcher.new("abcd")
-      end
-
-      it "returns false when passed a EndsWithMatcher initialized with different parameters" do
-        @matcher.should_not == EndsWithMatcher.new("efgh")
-      end
-    end
-
-    describe "matches?" do
-      it "matches a string ending with the suffix" do
-        @matcher.matches?("efghabcd").should be_true
-      end
-
-      it "does not match a string not ending with the suffix" do
-        @matcher.matches?("ijklefgh").should be_false
-      end
-
-      it "does not match some random object" do
-        @matcher.matches?(Object.new).should be_false
-      end
-    end
-  end
-
   describe AnyMatcher do
     before :each do
       @matcher = AnyMatcher.new

data/spec/machete/parser_spec.rb

@@ -74,16 +74,37 @@ module Machete
     it "parses attr" do
       'Foo<a = 42 | 43>'.should be_parsed_as(NodeMatcher.new(:Foo, :a => @ch4243))
       'Foo<a ^= "abcd">'.should be_parsed_as(
-        NodeMatcher.new(:Foo, :a => StartsWithMatcher.new("abcd"))
+        NodeMatcher.new(:Foo, :a => StringRegexpMatcher.new(/^abcd/))
+      )
+      'Foo<a ^= "[]{}()|-*.\\?+^$ #\t\f\v\n\r">'.should be_parsed_as(
+        NodeMatcher.new(:Foo, :a => StringRegexpMatcher.new(
+          /^\[\]\{\}\(\)\|\-\*\.\\\?\+\^\$\ \#\t\f\v\n\r/
+        ))
       )
       'Foo<a $= "abcd">'.should be_parsed_as(
-        NodeMatcher.new(:Foo, :a => EndsWithMatcher.new("abcd"))
+        NodeMatcher.new(:Foo, :a => StringRegexpMatcher.new(/abcd$/))
+      )
+      'Foo<a $= "[]{}()|-*.\\?+^$ #\t\f\v\n\r">'.should be_parsed_as(
+        NodeMatcher.new(:Foo, :a => StringRegexpMatcher.new(
+          /\[\]\{\}\(\)\|\-\*\.\\\?\+\^\$\ \#\t\f\v\n\r$/
+        ))
+      )
+      'Foo<a *= "abcd">'.should be_parsed_as(
+        NodeMatcher.new(:Foo, :a => StringRegexpMatcher.new(/abcd/))
+      )
+      'Foo<a *= "[]{}()|-*.\\?+^$ #\t\f\v\n\r">'.should be_parsed_as(
+        NodeMatcher.new(:Foo, :a => StringRegexpMatcher.new(
+          /\[\]\{\}\(\)\|\-\*\.\\\?\+\^\$\ \#\t\f\v\n\r/
+        ))
       )
     end
 
     # Canonical method_name is "a".
     it "parses method_name" do
       'Foo<a = 42>'.should be_parsed_as(node_matcher_with_attr(:a))
+      'Foo<true = 42>'.should be_parsed_as(node_matcher_with_attr(:true))
+      'Foo<false = 42>'.should be_parsed_as(node_matcher_with_attr(:false))
+      'Foo<any = 42>'.should be_parsed_as(node_matcher_with_attr(:any))
       'Foo<any = 42>'.should be_parsed_as(node_matcher_with_attr(:any))
       'Foo<even = 42>'.should be_parsed_as(node_matcher_with_attr(:even))
       'Foo<odd = 42>'.should be_parsed_as(node_matcher_with_attr(:odd))
@@ -148,6 +169,9 @@ module Machete
       ':a'.should be_parsed_as(LiteralMatcher.new(:a))
       '42'.should be_parsed_as(@i42)
       '"abcd"'.should be_parsed_as(LiteralMatcher.new("abcd"))
+      'true'.should be_parsed_as(LiteralMatcher.new(true))
+      'false'.should be_parsed_as(LiteralMatcher.new(false))
+      'nil'.should be_parsed_as(LiteralMatcher.new(nil))
     end
 
     # Canonical any is "any".
@@ -155,6 +179,21 @@ module Machete
       'any'.should be_parsed_as(AnyMatcher.new)
     end
 
+    # Canonical TRUE is "true".
+    it "parses TRUE" do
+      'true'.should be_parsed_as(LiteralMatcher.new(true))
+    end
+
+    # Canonical FALSE is "false".
+    it "parses FALSE" do
+      'false'.should be_parsed_as(LiteralMatcher.new(false))
+    end
+
+    # Canonical NIL is "nil".
+    it "parses NIL" do
+      'nil'.should be_parsed_as(LiteralMatcher.new(nil))
+    end
+
     # Canonical INTEGER is "42".
     it "parses INTEGER" do
       # Sign

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: machete
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - David Majda
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 +02:00
+date: 2011-10-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,7 @@ files:
 - .gitignore
 - .yardopts
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile