step_rewrite 0.0.1 → 0.1.0

data/Gemfile

@@ -1,5 +1,4 @@
 source :gemcutter
-source 'http://gems.github.com'
 
 # Specify your gem's dependencies in step_rewrite.gemspec
 gemspec

data/lib/step_rewrite.rb

@@ -8,3 +8,4 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require "step_rewrite/sexp_utilities"
 require "step_rewrite/rewriter"
+require 'step_rewrite/step_rewrite'

data/lib/step_rewrite/module.rb

@@ -0,0 +1,8 @@
+require 'step_rewrite'
+
+class Module
+  def define_step_method(name, *args, &block)
+    rewritten = StepRewrite.rewrite(*args, &block)
+    instance_eval "define_method(#{name.inspect}, &#{rewritten})"
+  end
+end

data/lib/step_rewrite/rewriter.rb

@@ -56,6 +56,4 @@ module StepRewrite
       return :attrasgn if exp.first == :attrasgn && special_call?(exp[3][1])
     end
   end
-
-
 end

data/lib/step_rewrite/step_rewrite.rb

@@ -0,0 +1,19 @@
+require 'forwardable'
+
+module StepRewrite
+  include Forwardable
+
+  def step(*args, &block)
+    StepRewrite.step(*args, &block)
+  end
+
+  def self.rewrite(callback_symbol = :_, &block)
+    old_sexp = Sexp.from_array(block.to_sexp)
+    new_sexp = StepRewrite::Rewriter.new(callback_symbol).process(old_sexp)
+    Ruby2Ruby.new.process(new_sexp)
+  end
+
+  def self.step(*args, &block)
+    eval(rewrite(*args, &block), block.binding).call
+  end
+end

data/lib/step_rewrite/version.rb

@@ -1,3 +1,3 @@
 module StepRewrite
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/lib/module_spec.rb

@@ -0,0 +1,39 @@
+require File.expand_path('../../spec_helper.rb', __FILE__)
+require 'step_rewrite/module'
+require 'rspec'
+
+describe Module do
+  class Foo
+    def call_adder(a)
+      yield a
+    end
+
+    def plus_five(b)
+      yield b + 5
+    end
+  end
+
+  it 'defines methods where the special callback symbol is rewritten' do
+    class Foo
+      define_step_method :into_itself_plus_five do |a|
+        res = call_adder(a, &_)
+        res_2 = plus_five(res, &_)
+        res_2*res
+      end
+    end
+
+    Foo.new.into_itself_plus_five(5).should == 50
+  end
+
+  it 'defines methods allowing configuration of the special callback symbol' do
+    class Foo
+      define_step_method :into_itself_plus_five, :cb do |a|
+        res = call_adder(a, &cb)
+        _ = lambda { |res_2| res_2 * res }
+        plus_five(res, &_)
+      end
+    end
+
+    Foo.new.into_itself_plus_five(5).should == 50
+  end
+end

data/spec/{step_rewrite_spec.rb → lib/rewriter_spec.rb}

@@ -1,5 +1,5 @@
-require File.expand_path('../../lib/step_rewrite', __FILE__)
-require File.expand_path('../convert_matcher', __FILE__)
+require File.expand_path('../../spec_helper.rb', __FILE__)
+require 'rspec'
 
 describe StepRewrite::Rewriter do
   describe "#process" do
@@ -146,7 +146,7 @@ describe StepRewrite::Rewriter do
         should convert {
           a, b, c = foo(&_)
           bar(a, b)
-          }.to {
+        }.to {
           foo { |a, b, c| bar(a, b) }
         }
       end
@@ -186,6 +186,19 @@ describe StepRewrite::Rewriter do
           foo { |a.b.c| bar(a.b) }
         }
       end
+
+      it do
+        should convert {
+          foo(bar.map { |v| v*2 }, &_)
+          bar { baz }
+          qux(&grault)
+        }.to {
+          foo(bar.map { |v| v*2 }) do
+            bar { baz }
+            qux(&grault)
+          end
+        }
+      end
     end
   end
 end

data/spec/lib/step_rewrite_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path('../../spec_helper.rb', __FILE__)
+require 'rspec'
+
+describe StepRewrite do
+  include StepRewrite
+
+  def call_adder(a)
+    yield a
+  end
+
+  def plus_five(b)
+    yield b + 5
+  end
+
+  it 'evaluates blocks after rewriting them around the special symbol _' do
+    step do
+      into_two = lambda {|x| x*2}
+      res = call_adder(5, &_)
+      plus_five(res, &into_two)
+    end.should == 20
+  end
+
+  it 'rewrites blocks using a configurable special symbol instead of _ if one is passed' do
+    step(:cb) do
+      _ = lambda {|x| x*2}
+      res = call_adder(5, &cb)
+      plus_five(res, &_)
+    end.should == 20
+  end
+
+  it 'allows you to rewrite blocks without including the module' do
+    StepRewrite.step do
+      into_two = lambda {|x| x*2}
+      res = call_adder(5, &_)
+      plus_five(res, &into_two)
+    end.should == 20
+  end
+
+  it 'gives you the rewritten code' do
+    StepRewrite.rewrite do
+      foo(&_); bar
+    end.should == "proc { foo { bar } }"
+  end
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.join(File.dirname(__FILE__),'..','lib','step_rewrite'))
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
+
+
+
+
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: step_rewrite
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Vishnu S Iyengar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 +05:30
+date: 2010-10-18 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -122,11 +122,16 @@ files:
 - Rakefile
 - console
 - lib/step_rewrite.rb
+- lib/step_rewrite/module.rb
 - lib/step_rewrite/rewriter.rb
 - lib/step_rewrite/sexp_utilities.rb
+- lib/step_rewrite/step_rewrite.rb
 - lib/step_rewrite/version.rb
-- spec/convert_matcher.rb
-- spec/step_rewrite_spec.rb
+- spec/lib/module_spec.rb
+- spec/lib/rewriter_spec.rb
+- spec/lib/step_rewrite_spec.rb
+- spec/spec_helper.rb
+- spec/support/convert_matcher.rb
 - step_rewrite.gemspec
 has_rdoc: true
 homepage: http://rubygems.org/gems/step_rewrite