josevalim-inherited_resources 0.8.2 → 0.8.3

data/Rakefile

@@ -2,6 +2,22 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "inherited_resources"
+    s.rubyforge_project = "inherited_resources"
+    s.summary = "Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important."
+    s.email = "jose.valim@gmail.com"
+    s.homepage = "http://github.com/josevalim/inherited_resources"
+    s.description = "Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important."
+    s.authors = ['José Valim']
+    s.files =  FileList["[A-Z]*", "{lib}/**/*"]
+  end
+rescue LoadError
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+
 desc 'Run tests for InheritedResources.'
 Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'

data/VERSION

@@ -0,0 +1 @@
+0.8.3

data/lib/inherited_resources.rb

@@ -6,24 +6,13 @@ require File.join(File.dirname(__FILE__), 'inherited_resources', 'respond_to')
 module InheritedResources; end
 
 class ActionController::Base
-  class << self
-    # If you cannot inherit from InheritedResources::Base you can call
-    # inherit_resource or resource_controller in your controller to have all
-    # the required modules and funcionality included.
-    #
-    def inherit_resources
-      include InheritedResources::Actions
-      include InheritedResources::BaseHelpers
-      extend  InheritedResources::ClassMethods
-      extend  InheritedResources::UrlHelpers
-
-      helper_method :collection_url, :collection_path, :resource_url, :resource_path,
-                    :new_resource_url, :new_resource_path, :edit_resource_url, :edit_resource_path,
-                    :resource, :collection, :resource_class
-
-      initialize_resources_class_accessors!
-      create_resources_url_helpers!
-    end
-    alias :resource_controller :inherit_resources
+  # If you cannot inherit from InheritedResources::Base you can call
+  # inherit_resource in your controller to have all the required modules and
+  # funcionality included.
+  #
+  def self.inherit_resources
+    InheritedResources::Base.inherit_resources(self)
+    initialize_resources_class_accessors!
+    create_resources_url_helpers!
   end
 end

data/lib/inherited_resources/actions.rb

@@ -29,7 +29,7 @@ module InheritedResources
     alias :edit! :edit
 
     # POST /resources
-    def create(redirect_url=nil, &block)
+    def create(&block)
       object = build_resource
       respond_block, redirect_block = select_block_by_arity(block)
 
@@ -52,7 +52,7 @@ module InheritedResources
     alias :create! :create
 
     # PUT /resources/1
-    def update(redirect_url=nil, &block)
+    def update(&block)
       object = resource
       respond_block, redirect_block = select_block_by_arity(block)
 
@@ -76,7 +76,7 @@ module InheritedResources
     alias :update! :update
 
     # DELETE /resources/1
-    def destroy(redirect_url=nil, &block)
+    def destroy(&block)
       resource.destroy
       respond_block, redirect_block = select_block_by_arity(block)
 

data/lib/inherited_resources/base.rb

@@ -11,19 +11,29 @@ module InheritedResources
   class Base < ::ApplicationController
     unloadable
 
-    include InheritedResources::Actions
-    include InheritedResources::BaseHelpers
-    extend  InheritedResources::ClassMethods
-    extend  InheritedResources::UrlHelpers
+    # Overwrite inherit_resources to add specific InheritedResources behavior.
+    #
+    def self.inherit_resources(base)
+      base.class_eval do
+        include InheritedResources::Actions
+        include InheritedResources::BaseHelpers
+        extend  InheritedResources::ClassMethods
+        extend  InheritedResources::UrlHelpers
 
-    helper_method :collection_url, :collection_path, :resource_url, :resource_path,
-                  :new_resource_url, :new_resource_path, :edit_resource_url, :edit_resource_path,
-                  :resource, :collection, :resource_class
+        helper_method :collection_url, :collection_path, :resource_url, :resource_path,
+                      :new_resource_url, :new_resource_path, :edit_resource_url, :edit_resource_path,
+                      :resource, :collection, :resource_class
 
