exposure 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/exposure/behaviors/building.rb

@@ -11,6 +11,12 @@ module Exposure
         self.const_get(:Builders)[name] = options[:with]
       end
       
+      def build_default_builders!
+        nesting = @_exposed_resource_options[:nested] || []
+        nesting = nesting.clone
+        build_default_builder(self.resources_name, nesting)
+      end
+      
       def build_default_builder(member, nesting)
         if nesting.any?
           builders = self::const_set(:DefaultBuilders, {

data/lib/exposure/behaviors/finding.rb

@@ -22,6 +22,31 @@ module Exposure
         self.const_get(:Finders)[name] = options[:with]
       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_nested_default_finders!(nesting)
+        nesting = nesting.clone
+        self.parent_model = nesting.first.to_s.singularize.camelize.constantize
+        
+        build_default_finders(self.resources_name, nesting)
+        
+        nesting.collect! {|sym| [sym.to_s.singularize.to_sym, sym]}
+        
+        
+        self.member_nesting = nesting + [ [self.resource_name.to_sym, self.resources_name.to_sym] ]
+        self.collection_nesting = nesting + [ [self.resources_name.to_sym, self.resources_name.to_sym] ]
+      end
+      
       def build_default_finders(member, nesting) #:nodoc:
         finders = self::const_set(:DefaultFinders, {
           self.resource_name.intern  => Proc.new { [:find, params[:id] ] },

data/lib/exposure/options.rb

@@ -21,37 +21,6 @@ module Exposure
         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!
-        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 = 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
     end
   end
 end

data/lib/exposure/patterns/resources.rb

@@ -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/spec/builders/builder_spec.rb

@@ -40,14 +40,14 @@ describe "builders", :type => :controller do
     should assign_to(:pirate).with(@pirate)
   end
   
-  it "finds with a method name as symbol" do
+  it "builds 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
+  it "builds with a block" do
     PiratesController.build :pirate do
       Pirate.new(params[:pirate])
     end

data/spec/builders/nested_builder_spec.rb

@@ -16,24 +16,29 @@ describe "nested builders", :type => :controller do
   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)
+    @pirate = Factory.create(:pirate)
+    @ship   = Factory.build(:ship)
+    Pirate.stub!(:find).and_return(@pirate)
+    @pirate.ships.stub!(:build).and_return(@ship)
+    
+    
+    params = {:pirate_id => @pirate.id, :ship => Factory.attributes_for(:ship)}
     
-    get(:new, {:pirate_id => 1, :ship => nil})
+    get(:new, params)
   end
   
   after(:each) do
     Object.remove_class(ShipsController)
   end
   
-  it { should assign_to(:ship) }
-  it { should assign_to(:resource) }
+  it { should assign_to(:ship).with(@ship) }
+  it { should assign_to(:resource).with(@ship) }
   
 end

data/spec/factories/pirate_factory.rb

@@ -4,5 +4,5 @@ Factory.define :pirate do |p|
 end
 
 Factory.define :pirate_with_ships, :parent => :pirate do |p|
-  p.ships {|ships| [ships.association(:ship)]}
+  p.ships {|ships| [ships.association(:ship), ships.association(:dinghy)] }
 end

data/spec/factories/ship_factory.rb

@@ -1,3 +1,7 @@
 Factory.define :ship do |s|
   s.name 'Black Pearl'
+end
+
+Factory.define :dinghy, :class => 'ship' do |s|
+  s.name 'A shabby little thing'
 end

data/spec/finders/nested_resources_finder_spec.rb

@@ -24,16 +24,16 @@ describe "nested finders", :type => :controller do
     @response   = ActionController::TestResponse.new
     
     @pirate = Factory.create(:pirate_with_ships)
-    Pirate.stub(:find => @pirate)
+    @ships = @pirate.ships
     
-    get(:index, {:pirate_id => 1})
+    get(:index, {:pirate_id => @pirate.id})
   end
   
   after(:each) do
     Object.remove_class(ShipsController)
   end
   
-  it { should assign_to(:ships) }
-  it { should assign_to(:resources) }
+  it { should assign_to(:ships).with(@ships)}
+  it { should assign_to(:resources).with(@ships) }
   
 end

data/spec/resources_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "a REST patterned resource of 'pirates'", :type => :controller do
+describe "a REST patterned resource", :type => :controller do
   setup = lambda {
     class PiratesController < ActionController::Base
       expose_many(:pirates)
@@ -28,7 +28,7 @@ describe "a REST patterned resource of 'pirates'", :type => :controller do
   end
   
   describe 'configuration' do
-    it "has a resource name of 'post'" do
+    it "has a resource name of 'pirate'" do
       @controller.send(:resource_name).should == 'pirate'
     end
   
@@ -41,11 +41,13 @@ describe "a REST patterned resource of 'pirates'", :type => :controller do
   
   describe 'index' do
     before do
+      @pirates = [Factory.stub(:pirate)]
+      Pirate.should_receive(:find).with(:all).and_return(@pirates)
       get :index
     end
 
-    it { should assign_to(:pirates) }
-    it { should assign_to(:resources) }
+    it { should assign_to(:pirates).with(@pirates) }
+    it { should assign_to(:resources).with(@pirates) }
     it { should respond_with(:success) }
     it { should render_template(:index) }
     it { should_not set_the_flash }
@@ -58,8 +60,8 @@ describe "a REST patterned resource of 'pirates'", :type => :controller do
         get :show, {:id => 1}
       end
       
-      it { should assign_to(:pirate) }
-      it { should assign_to(:resource) }
+      it { should assign_to(:pirate).with(@pirate) }
+      it { should assign_to(:resource).with(@pirate) }
       it { should respond_with(:success) }
       it { should render_template(:show) }
       it { should_not set_the_flash }
@@ -82,11 +84,13 @@ describe "a REST patterned resource of 'pirates'", :type => :controller do
   
   describe 'new' do
     before(:each) do
+      @pirate = Factory.stub(:pirate)
+      Pirate.should_receive(:new).and_return(@pirate)
       get :new
     end
     
-    it { should assign_to(:pirate) }
-    it { should assign_to(:resource) }
+    it { should assign_to(:pirate).with(@pirate) }
+    it { should assign_to(:resource).with(@pirate) }
     it { should respond_with(:success) }
     it { should render_template(:new) }
     it { should_not set_the_flash }
@@ -99,14 +103,14 @@ describe "a REST patterned resource of 'pirates'", :type => :controller do
         params = {
           :pirate => {}
         }
-        post_before_saving = Factory.build(:pirate)
-        Pirate.should_receive(:new).with(params[:pirate]).and_return(post_before_saving)
-        post_before_saving.should_receive(:save).and_return(true)
+        @pirate = Factory.build(:pirate)
+        Pirate.should_receive(:new).with(params[:pirate]).and_return(@pirate)
+        @pirate.should_receive(:save).and_return(true)
         post(:create, params)
       end
       
-      it { should assign_to(:pirate) }
-      it { should assign_to(:resource) }
+      it { should assign_to(:pirate).with(@pirate) }
+      it { should assign_to(:resource).with(@pirate) }
       it { should respond_with(:redirect).to(:index) }
       it { should set_the_flash.to('Pirate successfully created') }
     end
@@ -116,14 +120,14 @@ describe "a REST patterned resource of 'pirates'", :type => :controller do
         params = {
           :pirate => {}
         }
-        post_before_saving = Factory.build(:pirate)
-        Pirate.should_receive(:new).with(params[:pirate]).and_return(post_before_saving)
-        post_before_saving.should_receive(:save).and_return(false)
+        @pirate = Factory.build(:pirate)
+        Pirate.should_receive(:new).with(params[:pirate]).and_return(@pirate)
+        @pirate.should_receive(:save).and_return(false)
         post(:create, params)
       end
       
-      it { should assign_to(:pirate) }
-      it { should assign_to(:resource) }
+      it { should assign_to(:pirate).with(@pirate) }
+      it { should assign_to(:resource).with(@pirate) }
       it { should respond_with(:success) }
       it { should render_template(:new) }
       it { should_not set_the_flash }
@@ -133,12 +137,13 @@ describe "a REST patterned resource of 'pirates'", :type => :controller do
   describe 'edit' do
     describe 'with found resource' do
       before(:each) do
-        Pirate.should_receive(:find).with('1').and_return(Factory.stub(:pirate))
+        @pirate = Factory.stub(:pirate)
+        Pirate.should_receive(:find).with('1').and_return(@pirate)
         get :edit, {:id => 1}
       end
       
-      it { should assign_to(:pirate) }
-      it { should assign_to(:resource) }
+      it { should assign_to(:pirate).with(@pirate) }
+      it { should assign_to(:resource).with(@pirate) }
       it { should respond_with(:success) }
       it { should render_template(:edit) }
       it { should_not set_the_flash }
@@ -166,14 +171,14 @@ describe "a REST patterned resource of 'pirates'", :type => :controller do
           :id  => 1,
           :pirate => {}
         }
-        post_before_saving = Factory.build(:pirate)
-        Pirate.should_receive(:find).with("1").and_return(post_before_saving)
-        post_before_saving.should_receive(:update_attributes).with(params[:pirate]).and_return(true)
+        @pirate = Factory.build(:pirate)
+        Pirate.should_receive(:find).with("1").and_return(@pirate)
+        @pirate.should_receive(:update_attributes).with(params[:pirate]).and_return(true)
         put(:update, params)
       end
       
-      it { should assign_to(:pirate) }
-      it { should assign_to(:resource) }
+      it { should assign_to(:pirate).with(@pirate) }
+      it { should assign_to(:resource).with(@pirate) }
       it { should respond_with(:redirect).to(:show) }
       it { should set_the_flash.to('Pirate successfully updated') }
       
@@ -185,14 +190,14 @@ describe "a REST patterned resource of 'pirates'", :type => :controller do
           :id  => 1,
           :pirate => {}
         }
-        post_before_saving = Factory.build(:pirate)
-        Pirate.should_receive(:find).with("1").and_return(post_before_saving)
-        post_before_saving.should_receive(:update_attributes).with(params[:pirate]).and_return(false)
+        @pirate = Factory.build(:pirate)
+        Pirate.should_receive(:find).with("1").and_return(@pirate)
+        @pirate.should_receive(:update_attributes).with(params[:pirate]).and_return(false)
         put(:update, params)
       end
       
-      it { should assign_to(:pirate) }
-      it { should assign_to(:resource) }
+      it { should assign_to(:pirate).with(@pirate) }
+      it { should assign_to(:resource).with(@pirate) }
       it { should respond_with(:success) }
       it { should render_template(:edit) }
       it { should_not set_the_flash }
@@ -204,9 +209,9 @@ describe "a REST patterned resource of 'pirates'", :type => :controller do
       params = {
         :id  => 1,
       }
-      post_before_saving = Factory.build(:pirate)
-      Pirate.should_receive(:find).with("1").and_return(post_before_saving)
-      post_before_saving.should_receive(:destroy)
+      @pirate = Factory.build(:pirate)
+      Pirate.should_receive(:find).with("1").and_return(@pirate)
+      @pirate.should_receive(:destroy).and_return(true)
       delete(:destroy, params)
     end
     

metadata

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