cross-stub 0.1.3.1 → 0.1.4

data/HISTORY.txt

@@ -1,3 +1,8 @@
+=== 0.1.4 2010-04-03
+
+= Bugfixes
+* fixed taken-for-granted-yet-broken support for nested class & module [#liangzan]
+
 === 0.1.3.1 2010-02-04
 
 * no bug fix nor new function added, somehow the previously gem release failed to

data/VERSION

@@ -1 +1 @@
-0.1.3.1
+0.1.4

data/cross-stub.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cross-stub}
-  s.version = "0.1.3.1"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["NgTzeYang"]
-  s.date = %q{2010-02-04}
+  s.date = %q{2010-04-03}
   s.description = %q{}
   s.email = %q{ngty77@gmail.com}
   s.extra_rdoc_files = [
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ngty/cross-stub}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Simple cross process stubbing}
   s.test_files = [
     "spec/helpers.rb",

data/lib/cross-stub/pseudo_class.rb

@@ -10,10 +10,18 @@ module CrossStub
     end
 
     def initialize(klass)
-      @klass = klass.is_a?(String) ? Object.const_get(klass) : klass
+      @klass = get_class(klass)
       @metaclass = (class << @klass ; self ; end)
     end
 
+    def get_class(klass)
+      if klass.is_a?(String)
+        klass.split(/::/).inject(Object) { |const_train, const| const_train.const_get(const) }
+      else
+        klass
+      end
+    end
+
     def id
       @klass.to_s
     end
@@ -24,8 +32,7 @@ module CrossStub
 
     def replace_method(method, value_or_code)
       status = backup_method(method)
-      @klass.instance_eval \
-        "#{value_or_code}" =~ /^def / ? value_or_code :
+      @klass.instance_eval "#{value_or_code}" =~ /^def / ? value_or_code :
           %\def #{method}; Marshal.load(%|#{Marshal.dump(value_or_code)}|) ; end\
       status
     end

data/rails_generators/cross_stub/cross_stub_generator.rb

@@ -4,7 +4,7 @@ class CrossStubGenerator < Rails::Generator::Base
     record do |m|
       m.file 'config/initializers/cross-stub.rb', 'config/initializers/cross-stub.rb'
       m.file 'features/support/cross-stub.rb', 'features/support/cross-stub.rb'
-      m.gsub_file 'config/environments/cucumber.rb', /\z/, "config.gem 'cross-stub', :version => '>=0.1.3.1'\n"
+      m.gsub_file 'config/environments/cucumber.rb', /\z/, "config.gem 'cross-stub', :version => '>=0.1.4'\n"
     end
   end
 

data/spec/cross-stub/clearing_stubs_spec.rb

@@ -8,99 +8,105 @@ describe 'Clearing Stubs' do
 
     behaves_like "has #{mode} process setup"
 
-    it "should clear hash generated stub and return original value for #{mode} process" do
-      original_value = AnyClass.say_world
-      AnyClass.xstub(:say_world => 'i say world')
-      CrossStub.clear
-      @get_value['AnyClass.say_world'].should.equal original_value
-    end
+    %w{AnyClass AnyClass::Inner AnyModule AnyModule::Inner}.each do |klass_or_module|
+
+      before do
+        @context = @get_context[klass_or_module]
+      end
 
-    it "should clear hash generated stub and raise NoMethodError for #{mode} process" do
-      should.raise(NoMethodError) do
-        AnyClass.xstub(:say_hello => 'i say hello')
+      it "should clear hash generated stub and return original value for #{klass_or_module} in #{mode} process" do
+        original_value = @context.say_world
+        @context.xstub(:say_world => 'i say world')
         CrossStub.clear
-        @get_value['AnyClass.say_hello']
+        @get_value["#{@context}.say_world"].should.equal original_value
       end
-    end
 
-    it "should clear symbol generated stub and return original value for #{mode} process" do
-      original_value = AnyClass.say_world
-      AnyClass.xstub(:say_world)
-      CrossStub.clear
-      @get_value['AnyClass.say_world'].should.equal original_value
-    end
+      it "should clear hash generated stub and raise NoMethodError for #{klass_or_module} in #{mode} process" do
+        should.raise(NoMethodError) do
+          @context.xstub(:say_hello => 'i say hello')
+          CrossStub.clear
+          @get_value["#{@context}.say_hello"]
+        end
+      end
 
-    it "should clear symbol generated stub and raise NoMethodError for #{mode} process" do
-      should.raise(NoMethodError) do
-        AnyClass.xstub(:say_hello)
+      it "should clear symbol generated stub and return original value for #{klass_or_module} in #{mode} process" do
+        original_value = @context.say_world
+        @context.xstub(:say_world)
         CrossStub.clear
-        @get_value['AnyClass.say_hello']
+        @get_value["#{@context}.say_world"].should.equal original_value
       end
-    end
 
-    it "should clear block generated stub and return original value for #{mode} process" do
-      original_value = AnyClass.say_world
-      AnyClass.xstub do
-        def say_world ; 'i say world' ; end
+      it "should clear symbol generated stub and raise NoMethodError for #{klass_or_module} in #{mode} process" do
+        should.raise(NoMethodError) do
+          @context.xstub(:say_hello)
+          CrossStub.clear
+          @get_value["#{@context}.say_hello"]
+        end
       end
-      CrossStub.clear
-      @get_value['AnyClass.say_world'].should.equal original_value
-    end
 
-    it "should clear block generated stub and raise NoMethodError for #{mode} process" do
-      should.raise(NoMethodError) do
-        AnyClass.xstub do
-          def say_hello ; 'i say hello' ; end
+      it "should clear block generated stub and return original value for #{klass_or_module} in #{mode} process" do
+        original_value = @context.say_world
+        @context.xstub do
+          def say_world ; 'i say world' ; end
         end
         CrossStub.clear
-        @get_value['AnyClass.say_hello']
+        @get_value["#{@context}.say_world"].should.equal original_value
       end
-    end
 
-    it "should always clear previously generated stub for #{mode} process" do
-      original_value = AnyClass.say_world
+      it "should clear block generated stub and raise NoMethodError for #{klass_or_module} in #{mode} process" do
+        should.raise(NoMethodError) do
+          @context.xstub do
+            def say_hello ; 'i say hello' ; end
+          end
+          CrossStub.clear
+          @get_value["#{@context}.say_hello"]
+        end
+      end
 
-      # Stub an existing method
-      AnyClass.xstub(:say_world => 'i say world')
-      @get_value['AnyClass.say_world']
+      it "should always clear previously generated stub for #{klass_or_module} in #{mode} process" do
+        original_value = @context.say_world
 
-      # Clear stubs without refreshing another process
-      CrossStub.clear
-      CrossStub.setup(:file => $cache_file)
+        # Stub an existing method
+        @context.xstub(:say_world => 'i say world')
+        @get_value["#{@context}.say_world"]
 
-      # Stub a non-existing method
-      AnyClass.xstub(:say_hello => 'i say hello')
-      @get_value['AnyClass.say_hello']
+        # Clear stubs without refreshing another process
+        CrossStub.clear
+        CrossStub.setup(:file => $cache_file)
 
-      # Make sure existing method returns to original method
-      @get_value['AnyClass.say_world'].should.equal original_value
-    end
+        # Stub a non-existing method
+        @context.xstub(:say_hello => 'i say hello')
+        @get_value["#{@context}.say_hello"]
 
-    it "should always clear previously generated stub and raise NoMethodError for #{mode} process" do
-      # Stub a non-existing method
-      AnyClass.xstub(:say_hello => 'i say hello')
-      @get_value['AnyClass.say_hello']
+        # Make sure existing method returns to original method
+        @get_value["#{@context}.say_world"].should.equal original_value
+      end
 
-      # Clear stubs without refreshing another process
-      CrossStub.clear
-      CrossStub.setup(:file => $cache_file)
+      it "should always clear previously generated stub and raise NoMethodError for #{klass_or_module} in #{mode} process" do
+        # Stub a non-existing method
+        @context.xstub(:say_hello => 'i say hello')
+        @get_value["#{@context}.say_hello"]
 
-      # Stub an existing method
-      AnyClass.xstub(:say_world => 'i say world')
-      @get_value['AnyClass.say_world']
+        # Clear stubs without refreshing another process
+        CrossStub.clear
+        CrossStub.setup(:file => $cache_file)
 
-      # Make sure accessing non-existing method throws error
-      should.raise(NoMethodError) { @get_value['AnyClass.say_hello'] }
-    end
+        # Stub an existing method
+        @context.xstub(:say_world => 'i say world')
+        @get_value["#{@context}.say_world"]
 
-    it "should clear for method not implemented in ruby and return original value for #{mode} process" do
-      Time.xstub(:now => 'abc')
-      CrossStub.clear
-      value = nil
-      should.not.raise(NoMethodError) { value = @get_value['Time.now'] }
-      value.should.not.equal 'abc'
-    end
+        # Make sure accessing non-existing method throws error
+        should.raise(NoMethodError) { @get_value["#{@context}.say_hello"] }
+      end
 
+      it "should clear for method not implemented in ruby and return original value for #{klass_or_module} in #{mode} process" do
+        Time.xstub(:now => 'abc')
+        CrossStub.clear
+        value = nil
+        should.not.raise(NoMethodError) { value = @get_value['Time.now'] }
+        value.should.not.equal 'abc'
+      end
+    end
   end
 
 end

data/spec/cross-stub/creating_stubs_spec.rb

@@ -8,97 +8,103 @@ describe 'Creating Stubs' do
 
     behaves_like "has #{mode} process setup"
 
-    it "should create with hash argument(s) for #{mode} process" do
-      AnyClass.xstub(:say_hello => 'i say hello', :say_world => 'i say world')
-      @get_value['AnyClass.say_hello'].should.equal 'i say hello'
-      @get_value['AnyClass.say_world'].should.equal 'i say world'
-    end
+    %w{AnyClass AnyClass::Inner AnyModule AnyModule::Inner}.each do |klass_or_module|
 
-    it "should create with symbol argument(s) for #{mode} process" do
-      AnyClass.xstub(:say_hello)
-      @get_value['AnyClass.say_hello'].should.equal nil
-    end
+      before do
+        @context = @get_context[klass_or_module]
+      end
 
-    it "should create with block with no argument for #{mode} process" do
-      AnyClass.xstub do
-        def say_hello ; 'i say hello' ; end
+      it "should create with hash argument(s) for #{klass_or_module} class in #{mode} process" do
+        @context.xstub(:say_hello => 'i say hello', :say_world => 'i say world')
+        @get_value["#{@context}.say_hello"].should.equal 'i say hello'
+        @get_value["#{@context}.say_world"].should.equal 'i say world'
       end
-      @get_value['AnyClass.say_hello'].should.equal 'i say hello'
-    end
 
-    it "should create with symbol & block with no argument for #{mode} process" do
-      AnyClass.xstub(:say_hello) do
-        def say_world
-          'i say world'
+      it "should create with symbol argument(s) for #{klass_or_module} class in #{mode} process" do
+        @context.xstub(:say_hello)
+        @get_value["#{@context}.say_hello"].should.equal nil
+      end
+
+      it "should create with block with no argument for #{klass_or_module} class in #{mode} process" do
+        @context.xstub do
+          def say_hello ; 'i say hello' ; end
         end
+        @get_value["#{@context}.say_hello"].should.equal 'i say hello'
       end
-      @get_value['AnyClass.say_hello'].should.equal nil
-      @get_value['AnyClass.say_world'].should.equal 'i say world'
-    end
 
-    it "should create with hash & block with no argument for #{mode} process" do
-      AnyClass.xstub(:say_hello => 'i say hello') do
-        def say_world
-          'i say world'
+      it "should create with symbol & block with no argument for #{klass_or_module} class in #{mode} process" do
+        @context.xstub(:say_hello) do
+          def say_world
+            'i say world'
+          end
         end
+        @get_value["#{@context}.say_hello"].should.equal nil
+        @get_value["#{@context}.say_world"].should.equal 'i say world'
       end
-      @get_value['AnyClass.say_hello'].should.equal 'i say hello'
-      @get_value['AnyClass.say_world'].should.equal 'i say world'
-    end
 
-    it "should always create the most recent for #{mode} process" do
-      found, expected = [], ['i say hello', 'i say something else', 'i say something else again']
-      stub_and_get_value = lambda do |value|
-        AnyClass.xstub(:say_hello => value)
-        @get_value['AnyClass.say_hello']
+      it "should create with hash & block with no argument for #{klass_or_module} class in #{mode} process" do
+        @context.xstub(:say_hello => 'i say hello') do
+          def say_world
+            'i say world'
+          end
+        end
+        @get_value["#{@context}.say_hello"].should.equal 'i say hello'
+        @get_value["#{@context}.say_world"].should.equal 'i say world'
       end
 
-      found << stub_and_get_value[expected[0]]
-      found << stub_and_get_value[expected[1]]
+      it "should always create the most recent for #{klass_or_module} class in #{mode} process" do
+        found, expected = [], ['i say hello', 'i say something else', 'i say something else again']
+        stub_and_get_value = lambda do |value|
+          @context.xstub(:say_hello => value)
+          @get_value["#{@context}.say_hello"]
+        end
 
-      CrossStub.clear
-      CrossStub.setup(:file => $cache_file)
+        found << stub_and_get_value[expected[0]]
+        found << stub_and_get_value[expected[1]]
 
-      found << stub_and_get_value[expected[2]]
-      found.should.equal expected
-    end
+        CrossStub.clear
+        CrossStub.setup(:file => $cache_file)
 
-    it "should create stub with dependency on other stub for #{mode} process" do
-      AnyClass.xstub(:something => 'hello') do
-        def do_action(who, action)
-          %\#{who} #{action} #{something}\
-        end
+        found << stub_and_get_value[expected[2]]
+        found.should.equal expected
       end
-      @get_value['AnyClass.do_action.i.say'].should.equal 'i say hello'
-    end
 
-    it "should create for method not implemented in ruby for #{mode} process" do
-      now = Time.now - 365*60*60*24
-      Time.xstub(:now => now)
-      @get_value['Time.now'].should.equal now
-    end
+      it "should create stub with dependency on other stub for #{klass_or_module} class in #{mode} process" do
+        @context.xstub(:something => 'hello') do
+          def do_action(who, action)
+            %\#{who} #{action} #{something}\
+          end
+        end
+        @get_value["#{@context}.do_action.i.say"].should.equal 'i say hello'
+      end
 
-#    it "should create with block that takes argument(s) for #{mode} process" do
-#      # a, b = 1, 2
-#      # AnyClass.xstub do |a, b|
-#      #   def say_hello
-#      #     "i say #{a+b} hellos"
-#      #   end
-#      # end
-#      # AnyClass.say_hello.should.equal 'i say 3 hellos'
-#    end
-# 
-#    it "should create with hash & block that takes argument(s) for #{mode} process" do
-#      # a, b = 1, 2
-#      # AnyClass.xstub(:say_world => 'i say world') do |a, b|
-#      #   def say_hello
-#      #     "i say #{a+b} hellos"
-#      #   end
-#      # end
-#      # AnyClass.say_hello.should.equal 'i say 3 hellos'
-#      # AnyClass.say_world.should.equal 'i say world'
-#    end
+      it "should create for method not implemented in ruby for #{klass_or_module} class in #{mode} process" do
+        now = Time.now - 365*60*60*24
+        Time.xstub(:now => now)
+        @get_value['Time.now'].should.equal now
+      end
 
+      #    it "should create with block that takes argument(s) for #{mode} process" do
+      #      # a, b = 1, 2
+      #      # AnyClass.xstub do |a, b|
+      #      #   def say_hello
+      #      #     "i say #{a+b} hellos"
+      #      #   end
+      #      # end
+      #      # AnyClass.say_hello.should.equal 'i say 3 hellos'
+      #    end
+      #
+      #    it "should create with hash & block that takes argument(s) for #{mode} process" do
+      #      # a, b = 1, 2
+      #      # AnyClass.xstub(:say_world => 'i say world') do |a, b|
+      #      #   def say_hello
+      #      #     "i say #{a+b} hellos"
+      #      #   end
+      #      # end
+      #      # AnyClass.say_hello.should.equal 'i say 3 hellos'
+      #      # AnyClass.say_world.should.equal 'i say world'
+      #    end
+    end
   end
 
 end

data/spec/cross-stub/stubbing_error_spec.rb

@@ -16,6 +16,18 @@ describe 'Stubbing Error' do
     }
   end
 
