motion-stump 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 582335357cf4b0b510e0ebb140abfd520f9c05bb
-  data.tar.gz: e1571647e3da93c289ef8d443565ab13b00c9722
+  metadata.gz: dafe29c6f7a0e5c2425dbed30c336b6ab3a354db
+  data.tar.gz: 6174a4006293ab88a138d6f8d470fdeab9d2a3a9
 SHA512:
-  metadata.gz: 37cd5afe544468ce18afe677f6eb0020d6111845f605bf1ebc26916877e5b30431978045a189b1d0d269de58d8c0850f558ed5ab9dc8dc69a5c09b00d6e835b5
-  data.tar.gz: d32793edd2866cf12ea63245cf4ef278b0c372fbc1c195ce669a251b267aa7bb9d137db4f9b525f4c478238bb855d5876fb57b6bd31992ca47ab404631f4e81c
+  metadata.gz: ba97813ed8f07dc31bf1dd2a5a078bebc60f019ebb2a41c895bd1b7f8173a16dc54901ea6687d3802a7518722eef643d786b8811ba26bd6522a04030cbdb6bc1
+  data.tar.gz: efd82644bee3d4749b377db7bcbfe32cddec8e998b426966b49f07144ddcf82e06de79719140f1c275e6db36576d059629eb0a37bbf8b145c6943163692a04be

data/.gitignore

@@ -1 +1,3 @@
-Gemfile.lock
+Gemfile.lock
+.repl_history
+build

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in bubble-wrap.gemspec
 gemspec

data/Rakefile

@@ -1,20 +1,19 @@
-# -*- coding: utf-8 -*-
-require "bundler/gem_tasks"
-
-$:.unshift("/Library/RubyMotion/lib")
-
-require 'motion/project'
-require 'bundler'
-Bundler.setup :default, :development
-require 'motion-stump'
-
-Motion::Project::App.setup do |app|
-  app.name = 'motion-stump'
-end
-
-desc "Build the gem"
-task :gem do
-  sh "bundle exec gem build motion-stump.gemspec"
-  sh "mkdir -p pkg"
-  sh "mv *.gem pkg/"
-end
+# -*- coding: utf-8 -*-
+require "bundler/gem_tasks"
+
+$:.unshift("/Library/RubyMotion/lib")
+require 'motion/project/template/ios'
+require 'bundler'
+Bundler.setup :default, :development
+require 'motion-stump'
+
+Motion::Project::App.setup do |app|
+  app.name = 'motion-stump'
+end
+
+desc "Build the gem"
+task :gem do
+  sh "bundle exec gem build motion-stump.gemspec"
+  sh "mkdir -p pkg"
+  sh "mv *.gem pkg/"
+end

data/lib/motion-stump.rb

@@ -5,26 +5,18 @@ end
 ## Extend Motion config to include our spec helper
 module Motion; module Project;
   class Config
-    alias_method :spec_files_before_stump, :spec_files
-    def spec_files
-      core = Dir.chdir(motiondir + '/lib/motion') { (['spec.rb'] + Dir.glob(File.join('spec', 'helpers', '*.rb'))).map { |x| File.expand_path(x) } }
-      (core + [File.join(File.dirname(__FILE__), 'stump/stump_spec_helper.rb')] + spec_files_before_stump).uniq
+    alias_method :spec_core_files_without_stump, :spec_core_files
+    def spec_core_files
+      spec_core_files_without_stump + [File.join(File.dirname(__FILE__), 'motion/stump_spec_helper.rb')]
     end
   end
 end; end
 
-
 ## Include stump in dev mode
 Motion::Project::App.setup do |app|
   app.development do
-     [
-      File.join(File.dirname(__FILE__), 'stump/version.rb'),
-      File.join(File.dirname(__FILE__), 'stump/metaid.rb'),
-      File.join(File.dirname(__FILE__), 'stump/stub.rb'),
-      File.join(File.dirname(__FILE__), 'stump/mocks.rb'),
-      File.join(File.dirname(__FILE__), 'stump/mock.rb'),
-      File.join(File.dirname(__FILE__), 'stump/proxy.rb'),
-      File.join(File.dirname(__FILE__), 'stump/app_delegate.rb')
-    ].reverse.each {|f| app.files.unshift(f) }
+    stump_lib_dir = File.join(File.dirname(__FILE__), 'stump')
+    stump_files = Dir.glob(stump_lib_dir + "/**/*.rb")
+    app.files.unshift(stump_files)
   end
 end