-    def self.inherited(base) #:nodoc:
-      super(base)
-      base.send :initialize_resources_class_accessors!
-      base.send :create_resources_url_helpers!
+        base.with_options :instance_writer => false do |c|
+          c.class_inheritable_accessor :resource_class
+          c.class_inheritable_array :parents_symbols
+          c.class_inheritable_hash :resources_configuration, :scopes_configuration
+        end
+
+        protected :resource_class, :parents_symbols, :resources_configuration, :scopes_configuration
+      end
     end
+
+    inherit_resources(self)
   end
 end

data/lib/inherited_resources/class_methods.rb

@@ -1,7 +1,4 @@
 module InheritedResources
-  RESOURCES_CLASS_ACCESSORS = [ :resource_class, :resources_configuration,
-                                :parents_symbols, :scopes_configuration ] unless self.const_defined?(:RESOURCES_CLASS_ACCESSORS)
-
   module ClassMethods
 
     protected
@@ -293,19 +290,6 @@ module InheritedResources
       # Initialize resources class accessors and set their default values.
       #
       def initialize_resources_class_accessors! #:nodoc:
-        # Add and protect class accessors
-        metaklass = (class << self; self; end)
-
-        RESOURCES_CLASS_ACCESSORS.each do |cattr|
-          cattr_accessor "#{cattr}", :instance_writer => false
-
-          # Protect instance methods
-          self.send :protected, cattr
-
-          # Protect class writer
-          metaklass.send :protected, "#{cattr}="
-        end
-
         # Initialize resource class
         self.resource_class = begin
           self.controller_name.classify.constantize
@@ -314,7 +298,7 @@ module InheritedResources
         end
 
         # Initialize resources configuration hash
-        self.resources_configuration = {}
+        self.resources_configuration ||= {}
         config = self.resources_configuration[:self] = {}
         config[:collection_name] = self.controller_name.to_sym
         config[:instance_name]   = self.controller_name.singularize.to_sym
@@ -327,9 +311,17 @@ module InheritedResources
         config[:route_prefix] = namespaces.join('_') unless namespaces.empty?
 
         # Initialize polymorphic, singleton, scopes and belongs_to parameters
-        self.parents_symbols      = []
-        self.scopes_configuration = {}
-        self.resources_configuration[:polymorphic] = { :symbols => [], :optional => false }
+        self.parents_symbols      ||= []
+        self.scopes_configuration ||= {}
+        self.resources_configuration[:polymorphic] ||= { :symbols => [], :optional => false }
+      end
+
+      # Hook called on inheritance.
+      #
+      def inherited(base) #:nodoc:
+        super(base)
+        base.send :initialize_resources_class_accessors!
+        base.send :create_resources_url_helpers!
       end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-inherited_resources
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-28 00:00:00 -07:00
+date: 2009-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -26,7 +26,7 @@ files:
 - MIT-LICENSE
 - README
 - Rakefile
-- init.rb
+- VERSION
 - lib/inherited_resources.rb
 - lib/inherited_resources/actions.rb
 - lib/inherited_resources/base.rb
@@ -38,14 +38,12 @@ files:
 - lib/inherited_resources/polymorphic_helpers.rb
 - lib/inherited_resources/respond_to.rb
 - lib/inherited_resources/singleton_helpers.rb
-- lib/inherited_resources/spec.rb
 - lib/inherited_resources/url_helpers.rb
 has_rdoc: true
 homepage: http://github.com/josevalim/inherited_resources
 post_install_message: 
 rdoc_options: 
-- --main
-- README
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -65,69 +63,23 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Inherited Resources speeds up development by making your controllers inherit all restful actions so you just have to focus on what is important.
 test_files: 
-- test/aliases_test.rb
-- test/base_helpers_test.rb
+- test/respond_to_test.rb
+- test/customized_belongs_to_test.rb
+- test/nested_belongs_to_test.rb
 - test/base_test.rb
-- test/belongs_to_test.rb
+- test/redirect_to_test.rb
 - test/has_scope_test.rb
 - test/class_methods_test.rb
-- test/customized_belongs_to_test.rb
-- test/defaults_test.rb
+- test/aliases_test.rb
 - test/flash_test.rb
