metamorpher 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8979355b8d41bbbc8c4f0a547f68e92cef86b17
-  data.tar.gz: bc38d9940581f4172e381617cd127d8e2e862994
+  metadata.gz: 88f1db209b504179ee9762641fc8455a0a3f410a
+  data.tar.gz: 0b29350be7f0b56188f05247beb0f3258e53ffb1
 SHA512:
-  metadata.gz: 0f78c4e7669975915d24d7a75bcdfb1481745a01c8fbad1f0264137d55b5630d1e87173000cb86f3c2f70869dfdb5ad880a65dc5cefeea1db1d5d6895ee9ff84
-  data.tar.gz: da8af5b60c5f6ce8ce759838668d57127b29e9f1277f99ca90c11f45ed6169517bc6853b1f5e47d3d74958c2c112aefa8a747507f36056e69d30ad99f17e29bd
+  metadata.gz: 8739bffe9edec1e31138a85b925d2de93dde9ba421a4c088b6bdc6916bd691f2d93375b765818c7974e823a74172a64a4096dcc919e18bd724ef7997ce10d47a
+  data.tar.gz: f6777b8c3e2de91a1d780d5d4441bedf4dd8febac23c19375cbe7184895368b5dddc4713b2038dc858ffe26a2c4121e16ceec3c2dea95f6a78e4704c46ee0797

data/README.md