data/lib/{stump → motion}/stump_spec_helper.rb

@@ -9,17 +9,19 @@ module Stump
       end
 
       def verify_mocks
-        if !Stump::Mocks.failures.nil? && !Stump::Mocks.failures.empty?
-          fails = Stump::Mocks.failures.map {|object, method| "#{object.inspect} expected #{method}"}.join(", ")
-          should.flunk "Unmet expectations: #{fails}"
+        begin
+          if !Stump::Mocks.failures.nil? && !Stump::Mocks.failures.empty?
+            fails = Stump::Mocks.failures.map {|object, method| "#{object.inspect} expected #{method}"}.join(", ")
+            should.flunk "Unmet expectations: #{fails}"
+          end
+        ensure
+          Stump::Mocks.clear!
         end
       end
 
       def it_with_mock_verification(description, &block)
         @after << proc { verify_mocks }
         it_without_mock_verification(description, &block)
-      ensure
-        Stump::Mocks.clear!
       end
     end
   end
@@ -29,4 +31,4 @@ begin
   Bacon::Context.class_eval { include Stump::Baconize::ContextExtensions }
 rescue LoadError
   puts 'Bacon is not available.'
-end
+end

data/lib/stump/metaid.rb

@@ -7,7 +7,11 @@ class Object
 
   # Adds methods to a metaclass
   def meta_def name, &blk
-    meta_eval { define_method name, &blk }
+    meta_eval {
+      define_method(name) {|*args, &block|
+        blk.call(*args, &block)
+      }
+    }
   end
 
   # Defines an instance method within a class

data/lib/stump/metareset.rb

@@ -0,0 +1,30 @@
+class Object
+  def safe_meta_def method_name, &method_body
+    metaclass.remember_original_method(method_name)
+    meta_eval {
+      define_method(method_name) {|*args, &block|
+        method_body.call(*args, &block)
+      }
+    }
+  end
+
+  def reset(method_name)
+    metaclass.restore_original_method(method_name)
+  end
+
+  protected
+
+  def remember_original_method(method_name)
+    alias_method "__original_#{method_name}".to_sym, method_name if method_defined?(method_name)
+    self
+  end
+
+  def restore_original_method(method_name)
+    original_method_name = "__original_#{method_name}".to_sym
+    if method_defined?(original_method_name)
+      alias_method method_name, original_method_name
+      remove_method original_method_name
+    end
+    self
+  end
+end

data/lib/stump/mock.rb

@@ -1,25 +1,25 @@
 class Object
   # Create a mock method on an object.  A mock object will place an expectation
   # on behavior and cause a test failure if it's not fulfilled.
-  # 
+  #
   # ==== Examples
   #
   #    my_string = "a wooden rabbit"
   #    my_string.mock!(:retreat!, :return => "run away!  run away!")
   #    my_string.mock!(:question, :return => "what is the airspeed velocity of an unladen sparrow?")
-  #    
+  #
   #    # test/your_test.rb
   #    my_string.retreat!    # => "run away!  run away!"
   #    # If we let the test case end at this point, it fails with:
   #    # Unmet expectation: #<Sparrow:1ee7> expected question
   #
-  def mock!(method, options = {}, &block)    
+  def mock!(method, options = {}, &block)
     Stump::Mocks.add([self, method])
-    
+
     behavior =  if block_given?
-                  lambda do |*args| 
+                  lambda do |*args|
                     raise ArgumentError if block.arity >= 0 && args.length != block.arity
-                    
+
                     Stump::Mocks.verify([self, method])
                     block.call(*args)
                   end
@@ -29,20 +29,20 @@ class Object
                     yield(options[:yield])
                   end
                 else
-                  lambda do |*args|                     
+                  lambda do |*args|
                     Stump::Mocks.verify([self, method])
                     return options[:return]
                   end
                 end
 
-    meta_def method, &behavior
+    safe_meta_def method, &behavior
   end
 
   def should_not_call(method)
     behavior =  lambda do |*args|
                   should.flunk "Umet expectations: #{method} expected to not be called"
                 end
-    meta_def method, &behavior
+    safe_meta_def method, &behavior
   end
 end
 