-- test/nested_belongs_to_test.rb
-- test/optional_belongs_to_test.rb
+- test/url_helpers_test.rb
+- test/base_helpers_test.rb
+- test/belongs_to_test.rb
 - test/polymorphic_test.rb
-- test/redirect_to_test.rb
-- test/respond_to_test.rb
+- test/defaults_test.rb
 - test/singleton_test.rb
+- test/optional_belongs_to_test.rb
 - test/test_helper.rb
-- test/url_helpers_test.rb
-- test/locales/en.yml
-- test/views/cities/edit.html.erb
-- test/views/cities/index.html.erb
-- test/views/cities/new.html.erb
-- test/views/cities/show.html.erb
-- test/views/comments/edit.html.erb
-- test/views/comments/index.html.erb
-- test/views/comments/new.html.erb
-- test/views/comments/show.html.erb
-- test/views/employees/edit.html.erb
-- test/views/employees/index.html.erb
-- test/views/employees/new.html.erb
-- test/views/employees/show.html.erb
-- test/views/managers/edit.html.erb
-- test/views/managers/new.html.erb
-- test/views/managers/show.html.erb
-- test/views/painters/edit.html.erb
-- test/views/painters/index.html.erb
-- test/views/painters/new.html.erb
-- test/views/painters/show.html.erb
-- test/views/pets/edit.html.erb
-- test/views/pets/index.html.erb
-- test/views/pets/new.html.erb
-- test/views/pets/show.html.erb
-- test/views/products/edit.html.erb
-- test/views/products/index.html.erb
-- test/views/products/new.html.erb
-- test/views/products/show.html.erb
-- test/views/professors/edit.html.erb
-- test/views/professors/index.html.erb
-- test/views/professors/new.html.erb
-- test/views/professors/show.html.erb
-- test/views/projects/index.html.erb
-- test/views/projects/index.json.erb
-- test/views/projects/respond_to_skip_default_template.html.erb
-- test/views/projects/respond_to_with_resource.html.erb
-- test/views/students/edit.html.erb
-- test/views/students/new.html.erb
-- test/views/trees/edit.html.erb
-- test/views/trees/index.html.erb
-- test/views/trees/new.html.erb
-- test/views/trees/show.html.erb
-- test/views/users/edit.html.erb
-- test/views/users/index.html.erb
-- test/views/users/new.html.erb
-- test/views/users/show.html.erb

data/init.rb

@@ -1 +0,0 @@
-require File.join(File.dirname(__FILE__), 'lib', 'inherited_resources')

data/lib/inherited_resources/spec.rb

@@ -1,75 +0,0 @@
-# This is a nasty rspec bug fix when using InheritedResources.
-# The bug exists on rspec <= 1.1.12 versions.
-#
-if defined?(Spec::Rails::Example::ControllerExampleGroup)
-  unless Spec::Rails::Example::ControllerExampleGroup.const_defined?('TemplateIsolationExtensions')
-
-    module Spec::Rails::Example
-      class ControllerExampleGroup < FunctionalExampleGroup
-        module ControllerInstanceMethods #:nodoc:
-
-          # === render(options = nil, deprecated_status_or_extra_options = nil, &block)
-          #
-          # This gets added to the controller's singleton meta class,
-          # allowing Controller Examples to run in two modes, freely switching
-          # from context to context.
-          def render(options=nil, deprecated_status_or_extra_options=nil, &block)
-            if ::Rails::VERSION::STRING >= '2.0.0' && deprecated_status_or_extra_options.nil?
-              deprecated_status_or_extra_options = {}
-            end
-
-            unless block_given?
-              unless integrate_views?
-                if @template.respond_to?(:finder)
-                  (class << @template.finder; self; end).class_eval do
-                    define_method :file_exists? do; true; end
-                  end
-                else
-                  (class << @template; self; end).class_eval do
-                    define_method :file_exists? do; true; end
-                  end
-                end
-
-                (class << @template; self; end).send :include, TemplateIsolationExtensions
-              end
-            end
-
-            if matching_message_expectation_exists(options)
-              render_proxy.render(options, &block)
-              @performed_render = true
-            else
-              if matching_stub_exists(options)
-                @performed_render = true
-              else
-                super(options, deprecated_status_or_extra_options, &block)
-              end
-            end
-          end
-        end
-
-        module TemplateIsolationExtensions
-          def render_file(*args)
-            @first_render ||= args[0] unless args[0] =~ /^layouts/
-            @_first_render ||= args[0] unless args[0] =~ /^layouts/
-          end
-
-          def _pick_template(*args)
-            @_first_render ||= args[0] unless args[0] =~ /^layouts/
-            PickedTemplate.new
-          end
-
-          def render(*args)
-            if @_rendered
-              opts = args[0]
-              (@_rendered[:template] ||= opts[:file]) if opts[:file]
-              (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial]
-            else
-              super
-            end
-          end
-        end
-      end
-    end
-
-  end
-end

