resourcelogic 0.12.2 → 0.12.3

data/README.rdoc

@@ -7,7 +7,7 @@ The purpose of Resourcelogic is to support a development style I created called
 == Helpful links
 
 *	<b>Documentation:</b> http://rdoc.info/projects/binarylogic/resourcelogic
-* <b>Bugs / feature suggestions:</b> http://binarylogic.lighthouseapp.com/projects/28581-resourcelogic
+* <b>Issues:</b> http://github.com/binarylogic/resourcelogic/issues
 
 == Contextual Development
 

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.rubyforge_project = "resourcelogic"
     gem.add_dependency "activesupport"
   end
+  Jeweler::RubyforgeTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
@@ -36,14 +37,6 @@ rescue LoadError
   end
 end
 
-task :default => :test
+task :test => :check_dependencies
 
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-    desc "Release gem to RubyForge"
-    task :release => ["rubyforge:release:gem"]
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
-end
+task :default => :test

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
 :major: 0
 :minor: 12
+:patch: 3

data/lib/resourcelogic/actions.rb

@@ -8,7 +8,6 @@ module Resourcelogic
         ACTIONS.each do |action|
           class_scoping_reader action, FAILABLE_ACTIONS.include?(action) ? FailableActionOptions.new : ActionOptions.new
         end
-        class_scoping_reader :context, ContextOptions.new
         add_acts_as_resource_module(Methods)
       end
     end
@@ -153,7 +152,7 @@ module Resourcelogic
         end
         
         def load_parent
-          instance_variable_set "@#{parent_model_name}", parent_object if parent?
+          instance_variable_set "@#{parent_model_name}", parent if parent?
         end
         
         # Used internally to load the member object in to an instance variable @#{model_name} (i.e. @post)

data/lib/resourcelogic/aliases.rb

@@ -51,6 +51,8 @@ module Resourcelogic
     end
     
     module Config
+      # This really isn't needed thanks to the new parent_from_params? method.
+      # TODO: review this and remove it if neccessary.
       def path_alias(alias_name, model_name)
         current_aliases = path_aliases
         model_name = model_name.to_sym

data/lib/resourcelogic/base.rb

@@ -8,9 +8,8 @@ module Resourcelogic # :nodoc:
     end
     
     module ClassMethods
-      def acts_as_resource(&block)
+      def acts_as_resource
         resourceful(true)
-        yield self if block_given?
         acts_as_resource_modules.each { |mod| include mod }
         init_default_actions
       end
@@ -43,12 +42,12 @@ module Resourcelogic # :nodoc:
         end
       end
       
-      # Since this part of Authlogic deals with another class, ActiveRecord, we can't just start including things
-      # in ActiveRecord itself. A lot of these module includes need to be triggered by the acts_as_authentic method
-      # call. For example, you don't want to start adding in email validations and what not into a model that has
-      # nothing to do with Authlogic.
+      # Since this part of Resourcelogic deals with another class, ActionController, we can't just start including things
+      # in ActionController itself. A lot of these module includes need to be triggered by the acts_as_resource method
+      # call. For example, you don't want to start adding in email validations and what not into a controller that has
+      # nothing to do with Resourcelogic.
       #
-      # That being said, this is your tool for extending Authlogic and "hooking" into the acts_as_authentic call.
+      # That being said, this is your tool for extending Resourcelogic and "hooking" into the acts_as_resource call.
       def add_acts_as_resource_module(mod, action = :append)
         modules = acts_as_resource_modules
         case action
@@ -61,7 +60,7 @@ module Resourcelogic # :nodoc:
         write_inheritable_attribute(:acts_as_resource_modules, modules)
       end
       
-      # This is the same as add_acts_as_authentic_module, except that it removes the module from the list.
+      # This is the same as add_acts_as_resource_module, except that it removes the module from the list.
       def remove_acts_as_resource_module(mod)
         write_inheritable_attribute(:acts_as_resource_modules, acts_as_resource_modules - [mod])
         acts_as_resource_modules

