shoulda-let 0.0.3 → 0.0.4

data/Gemfile

@@ -1,6 +1,7 @@
 source :rubygems
 gemspec
 
+gem "bump"
 gem "rake"
 gem "test-unit", ">=2.5.1"
 gem "appraisal"

data/Gemfile.lock

@@ -1,34 +1,42 @@
 PATH
   remote: .
   specs:
-    shoulda-let (0.0.3)
+    shoulda-let (0.0.4)
       shoulda
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.8)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    appraisal (0.4.1)
+    appraisal (0.5.1)
       bundler
       rake
-    i18n (0.6.0)
-    multi_json (1.3.6)
-    rake (0.9.2.2)
-    shoulda (3.1.1)
-      shoulda-context (~> 1.0)
-      shoulda-matchers (~> 1.2)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.2.0)
+    bourne (1.1.2)
+      mocha (= 0.10.5)
+    bump (0.3.7)
+    i18n (0.6.1)
+    metaclass (0.0.1)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    multi_json (1.5.0)
+    rake (10.0.2)
+    shoulda (3.3.2)
+      shoulda-context (~> 1.0.1)
+      shoulda-matchers (~> 1.4.1)
+    shoulda-context (1.0.1)
+    shoulda-matchers (1.4.2)
       activesupport (>= 3.0.0)
