rspec-action_view 0.1.2 → 0.2.0

data/README.markdown

@@ -1,6 +1,6 @@
 # Rspec for Rails 3 ActionView
 
-RSpec 2 library to make it simple to spec Rails 3 ActionView extensions  
+RSpec 2 library to make it simple to spec Rails 3 ActionView extensions.
 
 ## Install
 
@@ -9,39 +9,41 @@ RSpec 2 library to make it simple to spec Rails 3 ActionView extensions
 ## Usage
 
 <pre>
-  describe "My ViewHelpers" do
-    it "should render content as expected" do        
-      setup_action_view do
-        tests MyViewHelper, MyOtherViewHelper      
+  module MyView
+    module Tab
+      def tab_for(clazz, &block)               
+        content = with_output_buffer(&block)  
+        content_tag :li, content, :class => clazz
+      end
+    end
+
+    module Say
+      def hello(clazz, &block)               
+        content = with_output_buffer(&block)
+        content_tag :div, content, :class => clazz
       end
 
-      with_action_view do |view|
-        view.tab_for('kristian') { 'hello' }.should match /kristian/
-        view.hello('david') { 'hello' }.should match /david/
-      end   
-      
-      with_action_view do |view| 
-
-        view.set :posts => ['post 1', 'post 2'], :title => 'Blog posts index'
-        view.instance_variable_get('@posts').should have(2).items
-           
-        res = view.with_template(%{
-          <%= @title %>
-          <%= tab_for('kristian') { 'hello' } %>
-          <%= @posts.join(',') %>
-        })
-        res.should match /hello/
-        res.should match /Blog posts index/
-        res.should match /post 1/        
-        
-        with_action_view do |view|      
-          view.with_template do %{
-            <%= tab_for('kristian') { 'hello' } %>
-          }
-          end.should match /hello/      
-        end
+      def name
+        'Kristian'
+      end
+    end
+  end
+
+  describe 'My View extensions!' do
+    extend_view_with MyView, :tab, :say
+
+    it "should work" do
+      with_engine(:erb) do |e|
+        e.run_template("hello <%= name %>").should match /Kristian/
+
+        e.run_template do 
+          %{<%= tab_for :x do %>
+            <%= hello :blip do %>
+              ged
+            <% end %>
+          <% end %>}
+        end.should match /ged/
       end
-             
     end
   end  
 </pre>

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/rspec-action_view/erb_template_inline.rb

@@ -0,0 +1,89 @@
+require 'action_view'
+require 'action_view/context'
+
+module RSpec
+  module ActionView
+    class ERBTemplateEngine
+
+      ERBHandler = ::ActionView::Template::Handlers::ERB
+
+      attr_accessor :output_buffer, :rendered
+
+      def initialize
+        @output_buffer = ActiveSupport::SafeBuffer.new
+        @rendered = ''
+      end
+
+      def render(options = {}, local_assigns = {}, &block)
+        view.assign(_assigns)
+        output = view.render(options, local_assigns, &block)
+        @rendered << output
+        output
+      end
+
+      module Locals
+        attr_accessor :locals
+      end
+
+      def locals
+        @locals ||= {}
+      end
+
+      def _get_view
+        view = ::ActionView::Base.new                                  
+      
+        # ???
+        # view.singleton_class.send :include, _helpers
+
+        view.extend(Locals)
+        view.locals = self.locals
+        view.output_buffer = self.output_buffer
+        view
+      end
+
+      def view
+        @view ||= _get_view
+      end
+
+      alias_method :_view, :view
+  
+      EXCLUDE_IVARS = %w{
+        @_assertion_wrapped
+        @_result
+        @controller
+        @layouts
+        @locals
+        @method_name
+        @output_buffer
+        @partials
+        @rendered
+        @request
+        @routes
+        @templates
+        @test_passed
+        @view
+        @view_context_class
+      }
+
+      def _instance_variables
+        instance_variables.map(&:to_s) - EXCLUDE_IVARS
+      end
+
+      def _assigns
+        _instance_variables.inject({}) do |hash, var|
+          name = var[1..-1].to_sym
+          hash[name] = instance_variable_get(var)
+          hash
+        end
+      end  
+
+      def run_template content=nil, &block
+        content ||= yield
+        render :inline => content
+      end
+    end  
+  end
+end
+
+
+

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

@@ -0,0 +1,13 @@
+module RSpec::Core
+  class ExampleGroup
+    def with_engine type = :erb, &block 
+      engine = RSpec::ActionView::ERBTemplateEngine.new
+      
+      if block
+        block.arity < 1 ? engine.instance_eval(&block) : block.call(engine)
+      end
+    end      
+    
+    # include RSpec::ActionView::Macro
+  end
+end

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

@@ -0,0 +1,26 @@
+require 'active_support/railtie'
+require 'rails3_plugin_toolbox'
+
+module RSpec
+  module ActionView
+    module Macro
+      def extend_view_with_modules *modules
+        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    
+        end
+      end
+    end
+  end
+end

data/lib/rspec-action_view.rb

@@ -1,51 +1,8 @@
 require 'rspec'
