tiramisu 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b275bd81b3a2fd180b1d094268b9bf5c6280309
-  data.tar.gz: ba695c8ac455c1ff10e7a17e503c005f59006c73
+  metadata.gz: c2a209cd49ba2dcf6462a297a09c967f59c1edff
+  data.tar.gz: c76e48db62fee768e7307da6b14250fa10f706a4
 SHA512:
-  metadata.gz: 906c88938fff1ad3556893cc19550c9806ad758f962dcb20889adaf7c17542bb70c7ad33851c3158afc63e2361e3282d94e93b99238f4bc149c4f69bc84c7984
-  data.tar.gz: 39dcd11c0f4cec696030f47f08b79e27e0bc7998d2da856ace138ce77c19dd2c852be606cf3d794d7381cf91ab539edba21d910e4f99e98d2c908a46b594ba58
+  metadata.gz: 434656cd75baf8224f27ff707b9022d71b5d1ca5d5e16a244b9c86b6804e90a92c0ab9a23a9c9a43a4675ea40ee2451a30d27fb9c683496019d07a77fe09b571
+  data.tar.gz: 7be65f54d0f46526c3835b5abe5efe355bd55557cc1524350148333d0039cbbd2ad0b2c0f9354d213cc0cf3a48240345f8b523a15532228a8984ae596c13c9c1

data/lib/tiramisu/expectations.rb

@@ -15,10 +15,11 @@ module Tiramisu
     attr_reader :expected_message, :received_messages
 
     def initialize object, expected_message, assert, caller
-      proxify(@object = object)
+      @object = object
       @expected_message = expected_message.to_sym
       @assert = assert
       @caller = caller
+      proxify(@object, @expected_message)
     end
 
     def validate
@@ -32,32 +33,52 @@ module Tiramisu
     end
 
     private
-    def proxify object
-      return if object.respond_to?(:__tiramisu__original_methods__)
-      def object.__tiramisu__original_methods__; @__tiramisu__original_methods__ ||= {} end
-      def object.__tiramisu__received_messages__; @__tiramisu__received_messages__ ||= {} end
-      object.methods.each do |m|
-        next if m == :__tiramisu__original_methods__ || m == :__tiramisu__received_messages__
-        object.__tiramisu__original_methods__[m] = object.method(m)
-        object.define_singleton_method m do |*a,&b|
-          log = {arguments: a, block: b, caller: Tiramisu.relative_location(caller[0])}
-          (__tiramisu__received_messages__[m] ||= []).push(log)
-          begin
-            log[:returned] = __tiramisu__original_methods__[m].call(*a, &b)
+    def proxify object, method
+      mount_original_methods_depot(object)
+      mount_received_messages_depot(object)
+      store_original_method(object, method)
+
+      object.define_singleton_method method do |*a,&b|
+        log = {arguments: a, block: b, caller: Tiramisu.relative_location(caller[0])}
+        (__tiramisu__received_messages__[method] ||= []).push(log)
+
+        if __tiramisu__original_methods__[method]
+          return begin
+            log[:returned] = __tiramisu__original_methods__[method].call(*a, &b)
           rescue UncaughtThrowError => e
             log[:thrown] = Tiramisu.extract_thrown_symbol(e)
           rescue Exception => e
             log[:raised] = e
           end
         end
+
+        if respond_to?(:method_missing)
+          return begin
+            log[:returned] = __send__(:method_missing, method, *a, &b)
+          rescue UncaughtThrowError => e
+            log[:thrown] = Tiramisu.extract_thrown_symbol(e)
+          rescue Exception => e
+            log[:raised] = e
+          end
+        end
+
+        log[:raised] = NoMethodError.new("undefined method `%s' for %s:%s" % [method, self.inspect, self.class])
       end
