exposure 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/exposure/behaviors/building.rb

@@ -2,7 +2,7 @@ module Exposure
   module Building
     def self.included(base)
       base.extend ClassMethods
-      base.send(:include, InstaneMethods)
+      base.send(:include, InstanceMethods)
     end
     
     module ClassMethods
@@ -20,17 +20,17 @@ module Exposure
       def build_default_builder(member, nesting)
         if nesting.any?
           builders = self::const_set(:DefaultBuilders, {
-            self.resource_name.intern  => Proc.new { [:build, params[resource_name] ] },
+            self.resource_name.intern  => proc { [:build, params[resource_name] ] },
           })
         else
           self::const_set(:DefaultBuilders, {
-            self.resource_name.intern  => Proc.new { [:new, params[resource_name] ] },
+            self.resource_name.intern  => proc { [:new, params[resource_name] ] },
           })
         end
       end
     end
     
-    module InstaneMethods
+    module InstanceMethods
       private
         def custom_builder_for(resource_name)
           if builder = self.class::Builders[resource_name]

data/lib/exposure/behaviors/callbacks.rb

@@ -2,7 +2,7 @@ module Exposure
   module Callbacks
     def self.included(base)
       base.extend ClassMethods
-      base.send(:include, InstaneMethods)
+      base.send(:include, InstanceMethods)
     end
     
     module ClassMethods
@@ -36,18 +36,18 @@ module Exposure
         except_methods = Array.wrap(options.delete(:except))
         
         if only_methods.any?
-          options[:if] << Proc.new {|c| only_methods.include?(c.action_name.intern) }
+          options[:if] << proc {|c| only_methods.include?(c.action_name.intern) }
         end
         
         if except_methods.any?
-          options[:if] << Proc.new {|c| !except_methods.include?(c.action_name.intern) }
+          options[:if] << proc {|c| !except_methods.include?(c.action_name.intern) }
         end
         
         self.send(callback_name, action, options)
       end
     end
     
-    module InstaneMethods
+    module InstanceMethods
     end
   end
 end

data/lib/exposure/behaviors/finding.rb

@@ -2,12 +2,12 @@ module Exposure
   module Finding
     def self.included(base)
       base.extend ClassMethods
-      base.send(:include, InstaneMethods)
+      base.send(:include, InstanceMethods)
     end
     
     module ClassMethods
-      # find :person, :with => Proc.new { Person.find_by_permalink(params[:permalink]) }
-      # find :people, :with => Proc.new { Person.send(params[:scope]) }
+      # find :person, :with => proc { Person.find_by_permalink(params[:permalink]) }
+      # find :people, :with => proc { Person.send(params[:scope]) }
       # find :dogs, :with => :dogs_adopted_after_date
       # find :dogs do
       #   Dog.all
@@ -49,18 +49,18 @@ module Exposure
       
       def build_default_finders(member, nesting) #:nodoc:
         finders = self::const_set(:DefaultFinders, {
-          self.resource_name.intern  => Proc.new { [:find, params[:id] ] },
-          self.resources_name.intern => Proc.new { [:all] }
+          self.resource_name.intern  => proc { [:find, params[:id] ] },
+          self.resources_name.intern => proc { [:all] }
         })
 
         nesting.each do |association_name|
-          finders[association_name.to_s.singularize.to_sym] = Proc.new { [:find, params[:"#{association_name.to_s.singularize}_id"]] }
-          finders[association_name] = Proc.new { [ :all ] }
+          finders[association_name.to_s.singularize.to_sym] = proc { [:find, params[:"#{association_name.to_s.singularize}_id"]] }
+          finders[association_name] = proc { [ :all ] }
         end
       end
     end
     
-    module InstaneMethods
+    module InstanceMethods
       private
         def custom_finder_for(resource_name)
           if finder = self.class::Finders[resource_name]
@@ -99,6 +99,7 @@ module Exposure
             if use_associaiton
               call_finder_chain(object.send(association).send(*value), chain)
             else
+              return value if value.empty? || value[0].kind_of?(ActiveRecord::Base) # the find already executed
               call_finder_chain(object.send(*value), chain)
             end
           else

data/lib/exposure/behaviors/flashing.rb

@@ -2,7 +2,7 @@ module Exposure
   module Flashing
     def self.included(base)
       base.extend ClassMethods