data/lib/resourcelogic/child.rb

@@ -46,11 +46,6 @@ module Resourcelogic
           base_parts.pop if base_parts.last.is_a?(Hash)
           base_parts
         end
-        
-        #def current_object_to_use(url_params)
-        #  result = (url_params.key?("#{model_name}_id".to_sym) && url_params["#{model_name}_id".to_sym]) || (id? && object)
-        #  result ? result : nil
-        #end
     end
   end
 end

data/lib/resourcelogic/parent.rb

@@ -1,5 +1,7 @@
 module Resourcelogic
   module Parent
+    class RequiredParentError < StandardError; end
+    
     def self.included(klass)
       klass.class_eval do
         extend Config
@@ -7,46 +9,44 @@ module Resourcelogic
         add_acts_as_resource_module(Reflection)
       end
     end
-    
+
     module Config
-      def belongs_to(name = nil, options = {})
+      def belongs_to(*args)
+        options = args.extract_options!
         @belongs_to ||= {}
-        if name.nil?
-          @belongs_to
-        else
-          @belongs_to[name.to_sym] = options
-        end
+        args.each { |name| @belongs_to[name.to_sym] = options }
+        @belongs_to
       end
-      
+
       def require_parent(value = nil)
         rw_config(:require_parent, value, false)
       end
     end
-    
+
     module Urls
       private
         def parent_url_parts(action = nil, url_params = {})
           [action] + contexts_url_parts + [url_params]
         end
-        
+
         def parent_collection_url_parts(*args)
           parent_url_parts(*args)
         end
     end
-    
+
     module Reflection
       def self.included(klass)
         klass.class_eval do
-          helper_method :parent?, :parent_model_name, :parent_object
+          helper_method :parent?, :parent_model_name, :parent
           before_filter :require_parent
         end
       end
-      
+
       private
         def belongs_to
           self.class.belongs_to
         end
-        
+
         def parent_path_name
           return @parent_path_name if defined?(@parent_path_name)
           path_parts = request.path.split("/")
@@ -58,7 +58,7 @@ module Resourcelogic
           end
           @parent_path_name = nil
         end
-        
+
         def parent_route_name
           return @parent_route_name if defined?(@parent_route_name)
           path_parts = request.path.split("/")
@@ -70,19 +70,19 @@ module Resourcelogic
           end
           @parent_route_name = parent_model_name
         end
-        
+
         # Returns the type of the current parent
         #
         def parent_model_name
           return @parent_model_name if defined?(@parent_model_name)
-          parent_from_path?
+          parent_from_path? || parent_from_params?
           @parent_model_name
         end
-        
+
         def parent_model
           @parent_model ||= parent_model_name.to_s.camelize.constantize
         end
-        
+
         # Returns the type of the current parent extracted form a request path
         #
         def parent_from_path?
@@ -99,44 +99,58 @@ module Resourcelogic
           end
           @parent_from_path = false
         end
-        
+
+        # Returns the type of the current parent extracted form the request parameters
+        #
+        def parent_from_params?
+          return @parent_from_params if defined?(@parent_from_params)
+          belongs_to.each do |model_name, options|
+            if params["#{model_name}_id".to_sym]
+              @parent_model_name = model_name
+              return @parent_from_params = true
+            end
+          end
+          @parent_from_params = false
+        end
+
         # Returns true/false based on whether or not a parent is present.
         #
         def parent?
           !parent_model_name.nil?
         end
-        
+
         # Returns true/false based on whether or not a parent is a singleton.
         #
         def parent_singleton?
           parent? && parent_id.nil?
         end
-        
+
         # Returns the current parent param, if there is a parent. (i.e. params[:post_id])
         def parent_id
           params["#{parent_route_name}_id".to_sym]
         end
-        
+
         # Returns the current parent object if a parent object is present.
         #
-        def parent_object(reload = false)
-          return @parent_object if !reload && defined?(@parent_object)
+        def parent(reload = false)
+          return @parent if !reload && defined?(@parent)
           if parent?
             if parent_singleton? && respond_to?("current_#{parent_model_name}", true)
