rspec-action_view 0.3.1 → 0.3.2

data/Rakefile

@@ -7,7 +7,10 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/rspec-action_view"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", "~> 2.0.0.beta.22"
+    
+    gem.add_dependency "rspec",             "~> 2.0.0.beta.22"    
+    gem.add_dependency "r3_plugin_toolbox", "~> 0.3.5"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/rspec-action_view/erb_template_inline.rb

@@ -79,13 +79,15 @@ module RSpec
 
       def run_template_locals locals = {}, local_assigns = {}, &block
         raise ArgumentError, "Must take template as a block argument" if !block
-        options = {:inline => block.call}
-        render options.merge(:locals => locals), {}
+        options = {:inline => block.call}.merge(:locals => locals)
+        render options, local_assigns
       end
 
       def run_template options = {}, local_assigns = {}, &block
+
         raise ArgumentError, "Must take template as a block argument" if !block        
-        render options.merge(:inline => block.call), local_assigns
+        options.merge!(:inline => block.call)
+        render options, local_assigns
       end
     end  
   end

data/lib/rspec-action_view/rspec/macro.rb

@@ -1,5 +1,5 @@
 require 'active_support/railtie'
-require 'rails3_plugin_toolbox'
+require 'r3_plugin_toolbox'
 require 'sugar-high/kind_of'
 
 module RSpec
@@ -7,7 +7,7 @@ module RSpec
     module Macro
       def extend_view_with base_name, *modules
         modules = modules.flatten 
-        Rails3::PluginExtender.new do
+        Rails3::Plugin::Extender.new do
           # extend action_view with methods from some modules
           extend_rails :view do |v|   
             if base_name.kind_of?(Module) && !modules.empty? && modules.only_kinds_of?(Symbol)

data/rspec-action_view.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-action_view}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-26}
+  s.date = %q{2010-09-25}
   s.description = %q{RSpec 2 library to make it simple to spec Rails 3 ActionView extensions}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -49,12 +49,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_runtime_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_runtime_dependency(%q<r3_plugin_toolbox>, ["~> 0.3.5"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+      s.add_dependency(%q<r3_plugin_toolbox>, ["~> 0.3.5"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
+    s.add_dependency(%q<r3_plugin_toolbox>, ["~> 0.3.5"])
   end
 end
 

data/spec/rspec-action_view/assign_locals_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module MyView
   
-  def goodbye name
+  def say_goodbye name
     "Goodbye #{name}".html_safe
   end
 
@@ -25,7 +25,7 @@ describe 'My View extensions!' do
     it "should assign Kristian to the local 'name' that is used in the erb and stub out a method on the view!" do
       with_engine(:erb) do |e, view|
         view.stubs(:host).returns 'localhost'
-        res = e.run_template(:locals => {:name => 'Kristian'}) {"<%= goodbye name %> host: <%= host %>"}
+        res = e.run_template(:locals => {:name => 'Kristian'}) {"<%= say_goodbye name %> host: <%= host %>"}
         res.should match /Kristian/
         res.should match /localhost/
       end
@@ -35,16 +35,16 @@ describe 'My View extensions!' do
   describe '#run_template' do  
     it "should assign Kristian to the local 'name' that is used in the erb, using full locals hash" do
       with_engine(:erb) do |e|
-        e.run_template(:locals => {:name => 'Kristian'}) {"<%= goodbye name %>"}.should match /Kristian/
+        e.run_template(:locals => {:name => 'Kristian'}) {"<%= say_goodbye name %>"}.should match /Kristian/
       end
     end
   end
-
+  
   describe '#run_template_locals' do
     it "should assign Kristian to the local 'name' that is used in the erb, using convenience hash for locals" do
       with_engine(:erb) do |e|
         e.run_template_locals :name => 'Kristian' do
-          %{<%= goodbye name %>}
+          %{<%= say_goodbye name %>}
         end.should match /Kristian/
       end
     end

data/spec/rspec-action_view/erb_tester_spec.rb

@@ -37,7 +37,7 @@ module MyView
   end
 end
 
-describe 'My View extensions!' do
+describe 'Running ERB template engine with View extensions' do
   extend_view_with MyView, :tab, :say
   extend_view_with MyView
   extend_view_with MyView::Blap, 'MyView::Blip'
@@ -48,7 +48,7 @@ describe 'My View extensions!' do
     end
   end
 
-
+  
   it "should extend with module Say - hello, name" do
     with_engine(:erb) do |e|
       e.run_template {"hello <%= name %>"}.should match /Kristian/
@@ -62,13 +62,13 @@ describe 'My View extensions!' do
       end.should match /ged/
     end
   end
-
+  
   it "should extend with modules Blip and Blap" do
     with_engine(:erb) do |e|
       e.run_template {"hello <%= blip %> go <%= blap %>"}.should match /blip me/
     end
   end
-
+  
   it "should extend handle nested blocks in ERB" do
     with_engine(:erb) do |e|
       e.run_template do 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 +02:00
+date: 2010-09-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,15 +23,49 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 0
+        - beta
+        - 22
+        version: 2.0.0.beta.22
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 22
+        version: 2.0.0.beta.22
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: r3_plugin_toolbox
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 5
+        version: 0.3.5
+  type: :runtime
+  version_requirements: *id003
 description: RSpec 2 library to make it simple to spec Rails 3 ActionView extensions
 email: kmandrup@gmail.com
 executables: []