-require 'action_view'
-require 'active_support/railtie'
-require 'action_view/template/handlers/erb'
+require 'require_all'
 
-class ActionViewTester
-  include ActionView::Helpers::TagHelper  
-  include ActionView::Helpers::CaptureHelper
+require_all File.dirname(__FILE__) + '/rspec-action_view'
 
-  def initialize &block
-    if block
-      block.arity < 1 ? self.instance_eval(&block) : block.call(self)  
-    end    
-  end
-
-  def set attributes={}
-    attributes.each do |key, value|
-      instance_var = "@#{key}"
-      instance_variable_set(instance_var, value)
-    end
-  end
-
-  def with_output_buffer(buf = nil)
-    yield
-  end  
-
-  def with_template content=nil, &block
-    require 'erb'      
-    content ||= yield
-    template = ERB.new content
-    template.result(binding)
-  end
-  
-  def self.tests *helpers
-    helpers.flatten.each do |name|
-      include name.to_s.camelize.constantize
-    end
-  end  
-end  
-
-module RSpec::Core
-  class ExampleGroup
-    def with_action_view &block 
-      block.call(ActionViewTester.new)
-    end
-    
-    def setup_action_view &block
-      ActionViewTester.instance_eval(&block)
-    end
-  end
-end
+RSpec.configure do |config|
+  config.extend RSpec::ActionView::Macro
+end

data/rspec-action_view.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-action_view}
-  s.version = "0.1.2"
+  s.version = "0.2.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-23}
+  s.date = %q{2010-08-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 = [
@@ -25,8 +25,11 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/rspec-action_view.rb",
+     "lib/rspec-action_view/erb_template_inline.rb",
+     "lib/rspec-action_view/rspec/example_group.rb",
+     "lib/rspec-action_view/rspec/macro.rb",
      "rspec-action_view.gemspec",
-     "spec/rspec-action_view_spec.rb",
+     "spec/rspec-action_view/erb_tester_spec.rb",
      "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/kristianmandrup/rspec-action_view}
@@ -35,7 +38,7 @@ 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_spec.rb",
+    "spec/rspec-action_view/erb_tester_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/rspec-action_view/erb_tester_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+module MyView
+  module Tab
+    def tab_for(clazz, &block)               
+      content = with_output_buffer(&block)  
+      content_tag :li, content, :class => clazz
+    end
+  end
+
+  module Say
+    def hello(clazz, &block)               
+      content = with_output_buffer(&block)
+      content_tag :div, content, :class => clazz
+    end
+    
+    def name
+      'Kristian'
+    end
+  end
+end
+
+describe 'My View extensions!' do
+  extend_view_with MyView, :tab, :say
+  
+  it "should work" do
+    with_engine(:erb) do |e|
+      e.run_template("hello <%= name %>").should match /Kristian/
+
+      e.run_template do 
+        %{<%= tab_for :x do %>
+          <%= hello :blip do %>
+            ged
+          <% end %>
+        <% end %>}
+      end.should match /ged/
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +02:00
+date: 2010-08-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,8 +50,11 @@ files:
 - Rakefile
 - VERSION
 - lib/rspec-action_view.rb
+- lib/rspec-action_view/erb_template_inline.rb
+- lib/rspec-action_view/rspec/example_group.rb
+- lib/rspec-action_view/rspec/macro.rb
 - rspec-action_view.gemspec
-- spec/rspec-action_view_spec.rb
+- spec/rspec-action_view/erb_tester_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/rspec-action_view
@@ -86,5 +89,5 @@ signing_key:
 specification_version: 3
 summary: RSpec for Rails 3 ActionView extensions
 test_files: 
-- spec/rspec-action_view_spec.rb
+- spec/rspec-action_view/erb_tester_spec.rb
 - spec/spec_helper.rb

data/spec/rspec-action_view_spec.rb

@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-module MyViewHelper
-  def tab_for(clazz, &block)               
-    content = with_output_buffer(&block)  
-    content_tag :li, content, :class => clazz
-  end
-end
-
-module MyOtherViewHelper
-  def hello(clazz, &block)               
-    content = with_output_buffer(&block)
-    content_tag :div, content, :class => clazz
-  end
-end
-
-
-
-describe "My ViewHelpers" do
-  it "should render content as expected" do        
-    setup_action_view do
-      tests MyViewHelper, MyOtherViewHelper      
-    end
-
-    with_action_view do |view|
-      view.tab_for('kristian') { 'hello' }.should match /kristian/
-      view.hello('david') { 'hello' }.should match /david/
-      
-      with_action_view do |view|      
-        view.set :posts => ['post 1', 'post 2'], :title => 'Blog posts index'
-        view.instance_variable_get('@posts').should have(2).items
-        
-        res = view.with_template do %{
-          <%= @title %>
-          <%= tab_for('kristian') { 'hello' } %>
-          <%= @posts.join(',') %>
-        }
-        end
-        res.should match /hello/
-        res.should match /Blog posts index/
-        res.should match /post 1/        
-        
-        with_action_view do |view|      
-          view.with_template do %{
-            <%= tab_for('kristian') { 'hello' } %>
-          }
-          end.should match /hello/      
-        end
-      end
-    end    
-  end
-end