@@ -50,7 +50,7 @@ module Kernel
   # Create a pure mock object rather than mocking specific methods on an object.
   #
   # ==== Examples
-  # 
+  #
   #     my_mock = mock(:thing, :return => "whee!")
   #     my_mock.thing    # => "whee"
   #

data/lib/stump/stub.rb

@@ -13,13 +13,7 @@ class Object
   def stub!(method_name, options = {}, &stubbed)
     behavior = (block_given? ? stubbed : lambda { return options[:return] })
 
-    class << self
-      self
-    end.instance_eval {
-      define_method(method_name) { |*args, &block|
-        behavior.call(*args, &block)
-      }
-    }
+    safe_meta_def method_name, &behavior
   end
 end
 

data/lib/stump/version.rb

@@ -1,3 +1,3 @@
 module Stump
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/main_spec.rb

@@ -6,6 +6,10 @@ describe "Application 'stump-test'" do
       return Dog.new
     end
 
+    def self.kind
+      'Mammal'
+    end
+
     def bark
       "Woof!"
     end
@@ -31,7 +35,7 @@ describe "Application 'stump-test'" do
   end
 
   describe "#stub!" do
-    it "should stub a class method" do 
+    it "should stub a class method" do
       Dog.stub!(:thing, return: :thing)
       Dog.should.not.be.nil
       Dog.thing.should == :thing
@@ -53,7 +57,7 @@ describe "Application 'stump-test'" do
       my_obj.hello("foo", "bar").should.be == "foo,bar"
     end
   end
-  
+
   describe "#stub" do
     it "should create a pure stub" do
       my_stub = stub(:thing, return: "dude, a thing!")
@@ -108,7 +112,7 @@ describe "Application 'stump-test'" do
   end
 
   describe "#mock" do
-    it "should create pure mock" do 
+    it "should create pure mock" do
       my_mock = mock(:hello, return: "hi")
       my_mock.hello.should == "hi"
     end
@@ -141,4 +145,61 @@ describe "Application 'stump-test'" do
       end
     end
   end
+
+  describe "#reset" do
+    describe "stubbing" do
+      it "should restore original class method" do
+        Dog.stub!(:kind, return: 'Reptile')
+        Dog.kind.should == 'Reptile'
+        Dog.reset(:kind)
+        Dog.kind.should == 'Mammal'
+      end
+
+      it "should restore original instance method" do
+        @dog.stub!(:bark, return: 'Meow!')
+        @dog.bark.should == 'Meow!'
+        @dog.reset(:bark)
+        @dog.bark.should == 'Woof!'
+      end
+    end
+
+    describe "mocking" do
+      it "should restore original class method" do
+        Dog.mock!(:kind, return: 'Reptile')
+        Dog.kind.should == 'Reptile'
+        Dog.reset(:kind)
+        Dog.kind.should == 'Mammal'
+      end
+
+      it "should restore original instance method" do
+        @dog.mock!(:bark, return: 'Meow!')
+        @dog.bark.should == 'Meow!'
+        @dog.reset(:bark)
+        @dog.bark.should == 'Woof!'
+      end
+    end
+  end
+
+  describe "after each scenario" do
+    it "should verify mocks" do
+      Should.class_eval do
+        def ignored_flunk(message)
+        end
+
+        alias_method :original_flunk, :flunk
+        alias_method :flunk, :ignored_flunk
+      end
+
+      Dog.mock!(:kind, return: 'Reptile')
+      1.should == 1
+    end
+
+    it "should have cleared mocks from the previous scenario" do
+      1.should == 1
+
+      Should.class_eval do
+        alias_method :flunk, :original_flunk
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-stump
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Francis Chong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-17 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-redgreen
@@ -51,14 +51,15 @@ files:
 - License.txt
 - README.md
 - Rakefile
+- app/app_delegate.rb
 - lib/motion-stump.rb
-- lib/stump/app_delegate.rb
+- lib/motion/stump_spec_helper.rb
 - lib/stump/metaid.rb
+- lib/stump/metareset.rb
 - lib/stump/mock.rb
 - lib/stump/mocks.rb
 - lib/stump/proxy.rb
 - lib/stump/stub.rb
-- lib/stump/stump_spec_helper.rb
 - lib/stump/version.rb
 - motion-stump.gemspec
 - spec/main_spec.rb