-    test-unit (2.5.1)
+      bourne (~> 1.1.2)
+    test-unit (2.5.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   appraisal
+  bump
   rake
   shoulda-let!
   test-unit (>= 2.5.1)

data/Rakefile

@@ -1,5 +1,6 @@
 require 'appraisal'
 require 'bundler/gem_tasks'
+require 'bump/tasks'
 
 task :test do
   sh "ruby test/shoulda_let_test.rb"

data/Readme.md

@@ -11,39 +11,74 @@ Install
 Usage
 =====
 <!-- example -->
-    context "foo" do
-      setup do
-        @result = let(:thing)
+    context "let" do
+      let(:thing){ "a thing" }
+
+      should "make the result available via let" do
+        assert_equal 'a thing', let(:thing)
+      end
+
+      should 'make the result available via an instance method' do
+        assert_equal 'a thing', thing
       end
 
-      let(:thing){ "parent" }
+      context "memoization" do
+        let(:thing) do
+          @invocations ||= 0
+          @invocations += 1
+          rand
+        end
+
+        should "be stable" do
+          first_value = thing
+          assert_equal first_value, thing
+          assert_equal first_value, let(:thing)
+        end
 
-      context "with something" do
-        let(:thing){ "something" }
-        should "be something" do
-          assert_equal "something", @result
+        should 'not reevaluate' do
+          thing; thing; thing
+          assert_equal 1, @invocations
         end
       end
 
-      context "with cache" do
-        let(:thing){ rand }
+      context "a child context with an overridden let" do
+        let(:thing) { 'child thing' }
 
-        should "be stable" do
-          assert_equal @result, let(:thing)
+        should "use the overridden value" do
+          assert_equal "child thing", thing
         end
+      end
+
+      context 'a child context with no overridden let' do
+        should 'use the parent value' do
+          assert_equal 'a thing', thing
+        end
+      end
 
-        should "be different" do
-          assert_not_equal $last_thing, let(:thing)
+      context "let!" do
+        let!(:thing) do
+          @thing_instantiated = true
+          'anything'
         end
 
-        should "prepare for be different" do
-          $last_thing = let(:thing)
+        should "automatically be evaluated" do
+          assert @thing_instantiated
+        end
+
+        should 'otherwise work like let' do
+          assert_equal 'anything', thing
         end
       end
 
-      context "with parent" do
-        should "be parent" do
-          assert_equal "parent", @result
+      context 'evaluation context' do
+        let(:thing) do
+          @let_evaluation_context = self
+          'a thing'
+        end
+
+        should 'be the test case' do
+          thing
+          assert_equal self, @let_evaluation_context
         end
       end
     end

data/gemfiles/shoulda2.gemfile

@@ -2,6 +2,7 @@
 
 source :rubygems
 
+gem "bump"
 gem "rake"
 gem "test-unit", ">=2.5.1"
 gem "appraisal"

data/gemfiles/shoulda2.gemfile.lock

@@ -10,6 +10,7 @@ GEM
     appraisal (0.4.1)
       bundler
       rake
+    bump (0.3.7)
     rake (0.9.2.2)
     shoulda (2.11.3)
     test-unit (2.5.1)
@@ -19,6 +20,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  bump
   rake
   shoulda (~> 2.11)
   shoulda-let!

data/gemfiles/shoulda3.gemfile

@@ -2,6 +2,7 @@
 
 source :rubygems
 
+gem "bump"
 gem "rake"
 gem "test-unit", ">=2.5.1"
 gem "appraisal"

data/gemfiles/shoulda3.gemfile.lock

@@ -13,6 +13,7 @@ GEM
     appraisal (0.4.1)
       bundler
       rake
+    bump (0.3.7)
     i18n (0.6.0)
     multi_json (1.3.6)
     rake (0.9.2.2)
@@ -29,6 +30,7 @@ PLATFORMS
 
 DEPENDENCIES
   appraisal
+  bump
   rake
   shoulda (~> 3.1)
   shoulda-let!

data/lib/shoulda/let.rb

@@ -1,27 +1,13 @@
 require "shoulda"
 require "shoulda/context"
+require 'shoulda/let/context_support'
+require 'shoulda/let/test_case_support'
 
-context_class = (Shoulda::VERSION >= "3.0.0" ? Shoulda::Context::Context : Shoulda::Context)
+context_class = (defined?(Shoulda::Context::Context) ? Shoulda::Context::Context : Shoulda::Context)
 context_class.class_eval do
-  # setup method used outside of should blocks
-  # let(:foo){ "Foo" }
-  def let(name, &block)
-    @let ||= {}
-    if block
-      @let[name] = block
-    else
-      @let.fetch(name){ parent.let(name) }
-    end
-  end
+  include Shoulda::Let::ContextSupport
 end
 
 Test::Unit::TestCase.class_eval do
-  # instance method used inside of should block
-  # assert_equal @result, let(:foo)
-  def let(name)
-    @let ||= {}
-    @let.fetch(name) do
-      @let[name] = instance_exec(&@shoulda_context.let(name))
-    end
-  end
+  include Shoulda::Let::TestCaseSupport
 end

data/lib/shoulda/let/context_support.rb

@@ -0,0 +1,30 @@
+module Shoulda
+  module Let
+
+    module ContextSupport
+      # setup method used outside of should blocks
+      # let(:foo){ "Foo" }
+      def let(name, &block)
+        name = name.to_sym
+        @let ||= {}
+        if block
+          @let[name] = block
+        else
+          @let.fetch(name){ parent.let(name) }
+        end
+      end
+
+      def let!(name, &block)
+        let(name, &block)
+        setup { let(name) }
+      end
+
+      def let_defined?(name)
+        name = name.to_sym
+        ( @let && @let.has_key?(name) ) ||
+        ( parent.respond_to?(:let_defined?) && parent.let_defined?(name) )
+      end
+    end
+
+  end
+end

data/lib/shoulda/let/test_case_support.rb

@@ -0,0 +1,28 @@
+module Shoulda
+  module Let
+
+    module TestCaseSupport
+      # instance method used inside of should block
+      # assert_equal @result, let(:foo)
+      def let(name)
+        @let_cache ||= {}
+        @let_cache[name] ||= instance_exec(&@shoulda_context.let(name))
+      end
+
+      def method_missing(name, *arguments, &block)
+        name = name.to_sym
+        if arguments.length == 0 && block.nil? && @shoulda_context.let_defined?(name)
+          let(name)
+        else
+          super
+        end
+      end
+
+      def respond_to?(name, *arguments, &block)
+        ( @shoulda_context && @shoulda_context.let_defined?(name) ) || super
+      end
+
+    end
+
+  end
+end

data/shoulda-let.gemspec

@@ -1,6 +1,6 @@
 name = "shoulda-let"
 
-Gem::Specification.new name, "0.0.3" do |s|
+Gem::Specification.new name, "0.0.4" do |s|
   s.summary = "A simple let for shoulda"
   s.authors = ["Michael Grosser"]
   s.email = "michael@grosser.it"

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-let
 version: !ruby/object:Gem::Version
-  version: 0.0.3
   prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  type: :runtime
 description: 
 email: michael@grosser.it
 executables: []
@@ -44,6 +44,8 @@ files:
 - gemfiles/shoulda3.gemfile
 - gemfiles/shoulda3.gemfile.lock
 - lib/shoulda/let.rb
+- lib/shoulda/let/context_support.rb
+- lib/shoulda/let/test_case_support.rb
 - shoulda-let.gemspec
 - test/shoulda_let_test.rb
 homepage: http://github.com/grosser/shoulda-let
@@ -54,23 +56,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3119661042567922531
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 4444769857253889543
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3119661042567922531
+      hash: 4444769857253889543
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24