resourcelogic 0.0.12 → 0.9.0

data/lib/resourcelogic/urligence.rb

@@ -1,60 +1,57 @@
 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
+    def smart_url(*objects)
+      url_params = objects.extract_options!
+      objects.push(:url)
+      objects.push(url_params)
+      urligence(*objects)
     end
-    
-    def smart_url(*url_parts)
-      url_params = url_parts.extract_options!
-      url_parts.push(:url)
-      url_parts.push(url_params)
-      urligence(*url_parts)
+  
+    def smart_path(*objects)
+      url_params = objects.extract_options!
+      objects.push(:path)
+      objects.push(url_params)
+      urligence(*objects)
     end
-    
-    def smart_path(*url_parts)
-      url_params = url_parts.extract_options!
-      url_parts.push(:path)
-      url_parts.push(url_params)
-      urligence(*url_parts)
+  
+    def hash_for_smart_url(*objects)
+      urligence(*objects.unshift(:hash_for).push(:url).push({:type => :hash}))
     end
-    
-    def hash_for_smart_url(*url_parts)
-      urligence(*url_parts.unshift(:hash_for).push(:url).push({:type => :hash}))
+  
+    def hash_for_smart_path(*objects)
+      urligence(*objects.unshift(:hash_for).push(:path).push({:type => :hash}))
     end
+  
+    def urligence(*objects)
+      objects = cleanup_url_objects(objects)
+      url_fragments = extract_url_fragments(objects)
+      url_objects = extract_url_objects(objects)
     
-    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
+      begin
+        if objects.first != :hash_for
+          send url_fragments.join("_"), *url_objects
         else
-          url_params = method_arguments.extract_options!
+          url_params = url_objects.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)
+          url_objects.each_with_index do |obj, i|
+            key = i == (url_objects.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
+          send url_fragments.join("_"), params
         end
+      rescue NoMethodError
+        raise objects.inspect
       end
-      
+    end
+  
+    private
       # The point of this method is to replace any object if a url param is passed. For example:
       #
-      #   [:admin, [:user, user_object], {:user_id => 4}]
+      #   [:user, user_object], {:user_id => 4}
       #
-      # The "user_object" should be replaced by user with id 4, since we are explicitly saying we want to use User.find(4).
-      # The last part is the url_params.
+      # The "user_object" should be replaced by user with id 4.
       #
       # This also pluralizes path names if the obj is nil. Example:
       #
@@ -70,35 +67,31 @@ module Resourcelogic
       #   payments/credit_cards
       #
       # You can manage and select a credit card from the credit cards resource but a payment object
-      # is not needed. In a sense you are just creating a "payments" context.
-      def cleanup_url_parts(url_parts)
-        url_parts = url_parts.compact
-        url_params = url_parts.last.is_a?(Hash) ? url_parts.last : {}
-        new_url_parts = []
-        
-        url_parts.each do |object|
+      # is not needed.
+      def cleanup_url_objects(objects)
+        objects = objects.compact
+        url_params = objects.last.is_a?(Hash) ? objects.last : {}
+        non_symbol_object_total = objects.select { |object| !object.is_a?(Symbol) }.size - 1
+        non_symbol_object_count = 0
+        new_objects = []
+        objects.each do |object|
+          non_symbol_object_count += 1 if !object.is_a?(Symbol)
           if !object.is_a?(Array)
-            # It's not an array, just copy it over
-            new_url_parts << object
+            new_objects << 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)))
-            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])
+            klass_name = klass ? klass.name.underscore : nil
+            key = (non_symbol_object_count == non_symbol_object_total) ? :id : "#{object.first}_id".to_sym
+            obj = (url_params.key?(key) ? ((!klass && url_params[key]) || (url_params[key] && klass.find(url_params.delete(key)))) : object[1])
+            new_objects << (obj.nil? ? object.first.to_s.pluralize.to_sym : [object.first, obj])
           end
         end
-        new_url_parts
+        new_objects
       end
-      
-      def extract_method_name_fragments(url_parts)
-        fragments = url_parts.collect do |obj|
+  
+  
+      def extract_url_fragments(objects)
+        fragments = objects.collect do |obj|
           if obj.is_a?(Symbol)
             obj
           elsif obj.is_a?(Array)