-              @parent_object = send("current_#{parent_model_name}")
+              @parent = send("current_#{parent_model_name}")
             elsif parent_singleton? && parent_scope.respond_to?(parent_model_name)
-              @parent_object = parent_scope.send(parent_model_name, reload)
+              @parent = parent_scope.send(parent_model_name, reload)
             else
-              @parent_object = parent_scope.find(parent_id)
+              @parent = parent_scope.find(parent_id)
             end
           else
-            @parent_object = nil
+            @parent = nil
           end
         end
-        
+
         def require_parent
-          raise StandardError.new("A parent is required to access this resource and no parent was found") if !parent? && self.class.require_parent == true
+          raise RequiredParentError.new("A parent is required to access this resource and no parent was found") if !parent? && self.class.require_parent == true
         end
     end
   end
-end
+end
+

data/lib/resourcelogic/scope.rb

@@ -18,7 +18,7 @@ module Resourcelogic
           return @scope if defined?(@scope)
           
           if parent?
-            @scope = parent_object.send(parent_scope_name)
+            @scope = parent.send(parent_scope_name)
           else
             @scope = model
           end

data/lib/resourcelogic/self.rb

@@ -109,7 +109,7 @@ module Resourcelogic
 
         # The current paremter than contains the object identifier.
         def id # :doc:
-         params[:id]
+          params[:id]
         end
         
         def id?

data/lib/resourcelogic/singleton.rb

@@ -15,8 +15,8 @@ module Resourcelogic
         if singleton?
           if !parent? && respond_to?("current_#{model_name}", true)
             @object = send("current_#{model_name}")
-          elsif parent? && parent_object.send(model_name)
-            @object = parent_object.send(model_name)
+          elsif parent? && parent.send(model_name)
+            @object = parent.send(model_name)
           else
             super
           end
@@ -35,7 +35,7 @@ module Resourcelogic
       
       def scope
         if singleton? && parent?
-          parent_object
+          parent
         else
           super
         end

data/lib/resourcelogic/urligence.rb

@@ -1,7 +1,7 @@
 module Resourcelogic
   module Urligence
     def self.included(klass)
-      klass.helper_method :smart_url, :smart_path, :hash_for_smart_url, :hash_for_smart_path, :method_missing
+      klass.helper_method :smart_url, :smart_path, :method_missing
     end
     
     def smart_url(*url_parts)
@@ -18,35 +18,12 @@ module Resourcelogic
       urligence(*url_parts)
     end
     
-    def hash_for_smart_url(*url_parts)
-      urligence(*url_parts.unshift(:hash_for).push(:url).push({:type => :hash}))
-    end
-    
-    def hash_for_smart_path(*url_parts)
-      urligence(*url_parts.unshift(:hash_for).push(:path).push({:type => :hash}))
-    end
-    
     private
       def urligence(*url_parts)
         url_parts = cleanup_url_parts(url_parts)
         method_name_fragments = extract_method_name_fragments(url_parts)
         method_arguments = extract_method_arguments(url_parts)
-        
-        if url_parts.first != :hash_for
-          send method_name_fragments.join("_"), *method_arguments
-        else
-          url_params = method_arguments.extract_options!
-          params = {}
-          method_arguments.each_with_index do |obj, i|
-            key = i == (method_arguments.size - 1) ?
-              :id :
-              (obj.is_a?(Array) ? "#{obj.first}_id".to_sym : "#{obj.class.name.underscore}_id".to_sym)
-            params.merge!((obj.is_a?(Array)) ? {key => obj[1].to_param} : {key => obj.to_param})
-          end
-          
-          params.merge!(url_params)
-          send method_name_fragments.join("_"), params
-        end
+        send method_name_fragments.join("_"), *method_arguments
       end
       
       # The point of this method is to replace any object if a url param is passed. For example:
@@ -81,22 +58,32 @@ module Resourcelogic
             # It's not an array, just copy it over
             new_url_parts << object
           else
-            # Let's try to 
             klass = object.first.to_s.camelize.constantize rescue nil
-            #klass_name = klass ? klass.name.underscore : nil
             params_key = "#{object.first}_id".to_sym
+            
             obj = if url_params.key?(params_key)
-              (!klass && url_params[params_key]) || (url_params[params_key] && klass.find(url_params.delete(params_key)))
+              if !klass
+                url_params[params_key]
+              elsif url_params[params_key]
+                klass.find(url_params.delete(params_key)
+              end
             else
               object[1]
             end
+            
             new_url_parts << [object.first, obj]
-            #new_url_parts << (obj.nil? ? object.first.to_s.pluralize.to_sym : [object.first, obj])
           end
         end
         new_url_parts
       end
       
+      # Extracts the parts from the url_parts that make up the method name
+      #
+      #   [:admin, [:user, user_object], :path]
+      #
+      # to:
+      #
+      #   [:admin, :user, :path]
       def extract_method_name_fragments(url_parts)
         fragments = url_parts.collect do |obj|
           if obj.is_a?(Symbol)
@@ -110,10 +97,29 @@ module Resourcelogic
         fragments.compact
       end
       
+      # Extracts the parts from url_parts that make up the method arguments
+      #
+      #   [:admin, [:user, user_object], :path]
+      #
+      # to:
+      #
+      #   [user_object]
       def extract_method_arguments(url_parts)
         url_parts.flatten.select { |obj| !obj.is_a?(Symbol) }
       end
       
+      # Dynamically generate url methods for better flexibility. This allows us to not only call the standard urls:
+      #
+      #   edit_object_path
+      #   object_path
+      #
+      # but also be able to call custom method paths:
+      #
+      #   select_object_path
+      #
+      # Where select is a method added yourself:
+      #
+      #   map.resources :users, :member => {:select => :any}
       def method_missing(method, *args, &block)
         if method.to_s =~ /^((.*)_)?(child_collection|parent_collection|sibling|sibling_collection)_(path|url)$/ || method.to_s =~ /^((.*)_)?(child|collection|object|parent)_(path|url)$/
           action = $2.blank? ? nil : $2.to_sym

data/resourcelogic.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{resourcelogic}
-  s.version = "0.12.2"
+  s.version = "0.12.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2009-07-16}
+  s.date = %q{2009-08-12}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -14,7 +17,6 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
-     "CHANGELOG.rdoc",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -28,7 +30,6 @@ Gem::Specification.new do |s|
      "lib/resourcelogic/base.rb",
      "lib/resourcelogic/child.rb",
      "lib/resourcelogic/context.rb",
-     "lib/resourcelogic/context_options.rb",
      "lib/resourcelogic/failable_action_options.rb",
      "lib/resourcelogic/parent.rb",
      "lib/resourcelogic/response_collector.rb",
@@ -44,7 +45,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{resourcelogic}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Removes the need to namespace controllers by adding context and relative url functions among other things.}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resourcelogic
 version: !ruby/object:Gem::Version 
-  version: 0.12.2
+  version: 0.12.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-16 00:00:00 -04:00
+date: 2009-08-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
-- CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -47,7 +46,6 @@ files:
 - lib/resourcelogic/base.rb
 - lib/resourcelogic/child.rb
 - lib/resourcelogic/context.rb
-- lib/resourcelogic/context_options.rb
 - lib/resourcelogic/failable_action_options.rb
 - lib/resourcelogic/parent.rb
 - lib/resourcelogic/response_collector.rb
@@ -82,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: resourcelogic
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Removes the need to namespace controllers by adding context and relative url functions among other things.

data/CHANGELOG.rdoc

@@ -1,3 +0,0 @@
-== 0.0.9
-
-* Initial release, beta.

data/lib/resourcelogic/context_options.rb

@@ -1,5 +0,0 @@
-module Resourcelogic
-  class ContextOptions
-    extend Resourcelogic::Accessors
-  end
-end