sexpr 0.4.0 → 0.5.0

data/CHANGELOG.md

@@ -1,14 +1,53 @@
+# 0.5.0 / 2012-02-25
+
+* Major enhancements
+
+  * `Processor#apply` is introduced and is intended to be used to apply processing rules
+    from the inside of the processor class. This method is equivalent to `#call` when no
+    preprocessor is installed (see below).
+  * Preprocessors can now be installed on a Processor through its `use` class method.
+    Preprocessors are applied ala 'Enumerable#inject' on the s-expression passed at
+    `Prcoessor#call`. The preprocessed result is then passed to `#apply` for further
+    processing by the processor itself.
+    (Please note that preprocessing is *not* performed by `#apply` itself; preprocessing
+    is typically applied once one the whole abstract syntax tree instead of successively
+    when its nodes are encountered. Tip: use helpers for such behavior).
+  * `Processor.use` can also be used to make specific computations ahead of processing
+    (such as a symbol table). For this, simply pass a Hash that maps a computation name
+    to a processor class. Attribute readers are automatically installed on the processor
+    class and instance variables set by `#call` accordingly.
+    (Please note such preprocessors do not participate to the rewriting chain described
+    above.)
+
+* Minor enhancements
+
+  * `Processor.call(sexpr, opts)` is a shortcut for `Processor.new(opts).call(sexpr)`
+  * `Grammar#default_taggging_module` is introduced for cases where either no fine-grained
+    tagging is needed (e.g. all nodes tagged with the same Node module) or fine-grained
+    tagging is needed but is not a total function (e.g. not all nodes have a
+    specialization of Node).
+
+* Bug fixes
+
+  * Processor options taken at construction are now correctly kept under @options (an
+    attribute reader is provided)
+
+* Breaking changes
+
+  * The `Processor#main_processor` feature (undocumented and unused in examples) has been
+    removed. Using preprocessors is much cleaner that linking processors to each other.
+
 # 0.4.0 / 2012-02-23
 
 * Major enhancements
 
-  * A processing/rewriting framework has been added to Sexpr. See the `Processor` and `Rewriter`
-    classes, as well as the boolean expression example.
-  * Tracking markers can now decorate s-expressions, provided they include the `Sexpr` module.
-    Tracking markers are a simple Hash of meta-information (i.e. not taken into account for
-    equality for s-expressions). Such markers can be set with `Grammar#sexpr(sexpr, markers)`.
-    Default markers are typically provided by parsers for traceability of the s-expression
-    with the source text it comes from.
+  * A processing/rewriting framework has been added to Sexpr. See the `Processor` and
+    `Rewriter` classes, as well as the boolean expression example.
+  * Tracking markers can now decorate s-expressions, provided they include the `Sexpr`
+    module. Tracking markers are a simple Hash of meta-information (i.e. not taken into
+    account for equality for s-expressions). Such markers can be set with
+    `Grammar#sexpr(sexpr, markers)`. Default markers are typically provided by parsers for
+    traceability of the s-expression with the source text it comes from.
 
 * Minor enhancements
 
@@ -20,12 +59,12 @@
 
 * Breaking changes
 
-  * `Parser.factor` does no longer accept options. This is to avoid the 'yet another options'
-    symptom and favor convention over configuration.
+  * `Parser.factor` does no longer accept options. This is to avoid the 'yet another
+    options' symptom and favor convention over configuration.
   * Accordingly, `Sexpr::Citrus::Parser` no longer takes options at construction either.
-  * `Grammar#sexpr` does no longer allow parsing options as second argument, but takes tracking
-    markers (see enhancements). To palliate to this, default parsing options can now be
-    specified through `Grammar#default_parse_options` (see enhancements).
+  * `Grammar#sexpr` does no longer allow parsing options as second argument, but takes
+    tracking markers (see enhancements). To palliate to this, default parsing options can
+    now be specified through `Grammar#default_parse_options` (see enhancements).
 
 # 0.3.0 / 2012-02-21
 
@@ -44,11 +83,11 @@
     the result to a constant makes perfect sense and benefits from the ruby's magic naming
     feature.
   * A loaded grammar now respond to a :sexpr method that parses (if needed) and returns a
