named_let 0.1.5 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6c9fc8085b3f8e7b8a9259ec6b721d8902c8ab8a
+  data.tar.gz: 2147cb0b463b4e516379e16d3a9f2d160ac48c09
+SHA512:
+  metadata.gz: bd513aa2a072274af34021a9b23682b4238f8647a54e6c420bf61cdfc322db55786c79a50f6fc4466c5facd40939981187036e7ee336cc05ca488d3c79119099
+  data.tar.gz: eccf40df57a6ec87fc5064cc5845a2f1c1a73822d9c493a37a0d7ed0a5841e5e07609c5446ab41a0dd16b67b373f3efcc5df9a96048569d7c2ccea33c7a32eee

data/lib/named_let.rb

@@ -38,33 +38,68 @@ module NamedLet
     klass = RSpec::Core::MemoizedHelpers::ClassMethods
   end
 
-  klass.class_eval do
-    def named_let(name, label = nil, &block)
-      define_method(name) do
-        __memoized.fetch(name) {|k| __memoized[k] = instance_eval(&block).tap{|o|
-          next o if o.nil?
+  def extend_for_reporting(obj, the_name)
+    return obj if obj.nil?
+
+    # if given -d/--debug option, append calling original ones.(ruby-debug required)
+    call_super = begin ;$DEBUG or Debugger.started? rescue LoadError; nil; end
+
+    inject_code = lambda{|o, code| begin; o.instance_eval code; rescue TypeError; end  }
+    escape      = lambda{|str| str.gsub(/\"/, '\\"')}
+
+    genereate_wrapper_code = lambda{|o, method|
+      original_result = escape.call(o.send(method)) if call_super
+      "def #{method}; \"#{the_name}\" #{call_super ? " + \" (#{original_result})\"" : ''} ;end"
+    }
+
+    to_s_code    = genereate_wrapper_code.call(obj, :to_s)
+    inspect_code = genereate_wrapper_code.call(obj, :inspect)
+
+    inject_code.call(obj, to_s_code)
+    inject_code.call(obj, inspect_code)
+    obj
+  end
+  module_function :extend_for_reporting
 
-          the_name = label || name
+  klass.class_eval do
+    if RSpec::Core::Version::STRING < "3.0"
 
-          # if given -d/--debug option, append calling original ones.(ruby-debug required)
-          call_super = begin ;$DEBUG or Debugger.started? rescue LoadError; nil; end
+      # for Rspec2
+      def named_let(name, label = nil, &block)
 
-          inject_code = lambda{|obj, code| begin; obj.instance_eval code; rescue TypeError; end  }
-          escape      = lambda{|str| str.gsub(/\"/, '\\"')}
+        the_name = label || name
 
-          genereate_wrapper_code = lambda{|obj, method|
-            original_result = escape.call(obj.send(method)) if call_super
-            code = "def #{method}; \"#{the_name}\" #{call_super ? " + \" (#{original_result})\"" : ''} ;end"
+        define_method(name) do
+          __memoized.fetch(name) {|k|
+            __memoized[k] = instance_eval(&block).tap{|o| NamedLet.extend_for_reporting(o, the_name) }
           }
+        end
+      end
+    else
+      # for Rspec3
+      def named_let(name, label = nil, &block)
+        # We have to pass the block directly to `define_method` to
+        # allow it to use method constructs like `super` and `return`.
+        raise "#let or #subject called without a block" if block.nil?
+        RSpec::Core::MemoizedHelpers.module_for(self).__send__(:define_method, name, &block)
 
-          to_s_code    = genereate_wrapper_code.call(o, :to_s)
-          inspect_code = genereate_wrapper_code.call(o, :inspect)
+        the_name = label || name
 
-          inject_code.call(o, to_s_code)
-          inject_code.call(o, inspect_code)
-          o
-        }}
+        # Apply the memoization. The method has been defined in an ancestor
+        # module so we can use `super` here to get the value.
+        if block.arity == 1
+          define_method(name) {
+            __memoized.fetch_or_store(name) {
+              super(RSpec.current_example, &nil).tap{|o| NamedLet.extend_for_reporting(o, the_name) }
+            }
+          }
+        else
+          define_method(name) {
+            __memoized.fetch_or_store(name) { super(&nil).tap{|o| NamedLet.extend_for_reporting(o, the_name) }}
+          }
+        end
       end
+
     end
 
     def named_let!(name, label = nil, &block)

data/lib/named_let/version.rb

@@ -1,3 +1,3 @@
 module NamedLet
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,62 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: named_let
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+version: !ruby/object:Gem::Version
+  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Tomohito Ozaki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-21 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-09-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: "'named_let(:name){ obj }' changes the value which returns 'obj#to_s' and 'obj#inspect' to :name, then output of 'rspec -format d' be improved more readable."
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "'named_let(:name){ obj }' changes the value which returns 'obj#to_s'
+  and 'obj#inspect' to :name, then output of 'rspec -format d' be improved more readable."
+email:
 - ozaki@yuroyoro.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -64,39 +54,27 @@ files:
 - lib/named_let.rb
 - lib/named_let/version.rb
 - named_let.gemspec
-has_rdoc: true
 homepage: https://github.com/yuroyoro/named_let
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: named_let
-rubygems_version: 1.5.2
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: named_let can be used to make the rspec's output easier to read.
 test_files: []
-