rspec-rails 1.1.5 → 1.1.6

data/History.txt

@@ -1,4 +1,10 @@
-=== Version 1.1.5
+=== Version 1.1.6 / 2008-10-02
+
+* 1 bug fix
+
+	* fixed regression where values assigned to the assigns hash were not accessible from the example (#549)
+
+=== Version 1.1.5 / 2008-09-28
 
 IMPORTANT: use 'script/autospec' (or just 'autospec' if you have the rspec gem
 installed) instead of 'autotest'. We changed the way autotest discovers rspec

data/Rakefile

@@ -16,7 +16,6 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
   p.extra_deps = [["rspec","1.1.5"]]
-  p.spec_extras = { :to_ruby => lambda { |str| File.open("rspec-rails.gemspec", "w+"){ |f| f.puts str } } }
 end
 
 ['audit','test','test_deps','default','publish_docs','post_blog', 'release'].each do |task|

data/lib/spec/rails/example/assigns_hash_proxy.rb

@@ -3,26 +3,20 @@ module Spec
     module Example
       class AssignsHashProxy #:nodoc:
         def initialize(example_group, &block)
-          @block = block
+          @target = block.call
           @example_group = example_group
         end
 
-        def [](ivar)
-          if assigns.include?(ivar.to_s)
-            assigns[ivar.to_s]
-          elsif assigns.include?(ivar)
-            assigns[ivar]
-          else
-            nil
-          end
+        def [](key)
+          assigns[key] || assigns[key.to_s] || @target.instance_variable_get("@#{key}")
         end
 
-        def []=(ivar, val)
-          @block.call.instance_variable_set("@#{ivar}", val)
+        def []=(key, val)
+          @target.instance_variable_set("@#{key}", val)
         end
 
-        def delete(name)
-          assigns.delete(name.to_s)
+        def delete(key)
+          assigns.delete(key.to_s)
         end
 
         def each(&block)

data/lib/spec/rails/version.rb

@@ -4,11 +4,11 @@ module Spec
       unless defined? MAJOR
         MAJOR  = 1
         MINOR  = 1
-        TINY   = 5
+        TINY   = 6
 
         STRING = [MAJOR, MINOR, TINY].join('.')
 
-        SUMMARY = "rspec-rails version #{STRING}"
+        SUMMARY = "rspec-rails #{STRING}"
       end
     end
   end

data/spec/rails/autotest/mappings_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 require File.join(File.dirname(__FILE__), *%w[.. .. .. lib autotest rails_rspec])
-require File.join(File.dirname(__FILE__), *%w[.. .. .. .. rspec spec autotest_matchers])
+require File.join(File.dirname(__FILE__), *%w[.. .. .. .. rspec spec autotest autotest_matchers])
 
 describe Autotest::RailsRspec, "file mapping" do
   before(:each) do

data/spec/rails/example/assigns_hash_proxy_spec.rb

@@ -62,4 +62,9 @@ describe "AssignsHashProxy" do
     @proxy.has_key?('foo').should == true
     @proxy.has_key?('bar').should == false
   end
+  
+  it "should expose values set in example" do
+    @proxy[:foo] = 'bar'
+    @proxy[:foo].should == 'bar'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-28 00:00:00 -05:00
+date: 2008-10-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -226,9 +226,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails version 1.1.5
+summary: rspec-rails 1.1.6
 test_files: []