@@ -109,20 +102,9 @@ module Resourcelogic
         end
         fragments.compact
       end
-      
-      def extract_method_arguments(url_parts)
-        url_parts.flatten.select { |obj| !obj.is_a?(Symbol) }
-      end
-      
-      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
-          target = $3
-          url_type = $4
-          send("smart_#{url_type}", *send("#{target}_url_parts", action, *args))
-        else
-          super
-        end
+    
+      def extract_url_objects(objects)
+        objects.flatten.select { |obj| !obj.is_a?(Symbol) }
       end
   end
 end

data/lib/resourcelogic/version.rb

@@ -0,0 +1,51 @@
+module Resourcelogic # :nodoc:
+  # A class for describing the current version of a library. The version
+  # consists of three parts: the +major+ number, the +minor+ number, and the
+  # +tiny+ (or +patch+) number.
+  class Version
+    include Comparable
+  
+    # A convenience method for instantiating a new Version instance with the
+    # given +major+, +minor+, and +tiny+ components.
+    def self.[](major, minor, tiny)
+      new(major, minor, tiny)
+    end
+
+    attr_reader :major, :minor, :tiny
+
+    # Create a new Version object with the given components.
+    def initialize(major, minor, tiny)
+      @major, @minor, @tiny = major, minor, tiny
+    end
+
+    # Compare this version to the given +version+ object.
+    def <=>(version)
+      to_i <=> version.to_i
+    end
+
+    # Converts this version object to a string, where each of the three
+    # version components are joined by the '.' character. E.g., 2.0.0.
+    def to_s
+      @to_s ||= [@major, @minor, @tiny].join(".")
+    end
+
+    # Converts this version to a canonical integer that may be compared
+    # against other version objects.
+    def to_i
+      @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
+    end
+    
+    def to_a
+      [@major, @minor, @tiny]
+    end
+
+    MAJOR = 0
+    MINOR = 9
+    TINY  = 0
+
+    # The current version as a Version instance
+    CURRENT = new(MAJOR, MINOR, TINY)
+    # The current version as a String
+    STRING = CURRENT.to_s
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: resourcelogic
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.9.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-28 00:00:00 -04:00
+date: 2009-04-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,49 +22,54 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.11.0
+    version: 
+description: Making an API a byproduct of good design.
 email: bjohnson@binarylogic.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
+- Manifest.txt
+- CHANGELOG.rdoc
 - README.rdoc
 files: 
-- .gitignore
 - CHANGELOG.rdoc
-- LICENSE
+- MIT-LICENSE
+- Manifest.txt
 - README.rdoc
 - Rakefile
-- VERSION.yml
 - init.rb
 - lib/resourcelogic.rb
 - lib/resourcelogic/accessors.rb
 - lib/resourcelogic/action_options.rb
 - lib/resourcelogic/actions.rb
-- lib/resourcelogic/aliases.rb
 - 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
-- lib/resourcelogic/scope.rb
 - lib/resourcelogic/self.rb
 - lib/resourcelogic/sibling.rb
 - lib/resourcelogic/singleton.rb
-- lib/resourcelogic/sub_views.rb
 - lib/resourcelogic/urligence.rb
-- resourcelogic.gemspec
+- lib/resourcelogic/version.rb
 has_rdoc: true
 homepage: http://github.com/binarylogic/resourcelogic
-licenses: []
-
 post_install_message: 
 rdoc_options: 
-- --charset=UTF-8
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -82,9 +87,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: resourcelogic
-rubygems_version: 1.3.4
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
-summary: Removes the need to namespace controllers by adding context and relative url functions among other things.
+specification_version: 2
+summary: Making an API a byproduct of good design.
 test_files: []
 

data/.gitignore

