nested-resources 0.0.2 → 0.0.3

data/README.rdoc

@@ -10,11 +10,11 @@ In Items controller.
 You can write controller like this.
 
  class ItemsController < ApplicationController
-   nested_controller :user # nested resource
+   nested_resources :user # nested resource
 
    def index
-     @user = nested(User) # find nested resource instance
-     @domains = @user.domains 
+     @user = nested.instance(User) # find nested resource instance
+     @items = @user.items
    
      respond_to do |format|
        format.html # index.html.erb
@@ -32,7 +32,7 @@ In views.
 
 In form view.
 
- <%= form_for(nested(@item)) do |f| %> => [@user, @item]
+ <%= form_for(nested.resource(@item)) do |f| %> => [@user, @item]
    ...
  <% end %> 
 
@@ -50,12 +50,20 @@ Run bundle install
 
 Has nested path?
 
- nested? User
+ nested?(:user)
  => true or false
 
 Deep nested resources like /users/1/items/2/comments
 
  nested_resources [:user, :item]
 
+Recursive resources
+
+ resources :users, :as => "parents" do
+   resources :users
+ end
+
+ nested_resources :user => :parent
+
 
 This project rocks and uses MIT-LICENSE.

data/Rakefile

@@ -7,19 +7,21 @@ rescue LoadError
 end
 
 require 'rake'
-require 'rake/rdoctask'
 
-require 'rake/testtask'
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-task :default => :test
+task :default => :spec
 
+require 'rake/rdoctask'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Nested-resources'

data/lib/nested-resources/nested-resources.rb

@@ -6,29 +6,35 @@ module NestedResources
     attr_reader :controller
     attr_reader :resources
 
-    def initialize(params, resources)
+    def initialize(params, *resources)
       @controller = params[:controller].split('/').last
       @given = {}
       @given_id = {}
       resources = [] if resources.blank?
-      resources = [resources] unless resources.is_a?(Array)
-      @resources  = resources.map{|v|
-        v = v.to_s.underscore if v.is_a?(Class)
-        v.to_sym
-      }
+      parse(resources)
       params.each { |k,v|
-        @resources.each{|resource|
-          key = (resource.to_s+"_id").to_sym
-          @given_id[resource]= v if key == k.to_sym
+        @resources.each{|resource, resource_id|
+          @given_id[resource]= v if resource_id == k.to_sym
         } 
       }
     end
 
+    def parse(resource)
+      @resources ||= {}
+      if resource.is_a?(Array)
+        resource.each{|v| parse(v) }
+      elsif resource.is_a?(Hash)
+        resource.each{|k, v| @resources[k.to_sym] = (v.to_s.underscore+"_id").to_sym}
+      else
+        @resources[resource.to_sym] = (resource.to_s.underscore+"_id").to_sym
+      end
+    end
+
     def path(original_path)
       original_path.split('/').map { |path|
         if path==controller
           respath=""
-          @resources.each { |resource|
+          @resources.each { |resource, resource_id|
             respath += resource.to_s.pluralize+"/"+@given_id[resource].to_s+"/" unless @given_id[resource].blank?
           }
           respath+path
@@ -43,7 +49,7 @@ module NestedResources
       result = []
       res.each_index { |i|
         if i==res.length-1
-          @resources.each{ |resource|
+          @resources.each{ |resource, resource_id|
             result.push instance(resource) unless @given_id[resource].blank?
           }
         end
@@ -56,12 +62,12 @@ module NestedResources
     alias_method :resources, :object
 
     def instance(name)
-      name = name.to_s.underscore if name.is_a?(Class)
-      @given[name.to_sym] ||= eval(name.to_s.camelize).find(@given_id[name.to_sym])
+      name = name.to_s.underscore
+      @given[name.to_sym] ||= name.to_s.camelize.constantize.find(@given_id[name.to_sym])
     end
 
     def exists?(name)
-      name = name.to_s.underscore if name.is_a?(Class)
+      name = name.to_s.underscore
       !!@given_id[name.to_sym]
     end
 

data/lib/nested-resources.rb

@@ -6,16 +6,18 @@ module NestedResources
   module NestedResourcesHelper
     def nested(obj = nil)
       if obj.is_a?(Class)
-        @nested.instance(obj)
+        @nested_resources.instance(obj)
+      elsif obj.is_a?(String)
+        @nested_resources.path(obj)
       elsif obj
-        @nested.path(obj)
+        @nested_resources.resources(obj)
       else
-        @nested
+        @nested_resources
       end
     end
 
     def nested?(obj)
-      @nested.exists?(obj)
+      @nested_resources.exists?(obj)
     end
   end
 end
@@ -35,7 +37,7 @@ class ActionController::Base
   def nested_resources_filter
     resources = self.class.read_inheritable_attribute(:nested_resources)
     return if resources.blank?
-    @nested = NestedResources::NestedResources.new(params, resources)
+    @nested_resources = NestedResources::NestedResources.new(params, resources)
   end
 
 end

metadata

@@ -2,7 +2,7 @@
 name: nested-resources
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: []
 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 Z
+date: 2011-05-17 00:00:00 Z
 dependencies: []
 
 description: Resolve Rails3 nested resources.