exposure 0.0.6 → 0.0.7

data/lib/exposure/patterns/resources.rb

@@ -5,10 +5,12 @@ module Exposure
         base::const_set(:DefaultResponses, DefaultResponses)
         base::const_set(:DefaultFlashMessages, DefaultFlashMessages)
         base::const_set(:Finders, { true => {}, false => {} })
-        base::const_set(:FlashMessages, { true => {}, false => {} })
+        base::const_set(:FlashMessages, {})
         base::const_set(:Responses, {} )
       end
       
+      DefaultActions = [:index, :show, :new, :create, :edit, :update, :destroy]
+      
       Callbacks = %w(
         before_find after_find after_find_on_failure after_find_on_success
         before_find_many after_find_many after_find_many_on_failure after_find_many_on_success
@@ -21,12 +23,9 @@ module Exposure
       )
       
       DefaultFlashMessages = {
-        true => {
-          :create =>  Proc.new { "#{resource_name.capitalize} successfully created" },
-          :update =>  Proc.new { "#{resource_name.capitalize} successfully updated" },
-          :destroy => Proc.new { "#{resource_name.capitalize} successfully removed" }
-        },
-        false => {}
+        'create.success.html' => Proc.new { "#{resource_name.capitalize} successfully created" },
+        'update.success.html' => Proc.new { "#{resource_name.capitalize} successfully updated" },
+        'destroy.success.html' => Proc.new { "#{resource_name.capitalize} successfully removed" }
       }
       
       DefaultResponses = {
@@ -86,7 +85,7 @@ module Exposure
         
         def new
           run_callbacks(:before_assign)
-          new_record
+          build_record
           run_callbacks(:after_assign)
           run_callbacks(:before_response)
           run_callbacks(:before_response_on_success)
@@ -95,7 +94,7 @@ module Exposure
         
         def create
           run_callbacks(:before_assign)
-          new_record
+          build_record
           run_callbacks(:after_assign)
 
           run_callbacks(:before_create)
@@ -106,14 +105,14 @@ module Exposure
             run_callbacks(:after_create_on_success)
             run_callbacks(:before_response)
             run_callbacks(:before_response_on_success)
-            flash_for(:create, true)
+            flash_for(:create, :success)
             response_for(:create, :success, request.format.to_sym)
           else
             run_callbacks(:after_save_on_failure)
             run_callbacks(:after_create_on_failure)
             run_callbacks(:before_response)
             run_callbacks(:before_response_on_failure)
-            flash_for(:create, false)
+            flash_for(:create, :failure)
             response_for(:create, :failure, request.format.to_sym)
           end
           
@@ -146,14 +145,14 @@ module Exposure
               run_callbacks(:after_update_on_success)
               run_callbacks(:before_response)
               run_callbacks(:before_response_on_success)
-              flash_for(:update, true)
+              flash_for(:update, :success)
               response_for(:update, :success, request.format.to_sym)
             else
               run_callbacks(:after_save_on_failure)
               run_callbacks(:after_create_on_failure)
               run_callbacks(:before_response)
               run_callbacks(:before_response_on_failure)
-              flash_for(:update, false)
+              flash_for(:update, :failure)
               response_for(:update, :failure, request.format.to_sym)
             end
           else
@@ -177,7 +176,7 @@ module Exposure
             run_callbacks(:after_destroy_on_success)
             run_callbacks(:before_response)
             run_callbacks(:before_response_on_success)
-            flash_for(:destroy, true)
+            flash_for(:destroy, :success)
             response_for(:destroy, :success, request.format.to_sym)
 
           else
@@ -188,104 +187,6 @@ module Exposure
         end
         
         private
-          def custom_response_for(action_name, action_status, format)
-            if responder = self.class::Responses["#{action_name}.#{action_status}.#{format}"]
-              case responder
-              when Symbol
-                self.send(responder)
-              when Proc
-                self.instance_eval &responder
-              end
-            else
-              false
-            end
-          end
-
-          def default_response_for(action_name, action_status, format)
-            if responder = self.class::DefaultResponses["#{action_name}.#{action_status}.#{format}"]
-              self.instance_eval &responder
-            else
-              return false
-            end
-          end
-
-          def response_for(action_name, action_status, format = :html)
-            format = :html if format == :all
-            custom_response_for(action_name, action_status, format) || default_response_for(action_name, action_status, format) || head(:not_acceptable)
-          end
-          
-          def custom_flash_for(action_name, action_successful)
-            if flash_message = self.class::FlashMessages[action_successful][action_name]
-              case flash_message
-              when String
-                flash[:message] = flash_message
-              when Symbol
-                flash[:message] = self.send(flash_message)
-              when Proc
-                flash[:message] = self.instance_eval(&flash_message)
-              end
-            else
-              false
-            end
-          end
-          
-          def default_flash_for(action_name, action_successful)
-            if message_proc = self.class::DefaultFlashMessages[action_successful][action_name]
-              flash[:message] = self.instance_eval(&message_proc)
-            end
-          end
-          
-          def flash_for(action_name, action_successful)
-            custom_flash_for(action_name, action_successful) || default_flash_for(action_name, action_successful)
-          end
-          
-          def custom_finder_for(resource_name)
-            if finder = self.class::Finders[resource_name]
-              return finder
-            end
-          end
-          
-          def default_finder_for(resource_name)
-            if finder = self.class::DefaultFinders[resource_name]
-              return finder
-            end
-          end
-          
-          def finder_for(resource_name)
-            custom_finder_for(resource_name) || default_finder_for(resource_name)
-          end
-          
-          def call_finder_chain(object, chain, use_associaiton = true)
-            links = chain.shift
-            return object unless links
-
-            message = finder_for(links[0])
-            association = links[1] if use_associaiton
-
-            case message
-            when Symbol
-              value = self.send(message)
-            when Proc
-              value = self.instance_eval(&message)
-            else
-              raise "invalid finder of #{message.inspect}"
-            end
-
-            if value.kind_of?(Array) && !value.respond_to?(:proxy_target)
-              if use_associaiton
-                call_finder_chain(object.send(association).send(*value), chain)
-              else
-                call_finder_chain(object.send(*value), chain)
-              end
-            else
-              call_finder_chain(value, chain)
-            end
-          end
-          
-          def builder_for(resource_name)
-            custom_builder_for(resource_name) || default_builder_for(resource_name)
-          end
-          
           def resource_name
             self.class.resource_name
           end
@@ -294,6 +195,10 @@ module Exposure
             self.class.resources_name
           end
           
+          def parent_model
+            self.class.parent_model
+          end
+          
           def save_record
             @resource.save
           end
@@ -302,16 +207,16 @@ module Exposure
             @resource.update_attributes(params[resource_name])
           end
           
-          def new_record
-            @resource = instance_variable_set("@#{resource_name}", self.class.parent_model.new(params[resource_name]))
+          def build_record
+            @resource = instance_variable_set("@#{resource_name}", parent_model.new(params[resource_name]))
           end
           
           def find_record
-            @resource = instance_variable_set("@#{resource_name}", call_finder_chain(self.class.parent_model, self.class.member_nesting.clone, false))
+            @resource = instance_variable_set("@#{resource_name}", call_finder_chain(parent_model, self.class.member_nesting.clone, false))
           end
           
           def find_records            
-            @resources = instance_variable_set("@#{resources_name}", call_finder_chain(self.class.parent_model, self.class.collection_nesting.clone, false))
+            @resources = instance_variable_set("@#{resources_name}", call_finder_chain(parent_model, self.class.collection_nesting.clone, false))
           end
           
           def delete_record

data/lib/exposure.rb

@@ -1,10 +1,15 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 require 'action_controller'
+require 'exposure/options'
 require 'exposure/configuration'
-require 'exposure/common'
+require 'exposure/behaviors/building'
+require 'exposure/behaviors/callbacks'
+require 'exposure/behaviors/finding'
+require 'exposure/behaviors/flashing'
+require 'exposure/behaviors/responding'
+
 require 'exposure/patterns/resources'
-require 'exposure/patterns/resource'
 
 module Exposure
   VERSION = '0.0.6'

data/spec/callbacks_spec.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "callbacks'", :type => :controller do
+  setup = lambda {
+    class PiratesController < ActionController::Base
+      expose_many(:pirates)
+      private
+        def first_callback_called
+          @callback_called = 1
+        end
+
+        def second_callback_called
+          @callback_called +=  1
+        end
+
+        def third_callback_called
+          @callback_called +=  1
+        end
+    end 
+  }
+  setup.call
+  
+  ActionController::Routing::Routes.draw do |map| 
+    map.resources :pirates
+  end
+  
+  controller_name :pirates
+  Object.remove_class(PiratesController)
+  
+  before(:each) do
+    setup.call
+    @controller = PiratesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+  
+  after(:each) do
+    Object.remove_class(PiratesController)
+  end
+    
+  it "can call multiple callbacks" do
+    PiratesController.after :assign, :first_callback_called, :second_callback_called, :third_callback_called
+    get(:new)
+    should assign_to(:callback_called).with(3)  
+  end
+end

data/spec/configuration_spec.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "included actions" do
+  AllActions = [:index, :show, :new, :create, :edit, :update, :destroy]
+  IncludedActions = [:new, :show]
+  ExcludedActions = AllActions - IncludedActions
+  
+  setup = lambda {
+    class ShipTypesController < ActionController::Base
+      expose_many(:ship_types, :only => IncludedActions)
+    end 
+  }
+  
+  setup.call
+  
+  ActionController::Routing::Routes.draw do |map| 
+    map.resources :ship_types
+  end
+  
+  Object.remove_class(ShipTypesController)
+  
+  before(:each) do
+    setup.call
+    @controller = ShipTypesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+  
+  after(:each) do
+    Object.remove_class(ShipTypesController)
+  end
+
+  IncludedActions.each do |action|
+    it "should have action #{action}" do
+      @controller.should respond_to(action)
+    end
+  end
+
+  ExcludedActions.each do |action|
+    it "should have not action #{action}" do
+      @controller.should_not respond_to(action)
+    end
+  end
+end
+
+describe "excluded actions" do
+  setup = lambda {
+    class ShipTypesController < ActionController::Base
+      expose_many(:ship_types, :except => ExcludedActions)
+    end 
+  }
+  setup.call
+  
+  ActionController::Routing::Routes.draw do |map| 
+    map.resources :ship_types
+  end
+  
+  Object.remove_class(ShipTypesController)
+  
+  before(:each) do
+    setup.call
+    @controller = ShipTypesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+  
+  after(:each) do
+    Object.remove_class(ShipTypesController)
+  end
+  
+  IncludedActions.each do |action|
+    it "should have action #{action}" do
+      @controller.should respond_to(action)
+    end
+  end
+  
+  ExcludedActions.each do |action|
+    it "should have not action #{action}" do
+      @controller.should_not respond_to(action)
+    end
+  end
+end

data/spec/exposure_spec.rb

@@ -1,18 +1,28 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe "exposure", :type => :controller do
-  class ShipTypesController < ActionController::Base
-    expose_many(:ship_types)
-  end 
+  setup = lambda {
+    class ShipTypesController < ActionController::Base
+      expose_many(:ship_types)
+    end
+  }
+  setup.call
   controller_name :ship_types
+  Object.remove_class(ShipTypesController)
+  
+  ActionController::Routing::Routes.draw do |map| 
+    map.resources :ship_types
+  end
   
   before(:each) do
+    setup.call
     @controller = ShipTypesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    ActionController::Routing::Routes.draw do |map| 
-      map.resources :ship_types
-    end
+  end
+  
+  after(:each) do
+    Object.remove_class(ShipTypesController)
   end
   
   describe "parent models" do

data/spec/finders/finder_spec.rb

@@ -1,30 +1,36 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe "finders", :type => :controller do   
-  class PiratesController < ActionController::Base
-    expose_many(:pirates)
-    private
-      def find_pirate
-        Pirate.find_by_title(params[:id])
-      end
-  end 
+describe "finders", :type => :controller do 
+  setup = lambda {
+    class PiratesController < ActionController::Base
+      expose_many(:pirates)
+      private
+        def find_pirate
+          Pirate.find_by_title(params[:id])
+        end
+    end
+    
+    ActionController::Routing::Routes.draw do |map| 
+      map.resources :pirates
+    end
+  }
   
+  setup.call
   controller_name :pirates
+  Object.remove_class(PiratesController)
 
   before(:each) do
+    setup.call
     @controller = PiratesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    ActionController::Routing::Routes.draw do |map| 
-      map.resources :pirates
-    end
     
     @pirate = Factory.stub(:pirate)
     Pirate.stub(:find_by_title => @pirate)
   end
   
   after(:each) do
-    PiratesController::Finders.clear
+    Object.remove_class(PiratesController)
   end
   
   it "finds with a method name as symbol" do

data/spec/finders/nested_resources_finder_spec.rb

@@ -1,21 +1,27 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe "nested finders", :type => :controller do   
-  class ShipsController < ActionController::Base
-    expose_many(:ships, :nested => [:pirates])
-  end 
+describe "nested finders", :type => :controller do
+  setup = lambda {
+    class ShipsController < ActionController::Base
+      expose_many(:ships, :nested => [:pirates])
+    end
+    
+    ActionController::Routing::Routes.draw do |map| 
+      map.resources :pirates do |pirate|
+        pirate.resources :ships
+      end
+    end
+  }
   
+  setup.call
   controller_name :ships
+  Object.remove_class(ShipsController)
 
   before(:each) do
+    setup.call
     @controller = ShipsController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    ActionController::Routing::Routes.draw do |map| 
-      map.resources :pirates do |pirate|
-        pirate.resources :ships
-      end
-    end
     
     @pirate = Factory.create(:pirate_with_ships)
     Pirate.stub(:find => @pirate)
@@ -23,6 +29,10 @@ describe "nested finders", :type => :controller do
     get(:index, {:pirate_id => 1})
   end
   
+  after(:each) do
+    Object.remove_class(ShipsController)
+  end
+  
   it { should assign_to(:ships) }
   it { should assign_to(:resources) }
   

data/spec/flashers/flash_with_block_spec.rb

@@ -1,22 +1,28 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe "flash messages with blocks", :type => :controller do   
-  class PiratesController < ActionController::Base
-    expose_many(:pirates)
-    PiratesController.flash_for :create do
-      "the flash is set to #{@pirate.title}"
-    end
-  end 
+describe "flash messages with blocks", :type => :controller do
+  setup = lambda {
+    class PiratesController < ActionController::Base
+      expose_many(:pirates)
+      PiratesController.flash_for :create do
+        "the flash is set to #{@pirate.title}"
+      end
+    end 
+  }
+  setup.call
+  
+  ActionController::Routing::Routes.draw do |map| 
+    map.resources :pirates, :collection => {:test => :any}
+  end
   
   controller_name :pirates
+  Object.remove_class(PiratesController)
   
   before(:each) do
+    setup.call
     @controller = PiratesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    ActionController::Routing::Routes.draw do |map| 
-      map.resources :pirates, :collection => {:test => :any}
-    end
     
     @pirate = Factory.stub(:pirate, {:title => 'Captain'})
     Pirate.stub(:new => @pirate)
@@ -28,5 +34,9 @@ describe "flash messages with blocks", :type => :controller do
     post(:create)
   end
   
+  after(:each) do
+    Object.remove_class(PiratesController)
+  end
+  
   it { should set_the_flash.to(@custom_flash_message) }
 end

data/spec/flashers/flash_with_method_spec.rb

@@ -1,24 +1,29 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe "flash messages with methods", :type => :controller do   
-  class PiratesController < ActionController::Base
-    expose_many(:pirates)
-    private
-      def custom_flash_message
-        'the flash was set'
-      end
-  end 
+describe "flash messages with methods", :type => :controller do
+  setup = lambda {
+    class PiratesController < ActionController::Base
+      expose_many(:pirates)
+      private
+        def custom_flash_message
+          'the flash was set'
+        end
+    end 
+    
+    ActionController::Routing::Routes.draw do |map| 
+      map.resources :pirates, :collection => {:test => :any}
+    end
+  }
   
+  setup.call
   controller_name :pirates
+  Object.remove_class(PiratesController)
   
   before(:each) do
+    setup.call
     @controller = PiratesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    ActionController::Routing::Routes.draw do |map| 
-      map.resources :pirates, :collection => {:test => :any}
-    end
-    
     @custom_flash_message = 'the flash was set'
     
     @pirate = Factory.stub(:pirate)
@@ -26,8 +31,7 @@ describe "flash messages with methods", :type => :controller do
   end
   
   after(:each) do
-    PiratesController::FlashMessages[true].clear
-    PiratesController::FlashMessages[false].clear
+    Object.remove_class(PiratesController)
   end
   
   describe "responding with a method call" do
@@ -82,5 +86,5 @@ describe "flash messages with methods", :type => :controller do
         post(:create)
         should set_the_flash.to(@custom_flash_message)
       end
-    end
+  end
 end

data/spec/flashers/flash_with_proc_spec.rb

@@ -1,19 +1,26 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe "flash messages with procs", :type => :controller do   
-  class PiratesController < ActionController::Base
-    expose_many(:pirates)
-  end 
+describe "flash messages with procs", :type => :controller do
+  setup = lambda {
+    class PiratesController < ActionController::Base
+      expose_many(:pirates)
+    end
+  }
+  setup.call
+  
+  ActionController::Routing::Routes.draw do |map| 
+    map.resources :pirates, :collection => {:test => :any}
+  end
   
   controller_name :pirates
+  Object.remove_class(PiratesController)
   
   before(:each) do
+    setup.call
+    
     @controller = PiratesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-    ActionController::Routing::Routes.draw do |map| 
-      map.resources :pirates, :collection => {:test => :any}
-    end
     
     @custom_flash_message = 'the flash was set'
     @proc = Proc.new { 'the flash was set' }
@@ -23,8 +30,7 @@ describe "flash messages with procs", :type => :controller do
   end
   
   after(:each) do
-    PiratesController::FlashMessages[true].clear
-    PiratesController::FlashMessages[false].clear
+    Object.remove_class(PiratesController)
   end
   
   describe "responding with a method call" do