-      base.send(:include, InstaneMethods)
+      base.send(:include, InstanceMethods)
     end
     
     module ClassMethods
@@ -30,7 +30,7 @@ module Exposure
       end
     end
     
-    module InstaneMethods
+    module InstanceMethods
       private
         def custom_flash_for(action_name, action_status)
           if flash_message = self.class::FlashMessages["#{action_name}.#{action_status}.html"]

data/lib/exposure/behaviors/responding.rb

@@ -2,7 +2,7 @@ module Exposure
   module Responding
     def self.included(base)
       base.extend ClassMethods
-      base.send(:include, InstaneMethods)
+      base.send(:include, InstanceMethods)
     end
     
     module ClassMethods
@@ -48,7 +48,7 @@ module Exposure
       end
     end
     
-    module InstaneMethods
+    module InstanceMethods
       private
         def custom_response_for(action_name, action_status, format)
           if responder = self.class::Responses["#{action_name}.#{action_status}.#{format}"]

data/lib/exposure/patterns/resources.rb

@@ -24,35 +24,35 @@ module Exposure
       )
       
       DefaultFlashMessages = {
-        '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" }
+        'create.success.html' => proc { "#{resource_name.capitalize} successfully created" },
+        'update.success.html' => proc { "#{resource_name.capitalize} successfully updated" },
+        'destroy.success.html' => proc { "#{resource_name.capitalize} successfully removed" }
       }
       
       DefaultResponses = {
-        'index.success.html'  => Proc.new   { render('index') },
-        'show.success.html'   => Proc.new   { render('show')  },
-        'new.success.html'    => Proc.new   { render('new')   },
-        'create.success.html' => Proc.new  { redirect_to({:action => 'index'}) },
-        'edit.success.html'   => Proc.new  { render('edit')  },
-        'update.success.html' => Proc.new  { redirect_to({:action => 'show' }) },
-        'destroy.success.html'=> Proc.new { redirect_to({:action => 'index'}) },
-        'create.failure.html' => Proc.new { render('new')    },
-        'update.failure.html' => Proc.new { render('edit')   },
-        'index.success.xml'   => Proc.new { render(:xml => @resources) },
-        'show.success.xml'   => Proc.new  { render(:xml => @resource) },
-        'new.success.xml'    => Proc.new  { render(:xml => @resource) },
-        'create.success.xml' => Proc.new  { render({:xml => @resource, :status => :created, :location => @resource}) },
-        'created.failure.xml'=> Proc.new  { render(:xml => @resource.errors, :status => :unprocessable_entity)},
-        'update.success.xml' => Proc.new  { head(:ok)},
-        'update.failure.xml' => Proc.new  { render(:xml => @resource.errors, :status => :unprocessable_entity)},
-        'destroy.success.xml'=> Proc.new  { head(:ok)}
+        'index.success.html'  => proc   { render('index') },
+        'show.success.html'   => proc   { render('show')  },
+        'new.success.html'    => proc   { render('new')   },
+        'create.success.html' => proc  { redirect_to({:action => 'index'}) },
+        'edit.success.html'   => proc  { render('edit')  },
+        'update.success.html' => proc  { redirect_to({:action => 'show' }) },
+        'destroy.success.html'=> proc { redirect_to({:action => 'index'}) },
+        'create.failure.html' => proc { render('new')    },
+        'update.failure.html' => proc { render('edit')   },
+        'index.success.xml'   => proc { render(:xml => @resources) },
+        'show.success.xml'   => proc  { render(:xml => @resource) },
+        'new.success.xml'    => proc  { render(:xml => @resource) },
+        'create.success.xml' => proc  { render({:xml => @resource, :status => :created, :location => @resource}) },
+        'created.failure.xml'=> proc  { render(:xml => @resource.errors, :status => :unprocessable_entity)},
+        'update.success.xml' => proc  { head(:ok)},
+        'update.failure.xml' => proc  { render(:xml => @resource.errors, :status => :unprocessable_entity)},
+        'destroy.success.xml'=> proc  { head(:ok)}
       }
 
       module Actions
-        def index
+        def index          
           run_callbacks(:before_find_many)
-           if find_records
+           if find_records             
              run_callbacks(:after_find_many_on_success)
              run_callbacks(:after_find_many)
              run_callbacks(:before_response)
