aniero-tire_swing 0.0.4 → 0.0.5

data/History.txt

@@ -1,4 +1,10 @@
-== 1.0.4 / 2008-11-17
+== 0.0.5 / 2008-11-26
+
+* 2 minor enhancements
+  * Switched dependency on ActiveSupport out for the lighter-weight Extlib
+  * Updated array_of to remove recursive flag and add support for extracting more than one kind of node
+
+== 0.0.4 / 2008-11-17
 
 * 4 minor enhancements
   * Updated array traversal code to be recursive by default
@@ -7,7 +13,7 @@
   * Added clone method for deep copy of AST
   * Updated node building to set node parents for easier traversal of the AST
 
-== 1.0.0 / 2008-06-29
+== 0.0.1 / 2008-06-29
 
 * 1 major enhancement
   * Birthday!

data/Rakefile

@@ -22,4 +22,4 @@ PROJ.spec.opts << '--color --format specdoc'
 
 depend_on "treetop"
 depend_on "attributes"
-depend_on "activesupport", ">= 2.0.2"
+depend_on "extlib", "~> 0.9.8"

data/lib/tire_swing.rb

@@ -1,7 +1,7 @@
 module TireSwing
 
   # :stopdoc:
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -44,9 +44,9 @@ module TireSwing
 end  # module TireSwing
 
 require "rubygems"
-gem "activesupport"
+gem "extlib"
 gem "attributes"
 
-%w(active_support/core_ext/string attributes treetop).each { |lib| require lib }
+%w(extlib/inflection extlib/string attributes treetop).each { |lib| require lib }
 
 TireSwing.require_all_libs_relative_to __FILE__

data/lib/tire_swing/node_definition.rb

@@ -31,7 +31,7 @@ module TireSwing::NodeDefinition
     #
     #   <AST.create_node(:variable)>
     #
-    # and when you're using the parser extension, tell the parser about the namespace
+    # but when you're using the parser extension, tell the parser about the namespace
     #
     #   TireSwing.parses_grammar(Grammar, AST)
     #
@@ -39,10 +39,10 @@ module TireSwing::NodeDefinition
     #
     #   <node(...)>
     #
-    # which is an instance method wrapper for the create_node class method.
+    # which is an instance method wrapper for this create_node module method.
     #
     def create_node(name)
-      TireSwing::NodeCreator.new(name, const_get(name.to_s.camelize))
+      TireSwing::NodeCreator.new(name, const_get(name.to_s.camel_case))
     end
 
     # Define a node.
@@ -114,7 +114,7 @@ module TireSwing::NodeDefinition
     #
     def node(name, *attribute_names, &blk)
       klass = TireSwing::Node.create *attribute_names
-      const_set name.to_s.camelize, klass
+      const_set name.to_s.camel_case, klass
       klass.class_eval &blk if block_given?
     end
 
@@ -131,15 +131,14 @@ module TireSwing::NodeDefinition
     #
     #   [assignment, [assignment, [assignment]]]
     #
-    # If you specify that the array is recursive, it will retrieve all nested child nodes, no matter how deep, which
-    # provide the kind of node you want.
+    # array_of(:assignment) will retrieve all of the assignment nodes from that recursive tree.
     #
-    # If you provide a block, the filtered result will be yielded to the block and returned as the final result.
+    # If you provide a block, the filtered syntax node will be yielded to the block and returned as the final result.
     #
-    def array_of(kind, recursive = true, &blk)
+    def array_of(*kinds, &block)
       lambda do |node|
-        result = NodeFilters.filter(node, kind, recursive)
-        blk ? result.map(&blk) : result
+        result = NodeFilters.filter(node, kinds)
+        block ? result.map(&block) : result
       end
     end
 
@@ -176,15 +175,11 @@ module TireSwing::NodeDefinition
 
   module NodeFilters
 
-    def self.filter(node, kind, recursive)
+    def self.filter(node, kinds)
       nodes = []
       children = node.respond_to?(:elements) ? (node.elements || []) : []
-      if recursive
-        nodes << node if node.respond_to?(:node_to_build) && node.node_to_build == kind
-        children.each { |child| nodes.push *filter(child, kind, true) }
-      else
-        nodes = ([node] + children).select { |n| n.respond_to?(:node_to_build) && n.node_to_build == kind }
-      end
+      nodes << node if node.respond_to?(:node_to_build) && kinds.include?(node.node_to_build)
+      children.each { |child| nodes.push *filter(child, kinds) }
       nodes
     end
 

