presenter-pattern 0.1.1 → 0.2.0

data/Manifest

@@ -1,10 +1,14 @@
 README.rdoc
 Rakefile
+lib/json-builder/handler.rb
+lib/json-builder/railtie.rb
 lib/presenter-pattern.rb
-lib/presenter-pattern/no_querying_views.rb
+lib/presenter-pattern/railtie.rb
 rails/init.rb
+test/json_responder_test.rb
+test/json_view_test.rb
 test/no_querying_view_test.rb
-test/schema.rb
+test/only_data_in_view_test.rb
 test/setup_test.rb
 test/test_helper.rb
 Manifest

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('presenter-pattern', '0.1.1') do |p|
+Echoe.new('presenter-pattern', '0.2.0') 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/json-builder/handler.rb

@@ -0,0 +1,11 @@
+module JsonBuilder
+  class Handler < ActionView::Template::Handler
+    include ActionView::Template::Handlers::Compilable
+
+    self.default_format = Mime::JSON
+
+    def compile(template)
+      "#{template.source}.to_json"
+    end
+  end
+end

data/lib/json-builder/railtie.rb

@@ -0,0 +1,12 @@
+require 'rails/railtie'
+require 'json-builder/handler'
+
+module JsonBuilder
+  class Railtie < Rails::Railtie
+    config.after_initialize do
+
+      ActionView::Template.register_template_handler(:rjson, ::JsonBuilder::Handler)
+
+    end
+  end
+end

data/lib/presenter-pattern/railtie.rb

@@ -0,0 +1,48 @@
+require 'rails/railtie'
+
+
+module PresenterPattern
+  class IllegalDatabaseQueryFromView < RuntimeError; end
+
+  class Railtie < Rails::Railtie
+    config.after_initialize do
+
+      if Rails.env.development? || Rails.env.test?
+
+        adapters = begin
+          ::ActiveRecord::ConnectionAdapters::AbstractAdapter.subclasses
+        rescue
+          #ActiveRecord not loaded
+          []
+        end
+        
+        if adapters.any?
+
+          puts "\n[WARNING] PresenterPattern is preventing your views from triggering a database query through the following adapters:"
+          adapters.map{|a| a.name.split('::').last}.each {|name| puts "  * #{name}"}
+          puts
+
+          adapters.each do |adapter|
+            adapter.class_eval do
+              alias :orig_execute :execute
+              def execute(*args)
+                first_view   = caller.grep(/app\/views/).first
+                #first_helper = caller.grep(/app\/helpers/).first
+
+                # 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."
+                else
+                  orig_execute *args
+                end
+              end
+            end
+          end
+          
+        end
+
+      end
+      
+    end
+  end
+end

data/lib/presenter-pattern.rb

@@ -1,8 +1,10 @@
-require 'presenter-pattern/no_querying_views'
+require 'presenter-pattern/railtie'
+require 'json-builder/railtie'
 
 module PresenterPattern
-  class Base
-
+  def protected_instance_variables
+    return instance_variable_names - ["@data"] if respond_to?(:instance_variable_names)
+    super
   end
 end
 

data/presenter-pattern.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{presenter-pattern}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   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-23}
+  s.date = %q{2011-05-25}
   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/no_querying_views.rb"]
-  s.files = ["README.rdoc", "Rakefile", "lib/presenter-pattern.rb", "lib/presenter-pattern/no_querying_views.rb", "rails/init.rb", "test/no_querying_view_test.rb", "test/schema.rb", "test/setup_test.rb", "test/test_helper.rb", "Manifest", "presenter-pattern.gemspec"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/json-builder/handler.rb", "lib/json-builder/railtie.rb", "lib/presenter-pattern.rb", "lib/presenter-pattern/railtie.rb"]
+  s.files = ["README.rdoc", "Rakefile", "lib/json-builder/handler.rb", "lib/json-builder/railtie.rb", "lib/presenter-pattern.rb", "lib/presenter-pattern/railtie.rb", "rails/init.rb", "test/json_responder_test.rb", "test/json_view_test.rb", "test/no_querying_view_test.rb", "test/only_data_in_view_test.rb", "test/setup_test.rb", "test/test_helper.rb", "Manifest", "presenter-pattern.gemspec"]
   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"]
   s.rubyforge_project = %q{presenter-pattern}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.7.2}
   s.summary = %q{Enables and enforces the presenter pattern in rails}