@@ -216,7 +216,7 @@ module Exposure
             @resource = instance_variable_set("@#{resource_name}", call_finder_chain(parent_model, self.class.member_nesting, false))
           end
           
-          def find_records      
+          def find_records        
             @resources = instance_variable_set("@#{resources_name}", call_finder_chain(parent_model, self.class.collection_nesting, false))
           end
           

data/lib/exposure.rb

@@ -1,5 +1,6 @@
 $:.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'

data/spec/builders/builder_spec.rb

@@ -34,7 +34,7 @@ describe "builders", :type => :controller do
   end
   
   it "builds with a proc" do
-    PiratesController.build :pirate, :with => Proc.new { Pirate.new(params[:pirate]) }
+    PiratesController.build :pirate, :with => proc { Pirate.new(params[:pirate]) }
     post(:create, {:pirate => {}}).inspect
     
     should assign_to(:pirate).with(@pirate)

data/spec/finders/finder_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe "finders", :type => :controller do 
+describe "finders", :type => :controller do
   setup = lambda {
     class PiratesController < ActionController::Base
       expose_many(:pirates)
@@ -8,6 +8,10 @@ describe "finders", :type => :controller do
         def find_pirate
           Pirate.find_by_title(params[:id])
         end
+        
+        def find_pirates
+          Pirate.all
+        end
     end
     
     ActionController::Routing::Routes.draw do |map| 
@@ -26,28 +30,44 @@ describe "finders", :type => :controller do
     @response   = ActionController::TestResponse.new
     
     @pirate = Factory.stub(:pirate)
+    @pirates = [Factory.stub(:pirate)]
     Pirate.stub(:find_by_title => @pirate)
+    Pirate.stub(:all => @pirates)
   end
   
   after(:each) do
     Object.remove_class(PiratesController)
   end
   
-  it "finds with a method name as symbol" do
-    PiratesController.find :pirate, :with => Proc.new { Pirate.find_by_title(params[:id]) }
+  it "finds member resource with a method name as symbol" do
+    PiratesController.find :pirate, :with => proc { Pirate.find_by_title(params[:id]) }
     get(:show, {:id => 'Captain'})
     
     should assign_to(:pirate).with(@pirate)
   end
   
-  it "finds with a proc" do
+  it "finds collection resource with a method name as symbol" do
+    PiratesController.find :pirates, :with => proc { [:all] }
+    get(:index)
+    
+    should assign_to(:pirates).with(@pirates)
+  end
+  
+  it "finds member resource with a proc" do
     PiratesController.find :pirate, :with => :find_pirate
     get(:show, {:id => 'Captain'})
     
     should assign_to(:pirate).with(@pirate)    
   end
   
-  it "finds with a block" do
+  it "finds collection resource with a proc" do
+    PiratesController.find :pirates, :with => :find_pirates
+    get(:index)
+    
+    should assign_to(:pirates).with(@pirates)    
+  end
+  
+  it "finds member resource with a block" do
     PiratesController.find :pirate do
       Pirate.find_by_title(params[:id])
     end
@@ -56,4 +76,14 @@ describe "finders", :type => :controller do
     
     should assign_to(:pirate).with(@pirate)    
   end
+  
+  it "finds collection resource with a block" do
+    PiratesController.find :pirates do
+      [:all]
+    end
+    
+    get(:index)
+    
+    should assign_to(:pirates).with(@pirates)    
+  end
 end

data/spec/flashers/flash_with_proc_spec.rb

@@ -10,7 +10,7 @@ describe "flash messages with procs", :type => :controller do
   setup.call
   
   def setup_flasher(action, success = nil)
-    PiratesController.flash_for :create, :is => Proc.new { 'the flash was set' }, :on => success
+    PiratesController.flash_for :create, :is => proc { 'the flash was set' }, :on => success
   end
   
   ActionController::Routing::Routes.draw do |map| 

data/spec/responders/respond_with_proc_spec.rb

@@ -14,7 +14,7 @@ describe "responders", :type => :controller do
    end
    
    def setup_responder(action, success = nil)
-     PiratesController.response_for :create, :is => Proc.new { redirect_to({:action => "test"}) }, :on => success
+     PiratesController.response_for :create, :is => proc { redirect_to({:action => "test"}) }, :on => success
    end
    
   controller_name :pirates

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exposure
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Trek Glowacki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -05:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: []