-    s-expression. The latter, and all its sub-expressions are automatically tagged with the
-    Sexpr module, as well as with user-defined modules. The latter are automatically discovered
-    with a convention over configuration heuristics that associates rule names to module names.
-    That convention may however be overridden with specific grammar methods (see the BoolExpr
-    example).
+    s-expression. The latter, and all its sub-expressions are automatically tagged with
+    the Sexpr module, as well as with user-defined modules. The latter are automatically
+    discovered with a convention over configuration heuristics that associates rule names
+    to module names. That convention may however be overridden with specific grammar
+    methods (see the BoolExpr example).
 
 # 0.2.0 / 2012-02-21
 

data/Gemfile

@@ -4,6 +4,6 @@ group :development do
   gem "epath", "~> 0.0.1"
   gem "citrus", "~> 2.4"
   gem "rake", "~> 0.9.2"
-  gem "rspec", "~> 2.8.0"
+  gem "rspec", "~> 2.8"
   gem "wlang", "~> 0.10.2"
 end

data/Gemfile.lock

@@ -23,5 +23,5 @@ DEPENDENCIES
   citrus (~> 2.4)
   epath (~> 0.0.1)
   rake (~> 0.9.2)
-  rspec (~> 2.8.0)
+  rspec (~> 2.8)
   wlang (~> 0.10.2)

data/README.md

@@ -1,5 +1,8 @@
 # Sexpr
 