@@ -1,7 +0,0 @@
-.DS_Store
-*.log
-*.sqlite3
-pkg/*
-coverage/*
-doc/*
-benchmarks/*

data/VERSION.yml

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

data/lib/resourcelogic/aliases.rb

@@ -1,134 +0,0 @@
-module Resourcelogic
-  # This module let's you define various aliases for your controller. For example,
-  # lets say you have the following routes:
-  #
-  #   /account/addresses        => UsersController
-  #   /admin/users/5/addresses  => UsersController
-  #
-  # Here is how your AddressesController would look:
-  #
-  #   class AddressesController < ResourceController
-  #     belongs_to :user
-  #   end
-  #
-  # The problem is that sometimes the parent object is called user, sometimes its
-  # called account. So the solution is to do:
-  #
-  #   class ResourceController < ApplicationController
-  #     route_alias :account, :user
-  #   end
-  #
-  # Now ResourceLogic knows that when it see account in the URL it will know the grab
-  # the User model.
-  #
-  # Now I know an alternative could be to do somethig like:
-  #
-  #   belongs_to :user, :alias => :account
-  #
-  # The above presents a problem. Take the following URL:
-  #
-  #   /productos/1/pictures/4/comments
-  #
-  # In order for Resourcelogic to do its magic relative URLs, it needs to know what
-  # model "productos" should be using. Which should be the Product model, yet we
-  # can't define that in the CommentsController because it's 2 levels above, and we
-  # only specify the parent.
-  #
-  # Now a lot of people say you should never nest more than 2 levels deep, and this
-  # is absolutely true 95% of the time. But what if I want to link back to the parent
-  # object from the comments controller and preserve it's context? In order to do
-  # this I have to go 3 levels deep, because maybe context for the PicturesController
-  # is really important / required. The only way to preserve context is with the URL.
-  #
-  # Sorry for rambling, this documentation is really more of an internal note for me
-  # and to hopefully clarify why I took this approach.
-  module Aliases
-    def self.included(klass)
-      klass.class_eval do
-        extend Config
-        include InstanceMethods
-      end
-    end
-    
-    module Config
-      def path_alias(alias_name, model_name)
-        current_aliases = path_aliases
-        model_name = model_name.to_sym
-        current_aliases[model_name] ||= []
-        current_aliases[model_name] << alias_name.to_sym
-        write_inheritable_attribute(:path_aliases, current_aliases)
-      end
-
-      def path_aliases
-        read_inheritable_attribute(:path_aliases) || {}
-      end
-      
-      def route_alias(alias_name, model_name)
-        current_aliases = route_aliases
-        model_name = model_name.to_sym
-        current_aliases[model_name] ||= []
-        current_aliases[model_name] << alias_name.to_sym
-        write_inheritable_attribute(:route_aliases, current_aliases)
-      end
-
-      def route_aliases
-        read_inheritable_attribute(:route_aliases) || {}
-      end
-    end
-    
-    module InstanceMethods
-      private
-        def model_name_from_route_alias(alias_name)
-          route_aliases.each do |model_name, aliases|
-            return model_name if aliases.include?(alias_name.to_sym)
-          end
-          nil
-        end
-      
-        def route_aliases
-          self.class.route_aliases
-        end
-        
-        def model_name_from_path_alias(alias_name)
-          path_aliases.each do |model_name, aliases|
-            return model_name if aliases.include?(alias_name.to_sym)
-          end
-          nil
-        end
-      
-        def path_aliases
-          self.class.path_aliases
-        end
-        
-        def possible_model_names(model_name)
-          [model_name] + (route_aliases[model_name] || []) + (path_aliases[model_name] || [])
-        end
-        
-        # The point of this method is to determine what the part of a url is really referring to.
-        # For example, let's say you did this:
-        #
-        #   map.resources :users, :as => :accounts
-        #
-        # Resource logic looks at the request.path. It's going to see "accounts" in the urls. How
-        # is it to know that by "accounts" you are referring to the "users" resource. That's the
-        # point of this method, to say "hey, accounts is mapped to users".
-        def model_name_from_path_part(part)
-          part = part.to_s.singularize
-          model_name_from_route_alias(part) || model_name_from_path_alias(part) || part.to_sym
-        end
-        
-        # The point of this method is to determine the name used in the route method. For example,
-        # let's say you did this:
-        #
-        #   map.resources :accounts, :controller => "users"
-        #
-        # You would want to use "account" in your path and url helper, not "user".
-        def route_name_from_path_part(part)
-          part = part.to_s.singularize
-          model_name = model_name_from_path_alias(part)
-          return model_name if model_name
-          part.to_sym
-        end
-    end
-  end
-end