data/test/locales/en.yml

@@ -1,17 +0,0 @@
-en:
-  flash:
-    addresses:
-      create:
-        notice: "You created a new address close to <b>{{reference}}</b>."
-      update:
-        notice: "Nice! {{resource_name}} was updated with success!"
-        error: "Oh no! We could not update your address!"
-    admin:
-      actions:
-        create:
-          notice: "Admin notice message."
-          error: "Admin error message."
-      addresses:
-        create:
-          notice: "Admin, you created a new address close to <b>{{reference}}</b>."
-

data/test/views/cities/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/cities/index.html.erb

@@ -1 +0,0 @@
-Index HTML

data/test/views/cities/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/cities/show.html.erb

@@ -1 +0,0 @@
-Show HTML

data/test/views/comments/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/comments/index.html.erb

@@ -1 +0,0 @@
-Index HTML

data/test/views/comments/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/comments/show.html.erb

@@ -1 +0,0 @@
-Show HTML

data/test/views/employees/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/employees/index.html.erb

@@ -1 +0,0 @@
-Index HTML

data/test/views/employees/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/employees/show.html.erb

@@ -1 +0,0 @@
-Show HTML

data/test/views/managers/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/managers/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/managers/show.html.erb

@@ -1 +0,0 @@
-Show HTML

data/test/views/painters/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/painters/index.html.erb

@@ -1 +0,0 @@
-Index HTML

data/test/views/painters/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/painters/show.html.erb

@@ -1 +0,0 @@
-Show HTML

data/test/views/pets/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/pets/index.html.erb

@@ -1 +0,0 @@
-Index HTML

data/test/views/pets/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/pets/show.html.erb

@@ -1 +0,0 @@
-Show HTML

data/test/views/products/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/products/index.html.erb

@@ -1 +0,0 @@
-Index HTML

data/test/views/products/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/products/show.html.erb

@@ -1 +0,0 @@
-Show HTML

data/test/views/professors/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/professors/index.html.erb

@@ -1 +0,0 @@
-Index HTML

data/test/views/professors/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/professors/show.html.erb

@@ -1 +0,0 @@
-Show HTML

data/test/views/projects/index.html.erb

@@ -1 +0,0 @@
-Index HTML

data/test/views/projects/index.json.erb

@@ -1 +0,0 @@
-Index JSON

data/test/views/projects/respond_to_skip_default_template.html.erb

@@ -1 +0,0 @@
-DefaultTemplate HTML

data/test/views/projects/respond_to_with_resource.html.erb

@@ -1 +0,0 @@
-RespondTo HTML

data/test/views/students/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/students/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/trees/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/trees/index.html.erb

@@ -1 +0,0 @@
-Index HTML

data/test/views/trees/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/trees/show.html.erb

@@ -1 +0,0 @@
-Show HTML

data/test/views/users/edit.html.erb

@@ -1 +0,0 @@
-Edit HTML

data/test/views/users/index.html.erb

@@ -1 +0,0 @@
-Index HTML

data/test/views/users/new.html.erb

@@ -1 +0,0 @@
-New HTML

data/test/views/users/show.html.erb

@@ -1 +0,0 @@
-Show HTML