+  it 'should not be raised when stubbing nested class' do
+    should.not.raise(CrossStub::Error) {
+      AnyClass::Inner.xstub(:say_hello => 'i say hello')
+    }
+  end
+
+  it 'should not be raised when stubbing nested module' do
+    should.not.raise(CrossStub::Error) {
+      AnyModule::Inner.xstub(:say_hello => 'i say hello')
+    }
+  end
+
   it 'should be raised when stubbing instance' do
     should.raise(CrossStub::CannotStubInstanceError) do
       o = AnyClass.new

data/spec/helpers.rb

@@ -12,12 +12,22 @@ class AnyClass
   def self.say_world
     'u say world'
   end
+  class Inner
+    def self.say_world
+      'u say world'
+    end
+  end
 end
 
 module AnyModule
   def self.say_world
     'u say world'
   end
+  module Inner
+    def self.say_world
+      'u say world'
+    end
+  end
 end
 
 module EchoClient
@@ -85,12 +95,13 @@ module EchoServer
         CrossStub.refresh(:file => $cache_file)
         log "(2) EchoServer::EM#receive_data ... completes stubs refresh"
         klass, method, *args = klass_and_method.split('.')
+        konst = klass.split(/::/).inject(Object) { |const_train, const| const_train.const_get(const) }
         log "(3) EchoServer::EM#receive_data ... parses arguments to:",
             "    * klass  ... #{klass}",
             "    * method ... #{method}",
             "    * args   ... #{args.inspect}"
