presenter-pattern 0.3.3 → 0.3.4

data/Manifest

@@ -2,7 +2,7 @@ README.rdoc
 Rakefile
 lib/presenter-pattern.rb
 lib/presenter-pattern/railtie.rb
-lib/presenter-pattern/test_case.rb
+presenter-pattern.gemspec
 rails/init.rb
 test/bad_controller_test.rb
 test/foos_controller_test.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('presenter-pattern', '0.3.3') do |p|
+Echoe.new('presenter-pattern', '0.3.4') do |p|
   p.description   = "Enables and enforces the presenter pattern in rails"
   p.url           = "https://github.com/jleven/presenter-pattern"
   p.author        = "Josh Leven"

data/lib/presenter-pattern/railtie.rb

@@ -31,7 +31,7 @@ module PresenterPattern
 
                 # if we're coming from a view, let's analyze the situation
                 if !first_view.nil? #and (first_helper.nil? or (caller.index(first_view) < caller.index(first_helper)))
-                  raise PresenterPattern::IllegalDatabaseQueryFromView, "No query from view prohibited, eager-load from a controller instead."
+                  raise PresenterPattern::IllegalDatabaseQueryFromView, "DB query from view prohibited, eager-load from a controller instead."
                 else
                   orig_execute *args
                 end

data/lib/presenter-pattern.rb

@@ -1,5 +1,4 @@
 require 'presenter-pattern/railtie'
-require 'presenter-pattern/test_case'
 
 # PresenterPattern::API enables and enforces very simple api controllers.
 # Essentially, your controller has the settings:
@@ -8,7 +7,7 @@ require 'presenter-pattern/test_case'
 #
 # and each action ends with an implicit:
 #    responds_with <return_value_from_action>
-#
+# unless response created explicitly
 #
 # 1. In your controller, include PresenterPattern::API, passing in the formats your api
 #    will support using the bracket operator (defaults to :xml and :json)
@@ -16,14 +15,11 @@ require 'presenter-pattern/test_case'
 #    e.g.    include PresenterPattern::API[:html, :json]
 #
 # 2. Each action must return the data you wish for your api to return.
-#    Do NOT call render from within your actions.
 #
 
 
 module PresenterPattern
   module API
-    class NoExplicitRender < RuntimeError; end
-
     def self.[](*formats)
       custom_api = self.dup
       custom_api.class_eval do
@@ -54,31 +50,26 @@ module PresenterPattern
     #
     # each action must return the data meant for their response
     # 
-    # - overwrites ActionController::Metal::ImplicitRender
+    # - this overwrites ActionController::Metal::ImplicitRender
     def send_action(method_name, *args)
       #call the action, and store return value
-      @__rval = self.send(method_name, *args)
-
-      #fail if action calls 'render'
-      raise NoExplicitRender, "Controllers implementing the PresenterPattern::API must not call any render methods" if response_body
+      rval = self.send(method_name, *args)
 
-      #set the view variable
-      name = self.class.instance_variable_get(:@view_var_name)
-      name = name.pluralize if name && method_name.to_s == "index" #pluralize the @view_var_name if it was set at the class and this is GET/index
-      @view_var_name = name || "data"
+      unless response_body
+        #set the view variable with the return value
+        name = self.class.instance_variable_get(:@view_var_name)
+        name = name.pluralize if name && method_name.to_s == "index" #pluralize the @view_var_name if it was set at the class and this is GET/index
+        name ||= "data"
+        self.instance_variable_set :"@#{name}", rval
 
-      #always follow responder pattern passing in the action's return value
-      respond_with @__rval, (@respond_with_opts || {})
+        #always follow responder pattern passing in the action's return value unless already rendered
+        respond_with rval, (@respond_opts || {})
+      end
     end
 
     def respond_opts(options)
-      @respond_with_opts ||= {}
-      @respond_with_opts.merge! options
-    end
-
-    #only the @__rval variable (set in send_action) is passed through to the view
-    def view_assigns
-      {@view_var_name => @__rval}
+      @respond_opts ||= {}
+      @respond_opts.merge! options
     end
   end
 end

data/presenter-pattern.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{presenter-pattern}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Leven"]
   s.date = %q{2011-05-26}
   s.description = %q{Enables and enforces the presenter pattern in rails}
   s.email = %q{josh.leven@gmail.com}
-  s.extra_rdoc_files = ["README.rdoc", "lib/presenter-pattern.rb", "lib/presenter-pattern/railtie.rb", "lib/presenter-pattern/test_case.rb"]
-  s.files = ["README.rdoc", "Rakefile", "lib/presenter-pattern.rb", "lib/presenter-pattern/railtie.rb", "lib/presenter-pattern/test_case.rb", "rails/init.rb", "test/bad_controller_test.rb", "test/foos_controller_test.rb", "test/setup_test.rb", "test/test_helper.rb", "Manifest", "presenter-pattern.gemspec"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/presenter-pattern.rb", "lib/presenter-pattern/railtie.rb"]
+  s.files = ["README.rdoc", "Rakefile", "lib/presenter-pattern.rb", "lib/presenter-pattern/railtie.rb", "presenter-pattern.gemspec", "rails/init.rb", "test/bad_controller_test.rb", "test/foos_controller_test.rb", "test/setup_test.rb", "test/test_helper.rb", "Manifest"]
   s.homepage = %q{https://github.com/jleven/presenter-pattern}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Presenter-pattern", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/test/bad_controller_test.rb

@@ -15,9 +15,9 @@ class BadControllerTest < ActionController::TestCase
     assert_equal @name, @response.body
   end
 
-  def test_only_data_variable_in_view
-    get :no_vars, :id => @foo.id
-    assert_equal "", @response.body
+  def test_non_data_variable_in_view
+    get :vars, :id => @foo.id
+    assert_equal "I can see this in the view!", @response.body
   end
 
   def test_empty_action
@@ -31,9 +31,8 @@ class BadControllerTest < ActionController::TestCase
     end
   end
 
-  def test_no_explicit_render
-    assert_raise(PresenterPattern::API::NoExplicitRender) do
-      get :explicit
-    end
+  def test_explicit_render
+    get :explicit
+    assert_nil assigns(:data) #shouldn't set @data even though there was a return value since render was called explicitly
   end
 end

data/test/foos_controller_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 class FoosControllerTest < ActionController::TestCase
-  include PresenterPattern::TestCase
   tests FoosController
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: presenter-pattern
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -19,20 +19,18 @@ extra_rdoc_files:
 - README.rdoc
 - lib/presenter-pattern.rb
 - lib/presenter-pattern/railtie.rb
-- lib/presenter-pattern/test_case.rb
 files:
 - README.rdoc
 - Rakefile
 - lib/presenter-pattern.rb
 - lib/presenter-pattern/railtie.rb
-- lib/presenter-pattern/test_case.rb
+- presenter-pattern.gemspec
 - rails/init.rb
 - test/bad_controller_test.rb
 - test/foos_controller_test.rb
 - test/setup_test.rb
 - test/test_helper.rb
 - Manifest
-- presenter-pattern.gemspec
 homepage: https://github.com/jleven/presenter-pattern
 licenses: []
 post_install_message: 

data/lib/presenter-pattern/test_case.rb

@@ -1,11 +0,0 @@
-module PresenterPattern
-  module TestCase
-    def assigns(key = nil)
-      name  = @controller.instance_variable_get :@view_var_name
-      value = @controller.instance_variable_get :@__rval
-      assigns = {}.with_indifferent_access
-      assigns[name] = value
-      key.nil? ? assigns : assigns[key]
-    end
-  end
-end