+[![Build Status](https://secure.travis-ci.org/blambeau/sexpr.png)](http://travis-ci.org/blambeau/sexpr)
+[![Dependency Status](https://gemnasium.com/blambeau/sexpr.png)](https://gemnasium.com/blambeau/sexpr)
+
 A ruby compilation framework around s-expressions.
 
 ## Links

data/Rakefile

@@ -1,11 +1,3 @@
-begin
-  gem "bundler", "~> 1.0"
-  require "bundler/setup"
-rescue LoadError => ex
-  puts ex.message
-  abort "Bundler failed to load, (did you run 'gem install bundler' ?)"
-end
-
 # Dynamically load the gem spec
 $gemspec_file = File.expand_path('../sexpr.gemspec', __FILE__)
 $gemspec      = Kernel.eval(File.read($gemspec_file))

data/examples/bool_expr/bool_expr.rb

@@ -42,9 +42,9 @@ module BoolExpr
     # cases
     def on_bool_not(sexpr)
       case expr = sexpr.last
-      when And then call [:bool_or,  [:bool_not, expr[1]], [:bool_not, expr[2]] ]
-      when Or  then call [:bool_and, [:bool_not, expr[1]], [:bool_not, expr[2]] ]
-      when Not then call expr.last
+      when And then apply [:bool_or,  [:bool_not, expr[1]], [:bool_not, expr[2]] ]
+      when Or  then apply [:bool_and, [:bool_not, expr[1]], [:bool_not, expr[2]] ]
+      when Not then apply expr.last
       when Lit then [:bool_lit, !expr.last]
       else
         sexpr

data/lib/sexpr/grammar/tagging.rb

@@ -15,25 +15,29 @@ module Sexpr
         nil
       end
 
+      def default_tagging_module
+        nil
+      end
+
       def sexpr(input, markers = nil)
         case input
         when Array
-          tag_sexpr input, tagging_reference, markers
+          tag_sexpr input, markers
         else
           sexpr = parser!.to_sexpr(parse(input))
-          tag_sexpr sexpr, tagging_reference, markers, true
+          tag_sexpr sexpr, markers, true
         end
       end
 
       private
 
-      def tag_sexpr(sexpr, reference, markers = nil, force = false)
+      def tag_sexpr(sexpr, markers = nil, force = false)
         return sexpr unless looks_a_sexpr?(sexpr)
         return sexpr if Sexpr===sexpr and not(force) and markers.nil?
 
         # set the Sexpr modules
         sexpr.extend(Sexpr) unless Sexpr===sexpr
-        tag_sexpr_with_user_module(sexpr, reference) if reference
+        tag_sexpr_with_user_module(sexpr)
 
         # set the markers if any
         if markers
@@ -43,16 +47,21 @@ module Sexpr
 
         # recurse
         sexpr[1..-1].each do |child|
-          tag_sexpr(child, reference, nil, force)
+          tag_sexpr(child, nil, force)
         end
         sexpr
       end
 
-      def tag_sexpr_with_user_module(sexpr, reference)
-        rulename = sexpr.first
-        modname  = rule2modname(rulename)
-        mod      = reference.const_get(modname) rescue nil
-        sexpr.extend(mod) if mod
+      def tag_sexpr_with_user_module(sexpr)
+        if ref = tagging_reference
+          rulename = sexpr.first
+          modname  = rule2modname(rulename)
+          tag      = ref.const_get(modname) rescue default_tagging_module
+          sexpr.extend(tag) if tag
+        elsif tag = default_tagging_module
+          sexpr.extend(tag)
+        end
+        sexpr
       end
 
       def looks_a_sexpr?(arg)

data/lib/sexpr/processor.rb

@@ -4,36 +4,53 @@ require_relative 'processor/sexpr_coercions'
 module Sexpr
   class Processor
 
-    ### class methods
+    class << self
 
-    def self.helpers
-      @helpers ||= superclass.helpers.dup rescue [ ]
-    end
+      def preprocessors
+        @preprocessors ||= superclass.preprocessors.dup rescue [ ]
+      end
 
-    def self.helper(helper_class)
-      methods = helper_class.const_get(:Methods) rescue nil
-      module_eval{ include methods } if methods
-      helpers << helper_class
-    end
+      def use(preprocessor, options = nil)
+        preprocessor.keys.each{|k| attr_reader(k)} if preprocessor.is_a?(Hash)
+        preprocessors << [preprocessor, options]
+      end
 
-    def self.build_helper_chain(helpers = self.helpers)
-      return NullHelper.new if helpers.empty?
-      helpers[0...-1].reverse.inject(helpers.last.new) do |chain, h_class|
-        prepended = h_class.new
-        prepended.next_in_chain = chain
-        prepended
+      def helpers
+        @helpers ||= superclass.helpers.dup rescue [ ]
       end
-    end
 
-    ### instance methods
+      def helper(helper_class)
+        methods = helper_class.const_get(:Methods) rescue nil
+        module_eval{ include methods } if methods
+        helpers << helper_class
+      end
+
+      def build_helper_chain(helpers = self.helpers)
+        return NullHelper.new if helpers.empty?
+        helpers[0...-1].reverse.inject(helpers.last.new) do |chain, h_class|
+          prepended = h_class.new
+          prepended.next_in_chain = chain
+          prepended
+        end
+      end
+
+      def call(sexpr, options = nil)
+        new(options).call(sexpr)
+      end
 
-    attr_reader :main_processor
+    end # class << self
 
-    def initialize(options = {})
-      @main_processor = options.delete(:main_processor) || self
+    attr_reader :options
+
+    def initialize(options = nil)
+      @options = options || {}
     end
 
     def call(sexpr)
+      apply(preprocess(sexpr))
+    end
+
+    def apply(sexpr)
       help(sexpr) do |n|
         meth = :"on_#{n.first}"
         meth = :"on_missing" unless respond_to?(meth)
@@ -47,6 +64,27 @@ module Sexpr
 
     private
 
+    def preprocess(sexpr)
+      preprocessors = self.class.preprocessors
+      preprocessors.each do |pre|
+        sexpr = _preprocess(sexpr, pre)
+      end
+      sexpr
+    end
+
+    def _preprocess(sexpr, preprocessing)
+      pre_class, options = preprocessing
+      if Hash===pre_class
+        pre_class.each_pair do |k,v|
+          computed = v.new(options).call(sexpr)
+          self.instance_variable_set(:"@#{k}", computed)
+        end
+        sexpr
+      else
+        pre_class.new(options).call(sexpr)
+      end
+    end
+
     def helper_chain
       @helper_chain ||= self.class.build_helper_chain
     end

data/lib/sexpr/rewriter.rb

@@ -12,7 +12,7 @@ module Sexpr
 
     def copy_and_apply(sexpr)
       sexpr.sexpr_copy do |copy, child|
-        copy << (Sexpr===child ? call(child) : child)
+        copy << (Sexpr===child ? apply(child) : child)
       end
     end
 

data/lib/sexpr/version.rb

@@ -2,7 +2,7 @@ module Sexpr
   module Version
 
     MAJOR = 0
-    MINOR = 4
+    MINOR = 5
     TINY  = 0
 
     def self.to_s

data/sexpr.gemspec

@@ -126,7 +126,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("epath", "~> 0.0.1")
   s.add_development_dependency("citrus", "~> 2.4")
   s.add_development_dependency("rake", "~> 0.9.2")
-  s.add_development_dependency("rspec", "~> 2.8.0")
+  s.add_development_dependency("rspec", "~> 2.8")
   s.add_development_dependency("wlang", "~> 0.10.2")
   
 

data/sexpr.noespec

@@ -1,6 +1,6 @@
 template-info:
   name: "ruby"
-  version: 1.7.0
+  version: 1.7.3
   links:
     source: https://github.com/blambeau/noe
 variables:
@@ -9,7 +9,7 @@ variables:
   upper:
     Sexpr
   version:
-    0.4.0
+    0.5.0
   summary: |-
     A compilation framework around s-expressions
   description: |-
@@ -22,5 +22,5 @@ variables:
     - {name: epath,     version: "~> 0.0.1",  groups: [development]}
     - {name: citrus,    version: "~> 2.4",    groups: [development]}
     - {name: rake,      version: "~> 0.9.2",  groups: [development]}
-    - {name: rspec,     version: "~> 2.8.0",  groups: [development]}
+    - {name: rspec,     version: "~> 2.8",    groups: [development]}
     - {name: wlang,     version: "~> 0.10.2", groups: [development]}

data/spec/fixtures/bar.rb

@@ -0,0 +1,9 @@
+require_relative 'foo'
+class BarHelper < Sexpr::Processor::Helper
+  module Methods
+  end
+end
+
+class BarProcessor < FooProcessor
+  helper BarHelper
+end

data/spec/fixtures/foo.rb

@@ -0,0 +1,14 @@
+class FooHelper < Sexpr::Processor::Helper
+  module Methods
+  end
+
+  def on_hello(rw, sexpr)
+    raise unless rw.is_a?(FooProcessor)
+    [:foo_hello, yield(rw, sexpr)]
+  end
+
+end
+
+class FooProcessor < Sexpr::Processor
+  helper FooHelper
+end

data/spec/fixtures/preprocessed.rb

@@ -0,0 +1,33 @@
+class Preprocessed < Sexpr::Processor
+
+  class Prefix < Sexpr::Processor
+
+    def on_missing(sexpr)
+      [ :"#{options[:prefix]}#{sexpr.first}" ] + sexpr[1..-1]
+    end
+
+  end
+  use Prefix, :prefix => "prefix_"
+
+  def on_prefix_hello(sexpr)
+    [:preprocessed_hello, sexpr]
+  end
+
+  def on_apply(sexpr)
+    apply(sexpr.last)
+  end
+
+end
+
+class SubPreprocessed < Preprocessed
+
+  class Upcase < Sexpr::Processor
+
+    def call(sexpr)
+      sexpr.first.to_s.upcase
+    end
+
+  end
+  use :upcased => Upcase
+
+end

data/spec/fixtures/simple_processor.rb

@@ -0,0 +1,19 @@
+class SimpleProcessor < Sexpr::Processor
+
+  def on_hello(sexpr)
+    [:simple_hello, sexpr]
+  end
+
+  def on_missing(sexpr)
+    if sexpr.first == :simple_missing
+      [:simple_pass_missing, sexpr]
+    else
+      super
+    end
+  end
+
+  def on_apply(sexpr)
+    apply(sexpr.last)
+  end
+
+end

data/spec/grammar/tagging/test_tag_sexpr.rb

@@ -4,24 +4,49 @@ module Sexpr::Grammar
     include Tagging
 
     module TaggingReference
+      module Node; end
       module Not; end
       module Lit; end
     end
 
+    def default_tagging_module
+      TaggingReference::Node
+    end
+
     def tag(x)
-      res = tag_sexpr(x, TaggingReference)
+      res = tag_sexpr(x)
       res.should eq(x)
       res
     end
 
-    it 'tags a sexpr at first level' do
-      tag([:lit]).should be_a(TaggingReference::Lit)
+    context 'when no tagging reference is provided' do
+
+      it 'tags with the default tagging module if set' do
+        tag([:lit]).should be_a(TaggingReference::Node)
+        tag([:or]).should be_a(TaggingReference::Node)
+      end
+
     end
 
-    it 'tags sexpr recursively' do
-      res = tag([:not, [:lit, true]])
-      res.should be_a(TaggingReference::Not)
-      res.last.should be_a(TaggingReference::Lit)
+    context 'when a tagging reference is provided' do
+
+      def tagging_reference
+        TaggingReference
+      end
+
+      it 'tags a sexpr at first level' do
+        tag([:lit]).should be_a(TaggingReference::Lit)
+      end
+
+      it 'tags sexpr recursively' do
+        res = tag([:not, [:lit, true]])
+        res.should be_a(TaggingReference::Not)
+        res.last.should be_a(TaggingReference::Lit)
+      end
+
+      it 'tags with the default tagging module when no match' do
+        res = tag([:or]).should be_a(TaggingReference::Node)
+      end
     end
 
   end

data/spec/processor/test_apply.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+module Sexpr
+  describe Processor, 'apply' do
+
+    let(:proc){ SimpleProcessor.new }
+
+    it 'dispatches to existing methods' do
+      ast = [:hello, "world"]
+      proc.apply(ast).should eq([:simple_hello, [:hello, "world"]])
+    end
+
+    it 'calls on_missing when not found' do
+      ast = [:simple_missing, [:hello, "world"]]
+      proc.apply(ast).should eq([:simple_pass_missing, ast])
+    end
+
+    it 'can be called from the inside' do
+      ast = [:apply, [:hello, "world"]]
+      proc.apply(ast).should eq([:simple_hello, [:hello, "world"]])
+    end
+
+    it 'raises unexpected by default in on_missing' do
+      ast = [:nonono, "world"]
+      lambda{ proc.apply(ast) }.should raise_error(UnexpectedSexprError, /nonono/)
+    end
+
+    it 'raises an ArgumentError unless called on a sexpr' do
+      lambda{
+        proc.apply("world").should raise_error(ArgumentError, /world/)
+      }
+    end
+
+  end
+end

data/spec/processor/test_call.rb

@@ -2,44 +2,45 @@ require 'spec_helper'
 module Sexpr
   describe Processor, 'call' do
 
-    let(:procclass){
-      Class.new(Processor) do
+    context 'without preprocessors installed' do
+      let(:proc){ SimpleProcessor.new }
 
-        def on_hello(sexpr)
-          [:seen_hello, sexpr]
-        end
+      it 'returns the result of apply' do
+        ast = [:hello, "world"]
+        proc.call(ast).should eq([:simple_hello, [:hello, "world"]])
+      end
+
+    end
 
-        def on_missing(sexpr)
-          if sexpr.first == :nosuchone
-            [:seen_missing, sexpr]
-          else
-            super
-          end
-        end
+    context "when preprocessors are installed" do
+      let(:proc){ SubPreprocessed.new }
 
+      it 'applies the preprocessors' do
+        ast = [:hello, "world"]
+        proc.call(ast).should eq([:preprocessed_hello, [:prefix_hello, "world"]])
       end
-    }
-    let(:proc){ procclass.new }
 
-    it 'dispatches to existing methods' do
-      ast = [:hello, "world"]
-      proc.call(ast).should eq([:seen_hello, [:hello, "world"]])
-    end
+      it 'sets preprocessor results under state variables when required' do
+        ast = [:hello, "world"]
+        proc.call(ast)
+        proc.upcased.should eq("PREFIX_HELLO")
+      end
 
-    it 'calls on_missing when not found' do
-      ast = [:nosuchone, "world"]
-      proc.call(ast).should eq([:seen_missing, [:nosuchone, "world"]])
     end
 
-    it 'raises unexpected by default in on_missing' do
-      ast = [:nonono, "world"]
-      lambda{ proc.call(ast) }.should raise_error(UnexpectedSexprError, /nonono/)
-    end
+    context 'when called on the class' do
+
+      it 'returns what an instance returns' do
+        expected = [:simple_hello, [:hello, "world"]]
+        SimpleProcessor.call([:hello, "world"]).should eq(expected)
+      end
+
+      it 'allows passing options' do
+        source   = [:hello, "world"]
+        expected = [:do_hello, "world"]
+        Preprocessed::Prefix.call(source, :prefix => "do_").should eq(expected)
+      end
 
-    it 'raises an ArgumentError unless called on a sexpr' do
-      lambda{
-        proc.call("world").should raise_error(ArgumentError, /world/)
-      }
     end
 
   end

data/spec/processor/test_use.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+module Sexpr
+  describe Processor, "use" do
+
+    it 'installs the preprocessors properly' do
+      expected = []
+      Processor.preprocessors.should eq(expected)
+
+      expected << [Preprocessed::Prefix, {:prefix => "prefix_"}]
+      Preprocessed.preprocessors.should eq(expected)
+
+      expected << [ {:upcased => SubPreprocessed::Upcase}, nil ]
+      SubPreprocessed.preprocessors.should eq(expected)
+    end
+
+    it 'sets attribute readers for hashes' do
+      Preprocessed.new.should_not respond_to(:upcased)
+      SubPreprocessed.new.should respond_to(:upcased)
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -7,27 +7,7 @@ $LOAD_PATH.unshift (root/"lib").to_s
 require 'sexpr'
 require (root/"examples/bool_expr/bool_expr").to_s
 
-class FooHelper < Sexpr::Processor::Helper
-  module Methods
-  end
-
-  def on_hello(rw, node)
-    raise unless rw.is_a?(FooProcessor)
-    [:foo_hello, yield(rw, node)]
-  end
-
-end
-class FooProcessor < Sexpr::Processor
-  helper FooHelper
-end
-
-class BarHelper < Sexpr::Processor::Helper
-  module Methods
-  end
-end
-class BarProcessor < FooProcessor
-  helper BarHelper
-end
+(Path.dir/:fixtures).glob("*.rb").each{|f| require f.without_extension}
 
 def fixtures_path
   Path.dir/"../examples/bool_expr"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexpr
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
+date: 2012-02-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epath
-  requirement: &84257100 !ruby/object:Gem::Requirement
+  requirement: &81881430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *84257100
+  version_requirements: *81881430
 - !ruby/object:Gem::Dependency
   name: citrus
-  requirement: &84256730 !ruby/object:Gem::Requirement
+  requirement: &81881110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *84256730
+  version_requirements: *81881110
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &84256430 !ruby/object:Gem::Requirement
+  requirement: &81880830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *84256430
+  version_requirements: *81880830
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &84256090 !ruby/object:Gem::Requirement
+  requirement: &81880580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *84256090
+  version_requirements: *81880580
 - !ruby/object:Gem::Dependency
   name: wlang
-  requirement: &84255790 !ruby/object:Gem::Requirement
+  requirement: &81880280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: 0.10.2
   type: :development
   prerelease: false
-  version_requirements: *84255790
+  version_requirements: *81880280
 description: Sexpr helps manipulating s-expressions in ruby.
 email:
 - blambeau@gmail.com
@@ -131,8 +131,9 @@ files:
 - spec/rewriter/test_copy_and_apply.rb
 - spec/processor/test_helper.rb
 - spec/processor/test_sexpr_coercions.rb
-- spec/processor/test_main_processor.rb
 - spec/processor/test_build_helper_chain.rb
+- spec/processor/test_use.rb
+- spec/processor/test_apply.rb
 - spec/processor/test_call.rb
 - spec/processor/helper/test_call.rb
 - spec/test_rewriter.rb
@@ -163,6 +164,10 @@ files:
 - spec/node/test_sexpr_body.rb
 - spec/node/test_sexpr_type.rb
 - spec/test_readme_examples.rb
+- spec/fixtures/preprocessed.rb
+- spec/fixtures/simple_processor.rb
+- spec/fixtures/bar.rb
+- spec/fixtures/foo.rb
 - tasks/debug_mail.rake
 - tasks/yard.rake
 - tasks/gem.rake
@@ -181,9 +186,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -185808739
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -215,8 +217,9 @@ test_files:
 - spec/rewriter/test_copy_and_apply.rb
 - spec/processor/test_helper.rb
 - spec/processor/test_sexpr_coercions.rb
-- spec/processor/test_main_processor.rb
 - spec/processor/test_build_helper_chain.rb
+- spec/processor/test_use.rb
+- spec/processor/test_apply.rb
 - spec/processor/test_call.rb
 - spec/processor/helper/test_call.rb
 - spec/test_rewriter.rb
@@ -247,3 +250,7 @@ test_files:
 - spec/node/test_sexpr_body.rb
 - spec/node/test_sexpr_type.rb
 - spec/test_readme_examples.rb
+- spec/fixtures/preprocessed.rb
+- spec/fixtures/simple_processor.rb
+- spec/fixtures/bar.rb
+- spec/fixtures/foo.rb

data/spec/processor/test_main_processor.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-module Sexpr
-  describe Processor, "main_processor" do
-
-    let(:procclass){ Class.new(Processor) }
-
-    it 'defaults to self' do
-      proc = procclass.new
-      proc.main_processor.should eq(proc)
-    end
-
-    it 'may be specified through options' do
-      proc = procclass.new(:main_processor => :hello)
-      proc.main_processor.should eq(:hello)
-    end
-
-  end
-end