-        value = args.empty? ? Object.const_get(klass).send(method) :
-          Object.const_get(klass).send(method, *args) rescue $!.message
+        value = args.empty? ? konst.send(method) :
+          konst.send(method, *args) rescue $!.message
         log "(4) EchoServer::EM#receive_data ... returns: #{value.inspect}"
         send_data(Marshal.dump(value))
         log "(5) EchoServer::EM#receive_data ... end"

data/spec/spec_helper.rb

@@ -10,6 +10,9 @@ Bacon.summary_on_exit
 shared 'has standard setup' do
   before do
     CrossStub.setup(:file => $cache_file)
+    @get_context = lambda do |klass_or_module|
+      klass_or_module.split(/::/).inject(Object) { |context, name| context.const_get(name) }
+    end
   end
   after do
     CrossStub.clear
@@ -20,8 +23,9 @@ shared 'has current process setup' do
   before do
     @get_value = lambda do |klass_and_method_and_args|
       klass, method, *args = klass_and_method_and_args.split('.')
-      args.empty? ? Object.const_get(klass).send(method) :
-        Object.const_get(klass).send(method, *args)
+      konst = klass.split(/::/).inject(Object) { |const_train, const| const_train.const_get(const) }
+      args.empty? ? konst.send(method) :
+        konst.send(method, *args)
     end
   end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cross-stub
 version: !ruby/object:Gem::Version 
-  version: 0.1.3.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - NgTzeYang
@@ -9,49 +14,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 +08:00
+date: 2010-04-03 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bacon
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 0
         version: 0.0.0
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: eventmachine
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 0
         version: 0.0.0
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: ParseTree
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 4
         version: 3.0.4
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: ruby2ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 4
         version: 1.2.4
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: ""
 email: ngty77@gmail.com
 executables: []
@@ -98,18 +119,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple cross process stubbing