data/lib/tire_swing/parser_extension.rb

@@ -29,7 +29,7 @@ module TireSwing
   #
   # You can specify an alternate module which contains the AST if desired.
   def self.parses_grammar(grammar, ast=nil)
-    parser = (grammar.to_s + "Parser").constantize
+    parser = Extlib::Inflection.constantize(grammar.to_s + "Parser")
     ast ||= grammar
     parser.module_eval do
       extend ParserExtension

data/lib/tire_swing/visitor_definition.rb

@@ -45,7 +45,7 @@ module TireSwing::VisitorDefinition
     #
     def visitor(name, &blk)
       klass = Class.new(TireSwing::Visitor)
-      const_set name.to_s.camelize, klass
+      const_set name.to_s.camel_case, klass
       klass.class_eval &blk if block_given?
     end
   end

data/spec/grammars/lists.rb

@@ -28,7 +28,7 @@ module Lists
   module AST
     include TireSwing::NodeDefinition
     node :lists, :elements, :lists => extract(:list)
-    node :list, :elements, :numbers => array_of(:number, true) { |num| num.text_value.to_i }
+    node :list, :elements, :numbers => array_of(:number) { |num| num.text_value.to_i }
     node :number # placeholder
   end
 

data/spec/node_definition_spec.rb

@@ -76,20 +76,18 @@ describe TireSwing::NodeDefinition do
       TestNodes.array_of(:foo).call(node).should == [node]
     end
 
-    it "filters recursively by default" do
+    it "filters recursively" do
       b = mock_syntax_node("b", :elements => ["stuff", "whatever"], :node_to_build => :foo)
       a = mock_syntax_node("a", :elements => ["jkl", b], :node_to_build => :foo)
       top = mock_syntax_node("top", :elements => ["asdf", a], :node_to_build => :foo)
-      TestNodes.array_of(:foo, true).call(top).should == [top, a, b]
+      TestNodes.array_of(:foo).call(top).should == [top, a, b]
     end
 
-    describe "with the recursive flag set to false" do
-      it "returns a lambda that does not filter recursively" do
-        b = mock_syntax_node("b", :elements => ["stuff", "whatever"], :node_to_build => :foo)
-        a = mock_syntax_node("a", :elements => ["jkl", b], :node_to_build => :foo)
-        top = mock_syntax_node("top", :elements => ["asdf", a], :node_to_build => :foo)
-        TestNodes.array_of(:foo, false).call(top).should == [top, a]
-      end
+    it "filters for more than one kind of node" do
+      c = mock_syntax_node("c", :elements => [], :node_to_build => :foo)
+      b = mock_syntax_node("b", :elements => [c], :node_to_build => :bar)
+      a = mock_syntax_node("a", :elements => [b], :node_to_build => :foo)
+      TestNodes.array_of(:foo, :bar).call(a).should == [a, b, c]
     end
 
     describe "with a block provided" do

data/tire_swing.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tire_swing}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Witmer"]
-  s.date = %q{2008-11-17}
+  s.date = %q{2008-11-26}
   s.description = %q{Simple node and visitor definitions for Treetop grammars.}
   s.email = %q{nwitmer at gmail dot com}
   s.extra_rdoc_files = ["History.txt", "README.txt", "spec/fixtures/assignments.txt"]
@@ -26,15 +26,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<treetop>, [">= 1.2.4"])
       s.add_runtime_dependency(%q<attributes>, [">= 5.0.1"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.0.2"])
+      s.add_runtime_dependency(%q<extlib>, ["~> 0.9.8"])
     else
       s.add_dependency(%q<treetop>, [">= 1.2.4"])
       s.add_dependency(%q<attributes>, [">= 5.0.1"])
-      s.add_dependency(%q<activesupport>, [">= 2.0.2"])
+      s.add_dependency(%q<extlib>, ["~> 0.9.8"])
     end
   else
     s.add_dependency(%q<treetop>, [">= 1.2.4"])
     s.add_dependency(%q<attributes>, [">= 5.0.1"])
-    s.add_dependency(%q<activesupport>, [">= 2.0.2"])
+    s.add_dependency(%q<extlib>, ["~> 0.9.8"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aniero-tire_swing
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Nathan Witmer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-17 00:00:00 -08:00
+date: 2008-11-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,13 +31,13 @@ dependencies:
         version: 5.0.1
     version: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: extlib
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 0.9.8
     version: 
 description: Simple node and visitor definitions for Treetop grammars.
 email: nwitmer at gmail dot com