@@ -373,6 +373,32 @@ builder.derivation! :key, :value do |key, value|
 end
 ```
 
+When deriving a variable's value without changing it, there's no need to supply a block:
+
+```ruby
+builder.derivation! :value
+# builder.derivation! :value { |value| value }
+```
+
+To obtain the entire match during a derivation, use the special variable `&`:
+
+```ruby
+class ReverseVariables
+  include Metamorpher::Rewriter
+  include Metamorpher::Builders::AST
+
+  def pattern
+    builder.literal!(:send, nil, builder.VAR)
+  end
+
+  def replacement
+    builder.derivation! :& do |match|
+      builder.literal(:send, match, :reverse)
+    end
+  end
+end
+```
+
 ## Practicalities
 
 Metamorpher provides modules that can be used to simplify the transformation of Ruby programs. This section describes how to build metamorpher terms that represent Ruby programs, and how to refactor Ruby programs. [Matchers](#matchers) and [Rewriters](#rewriters) can be used to manipulate Ruby programs too.

data/RELEASES.md

@@ -1,5 +1,9 @@
 # Release History
 
+## v0.2.2 (4 June 2015)
+* Provide whole match special variable (&) for derivations
+* Provide sensible default logic (derive the value of their first argument) for derivations
+
 ## v0.2.1 (12 May 2015)
 * Provide support for term sets, which make it possible to match (or rewrite to) multiple expressions at once
 

data/lib/metamorpher/builders/ast/derivation_builder.rb

@@ -7,13 +7,22 @@ module Metamorpher
       class DerivationBuilder
         def derivation!(*base, &block)
           fail ArgumentError, "wrong number of arguments (0)" if base.empty?
-          fail ArgumentError, "a block must be provided" if block.nil?
 
           Terms::Derived.new(
             base: base,
-            derivation: ->(*args) { block.call(*args, Builder.new) }
+            derivation: derivation_strategy(block)
           )
         end
+
+        private
+
+        def derivation_strategy(block)
+          if block.nil?
+            ->(*args) { args.first }
+          else
+            ->(*args) { block.call(*args, Builder.new) }
+          end
+        end
       end
     end
   end

data/lib/metamorpher/builders/ruby/variable_replacement_visitor.rb

@@ -5,7 +5,8 @@ module Metamorpher
         attr_accessor :variable_name, :replacement
 
         def initialize(variable_name, replacement)
-          @variable_name, @replacement = variable_name, replacement
+          @variable_name = variable_name
+          @replacement = replacement
         end
 
         def visit_literal(literal)

data/lib/metamorpher/rewriter/rule.rb

@@ -22,11 +22,19 @@ module Metamorpher
       end
 
       def rewrite(ast, match, &block)
-        original, rewritten = match.root, replacement.substitute(match.substitution)
+        original = match.root
+        substitution = substitution_with_special_values(match)
+        rewritten = replacement.substitute(substitution)
         block.call(original, rewritten) if block
         ast.replace(original.path, rewritten)
       end
 
+      def substitution_with_special_values(match)
+        match.substitution.dup.tap do |substitution|
+          substitution[:&] = match.root.dup # add the "whole match" special variable (&)
+        end
+      end
+
       def matches_for(ast)
         traverser.traverse(ast)
           .lazy # only compute the next match when needed

data/lib/metamorpher/terms/derived.rb

@@ -3,7 +3,7 @@ require "metamorpher/terms/term"
 module Metamorpher
   module Terms
     class Derived < Term
-      attributes :base, :derivation
+      attributes :base, derivation: -> (t) { t }
 
       def inspect
         "[#{base.map(&:upcase).join(', ')}] -> ..."

data/lib/metamorpher/version.rb

@@ -1,3 +1,3 @@
 module Metamorpher
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/metamorpher.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "attributable", "~> 0.1.0"
   spec.add_runtime_dependency "parser", "~> 2.2.2"
-  spec.add_runtime_dependency "unparser", "~> 0.2.3"
+  spec.add_runtime_dependency "unparser", "~> 0.2.4"
 
-  spec.add_development_dependency "bundler", "~> 1.9.4"
+  spec.add_development_dependency "bundler", "~> 1.10.2"
   spec.add_development_dependency "rake", "~> 10.4.2"
   spec.add_development_dependency "rspec", "~> 3.2.0"
   spec.add_development_dependency "codeclimate-test-reporter", "~> 0.4.6"
-  spec.add_development_dependency "rubocop", "~> 0.30.1"
+  spec.add_development_dependency "rubocop", "~> 0.31.0"
 end

data/spec/integration/ast/rewriter_spec.rb

@@ -162,6 +162,32 @@ describe "Rewriting" do
       end
     end
 
+    describe "from entire value" do
+      class Inverter
+        include Metamorpher::Rewriter
+        include Metamorpher::Builders::AST
+
+        def pattern
+          builder.true
+        end
+
+        def replacement
+          builder.derivation!(:&) do |matched|
+            builder.literal!(:not, matched)
+          end
+        end
+      end
+
+      subject { Inverter.new }
+
+      it "should rewrite yielding the entire match to the derivation logic" do
+        expression = builder.literal! :true
+        reduced = builder.literal!(:not, :true)
+
+        expect(subject.reduce(expression)).to eq(reduced)
+      end
+    end
+
     describe "to several alternatives" do
       class FlexiblePluraliseRewriterInner
         include Metamorpher::Rewriter
@@ -190,5 +216,29 @@ describe "Rewriting" do
         expect(subject.reduce(expression)).to eq(reduced)
       end
     end
+
+    describe "using implicit derivation" do
+      class KeyExtractor
+        include Metamorpher::Rewriter
+        include Metamorpher::Builders::AST
+
+        def pattern
+          builder.literal!(:"=>", builder.KEY, builder.VALUE)
+        end
+
+        def replacement
+          builder.derivation!(:key)
+        end
+      end
+
+      subject { KeyExtractor.new }
+
+      it "should rewrite using the implicit derivation" do
+        expression = builder.literal! :"=>", :foo, :bar
+        reduced = builder.literal! :foo
+
+        expect(subject.reduce(expression)).to eq(reduced)
+      end
+    end
   end
 end

data/spec/support/shared_examples/shared_examples_for_derivation_builders.rb

@@ -14,11 +14,22 @@ module Metamorpher
         end
 
         it "should capture all arguments as the base" do
-          built = subject.derivation!(:key, :value) {}
+          built = subject.derivation!(:key, :value)
 
           expect(built.base).to eq([:key, :value])
         end
 
+        it "should derive the first argument if no block is passed" do
+          built = subject.derivation!(:key, :value)
+
+          derived = built.derivation.call(
+            Literal.new(name: :dog),
+            Literal.new(name: :lassie)
+          )
+
+          expect(derived).to eq(Literal.new(name: :dog))
+        end
+
         it "should provide a builder for use in the block" do
           built = subject.derivation!(:key, :value) do |key, value, builder|
             builder.pair(key, value)
@@ -43,10 +54,6 @@ module Metamorpher
         it "should raise if no arguments are passed" do
           expect { subject.derivation! { nil } }.to raise_error(ArgumentError)
         end
-
-        it "should raise if no block is passed" do
-          expect { subject.derivation!(:method) }.to raise_error(ArgumentError)
-        end
       end
     end
   end

data/spec/unit/matcher/matching_spec.rb

@@ -3,7 +3,7 @@ require "metamorpher/terms/literal"
 require "metamorpher/terms/derived"
 
 module Metamorpher
-  module Terms
+  module Terms # rubocop:disable Metrics/ModuleLength
     describe Variable do
       let(:root) do
         Literal.new(

data/spec/unit/rewriter/substitution_spec.rb

@@ -36,6 +36,16 @@ module Metamorpher
       it "should raise if the substitution contains no value for variable's name" do
         expect { subject.substitute({}) }.to raise_error(Rewriter::SubstitutionError)
       end
+
+      context "default derivations" do
+        it "should be the identity function for a single parameter" do
+          subject = Derived.new(base: [:type])
+          literal = Literal.new(name: :foo)
+          substitution = { type: literal }
+
+          expect(subject.substitute(substitution)).to eq(literal)
+        end
+      end
     end
 
     describe Literal do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metamorpher
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Louis Rose
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attributable
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.4
+        version: 1.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.4
+        version: 1.10.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.1
+        version: 0.31.0
 description: Provides structures that support program transformations, such as refactoring
   or program mutation.
 email: