inheritance_module_eval 1.0.0 → 1.0.1

data/.travis.yml

@@ -1,5 +1,5 @@
 rvm:
-  - 1.8.7 # (current default)
+  - 1.8.7
   - 1.9.2
   - 1.9.3
   - jruby

data/HISTORY.md

@@ -1,3 +1,11 @@
+1.0.1
+-----
+Refactor code, extract intergation code to "inheritance_module_eval/integration"
+
+1.0.0
+-----
+Implement inheritance module eval. Add Specs
+
 0.0.1
-=====
+-----
 Initial release. Add README, LICENSE, .gitignore, etc

data/README.md

@@ -9,30 +9,38 @@ Installation
 
 Usage
 -----
-There are 2 methods:
+Inheritance module_eval provides 2 methods for eval instance and class methods:
 
-* instance_module_eval
-* class_module_eval
+* instance_eval_on
+* class_eval_on
 
-instance_module_eval method used to eval instance methods (ie: methods of an object)
 
-class_module_eval method used to eval class methods (ie: methods of an class)
+    InheritanceModuleEval.instance_eval_on(instance_object, code = nil, &block) #method used to eval instance methods (ie: methods of an object)
+    InheritanceModuleEval.class_eval_on(class_object, code = nil, &block)       #method used to eval class methods (ie: methods of an class)
 
+Note: you may include
+
+    require "inheritance_module_eval/integration"
+to intergate inheritance_module_eval in ruby core. That will give 2 methods:
+
+* instance_module_eval(code = nil, &block)
+* class_module_eval(code = nil, &block)
 
 Below is some simple example of inheritance_module_eval usage:
 
     require 'inheritance_module_eval'
+    require "inheritance_module_eval/integration"
 
     # Some dummy class that uses #instance_module_eval
     class Content
       self.field(name)
         instance_module_eval %{
           def #{name}
-            instance_valiable_get(@#{name})
+            @#{name}
           end
 
           def #{name}=(new_value)
-            instance_valiable_set(@#{name}, new_value)
+            @#{name}= new_value
           end
         }
         end
@@ -63,7 +71,7 @@ Compatibility
 -------------
 tested with Ruby
 
-* 1.8.7 # (current default)
+* 1.8.7
 * 1.9.2
 * 1.9.3
 * jruby

data/lib/inheritance_module_eval/integration.rb

@@ -0,0 +1,16 @@
+require "integration_module_eval"
+class Module
+  # acts same as module_eval, but saves method hierarchy
+  # should be called only for instance methods evaluation
+  # @params (see Module#module_eval)
+  def instance_module_eval(code = nil, &block)
+    InheritanceModuleEval.instance_eval_on self, code, &block
+  end
+
+  # acts same as module_eval, but saves method hierarchy
+  # should be called only for class methods evaluation
+  # @params (see Module#module_eval)
+  def class_module_eval(code = nil, &block)
+    InheritanceModuleEval.class_eval_on self, code, &block
+  end
+end

data/lib/inheritance_module_eval/version.rb

@@ -1,3 +1,3 @@
 module InheritanceModuleEval
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/inheritance_module_eval.rb

@@ -1,27 +1,11 @@
 require "inheritance_module_eval/version"
 
-class Module
-  # acts same as module_eval, but saves method hierarchy
-  # should be called only for instance methods evaluation
-  # @params (see Module#module_eval)
-  def instance_module_eval(code = nil, &block)
-    InheritanceModuleEval.instance_eval_on self, code, &block
-  end
-
-  # acts same as module_eval, but saves method hierarchy
-  # should be called only for class methods evaluation
-  # @params (see Module#module_eval)
-  def class_module_eval(code = nil, &block)
-    InheritanceModuleEval.class_eval_on self, code, &block
-  end
-end
-
 module InheritanceModuleEval
-  def self.instance_eval_on(sender, code, &block)
+  def self.instance_eval_on(sender, code = nil, &block)
     sender.send :include, (get_module_for code, &block)
   end
 
-  def self.class_eval_on(sender, code, &block)
+  def self.class_eval_on(sender, code = nil, &block)
     sender.send :extend, (get_module_for code, &block)
   end
 

data/spec/inheritance_spec.rb

@@ -8,55 +8,46 @@ class Child < Parent
 
 end
 describe InheritanceModuleEval do
-  describe "integration" do
-    specify "class should respond to instance_module_eval" do
-      Class.new.should respond_to(:instance_module_eval)
-    end
-
-    specify "module should respond to instance_module_eval" do
-      Module.new.should respond_to(:instance_module_eval)
-    end
-
-    specify "class should respond to class_module_eval" do
-      Class.new.should respond_to(:class_module_eval)
-    end
-
-    specify "module should respond to class_module_eval" do
-      Module.new.should respond_to(:class_module_eval)
-    end
-  end
-
   describe "add dynamic methods" do
     before(:each) do
       @test_object = Class.new
     end
 
-    pending "should delegate to module_eval" do
-      Module.should_receive(:module_eval).twice
-      @test_object.instance_module_eval %{
+    it "should delegate to module_eval" do
+      mock_module = mock(:mock_module)
+      @test_object.stub(:include)
+      @test_object.stub(:extend)
+      Module.stub(:new).and_return(mock_module)
+
+      mock_module.should_receive(:module_eval).once
+
+      InheritanceModuleEval.instance_eval_on @test_object do
         def say_hi
           puts hi
         end
-      }
-      @test_object.class_module_eval %{
+      end
+
+      mock_module.should_receive(:module_eval).once
+
+      InheritanceModuleEval.class_eval_on @test_object do
         def say_hi
           puts hi
         end
-      }
+      end
     end
 
     describe "instance methods" do
       it "should eval a string" do
-        @test_object.instance_module_eval %{
-          def say_hi
-            puts 'hi'
-          end
-                                              }
+        InheritanceModuleEval.instance_eval_on @test_object, %{
+                                                                def say_hi
+                                                                  puts 'hi'
+                                                                end
+                                                              }
           @test_object.new.should respond_to :say_hi
 
       end
       it "should eval a block" do
-        @test_object.instance_module_eval do
+        InheritanceModuleEval.instance_eval_on @test_object do
           def say_hi
             puts 'hi'
           end
@@ -67,20 +58,21 @@ describe InheritanceModuleEval do
 
     describe "class_methods" do
       it "should eval a string" do
-        @test_object.class_module_eval %{
+        InheritanceModuleEval.class_eval_on @test_object do
           def say_hi
             puts 'hi'
           end
-                                              }
-          @test_object.should respond_to :say_hi
+        end
 
+        @test_object.should respond_to :say_hi
       end
       it "should eval a block" do
-        @test_object.class_module_eval do
+        InheritanceModuleEval.class_eval_on @test_object do
           def say_hi
             puts 'hi'
           end
         end
+
         @test_object.should respond_to :say_hi
       end
     end
@@ -88,32 +80,35 @@ describe InheritanceModuleEval do
 
     describe "collisions" do
       describe "define already defined method in a class" do
-        describe "redefine it after class declaration" do
+        context "redefine it after class declaration" do
           it "should has lower priority then method, declared in a class" do
             klass = Class.new
             klass.class_eval do
               def say_hi
                 "hi from method" << " " << super
               end
-              instance_module_eval %{
-                def say_hi
-                  "hi from eval"
-                end
-              }
             end
+
+            InheritanceModuleEval.instance_eval_on klass do
+              def say_hi
+                "hi from eval"
+              end
+            end
+
             klass.new.say_hi.should == "hi from method hi from eval"
           end
         end
 
-        describe "redefine it before class declaration" do
-          it "should push dynamic method up in the inheritance tree" do
+        context "redefine it before class declaration" do
+          it "should has lower priority then method, declared in a class" do
             klass = Class.new
             klass.class_eval do
-              instance_module_eval %{
+              InheritanceModuleEval.instance_eval_on self do
                 def say_hi
                   "tiny hi"
                 end
-              }
+              end
+
               def say_hi
                 super.upcase
               end
@@ -126,26 +121,30 @@ describe InheritanceModuleEval do
           it "should push dynamic method up in the inheritance tree" do
             klass = Class.new
             klass.class_eval do
-              instance_module_eval %{
+              InheritanceModuleEval.instance_eval_on self do
                 def say_hi
                   [5]
                 end
-              }
-              instance_module_eval %{
+              end
+
+              InheritanceModuleEval.instance_eval_on self do
                 def say_hi
                   [4] + super
                 end
-              }
-              instance_module_eval %{
+              end
+
+              InheritanceModuleEval.instance_eval_on self do
                 def say_hi
                   [3] + super
                 end
-              }
-              instance_module_eval %{
+              end
+
+              InheritanceModuleEval.instance_eval_on self do
                 def say_hi
                   [2] + super
                 end
-              }
+              end
+
               def say_hi
                 [1] + super
               end
@@ -166,7 +165,7 @@ describe InheritanceModuleEval do
             klass = Class.new
             klass.class_eval do
               include test_module
-              instance_module_eval do
+              InheritanceModuleEval.instance_eval_on self do
                 def say_hi
                   ["hi from eval"] + super
                 end
@@ -185,7 +184,7 @@ describe InheritanceModuleEval do
 
     describe "#get_module_for" do
       it "should return Module" do
-        InheritanceModuleEval.send :get_module_for, "puts('hi')"
+        InheritanceModuleEval.send :get_module_for, "'hi'"
       end
 
       it "should raise ArgumentError if no code given" do

data/spec/intergation_spec.rb

@@ -0,0 +1,18 @@
+require "inheritance_module_eval/integration"
+describe "integration" do
+  specify "class should respond to instance_module_eval" do
+    Class.new.should respond_to(:instance_module_eval)
+  end
+
+  specify "module should respond to instance_module_eval" do
+    Module.new.should respond_to(:instance_module_eval)
+  end
+
+  specify "class should respond to class_module_eval" do
+    Class.new.should respond_to(:class_module_eval)
+  end
+
+  specify "module should respond to class_module_eval" do
+    Module.new.should respond_to(:class_module_eval)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inheritance_module_eval
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-12 00:00:00.000000000Z
+date: 2011-11-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10342840 !ruby/object:Gem::Requirement
+  requirement: &19224720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *10342840
+  version_requirements: *19224720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10342420 !ruby/object:Gem::Requirement
+  requirement: &19224100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10342420
+  version_requirements: *19224100
 description: ! 'saves inheritance structure of dynamically created methods.
 
   Allows to redefine dynamic method in the same class or in any child class, and call
@@ -53,8 +53,10 @@ files:
 - Rakefile
 - inheritance_module_eval.gemspec
 - lib/inheritance_module_eval.rb
+- lib/inheritance_module_eval/integration.rb
 - lib/inheritance_module_eval/version.rb
 - spec/inheritance_spec.rb
+- spec/intergation_spec.rb
 homepage: http://github.com/AlexParamonov/inheritance_module_eval
 licenses: []
 post_install_message: 
@@ -80,4 +82,3 @@ signing_key:
 specification_version: 3
 summary: inheritance safe module_eval.
 test_files: []
-has_rdoc: