nileshtrivedi-lp_resource_builder 0.5.1 → 0.5.3

data/README.rdoc

@@ -6,23 +6,15 @@ resource_controller makes RESTful controllers easier, more maintainable, and sup
 
 Add it as a gem dependency
 
-  config.gem 'resource_controller'
-  
-...or for the development version
-  
-  config.gem 'giraffesoft-resource_controller', :lib => 'resource_controller', :source => 'http://gems.github.com'
+  config.gem 'nileshtrivedi-lp_resource_builder', :lib => 'resource_controller', :source => 'http://gems.github.com'
   
 Or install it as a gem manually  
   
-  sudo gem install resource_controller
-  
-...or for the development version
-  
-  sudo gem install giraffesoft-resource_controller
+  sudo gem install nileshtrivedi-lp_resource_builder
   
 Or grab the source
   
-  git clone git://github.com/giraffesoft/resource_controller.git
+  git clone git://github.com/nileshtrivedi/resource_controller.git
 
 = Usage
 
@@ -318,7 +310,7 @@ Or with namespaced, nested controllers...
 You get the idea.  Everything is automagical!  All parameters are inferred.
 
 == Credits
-
+resource_builder is a fork of resource_controller, maintained by {Nilesh Trivedi}[http://nileshtrivedi.in]
 resource_controller was created, and is maintained by {James Golick}[http://jamesgolick.com].
 
 == License

data/Rakefile

@@ -1,26 +1,13 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require File.dirname(__FILE__)+'/lib/resource_controller/version'
-Dir['tasks/**.rake'].each { |tasks| load tasks }
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the ResourceController plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/test/**/*_test.rb'
-  t.verbose = true
-end
+Dir.chdir('test')
+load 'Rakefile'
 
 desc 'Generate documentation for the ResourceController plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
+  rdoc.rdoc_dir = '../rdoc'
   rdoc.title    = 'ResourceController'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include('../README.rdoc')
+  rdoc.rdoc_files.include('../lib/**/*.rb')
 end
 
 task :upload_docs => :rdoc do
@@ -28,8 +15,8 @@ task :upload_docs => :rdoc do
   `ssh jamesgolick.com 'rm -Rf /home/apps/jamesgolick.com/public/resource_controller/rdoc'`
   
   puts "Uploading current rdoc"
-  `scp -r rdoc jamesgolick.com:/home/apps/jamesgolick.com/public/resource_controller`
+  `scp -r ../rdoc jamesgolick.com:/home/apps/jamesgolick.com/public/resource_controller`
   
   puts "Deleting rdoc"
-  `rm -Rf rdoc`
+  `rm -Rf ../rdoc`
 end

data/generators/scaffold_resource/templates/view__form.erb

@@ -2,5 +2,6 @@
 <p>
   <label for="<%= singular_name %>_<%= attribute.name %>"><%= attribute.column.human_name %>:</label>
   <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+  <%%= error_message_on "<%= singular_name %>", "<%= attribute.name %>" %>
 </p>
-<% end -%>
+<% end -%>

data/generators/scaffold_resource/templates/view_partial_edit.html.erb

@@ -1,8 +1,6 @@
 <%% if @<%= singular_name %>.editable_by?(current_user) %>
 <h1>Editing <%= singular_name.titleize %></h1>
-
 <%%= error_messages_for :<%= singular_name %> %>
-
 <%% form_for(:<%= singular_name %>, :url => object_url, :html => { :method => :put }) do |f| %>
 <%%= render(:partial => "form", :locals => {:f => f}) %>
   <p>

data/generators/scaffold_resource/templates/view_partial_new.html.erb

@@ -1,7 +1,5 @@
 <h1>New <%= singular_name.titleize %></h1>
 
-<%%= error_messages_for :<%= singular_name %> %>
-
 <%% form_for(:<%= singular_name %>, :url => collection_url) do |f| %>
   <%%= render(:partial => "form", :locals => {:f => f}) %>
   <p>

data/lib/resource_controller/helpers/current_objects.rb

@@ -1,69 +1,73 @@
-module ResourceController::Helpers::CurrentObjects
-  protected
-    # Used internally to return the model for your resource.  
-    #
-    def model
-      model_name.to_s.camelize.constantize
-    end
+module ResourceController
+  module Helpers
+    module CurrentObjects
+      protected
+        # Used internally to return the model for your resource.  
+        #
+        def model
+          model_name.to_s.camelize.constantize
+        end
 
   
-    # Used to fetch the collection for the index method
-    #
-    # In order to customize the way the collection is fetched, to add something like pagination, for example, override this method.
-    #
-    def collection
-      end_of_association_chain.find(:all)
-    end
+        # Used to fetch the collection for the index method
+        #
+        # In order to customize the way the collection is fetched, to add something like pagination, for example, override this method.
+        #
+        def collection
+          end_of_association_chain.find(:all)
+        end
     
-    # Returns the current param.
-    # 
-    # Defaults to params[:id].
-    #
-    # Override this method if you'd like to use an alternate param name.
-    #
-    def param
-      params[:id]
-    end
+        # Returns the current param.
+        # 
+        # Defaults to params[:id].
+        #
+        # Override this method if you'd like to use an alternate param name.
+        #
+        def param
+          params[:id]
+        end
   
-    # Used to fetch the current member object in all of the singular methods that operate on an existing member.
-    #
-    # Override this method if you'd like to fetch your objects in some alternate way, like using a permalink.
-    #
-    # class PostsController < ResourceController::Base
-    #   private
-    #     def object
-    #       @object ||= end_of_association_chain.find_by_permalink(param)
-    #     end
-    #   end
-    #
-    def object
-      @object ||= end_of_association_chain.find(param) unless param.nil?
-      @object
-    end
+        # Used to fetch the current member object in all of the singular methods that operate on an existing member.
+        #
+        # Override this method if you'd like to fetch your objects in some alternate way, like using a permalink.
+        #
+        # class PostsController < ResourceController::Base
+        #   private
+        #     def object
+        #       @object ||= end_of_association_chain.find_by_permalink(param)
+        #     end
+        #   end
+        #
+        def object
+          @object ||= end_of_association_chain.find(param) unless param.nil?
+          @object
+        end
     
-    # Used internally to load the member object in to an instance variable @#{model_name} (i.e. @post)
-    #
-    def load_object
-      instance_variable_set "@#{parent_type}", parent_object if parent?
-      instance_variable_set "@#{object_name}", object
-    end
+        # Used internally to load the member object in to an instance variable @#{model_name} (i.e. @post)
+        #
+        def load_object
+          instance_variable_set "@#{parent_type}", parent_object if parent?
+          instance_variable_set "@#{object_name}", object
+        end
     
-    # Used internally to load the collection in to an instance variable @#{model_name.pluralize} (i.e. @posts)
-    #
-    def load_collection
-      instance_variable_set "@#{parent_type}", parent_object if parent?
-      instance_variable_set "@#{object_name.to_s.pluralize}", collection
-    end
+        # Used internally to load the collection in to an instance variable @#{model_name.pluralize} (i.e. @posts)
+        #
+        def load_collection
+          instance_variable_set "@#{parent_type}", parent_object if parent?
+          instance_variable_set "@#{object_name.to_s.pluralize}", collection
+        end
   
-    # Returns the form params.  Defaults to params[model_name] (i.e. params["post"])
-    #
-    def object_params
-      params["#{object_name}"]
-    end
+        # Returns the form params.  Defaults to params[model_name] (i.e. params["post"])
+        #
+        def object_params
+          params["#{object_name}"]
+        end
     
-    # Builds the object, but doesn't save it, during the new, and create action.
-    #
-    def build_object
-      @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
+        # Builds the object, but doesn't save it, during the new, and create action.
+        #
+        def build_object
+          @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
+        end
     end
+  end
 end

data/lib/resource_controller/helpers/internal.rb

@@ -2,75 +2,79 @@
 # 
 # All of these methods are used internally to execute the options, set by the user in ActionOptions and FailableActionOptions
 #
-module ResourceController::Helpers::Internal
-  protected
-    # Used to actually pass the responses along to the controller's respond_to method.
-    #
-    def response_for(action)
-      respond_to do |wants|
-        options_for(action).response.each do |method, block|
-          if block.nil?
-            wants.send(method)
-          else
-            wants.send(method) { instance_eval(&block) }
+module ResourceController
+  module Helpers
+    module Internal
+      protected
+        # Used to actually pass the responses along to the controller's respond_to method.
+        #
+        def response_for(action)
+          respond_to do |wants|
+            options_for(action).response.each do |method, block|
+              if block.nil?
+                wants.send(method)
+              else
+                wants.send(method) { instance_eval(&block) }
+              end
+            end
           end
         end
-      end
-    end
+
+        # Calls the after callbacks for the action, if one is present.
+        #
+        def after(action)
+          invoke_callbacks *options_for(action).after
+        end
+
+        # Calls the before block for the action, if one is present.
+        #
+        def before(action)
+          invoke_callbacks *self.class.send(action).before
+        end
   
-    # Calls the after callbacks for the action, if one is present.
-    #
-    def after(action)
-      invoke_callbacks *options_for(action).after
-    end
+        # Sets the flash and flash_now for the action, if it is present.
+        #
+        def set_flash(action)
+          set_normal_flash(action)
+          set_flash_now(action)
+        end
   
-    # Calls the before block for the action, if one is present.
-    #
-    def before(action)
-      invoke_callbacks *self.class.send(action).before
-    end
-    
-    # Sets the flash and flash_now for the action, if it is present.
-    #
-    def set_flash(action)
-      set_normal_flash(action)
-      set_flash_now(action)
-    end
-    
-    # Sets the regular flash (i.e. flash[:notice] = '...')
-    #
-    def set_normal_flash(action)
-      if f = options_for(action).flash
-        flash[:notice]     = f.is_a?(Proc) ? instance_eval(&f) : options_for(action).flash
-      end
-    end
-    
-    # Sets the flash.now (i.e. flash.now[:notice] = '...')
-    #
-    def set_flash_now(action)
-      if f = options_for(action).flash_now
-        flash.now[:notice] = f.is_a?(Proc) ? instance_eval(&f) : options_for(action).flash_now
-      end
-    end
-    
-    # Returns the options for an action, which is a symbol.
-    #
-    # Manages splitting things like :create_fails.
-    #
-    def options_for(action)
-      action = action == :new_action ? [action] : "#{action}".split('_').map(&:to_sym)
-      options = self.class.send(action.first)
-      options = options.send(action.last == :fails ? :fails : :success) if ResourceController::FAILABLE_ACTIONS.include? action.first
+        # Sets the regular flash (i.e. flash[:notice] = '...')
+        #
+        def set_normal_flash(action)
+          if f = options_for(action).flash
+            flash[:notice]     = f.is_a?(Proc) ? instance_eval(&f) : options_for(action).flash
+          end
+        end
+  
+        # Sets the flash.now (i.e. flash.now[:notice] = '...')
+        #
+        def set_flash_now(action)
+          if f = options_for(action).flash_now
+            flash.now[:notice] = f.is_a?(Proc) ? instance_eval(&f) : options_for(action).flash_now
+          end
+        end
+  
+        # Returns the options for an action, which is a symbol.
+        #
+        # Manages splitting things like :create_fails.
+        #
+        def options_for(action)
+          action = action == :new_action ? [action] : "#{action}".split('_').map(&:to_sym)
+          options = self.class.send(action.first)
+          options = options.send(action.last == :fails ? :fails : :success) if ResourceController::FAILABLE_ACTIONS.include? action.first
+  
+          options
+        end
+  
+        def invoke_callbacks(*callbacks)
+          unless callbacks.empty?
+            callbacks.select { |callback| callback.is_a? Symbol }.each { |symbol| send(symbol) }
     
-      options
+            block = callbacks.detect { |callback| callback.is_a? Proc }
+            instance_eval &block unless block.nil?
+          end
+        end 
     end
-    
-    def invoke_callbacks(*callbacks)
-      unless callbacks.empty?
-        callbacks.select { |callback| callback.is_a? Symbol }.each { |symbol| send(symbol) }
-      
-        block = callbacks.detect { |callback| callback.is_a? Proc }
-        instance_eval &block unless block.nil?
-      end
-    end 
+  end
 end

data/lib/resource_controller/helpers/nested.rb

@@ -1,63 +1,67 @@
 # Nested and Polymorphic Resource Helpers
 #
-module ResourceController::Helpers::Nested
-  protected    
-    # Returns the relevant association proxy of the parent. (i.e. /posts/1/comments # => @post.comments)
-    #
-    def parent_association
-      @parent_association ||= parent_object.send(model_name.to_s.pluralize.to_sym)
-    end
+module ResourceController
+  module Helpers
+    module Nested
+      protected    
+        # Returns the relevant association proxy of the parent. (i.e. /posts/1/comments # => @post.comments)
+        #
+        def parent_association
+          @parent_association ||= parent_object.send(model_name.to_s.pluralize.to_sym)
+        end
     
-    # Returns the type of the current parent
-    #
-    def parent_type
-      @parent_type ||= parent_type_from_params || parent_type_from_request
-    end
+        # Returns the type of the current parent
+        #
+        def parent_type
+          @parent_type ||= parent_type_from_params || parent_type_from_request
+        end
     
-    # Returns the type of the current parent extracted from params
-    #    
-    def parent_type_from_params
-      [*belongs_to].find { |parent| !params["#{parent}_id".to_sym].nil? }
-    end
+        # Returns the type of the current parent extracted from params
+        #    
+        def parent_type_from_params
+          [*belongs_to].find { |parent| !params["#{parent}_id".to_sym].nil? }
+        end
     
-    # Returns the type of the current parent extracted form a request path
-    #    
-    def parent_type_from_request
-      [*belongs_to].find { |parent| request.path.split('/').include? parent.to_s }
-    end
+        # Returns the type of the current parent extracted form a request path
+        #    
+        def parent_type_from_request
+          [*belongs_to].find { |parent| request.path.split('/').include? parent.to_s }
+        end
     
-    # Returns true/false based on whether or not a parent is present.
-    #
-    def parent?
-      !parent_type.nil?
-    end
+        # Returns true/false based on whether or not a parent is present.
+        #
+        def parent?
+          !parent_type.nil?
+        end
     
-    # Returns true/false based on whether or not a parent is a singleton.
-    #    
-    def parent_singleton?
-      !parent_type_from_request.nil?
-    end
+        # Returns true/false based on whether or not a parent is a singleton.
+        #    
+        def parent_singleton?
+          !parent_type_from_request.nil? && parent_type_from_params.nil?
+        end
     
-    # Returns the current parent param, if there is a parent. (i.e. params[:post_id])
-    def parent_param
-      params["#{parent_type}_id".to_sym]
-    end
+        # Returns the current parent param, if there is a parent. (i.e. params[:post_id])
+        def parent_param
+          params["#{parent_type}_id".to_sym]
+        end
     
-    # Like the model method, but for a parent relationship.
-    # 
-    def parent_model
-      parent_type.to_s.camelize.constantize
-    end
+        # Like the model method, but for a parent relationship.
+        # 
+        def parent_model
+          parent_type.to_s.camelize.constantize
+        end
     
-    # Returns the current parent object if a parent object is present.
-    #
-    def parent_object
-      parent? && !parent_singleton? ? parent_model.find(parent_param) : nil
-    end
+        # Returns the current parent object if a parent object is present.
+        #
+        def parent_object
+          parent? && !parent_singleton? ? parent_model.find(parent_param) : nil
+        end
     
-    # If there is a parent, returns the relevant association proxy.  Otherwise returns model.
-    #
-    def end_of_association_chain
-      parent? ? parent_association : model
+        # If there is a parent, returns the relevant association proxy.  Otherwise returns model.
+        #
+        def end_of_association_chain
+          parent? ? parent_association : model
+        end
     end
+  end
 end

data/lib/resource_controller/helpers/singleton_customizations.rb

@@ -2,59 +2,63 @@
 # 
 # Used internally to transform a plural RESTful controller into a singleton
 #
-module ResourceController::Helpers::SingletonCustomizations
-  def self.included(subclass)
-    subclass.class_eval do  
-      methods_to_undefine = [:param, :index, :collection, :load_collection, :collection_url, 
-        :collection_path, :hash_for_collection_url, :hash_for_collection_path]
-      methods_to_undefine.each { |method| undef_method(method) if method_defined? method }
+module ResourceController
+  module Helpers
+    module SingletonCustomizations
+      def self.included(subclass)
+        subclass.class_eval do  
+          methods_to_undefine = [:param, :index, :collection, :load_collection, :collection_url, 
+            :collection_path, :hash_for_collection_url, :hash_for_collection_path]
+          methods_to_undefine.each { |method| undef_method(method) if method_defined? method }
       
-      class << self
-        def singleton?
-          true
+          class << self
+            def singleton?
+              true
+            end
+          end
         end
       end
-    end
-  end
   
-  protected
-    # Used to fetch the current object in a singleton controller.
-    #
-    # By defult this method is able to fetch the current object for resources nested with the :has_one association only. (i.e. /users/1/image # => @user.image)
-    # In other cases you should override this method and provide your custom code to fetch a singleton resource object, like using a session hash.
-    #
-    # class AccountsController < ResourceController::Singleton
-    #   private
-    #     def object
-    #       @object ||= Account.find(session[:account_id])
-    #     end
-    #   end
-    #  
-    def object
-      @object ||= parent? ? end_of_association_chain : nil
-    end
+      protected
+        # Used to fetch the current object in a singleton controller.
+        #
+        # By defult this method is able to fetch the current object for resources nested with the :has_one association only. (i.e. /users/1/image # => @user.image)
+        # In other cases you should override this method and provide your custom code to fetch a singleton resource object, like using a session hash.
+        #
+        # class AccountsController < ResourceController::Singleton
+        #   private
+        #     def object
+        #       @object ||= Account.find(session[:account_id])
+        #     end
+        #   end
+        #  
+        def object
+          @object ||= parent? ? end_of_association_chain : nil
+        end
 
-    # Returns the :has_one association proxy of the parent. (i.e. /users/1/image # => @user.image)
-    #  
-    def parent_association
-      @parent_association ||= parent_object.send(model_name.to_sym)
-    end
+        # Returns the :has_one association proxy of the parent. (i.e. /users/1/image # => @user.image)
+        #  
+        def parent_association
+          @parent_association ||= parent_object.send(model_name.to_sym)
+        end
   
-    # Used internally to provide the options to smart_url in a singleton controller.
-    #  
-    def object_url_options(action_prefix = nil, alternate_object = nil)
-      [action_prefix] + namespaces + [parent_url_options, route_name.to_sym]
-    end
+        # Used internally to provide the options to smart_url in a singleton controller.
+        #  
+        def object_url_options(action_prefix = nil, alternate_object = nil)
+          [action_prefix] + namespaces + [parent_url_options, route_name.to_sym]
+        end
   
-    # Builds the object, but doesn't save it, during the new, and create action.
-    #
-    def build_object
-      @object ||= singleton_build_object_base.send parent? ? "build_#{model_name}".to_sym : :new, object_params
-    end
+        # Builds the object, but doesn't save it, during the new, and create action.
+        #
+        def build_object
+          @object ||= singleton_build_object_base.send parent? ? "build_#{model_name}".to_sym : :new, object_params
+        end
     
-    # Singleton controllers don't build off of association proxy, so we can't use end_of_association_chain here
-    #
-    def singleton_build_object_base
-      parent? ? parent_object : model
+        # Singleton controllers don't build off of association proxy, so we can't use end_of_association_chain here
+        #
+        def singleton_build_object_base
+          parent? ? parent_object : model
+        end
     end
+  end
 end

data/lib/resource_controller/helpers/urls.rb

@@ -37,92 +37,96 @@
 # 
 # You get the idea.  Everything is automagical!  All parameters are inferred.
 #
-module ResourceController::Helpers::Urls
-  protected
-    ['', 'edit_'].each do |type|
-      symbol = type.blank? ? nil : type.gsub(/_/, '').to_sym
+module ResourceController
+  module Helpers
+    module Urls
+      protected
+        ['', 'edit_'].each do |type|
+          symbol = type.blank? ? nil : type.gsub(/_/, '').to_sym
       
-      define_method("#{type}object_url") do |*alternate_object|
-        smart_url *object_url_options(symbol, alternate_object.first)
-      end
+          define_method("#{type}object_url") do |*alternate_object|
+            smart_url *object_url_options(symbol, alternate_object.first)
+          end
       
-      define_method("#{type}object_path") do |*alternate_object|
-        smart_path *object_url_options(symbol, alternate_object.first)
-      end
+          define_method("#{type}object_path") do |*alternate_object|
+            smart_path *object_url_options(symbol, alternate_object.first)
+          end
       
-      define_method("hash_for_#{type}object_url") do |*alternate_object|
-        hash_for_smart_url *object_url_options(symbol, alternate_object.first)
-      end
+          define_method("hash_for_#{type}object_url") do |*alternate_object|
+            hash_for_smart_url *object_url_options(symbol, alternate_object.first)
+          end
       
-      define_method("hash_for_#{type}object_path") do |*alternate_object|
-        hash_for_smart_path *object_url_options(symbol, alternate_object.first)
-      end
-    end
+          define_method("hash_for_#{type}object_path") do |*alternate_object|
+            hash_for_smart_path *object_url_options(symbol, alternate_object.first)
+          end
+        end
     
-    def new_object_url
-      smart_url *new_object_url_options
-    end
+        def new_object_url
+          smart_url *new_object_url_options
+        end
     
-    def new_object_path
-      smart_path *new_object_url_options
-    end
+        def new_object_path
+          smart_path *new_object_url_options
+        end
     
-    def hash_for_new_object_url
-      hash_for_smart_url *new_object_url_options
-    end
+        def hash_for_new_object_url
+          hash_for_smart_url *new_object_url_options
+        end
     
-    def hash_for_new_object_path
-      hash_for_smart_path *new_object_url_options
-    end
+        def hash_for_new_object_path
+          hash_for_smart_path *new_object_url_options
+        end
     
-    def collection_url
-      smart_url *collection_url_options
-    end
+        def collection_url
+          smart_url *collection_url_options
+        end
     
-    def collection_path
-      smart_path *collection_url_options
-    end
+        def collection_path
+          smart_path *collection_url_options
+        end
     
-    def hash_for_collection_url
-      hash_for_smart_url *collection_url_options
-    end
+        def hash_for_collection_url
+          hash_for_smart_url *collection_url_options
+        end
     
-    def hash_for_collection_path
-      hash_for_smart_path *collection_url_options
-    end
+        def hash_for_collection_path
+          hash_for_smart_path *collection_url_options
+        end
     
-    # Used internally to provide the options to smart_url from Urligence.
-    #
-    def collection_url_options
-      namespaces + [parent_url_options, route_name.to_s.pluralize.to_sym]
-    end
+        # Used internally to provide the options to smart_url from Urligence.
+        #
+        def collection_url_options
+          namespaces + [parent_url_options, route_name.to_s.pluralize.to_sym]
+        end
     
-    # Used internally to provide the options to smart_url from Urligence.
-    #
-    def object_url_options(action_prefix = nil, alternate_object = nil)
-      [action_prefix] + namespaces + [parent_url_options, [route_name.to_sym, alternate_object || object]]
-    end
+        # Used internally to provide the options to smart_url from Urligence.
+        #
+        def object_url_options(action_prefix = nil, alternate_object = nil)
+          [action_prefix] + namespaces + [parent_url_options, [route_name.to_sym, alternate_object || object]]
+        end
     
-    # Used internally to provide the options to smart_url from Urligence.
-    #
-    def new_object_url_options
-      [:new] + namespaces + [parent_url_options, route_name.to_sym]
-    end
+        # Used internally to provide the options to smart_url from Urligence.
+        #
+        def new_object_url_options
+          [:new] + namespaces + [parent_url_options, route_name.to_sym]
+        end
     
-    def parent_url_options
-      if parent?
-        parent_singleton? ? parent_type.to_sym : [parent_type.to_sym, parent_object]
-      else
-        nil
-      end
-    end
+        def parent_url_options
+          if parent?
+            parent_singleton? ? parent_type.to_sym : [parent_type.to_sym, parent_object]
+          else
+            nil
+          end
+        end
     
-    # Returns all of the current namespaces of the current controller, symbolized, in array form.
-    #
-    def namespaces
-      names = self.class.name.split("::")
-      names.pop
+        # Returns all of the current namespaces of the current controller, symbolized, in array form.
+        #
+        def namespaces
+          names = self.class.name.split("::")
+          names.pop
       
-      names.map(&:underscore).map(&:to_sym)
+          names.map(&:underscore).map(&:to_sym)
+        end
     end
+  end
 end

data/test/app/models/photo.rb

@@ -1,4 +1,5 @@
 class Photo < ActiveRecord::Base
   has_and_belongs_to_many :tags
   belongs_to :user, :class_name => "Account", :foreign_key => "account_id"
+  belongs_to :personnel
 end

data/test/config/environment.rb

@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.1.1' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -45,20 +45,3 @@ Rails::Initializer.run do |config|
   
   config.action_controller.session = { :session_key => "_myapp_session", :secret => "6c1372e61789239a727cdbc8252eb6da" }
 end
-
-require "#{RAILS_ROOT}/../init"
-
-# Add new inflection rules using the following format 
-# (all these examples are active by default):
-# Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
-
-# Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register "application/x-mobile", :mobile
-
-# Include your application configuration below

data/test/config/routes.rb

@@ -20,6 +20,9 @@ ActionController::Routing::Routes.draw do |map|
   
   map.namespace :cms do |cms|
     cms.resources :products, :has_many => :options
+    cms.resources :personnel do |personnel|
+      personnel.resources :photos
+    end
   end
 
   map.resources :posts do |post|

data/test/db/schema.rb

@@ -1,5 +1,5 @@
 # This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of ActiveRecord to incrementally modify your database, and
+# please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
 # Note that this schema.rb definition is the authoritative source for your database schema. If you need
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 12) do
+ActiveRecord::Schema.define(:version => 14) do
 
   create_table "accounts", :force => true do |t|
     t.string "name"
@@ -33,9 +33,15 @@ ActiveRecord::Schema.define(:version => 12) do
     t.string  "title"
   end
 
+  create_table "personnel", :force => true do |t|
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "photos", :force => true do |t|
     t.string  "title"
     t.integer "account_id"
+    t.integer "personnel_id"
   end
 
   create_table "photos_tags", :force => true do |t|
@@ -45,7 +51,7 @@ ActiveRecord::Schema.define(:version => 12) do
 
   create_table "posts", :force => true do |t|
     t.string "title", :default => ""
-    t.text   "body"
+    t.text   "body",  :default => ""
   end
 
   create_table "products", :force => true do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nileshtrivedi-lp_resource_builder
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors: 
 - James Golick
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-03 21:00:00 -07:00
+date: 2008-10-16 21:00:00 -07:00
 default_executable: 
 dependencies: []