-  s.test_files = ["test/no_querying_view_test.rb", "test/setup_test.rb", "test/test_helper.rb"]
+  s.test_files = ["test/json_responder_test.rb", "test/json_view_test.rb", "test/no_querying_view_test.rb", "test/only_data_in_view_test.rb", "test/setup_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/json_responder_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class JsonResponderTest < ActionController::TestCase
+  tests BarsController
+
+  def setup
+    super
+    @name = "Hello World!"
+    @bar = Bar.create :name => @name
+  end
+
+  def test_data_variable_in_view
+    get :show, :id => @bar.id, :format => 'json'
+    assert_response :success
+    assert_equal '{"name":"Hello World!","fruit":"banana"}', @response.body
+  end
+end

data/test/json_view_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+class JsonViewTest < ActionController::TestCase
+  tests FoosController
+
+  def setup
+    super
+    @name = "Hello World!"
+    @foo = Foo.create :name => @name
+  end
+
+  def test_data_variable_in_view
+    get :show, :id => @foo.id, :format => 'json'
+    assert_response :success
+    assert_equal '{"name":"Hello World!","array":["a","c"],"hash":{"value1":1,"value2":["a","b","c"]}}', @response.body
+  end
+end

data/test/no_querying_view_test.rb

@@ -5,24 +5,9 @@ class NoQueryingViewTest < ActionController::TestCase
 
   def setup
     super
-    #Foo.delete_all
-
-#    @controller = FoosController.new
-#    @request    = ActionController::TestRequest.new
-#    @response   = ActionController::TestResponse.new
-
-#    PresenterPattern::Application.routes.draw do
-#      resource :foo
-#    end
-
     @foo = Foo.create :name => "name"
   end
 
-#  def teardown
-#    super
-#    Foo.delete_all
-#  end
-
   def test_thin_views_are_successful
     get :show, :id => @foo.id
     assert_response :success

data/test/only_data_in_view_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class OnlyDataInViewTest < ActionController::TestCase
+  tests FoosController
+
+  def setup
+    super
+    @name = "Hello World!"
+    @foo = Foo.create :name => @name
+  end
+
+  def test_data_variable_in_view
+    get :show, :id => @foo.id
+    assert_response :success
+    assert_equal @name, @response.body
+  end
+
+  def test_only_data_variable_in_view
+    get :edit, :id => @foo.id
+    assert_equal "", @response.body
+  end
+
+end

data/test/test_helper.rb

@@ -12,8 +12,5 @@ require 'yaml'
 require 'active_record'
 require 'logger'
 
-require File.expand_path('../rails/init', File.dirname(__FILE__))
+#require File.expand_path('../rails/init', File.dirname(__FILE__))
 
-#def app
-#  RailsApp::Application
-#end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: presenter-pattern
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-23 00:00:00.000000000Z
+date: 2011-05-25 00:00:00.000000000Z
 dependencies: []
 description: Enables and enforces the presenter pattern in rails
 email: josh.leven@gmail.com
@@ -17,16 +17,22 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- lib/json-builder/handler.rb
+- lib/json-builder/railtie.rb
 - lib/presenter-pattern.rb
-- lib/presenter-pattern/no_querying_views.rb
+- lib/presenter-pattern/railtie.rb
 files:
 - README.rdoc
 - Rakefile
+- lib/json-builder/handler.rb
+- lib/json-builder/railtie.rb
 - lib/presenter-pattern.rb
-- lib/presenter-pattern/no_querying_views.rb
+- lib/presenter-pattern/railtie.rb
 - rails/init.rb
+- test/json_responder_test.rb
+- test/json_view_test.rb
 - test/no_querying_view_test.rb
-- test/schema.rb
+- test/only_data_in_view_test.rb
 - test/setup_test.rb
 - test/test_helper.rb
 - Manifest
@@ -57,11 +63,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: presenter-pattern
-rubygems_version: 1.8.3
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Enables and enforces the presenter pattern in rails
 test_files:
+- test/json_responder_test.rb
+- test/json_view_test.rb
 - test/no_querying_view_test.rb
+- test/only_data_in_view_test.rb
 - test/setup_test.rb
 - test/test_helper.rb

data/lib/presenter-pattern/no_querying_views.rb

@@ -1,38 +0,0 @@
-no_querying_views = begin
-  Rails.env.development? || Rails.env.test?
-rescue
-  false
-end
-
-if no_querying_views
-  module PresenterPattern
-    class IllegalDatabaseQueryFromView < RuntimeError; end
-  end
-
-  module ::ActiveRecord
-    module ConnectionAdapters
-      %w(PostgreSQLAdapter MysqlAdapter SQLite3Adapter).each do |adapter_name|
-        begin
-          adapter = const_get adapter_name
-          adapter.class_eval do
-            puts "[WARNING] Presenter::Rails is preventing your views from triggering PG, MySQL or SQLite3 database connections."
-            alias :orig_execute :execute
-            def execute(*args)
-              first_view   = caller.grep(/app\/views/).first
-              first_helper = caller.grep(/app\/helpers/).first
-
-              # 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."
-              else
-                orig_execute *args
-              end
-            end
-          end
-        rescue
-          # the adapter has not been instantiated
-        end
-      end
-    end
-  end
-end

data/test/schema.rb

@@ -1,11 +0,0 @@
-ActiveRecord::Schema.define(:version => 0) do
-  create_table :foos, :force => true do |t|
-    t.string :name
-    t.string :squawk
-  end
-  create_table :bars, :force => true do |t|
-    t.string :name
-    t.string :tweet
-    t.integer :foo_id
-  end
-end