resource_awareness 0.0.3 → 0.0.4

data/lib/rails/resource.rb

@@ -1,17 +1,35 @@
 module Rails
   class Resource
-    
-    attr_accessor :name, :singular_name, :id, :route, :controller_name, :controller, :name_prefix
-    
+    attr_accessor :id, :name, :singular_name, :controller_name, :name_prefix, :path_prefix, :home_route
+
     def initialize(entity, scope, options)
       self.name_prefix = scope[:name_prefix]
       self.name = entity.to_s
       self.singular_name = name.singularize
       self.id = [name_prefix, name].compact.join('_')
-      self.route = Rails.application.routes.named_routes[id]
-      self.controller_name = route.defaults[:controller]
-      self.controller = (controller_name + '_controller').camelize.constantize
+      self.home_route = Rails.application.routes.named_routes[id]
+      self.path_prefix = home_route.path.sub("/#{name}(.:format)", '')
+      self.path_prefix = nil if path_prefix.blank?
+      self.controller_name = home_route.requirements[:controller]
+    end
+    
+    def path
+      path_prefix ? "#{path_prefix}/#{name}" : "/#{name}"
     end
     
+    def attributes
+      {
+        :id => id,
+        :name => name,
+        :singular_name => singular_name,
+        :path_prefix => path_prefix,
+        :path => path,
+        :controller_name => controller_name
+      }
+    end
+    
+    def to_xml
+      attributes.to_xml
+    end
   end
 end

data/lib/rails/singleton_resource.rb

@@ -1,5 +1,4 @@
 module Rails
   class SingletonResource < Resource
-    
   end
 end

data/lib/resource_awareness/action_controller_extensions.rb

@@ -1,11 +1,7 @@
 require 'action_controller/base'
 
 class ActionController::Base
-  class << self
-    
-    def resource
-      @resource ||= Rails.application.resources.find { |r| r.controller == self }
-    end
-    
+  def resource
+    @resource ||= Rails.application.resources.find { |r| r.controller_name == self.controller_name }
   end
 end

data/lib/resource_awareness/application_extensions.rb

@@ -2,11 +2,9 @@ require 'rails/application'
 
 module ResourceAwareness
   module ApplicationExtensions
-    
     def resources
       @resources ||= []
     end
-    
   end
 end
 

data/lib/resource_awareness/mapper_extensions.rb

@@ -4,33 +4,27 @@ require 'rails/singleton_resource'
 
 module ResourceAwareness
   module MapperExtensions
-    
     def resources(*entities, &block)
       super
       options = entities.extract_options!
-      return unless leaf_call?(entities, options)
-      Rails.application.resources << Rails::Resource.new(entities.first, @scope, options)
+      Rails.application.resources << Rails::Resource.new(entities.first, @scope, options) if leaf_call?(entities, options)
     end
-    
+
     def resource(*entities, &block)
       super
       options = entities.extract_options!
-      return unless leaf_call?(entities, options)
-      Rails.application.resources << Rails::SingletonResource.new(entities.first, @scope, options)
+      Rails.application.resources << Rails::SingletonResource.new(entities.first, @scope, options) if leaf_call?(entities, options)
     end
-    
+
     private
-    
+
     # the resource(s) methods call themselves recursively in certain conditions
     # (see the Mapper#apply_common_behavior_for method for details)
     # this method returns true only if this is a 'leaf call' (a call that doesn't call itself again)
+    # TODO: there should be a better way to determine this
     def leaf_call?(entities, options)
-      return false if @scope[:scope_level] == :resources
-      return false if entities.length > 1
-      return false if options[:path_names]
-      true
+      !(@scope[:scope_level] == :resources || entities.length > 1 || options[:path_names])
     end
-    
   end
 end
 

data/lib/resource_awareness/railtie.rb

@@ -3,22 +3,22 @@ require 'rails'
 
 module ResourceAwareness
   class Railtie < Rails::Railtie
-    
+
     initializer 'resource_awareness.extend_application' do
       require 'resource_awareness/application_extensions'
     end
-    
+
     initializer 'resource_awareness.extend_mapper' do
       require 'resource_awareness/mapper_extensions'
     end
-    
+
     initializer 'resource_awareness.extend_action_controller' do
       require 'resource_awareness/action_controller_extensions'
     end
-    
+
     rake_tasks do
       load 'tasks/resource_awareness.rake'
     end
-    
+
   end
 end

data/lib/tasks/resource_awareness.rake

@@ -1,4 +1,4 @@
 task :resources => :environment do
-  widest_route_id = Rails.application.resources.collect(&:id).max
-  puts Rails.application.resources.collect { |r| "%-#{widest_route_id.length + 20}s%s" % [r.id, r.route.path.sub('(.:format)', '')] }
+  width_of_widest_route_id = Rails.application.resources.collect(&:id).max.length
+  puts Rails.application.resources.collect { |r| "%-#{width_of_widest_route_id + 20}s%s" % [r.id, r.path] }
 end                                                          

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Ingo Weiss
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +02:00
+date: 2010-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: |
-  Makes a Rails application's resources (as defined via the 'resource(s)' routing DSL methods) available as Rails.application.resources
+  Makes information about a Rails application's resources (as defined via the 'resource(s)' routing DSL methods) available via Rails.application.resources
 
 email: ingo@ingoweiss.com
 executables: []
@@ -74,10 +74,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: "[none]"
+rubyforge_project: 
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Make Rails aware of it's resources
+summary: Makes Rails applications aware of their resources
 test_files: []