rspec-action_view 0.2.0 → 0.3.0

data/README.markdown

@@ -1,6 +1,9 @@
 # Rspec for Rails 3 ActionView
 
 RSpec 2 library to make it simple to spec Rails 3 ActionView extensions.
+Works with locals, #html_safe and nested blocks using #with_output_buffer and much, much more...
+
+Enjoy! I know I am... ;)
 
 ## Install
 
@@ -23,8 +26,12 @@ RSpec 2 library to make it simple to spec Rails 3 ActionView extensions.
         content_tag :div, content, :class => clazz
       end
 
-      def name
-        'Kristian'
+      def my_name
+        'Kristian'.html_safe
+      end
+
+      def hi(first_name_, last_name)
+        "Hi #{first_name} #{last_name} !".html_safe
       end
     end
   end
@@ -34,7 +41,7 @@ RSpec 2 library to make it simple to spec Rails 3 ActionView extensions.
 
     it "should work" do
       with_engine(:erb) do |e|
-        e.run_template("hello <%= name %>").should match /Kristian/
+        e.run_template {"hello <%= my_name %>"}.should match /Kristian/
 
         e.run_template do 
           %{<%= tab_for :x do %>
@@ -45,6 +52,14 @@ RSpec 2 library to make it simple to spec Rails 3 ActionView extensions.
         end.should match /ged/
       end
     end
+    
+    it "should assign Kristian to the local 'name' that is used in the erb" do
+      with_engine(:erb) do |e|
+        e.run_template_locals :first_name => 'Kristian', :last_name => 'Mandrup' do
+          %{<%= hi(first_name, last_name) %>}
+        end.should match /Kristian/
+      end
+    end
   end  
 </pre>
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rspec-action_view/erb_template_inline.rb

@@ -77,9 +77,15 @@ module RSpec
         end
       end  
 
-      def run_template content=nil, &block
-        content ||= yield
-        render :inline => content
+      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), {}
+      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
       end
     end  
   end

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

@@ -1,24 +1,21 @@
 require 'active_support/railtie'
 require 'rails3_plugin_toolbox'
+require 'sugar-high/kind_of'
 
 module RSpec
   module ActionView
     module Macro
-      def extend_view_with_modules *modules
+      def extend_view_with base_name, *modules
+        modules = modules.flatten 
         Rails3::PluginExtender.new do
           # extend action_view with methods from some modules
-          extend_rails :view do                 
-            extend_with *modules
-          end    
-        end
-      end
-
-      def extend_view_with base_name, *modules 
-        Rails3::PluginExtender.new do
-          # extend action_view with methods from some modules
-          extend_rails :view do
-            extend_from_module base_name, *modules 
-          end    
+          extend_rails :view do |v|   
+            if base_name.kind_of?(Module) && !modules.empty? && modules.only_kinds_of?(Symbol)
+              v.extend_from_module(base_name, *modules) 
+            else
+              v.extend_with base_name, *modules
+            end
+          end
         end
       end
     end

data/rspec-action_view.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-action_view}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-25}
+  s.date = %q{2010-08-26}
   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 = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/rspec-action_view/rspec/example_group.rb",
      "lib/rspec-action_view/rspec/macro.rb",
      "rspec-action_view.gemspec",
+     "spec/rspec-action_view/assign_locals_spec.rb",
      "spec/rspec-action_view/erb_tester_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -38,7 +39,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{RSpec for Rails 3 ActionView extensions}
   s.test_files = [
-    "spec/rspec-action_view/erb_tester_spec.rb",
+    "spec/rspec-action_view/assign_locals_spec.rb",
+     "spec/rspec-action_view/erb_tester_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/rspec-action_view/assign_locals_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+module MyView
+  
+  def goodbye name
+    "Goodbye #{name}".html_safe
+  end
+
+  def hello name
+    "Hello #{name}".html_safe
+  end
+  
+  module Tab
+    def tab_for(clazz, &block)               
+      content = with_output_buffer(&block)  
+      content_tag :li, content, :class => clazz
+    end
+  end    
+end
+
+describe 'My View extensions!' do
+  extend_view_with MyView
+
+  describe '#run_template' do  
+    it "should assign Kristian to the local 'name' that is used in the erb" do
+      with_engine(:erb) do |e|
+        e.run_template(:locals => {:name => 'Kristian'}) {"<%= 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" do
+      with_engine(:erb) do |e|
+        e.run_template_locals :name => 'Kristian' do
+          %{<%= goodbye name %>}
+        end.should match /Kristian/
+      end
+    end
+  end
+end

data/spec/rspec-action_view/erb_tester_spec.rb

@@ -1,6 +1,11 @@
 require 'spec_helper'
 
 module MyView
+  
+  def goodbye
+    'Goodbye'
+  end
+  
   module Tab
     def tab_for(clazz, &block)               
       content = with_output_buffer(&block)  
@@ -8,6 +13,18 @@ module MyView
     end
   end
 
+  module Blip
+    def blip
+      content_tag :li, 'blip me'
+    end
+  end
+
+  module Blap
+    def blap
+      content_tag :li, 'blap me'
+    end
+  end
+
   module Say
     def hello(clazz, &block)               
       content = with_output_buffer(&block)
@@ -22,11 +39,38 @@ end
 
 describe 'My View extensions!' do
   extend_view_with MyView, :tab, :say
+  extend_view_with MyView
+  extend_view_with MyView::Blap, 'MyView::Blip'
+  
+  it "should extend with single module MyView" do
+    with_engine(:erb) do |e|
+      e.run_template {"<%= goodbye %>"}.should match /Goodbye/
+    end
+  end
+
+
+  it "should extend with module Say - hello, name" do
+    with_engine(:erb) do |e|
+      e.run_template {"hello <%= name %>"}.should match /Kristian/
   
-  it "should work" do
+      e.run_template do 
+        %{
+          <%= hello :blip do %>
+            ged
+          <% end %>
+        }
+      end.should match /ged/
+    end
+  end
+
+  it "should extend with modules Blip and Blap" do
     with_engine(:erb) do |e|
-      e.run_template("hello <%= name %>").should match /Kristian/
+      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 
         %{<%= tab_for :x do %>
           <%= hello :blip do %>
@@ -36,4 +80,5 @@ describe 'My View extensions!' do
       end.should match /ged/
     end
   end
+
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-25 00:00:00 +02:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - lib/rspec-action_view/rspec/example_group.rb
 - lib/rspec-action_view/rspec/macro.rb
 - rspec-action_view.gemspec
+- spec/rspec-action_view/assign_locals_spec.rb
 - spec/rspec-action_view/erb_tester_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -89,5 +90,6 @@ signing_key:
 specification_version: 3
 summary: RSpec for Rails 3 ActionView extensions
 test_files: 
+- spec/rspec-action_view/assign_locals_spec.rb
 - spec/rspec-action_view/erb_tester_spec.rb
 - spec/spec_helper.rb