sexpr 0.5.1 → 0.6.0

data/spec/unit/matcher/rule/test_eat.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+module Sexpr::Matcher
+  describe Rule, "eat" do
+
+    let(:rule){ Rule.new :hello, self }
+
+    def eat(seen)
+      @seen = seen
+    end
+
+    it 'delegates to the defn' do
+      rule.eat([:foo])
+      @seen.should eq([:foo])
+    end
+
+  end
+end

data/spec/unit/matcher/rule/test_match_q.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+module Sexpr::Matcher
+  describe Rule, "match?" do
+
+    let(:rule){ Rule.new :hello, self }
+
+    def match?(seen)
+      @seen = seen
+    end
+
+    it 'delegates to the defn' do
+      rule.match?([:foo])
+      @seen.should eq([:foo])
+    end
+
+  end
+end

data/spec/{matcher → unit/matcher}/terminal/test_eat.rb

@@ -17,4 +17,4 @@ module Sexpr::Matcher
     end
 
   end
-end
+end

data/spec/unit/processor/test_grammar.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+module Sexpr
+  describe Processor, ".grammar" do
+
+    subject{ clazz.grammar }
+
+    context 'on Processor itself' do
+      let(:clazz){ Processor }
+
+      it{ should be(Sexpr) }
+    end
+
+    context 'on a subclass defining a grammar' do
+      let(:clazz){
+        Class.new(Processor){
+          grammar :foo
+        }
+      }
+
+      it{ should eq(:foo) }
+    end
+
+    context 'on a subclass of a rewriter class defining a grammar' do
+      let(:superclazz){
+        Class.new(Processor){
+          grammar :foo
+        }
+      }
+      let(:clazz){
+        Class.new(superclazz)
+      }
+
+      it{ should eq(:foo) }
+    end
+
+    context 'on a subclass that overrides the grammar' do
+      let(:superclazz){
+        Class.new(Processor){
+          grammar :foo
+        }
+      }
+      let(:clazz){
+        Class.new(superclazz){
+          grammar :bar
+        }
+      }
+
+      it{ should eq(:bar) }
+
+      it 'should not override on the parent' do
+        superclazz.grammar.should eq(:foo)
+      end
+    end
+
+  end
+end

data/spec/{processor → unit/processor}/test_sexpr_coercions.rb

@@ -3,8 +3,12 @@ module Sexpr
   class Processor
     describe SexprCoercions do
 
-      let(:helper){ SexprCoercions.new }
-      let(:processor){ Processor.new }
+      let(:helper){
+        SexprCoercions.new
+      }
+      let(:processor){
+        Rewriter.new
+      }
 
       it 'extends input sexprs' do
         sexpr = [:hello, "world"]

data/spec/{test_load.rb → unit/test_load.rb}

@@ -4,9 +4,10 @@ module Sexpr
 
       subject{ Sexpr.load(arg) }
 
-      after do
+      before do
         subject.should be_a(Grammar)
-        subject[:bool_expr].should be_a(Matcher::Alternative)
+        subject[:bool_expr].should be_a(Matcher::Rule)
+        subject[:bool_expr].defn.should be_a(Matcher::Alternative)
       end
 
       context "on a YAML path" do