-      object.define_singleton_method :method_missing do |m,*a,&b|
-        log = {arguments: a, block: b, caller: Tiramisu.relative_location(caller[0])}
-        (__tiramisu__received_messages__[:method_missing] ||= []).push(log.merge(arguments: [m] + a))
-        (__tiramisu__received_messages__[m] ||= []).push(log.merge({
-          raised: NoMethodError.new("undefined method `%s' for %s:%s" % [m, object.inspect, object.class])
-        }))
-      end
+    end
+
+    def mount_original_methods_depot object
+      return if object.respond_to?(:__tiramisu__original_methods__)
+      def object.__tiramisu__original_methods__; @__tiramisu__original_methods__ ||= {} end
+    end
+
+    def mount_received_messages_depot object
+      return if object.respond_to?(:__tiramisu__received_messages__)
+      def object.__tiramisu__received_messages__; @__tiramisu__received_messages__ ||= {} end
+    end
+
+    def store_original_method object, method
+      return unless object.respond_to?(method)
+      object.__tiramisu__original_methods__[method] ||= object.method(method)
     end
 
     def assert_message_received

data/test/receive_test.rb

@@ -41,4 +41,31 @@ describe :receive do
       this.assert_equal Tiramisu::GenericFailure, run(:test).class
     end
   end
+
+  describe 'missing methods' do
+
+    it 'should call method_missing if defined' do
+      this = self
+      x = Class.new {def self.method_missing(m); 'x' + m.to_s; end}
+      spec rand do
+        test :test do
+          assert(x).receive(:y)
+          x.y
+        end
+        this.assert_equal 'xy', x.y
+        this.assert_equal :__tiramisu_passed__, run(:test)
+      end
+    end
+
+    it 'should raise NoMethodError if no method_missing defined' do
+      this = self
+      spec rand do
+        test :test do
+          assert(x = 'x').receive(:y).and_raise(NoMethodError)
+          x.y
+        end
+        this.assert_equal :__tiramisu_passed__, run(:test)
+      end
+    end
+  end
 end

data/tiramisu.gemspec

@@ -1,27 +1,26 @@
-# coding: utf-8
-
-name, version = 'tiramisu 0.0.2'.split
 Gem::Specification.new do |spec|
-  spec.name          = name
-  spec.version       = version
-  spec.authors       = ['Slee Woo']
-  spec.email         = ['mail@sleewoo.com']
-  spec.description   = 'Super-simple testing library for Ruby'
-  spec.summary       = [name, version]*'-'
-  spec.homepage      = 'https://github.com/sleewoo/' + name
-  spec.license       = 'MIT'
+  spec.name        = 'tiramisu'
+  spec.version     = '0.0.3'
+  spec.authors     = ['Slee Woo']
+  spec.email       = ['mail@sleewoo.com']
+  spec.description = 'Super-simple testing library for Ruby'
+  spec.summary     = [spec.name, spec.version]*'-'
+  spec.homepage    = 'https://github.com/sleewoo/' + spec.name
+  spec.license     = 'MIT'
 
-  spec.files = Dir['**/{*,.[a-z]*}'].reject {|e| e =~ /\.(gem|lock)\Z/}
+  spec.files = Dir['**/{*,.[a-z]*}'].reject {|e| e =~ /\.(gem|lock|html)\Z/}
   spec.require_paths = ['lib']
 
-  spec.executables = Dir['bin/*'].map{ |f| File.basename(f)}
+  spec.executables = Dir['bin/*'].map { |f| File.basename(f)}
 
   spec.required_ruby_version = '>= 2'
+
   spec.add_runtime_dependency 'tty-progressbar', '~> 0.5'
   spec.add_runtime_dependency 'tty-screen',      '~> 0.1'
   spec.add_runtime_dependency 'pastel',          '~> 0.4'
   spec.add_runtime_dependency 'coderay',         '~> 1'
   spec.add_runtime_dependency 'json',            '~> 1.8'
+
   spec.add_development_dependency 'minitest', '~> 5.5'
   spec.add_development_dependency 'bundler',  '~> 1.8'
   spec.add_development_dependency 'rake',     '~> 10.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiramisu
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Slee Woo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tty-progressbar
@@ -191,5 +191,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: tiramisu-0.0.2
+summary: tiramisu-0.0.3
 test_files: []