exposure 0.0.7 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.1.0

data/lib/exposure/behaviors/building.rb

@@ -12,24 +12,62 @@ module Exposure
       end
       
       def build_default_builder(member, nesting)
-        self::const_set(:DefaultBuilder, {
-          self.resource_name.intern  => Proc.new { [:new, params[resource_name] ] }
-        })
+        if nesting.any?
+          builders = self::const_set(:DefaultBuilders, {
+            self.resource_name.intern  => Proc.new { [:build, params[resource_name] ] },
+          })
+        else
+          self::const_set(:DefaultBuilders, {
+            self.resource_name.intern  => Proc.new { [:new, params[resource_name] ] },
+          })
+        end
       end
     end
     
     module InstaneMethods
       private
         def custom_builder_for(resource_name)
-          
+          if builder = self.class::Builders[resource_name]
+            return builder
+          end
         end
         
         def default_builder_for(resource_name)
-          
+          if builder = self.class::DefaultBuilders[resource_name]
+            return builder
+          end
         end
         
         def builder_for(resource_name)
-          custom_builder_for(resource_name) || default_builder_for(resource_name)
+          custom_builder_for(resource_name) || default_builder_for(resource_name) || finder_for(resource_name)
+        end
+        
+        def call_builder_chain(object, chain, use_associaiton = true)
+          chain = chain.clone
+          links = chain.shift
+          return object unless links
+          
+          message = builder_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 builder of #{message.inspect}"
+          end
+          
+          if value.kind_of?(Array) && !value.respond_to?(:proxy_target)
+            if use_associaiton
+              call_builder_chain(object.send(association).send(*value), chain)
+            else
+              call_builder_chain(object.send(*value), chain)
+            end
+          else
+            call_builder_chain(value, chain)
+          end
         end
     end
   end

data/lib/exposure/behaviors/callbacks.rb

@@ -13,7 +13,7 @@ module Exposure
           build_callback('before', trigger, action, options)
         end
       end
-
+      
       # access point for creating and configuring after_ callbacks.
       def after(trigger, *actions)
         options = actions.extract_options!
@@ -25,24 +25,24 @@ module Exposure
       # builds callbacks that adhere to the ActiveSupport::Callbacks interface
       def build_callback(prefix, trigger, action, options) #:nodoc:
         callback_name = "#{prefix}_#{trigger}"
-
+        
         if options[:on]
           callback_name += "_on_#{options.delete(:on)}"
         end
-
+        
         options[:if] ||= []
-
+        
         only_methods = options.delete(:only)
         except_methods = options.delete(:except)
-
+        
         if only_methods
           options[:if] << Proc.new {|c| only_methods.include?(c.action_name.intern) }
         end
-
+        
         if except_methods
           options[:if] << Proc.new {|c| !except_methods.include?(c.action_name.intern) }
         end
-
+        
         self.send(callback_name, action, options)
       end
     end

data/lib/exposure/behaviors/finding.rb

@@ -54,12 +54,13 @@ module Exposure
         end
         
         def call_finder_chain(object, chain, use_associaiton = true)
+          chain = chain.clone
           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)
@@ -68,7 +69,7 @@ module Exposure
           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)

data/lib/exposure/behaviors/flashing.rb

@@ -17,7 +17,7 @@ module Exposure
       #     can be a Proc or method name as symbol.
       def flash_for(action_name, options = {}, &block)
         options[:is] ||= block
-
+        
         case options[:on]
         when NilClass, :any
           self.const_get(:FlashMessages)["#{action_name}.success.html"]  = options[:is]
@@ -46,13 +46,13 @@ module Exposure
             false
           end
         end
-      
+        
         def default_flash_for(action_name, action_status)
           if message_proc = self.class::DefaultFlashMessages["#{action_name}.#{action_status}.html"]
             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

data/lib/exposure/behaviors/responding.rb

@@ -27,7 +27,7 @@ module Exposure
         options = actions.extract_options!
         options[:is] ||= block
         formats  = options[:formats] || [:html]
-
+        
         case options[:on]
         when NilClass, :any
           build_custom_response(actions, :success, formats, options[:is])
@@ -62,7 +62,7 @@ module Exposure
             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
@@ -70,7 +70,7 @@ module Exposure
             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)

data/lib/exposure/configuration.rb

@@ -25,6 +25,7 @@ module Exposure
       
       include ActiveSupport::Callbacks
       include Exposure::Finding
+      include Exposure::Building
       include Exposure::Flashing
       include Exposure::Responding
       include Exposure::Callbacks

data/lib/exposure/options.rb

@@ -1,52 +1,54 @@
 module Exposure
   module Configuration
     module Options
-      
       def allow_actions!
         if @_exposed_resource_options[:only]
           @_exposed_resource_options[:except] = Patterns::Resources::DefaultActions - @_exposed_resource_options[:only]
         end
-
+        
         if @_exposed_resource_options[:except]
           @_exposed_resource_options[:except].each do |action|
             undef_method(action)
           end
         end
       end
-
+      
       def allow_formats!
         formats = @_exposed_resource_options[:formats] || [:html, :xml] 
       end
-
+      
       def name!
         self.resource_name  = @_exposed_resource_name.to_s.singularize
         self.resources_name = @_exposed_resource_name.to_s
       end
-
+      
       def build_default_finders!
         if nesting = @_exposed_resource_options[:nested]
           self.build_nested_default_finders!(nesting)
           return 
         end
-
+        
         self.parent_model = self.resource_name.camelize.constantize
         build_default_finders(self.resource_name, [])
         self.member_nesting = [ [self.resource_name.to_sym] ]
         self.collection_nesting = [ [self.resources_name.to_sym] ]
       end
-
+      
       def build_default_builders!
-        true
+        nesting = @_exposed_resource_options[:nested] || []
+        nesting = nesting.clone
+        nesting.shift
+        build_default_builder(self.resources_name, nesting)
       end
-
+      
       def build_nested_default_finders!(nesting)
-
+        nesting = nesting.clone
         self.parent_model = nesting.shift.to_s.singularize.camelize.constantize
-
+        
         build_default_finders(self.resources_name, nesting)
-
-        nesting.collect! {|sym| [sym.to_s.singularize.to_sym, sym]}
-
+        
+        nesting = nesting.collect! {|sym| [sym.to_s.singularize.to_sym, sym]}
+        
         self.member_nesting = nesting + [ [self.resource_name.to_sym] ]
         self.collection_nesting = nesting + [ [self.resources_name.to_sym] ]
       end

data/lib/exposure/patterns/resources.rb

@@ -5,6 +5,7 @@ module Exposure
         base::const_set(:DefaultResponses, DefaultResponses)
         base::const_set(:DefaultFlashMessages, DefaultFlashMessages)
         base::const_set(:Finders, { true => {}, false => {} })
+        base::const_set(:Builders, {})
         base::const_set(:FlashMessages, {})
         base::const_set(:Responses, {} )
       end
@@ -208,15 +209,15 @@ module Exposure
           end
           
           def build_record
-            @resource = instance_variable_set("@#{resource_name}", parent_model.new(params[resource_name]))
+            @resource = instance_variable_set("@#{resource_name}", call_builder_chain(parent_model, self.class.member_nesting, false))
           end
           
           def find_record
-            @resource = instance_variable_set("@#{resource_name}", call_finder_chain(parent_model, self.class.member_nesting.clone, false))
+            @resource = instance_variable_set("@#{resource_name}", call_finder_chain(parent_model, self.class.member_nesting, false))
           end
           
           def find_records            
-            @resources = instance_variable_set("@#{resources_name}", call_finder_chain(parent_model, self.class.collection_nesting.clone, false))
+            @resources = instance_variable_set("@#{resources_name}", call_finder_chain(parent_model, self.class.collection_nesting, false))
           end
           
           def delete_record

data/lib/exposure.rb

@@ -12,7 +12,7 @@ require 'exposure/behaviors/responding'
 require 'exposure/patterns/resources'
 
 module Exposure
-  VERSION = '0.0.6'
+  VERSION = File.read(File.join(File.dirname(__FILE__), '../VERSION')).strip!.freeze
   def self.included(base)
     base.extend Configuration
   end

data/spec/builders/builder_spec.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "builders", :type => :controller do 
+  setup = lambda {
+    class PiratesController < ActionController::Base
+      expose_many(:pirates)
+      private
+        def build_pirate
+          Pirate.new(params[:pirate])
+        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
+    
+    @pirate = Factory.stub(:pirate)
+    Pirate.stub(:new => @pirate)
+  end
+  
+  after(:each) do
+    Object.remove_class(PiratesController)
+  end
+  
+  it "builds with a proc" do
+    PiratesController.build :pirate, :with => Proc.new { Pirate.new(params[:pirate]) }
+    post(:create, {:pirate => {}}).inspect
+    
+    should assign_to(:pirate).with(@pirate)
+  end
+  
+  it "finds with a method name as symbol" do
+    PiratesController.build :pirate, :with => :build_pirate
+    post(:create, {:pirate => {}})
+    
+    should assign_to(:pirate).with(@pirate)    
+  end
+  
+  it "finds with a block" do
+    PiratesController.build :pirate do
+      Pirate.new(params[:pirate])
+    end
+    
+    post(:create, {:pirate => {}})
+    
+    should assign_to(:pirate).with(@pirate)    
+  end
+end

data/spec/builders/nested_builder_spec.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "nested builders", :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
+    
+    @pirate = Factory.create(:pirate_with_ships)
+    Pirate.stub(:find => @pirate)
+    
+    get(:new, {:pirate_id => 1, :ship => nil})
+  end
+  
+  after(:each) do
+    Object.remove_class(ShipsController)
+  end
+  
+  it { should assign_to(:ship) }
+  it { should assign_to(:resource) }
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: exposure
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors: 
 - Trek Glowacki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -04:00
+date: 2009-11-10 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -39,6 +39,8 @@ files:
 - script/console
 - script/destroy
 - script/generate
+- spec/builders/builder_spec.rb
+- spec/builders/nested_builder_spec.rb
 - spec/callbacks_spec.rb
 - spec/configuration_spec.rb
 - spec/custom_matchers.rb
@@ -99,6 +101,8 @@ signing_key:
 specification_version: 3
 summary: exposed resources
 test_files: 
+- spec/builders/builder_spec.rb
+- spec/builders/nested_builder_spec.rb
 - spec/callbacks_spec.rb
 - spec/configuration_spec.rb
 - spec/custom_matchers.rb