data/spec/{test_sexpr.rb → unit/test_sexpr.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+require 'spec_helper'
 describe Sexpr do
 
   it "should have a version number" do

data/tasks/gem.rake

@@ -25,13 +25,18 @@
 #
 begin
   require 'rubygems/package_task'
-  Gem::PackageTask.new($gemspec) do |t|
+
+  # Dynamically load the gem spec
+  gemspec_file = File.expand_path('../../sexpr.gemspec', __FILE__)
+  gemspec      = Kernel.eval(File.read(gemspec_file))
+
+  Gem::PackageTask.new(gemspec) do |t|
 
     # Name of the package
-    t.name = $gemspec.name
+    t.name = gemspec.name
 
     # Version of the package
-    t.version = $gemspec.version
+    t.version = gemspec.version
 
     # Directory used to store the package files
     t.package_dir = "pkg"
@@ -49,7 +54,7 @@ begin
     t.need_zip = false
 
     # List of files to be included in the package.
-    t.package_files = $gemspec.files
+    t.package_files = gemspec.files
 
     # Tar command for gzipped or bzip2ed archives.
     t.tar_command = "tar"

data/tasks/test.rake

@@ -0,0 +1,26 @@
+require "rspec/core/rake_task"
+namespace :test do
+
+  desc "Run unit tests"
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    t.pattern = "spec/unit/**/test_*.rb"
+    t.fail_on_error = true
+    t.failure_message = nil
+    t.verbose = true
+    t.rspec_path = "rspec"
+    t.rspec_opts = ["--color", "--backtrace"]
+  end
+
+  desc "Run unit tests"
+  RSpec::Core::RakeTask.new(:integration) do |t|
+    t.pattern = "spec/integration/**/test_*.rb"
+    t.fail_on_error = true
+    t.failure_message = nil
+    t.verbose = true
+    t.rspec_path = "rspec"
+    t.rspec_opts = ["--color", "--backtrace"]
+  end
+
+  task :all => [ :unit, :integration ]
+end
+task :test => [ :"test:all" ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexpr
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: epath
-  requirement: &70208258266200 !ruby/object:Gem::Requirement
+  name: path
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *70208258266200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: citrus
-  requirement: &70208258265600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,32 +37,47 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *70208258265600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70208258265040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *70208258265040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70208258264540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *70208258264540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &70208258263980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: *70208258263980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.2
 description: Sexpr helps manipulating s-expressions in ruby.
 email:
 - blambeau@gmail.com
@@ -93,6 +118,7 @@ files:
 - lib/sexpr/loader.rb
 - lib/sexpr/matcher/alternative.rb
 - lib/sexpr/matcher/many.rb
+- lib/sexpr/matcher/non_terminal.rb
 - lib/sexpr/matcher/reference.rb
 - lib/sexpr/matcher/rule.rb
 - lib/sexpr/matcher/sequence.rb
@@ -117,61 +143,69 @@ files:
 - spec/fixtures/foo.rb
 - spec/fixtures/preprocessed.rb
 - spec/fixtures/simple_processor.rb
-- spec/grammar/matching/test_compile_rule.rb
-- spec/grammar/matching/test_compile_rule_defn.rb
-- spec/grammar/options/test_install_parser.rb
-- spec/grammar/options/test_install_path.rb
-- spec/grammar/options/test_install_root.rb
-- spec/grammar/tagging/test_looks_a_sexpr.rb
-- spec/grammar/tagging/test_mod2rulename.rb
-- spec/grammar/tagging/test_rule2modname.rb
-- spec/grammar/tagging/test_tag_sexpr.rb
-- spec/grammar/test_new.rb
-- spec/grammar/test_parse.rb
-- spec/grammar/test_sexpr.rb
-- spec/matcher/alternative/test_eat.rb
-- spec/matcher/alternative/test_match_q.rb
-- spec/matcher/many/test_eat.rb
-- spec/matcher/many/test_initialize.rb
-- spec/matcher/many/test_match_q.rb
-- spec/matcher/reference/test_eat.rb
-- spec/matcher/reference/test_match_q.rb
-- spec/matcher/rule/test_eat.rb
-- spec/matcher/rule/test_match_q.rb
-- spec/matcher/sequence/test_eat.rb
-- spec/matcher/sequence/test_match_q.rb
-- spec/matcher/terminal/test_eat.rb
-- spec/matcher/terminal/test_match_q.rb
-- spec/matcher/terminal/test_terminal_match.rb
-- spec/node/test_sexpr_body.rb
-- spec/node/test_sexpr_copy.rb
-- spec/node/test_sexpr_type.rb
-- spec/node/test_tracking_markers.rb
-- spec/parser/citrus/test_new.rb
-- spec/parser/citrus/test_parse.rb
-- spec/parser/citrus/test_recognize.rb
-- spec/parser/citrus/test_registration.rb
-- spec/parser/citrus/test_to_sexpr.rb
-- spec/parser/test_factor.rb
-- spec/parser/test_input_text.rb
-- spec/processor/helper/test_call.rb
-- spec/processor/test_apply.rb
-- spec/processor/test_build_helper_chain.rb
-- spec/processor/test_call.rb
-- spec/processor/test_helper.rb
-- spec/processor/test_sexpr_coercions.rb
-- spec/processor/test_use.rb
-- spec/rewriter/test_copy_and_apply.rb
+- spec/integration/bool_expr/test_not_push.rb
+- spec/integration/bool_expr/test_parsing.rb
+- spec/integration/bool_expr/test_tagging.rb
+- spec/integration/bool_expr/test_validation.rb
+- spec/integration/test_readme_examples.rb
 - spec/spec_helper.rb
-- spec/test_load.rb
-- spec/test_readme_examples.rb
-- spec/test_rewriter.rb
-- spec/test_sexpr.rb
+- spec/unit/grammar/matching/test_compile_rule.rb
+- spec/unit/grammar/matching/test_compile_rule_defn.rb
+- spec/unit/grammar/matching/test_compile_rules.rb
+- spec/unit/grammar/options/test_install_parser.rb
+- spec/unit/grammar/options/test_install_path.rb
+- spec/unit/grammar/options/test_install_root.rb
+- spec/unit/grammar/tagging/test_looks_a_sexpr.rb
+- spec/unit/grammar/tagging/test_mod2rulename.rb
+- spec/unit/grammar/tagging/test_rule2modname.rb
+- spec/unit/grammar/tagging/test_tag_sexpr.rb
+- spec/unit/grammar/tagging/test_tagging_module_for.rb
+- spec/unit/grammar/test_new.rb
+- spec/unit/grammar/test_parse.rb
+- spec/unit/grammar/test_sexpr.rb
+- spec/unit/matcher/alternative/test_eat.rb
+- spec/unit/matcher/alternative/test_match_q.rb
+- spec/unit/matcher/many/test_eat.rb
+- spec/unit/matcher/many/test_initialize.rb
+- spec/unit/matcher/many/test_match_q.rb
+- spec/unit/matcher/non_terminal/test_eat.rb
+- spec/unit/matcher/non_terminal/test_match_q.rb
+- spec/unit/matcher/reference/test_eat.rb
+- spec/unit/matcher/reference/test_match_q.rb
+- spec/unit/matcher/rule/test_eat.rb
+- spec/unit/matcher/rule/test_match_q.rb
+- spec/unit/matcher/sequence/test_eat.rb
+- spec/unit/matcher/sequence/test_match_q.rb
+- spec/unit/matcher/terminal/test_eat.rb
+- spec/unit/matcher/terminal/test_match_q.rb
+- spec/unit/matcher/terminal/test_terminal_match.rb
+- spec/unit/node/test_sexpr_body.rb
+- spec/unit/node/test_sexpr_copy.rb
+- spec/unit/node/test_sexpr_type.rb
+- spec/unit/node/test_tracking_markers.rb
+- spec/unit/parser/citrus/test_new.rb
+- spec/unit/parser/citrus/test_parse.rb
+- spec/unit/parser/citrus/test_recognize.rb
+- spec/unit/parser/citrus/test_registration.rb
+- spec/unit/parser/citrus/test_to_sexpr.rb
+- spec/unit/parser/test_factor.rb
+- spec/unit/parser/test_input_text.rb
+- spec/unit/processor/helper/test_call.rb
+- spec/unit/processor/test_apply.rb
+- spec/unit/processor/test_build_helper_chain.rb
+- spec/unit/processor/test_call.rb
+- spec/unit/processor/test_grammar.rb
+- spec/unit/processor/test_helper.rb
+- spec/unit/processor/test_sexpr_coercions.rb
+- spec/unit/processor/test_use.rb
+- spec/unit/rewriter/test_copy_and_apply.rb
+- spec/unit/test_load.rb
+- spec/unit/test_rewriter.rb
+- spec/unit/test_sexpr.rb
 - tasks/debug_mail.rake
 - tasks/debug_mail.txt
 - tasks/gem.rake
-- tasks/spec_test.rake
-- tasks/unit_test.rake
+- tasks/test.rake
 - tasks/yard.rake
 homepage: https://github.com/blambeau/sexp
 licenses: []
@@ -185,6 +219,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1636299260156006054
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A compilation framework around s-expressions
@@ -202,53 +239,62 @@ test_files:
 - spec/fixtures/foo.rb
 - spec/fixtures/preprocessed.rb
 - spec/fixtures/simple_processor.rb
-- spec/grammar/matching/test_compile_rule.rb
-- spec/grammar/matching/test_compile_rule_defn.rb
-- spec/grammar/options/test_install_parser.rb
-- spec/grammar/options/test_install_path.rb
-- spec/grammar/options/test_install_root.rb
-- spec/grammar/tagging/test_looks_a_sexpr.rb
-- spec/grammar/tagging/test_mod2rulename.rb
-- spec/grammar/tagging/test_rule2modname.rb
-- spec/grammar/tagging/test_tag_sexpr.rb
-- spec/grammar/test_new.rb
-- spec/grammar/test_parse.rb
-- spec/grammar/test_sexpr.rb
-- spec/matcher/alternative/test_eat.rb
-- spec/matcher/alternative/test_match_q.rb
-- spec/matcher/many/test_eat.rb
-- spec/matcher/many/test_initialize.rb
-- spec/matcher/many/test_match_q.rb
-- spec/matcher/reference/test_eat.rb
-- spec/matcher/reference/test_match_q.rb
-- spec/matcher/rule/test_eat.rb
-- spec/matcher/rule/test_match_q.rb
-- spec/matcher/sequence/test_eat.rb
-- spec/matcher/sequence/test_match_q.rb
-- spec/matcher/terminal/test_eat.rb
-- spec/matcher/terminal/test_match_q.rb
-- spec/matcher/terminal/test_terminal_match.rb
-- spec/node/test_sexpr_body.rb
-- spec/node/test_sexpr_copy.rb
-- spec/node/test_sexpr_type.rb
-- spec/node/test_tracking_markers.rb
-- spec/parser/citrus/test_new.rb
-- spec/parser/citrus/test_parse.rb
-- spec/parser/citrus/test_recognize.rb
-- spec/parser/citrus/test_registration.rb
-- spec/parser/citrus/test_to_sexpr.rb
-- spec/parser/test_factor.rb
-- spec/parser/test_input_text.rb
-- spec/processor/helper/test_call.rb
-- spec/processor/test_apply.rb
-- spec/processor/test_build_helper_chain.rb
-- spec/processor/test_call.rb
-- spec/processor/test_helper.rb
-- spec/processor/test_sexpr_coercions.rb
-- spec/processor/test_use.rb
-- spec/rewriter/test_copy_and_apply.rb
+- spec/integration/bool_expr/test_not_push.rb
+- spec/integration/bool_expr/test_parsing.rb
+- spec/integration/bool_expr/test_tagging.rb
+- spec/integration/bool_expr/test_validation.rb
+- spec/integration/test_readme_examples.rb
 - spec/spec_helper.rb
-- spec/test_load.rb
-- spec/test_readme_examples.rb
-- spec/test_rewriter.rb
-- spec/test_sexpr.rb
+- spec/unit/grammar/matching/test_compile_rule.rb
+- spec/unit/grammar/matching/test_compile_rule_defn.rb
+- spec/unit/grammar/matching/test_compile_rules.rb
+- spec/unit/grammar/options/test_install_parser.rb
+- spec/unit/grammar/options/test_install_path.rb
+- spec/unit/grammar/options/test_install_root.rb
+- spec/unit/grammar/tagging/test_looks_a_sexpr.rb
+- spec/unit/grammar/tagging/test_mod2rulename.rb
+- spec/unit/grammar/tagging/test_rule2modname.rb
+- spec/unit/grammar/tagging/test_tag_sexpr.rb
+- spec/unit/grammar/tagging/test_tagging_module_for.rb
+- spec/unit/grammar/test_new.rb
+- spec/unit/grammar/test_parse.rb
+- spec/unit/grammar/test_sexpr.rb
+- spec/unit/matcher/alternative/test_eat.rb
+- spec/unit/matcher/alternative/test_match_q.rb
+- spec/unit/matcher/many/test_eat.rb
+- spec/unit/matcher/many/test_initialize.rb
+- spec/unit/matcher/many/test_match_q.rb
+- spec/unit/matcher/non_terminal/test_eat.rb
+- spec/unit/matcher/non_terminal/test_match_q.rb
+- spec/unit/matcher/reference/test_eat.rb
+- spec/unit/matcher/reference/test_match_q.rb
+- spec/unit/matcher/rule/test_eat.rb
+- spec/unit/matcher/rule/test_match_q.rb
+- spec/unit/matcher/sequence/test_eat.rb
+- spec/unit/matcher/sequence/test_match_q.rb
+- spec/unit/matcher/terminal/test_eat.rb
+- spec/unit/matcher/terminal/test_match_q.rb
+- spec/unit/matcher/terminal/test_terminal_match.rb
+- spec/unit/node/test_sexpr_body.rb
+- spec/unit/node/test_sexpr_copy.rb
+- spec/unit/node/test_sexpr_type.rb
+- spec/unit/node/test_tracking_markers.rb
+- spec/unit/parser/citrus/test_new.rb
+- spec/unit/parser/citrus/test_parse.rb
+- spec/unit/parser/citrus/test_recognize.rb
+- spec/unit/parser/citrus/test_registration.rb
+- spec/unit/parser/citrus/test_to_sexpr.rb
+- spec/unit/parser/test_factor.rb
+- spec/unit/parser/test_input_text.rb
+- spec/unit/processor/helper/test_call.rb
+- spec/unit/processor/test_apply.rb
+- spec/unit/processor/test_build_helper_chain.rb
+- spec/unit/processor/test_call.rb
+- spec/unit/processor/test_grammar.rb
+- spec/unit/processor/test_helper.rb
+- spec/unit/processor/test_sexpr_coercions.rb
+- spec/unit/processor/test_use.rb
+- spec/unit/rewriter/test_copy_and_apply.rb
+- spec/unit/test_load.rb
+- spec/unit/test_rewriter.rb
+- spec/unit/test_sexpr.rb