dry_crud 1.3.1 → 1.4.0

data/README.rdoc

@@ -19,7 +19,7 @@ To integrate DRY CRUD into your code, only a few additions are required:
 * For uniform CRUD functionality, just subclass your controllers from +CrudController+. 
 * Overwrite the <tt>:to_s</tt> method of your models for a human-friendly representation in captions.
 
-Version 1.0 and higher are built for Rails 3. If you need a version for Rails 2.3, please get version 0.6.0 of the gem or go to the rails-2.3 branch on Github. DRY CRUD 1.3 is fully compatible with Ruby 1.8.7, Ruby 1.9.2 and JRuby.
+Version 1.4 and higher are built for Rails 3.1. As of Rails 3.1, views are inheritable as well, so a core functionality of DRY CRUD got into the Rails core itself. For Rails 3.0, use version 1.3.1 or refer to the rails-3.0 branch. If you need a version for Rails 2.3, please get version 0.6.0 of the gem or go to the rails-2.3 branch on Github. DRY CRUD 1.3 is fully compatible with Ruby 1.8.7, Ruby 1.9.2 and JRuby.
 
 == Overview
 
@@ -31,8 +31,6 @@ Enter DRY CRUD.
 The main idea of DRY CRUD is to concentrate basic functionality of your application, like CRUD actions, uniform formatting, forms and tables into specifically extendable units. DRY CRUD generates various foundation classes that you may freely adapt to your application's needs. For each model, you may transparently customize arbitrary parts or just fallback to the general behavior. This applies not only for controllers, but also for view templates and helpers. There is no black box your code depends on. You lay the foundation that fits your application best.
 </b>
 
-A core element of DRY CRUD is the +RenderInheritable+ module. This gives you inheritable views and partials. In the default case, a template is searched in the current controller's view folder. If it is not found there, the template with the same name in the view folder of the superclass controller is used. This lookup path might be customized as well. RenderInheritable is also available as a stand-alone gem at http://github.com/codez/render_inheritable.
-
 DRY CRUD is a Rails generator. All code resides in your application and is open for you to inspect and to extend. You may pick whatever you consider useful or adapt what is not sufficient. Even if you do not require any CRUD functionality, you might find some helpers simplifying your work. There are no runtime dependencies to the dry_crud gem. Having said this, DRY CRUD does not want to provide a maximum of functionality that requires a lot of configuration, but rather a clean and lightweight foundation to build your application's requirements upon. This is why DRY CRUD comes as a generator and not as a Rails plugin.
 
 DRY CRUD does not depend on any other plugins, but easily allows you to integrate them in order to unify the behavior of your CRUD controllers. You might even use the plugins mentioned above to adapt your generated +CrudController+ base class. All classes come with thorough tests that provide you with a solid foundation for implementing your own adaptions.
@@ -219,8 +217,6 @@ All generated files are supposed to provide a reasonable foundation for the CRUD
 
 {controller/list_controller.rb}[http://codez.ch/dry_crud/?q=ListController]:: Abstract controller providing a basic list action. There are two sub-modules that provide search and sort functionality for the table displayed in the list action. A third sub-module remembers the list parameters in order to return to an identical list.
 
-{controller/render_inheritable.rb}[http://codez.ch/dry_crud/?q=RenderInheritable]:: A controller enhancement that allows one to render inheritable views and partials. If no view file is found for the current controller, the corresponding file is looked up in its superclass hierarchy. Thus, only views or partials that look differently have to be overwritten.
-
 
 === Helpers:
 

data/Rakefile

@@ -1,13 +1,7 @@
 require 'rubygems'
-require "rake/testtask"
-require 'rake/gempackagetask' 
-require 'rake/rdoctask' 
-sdoc = begin 
-  require 'sdoc'
-  true
-rescue Exception
-  false
-end
+require 'rake/testtask'
+require 'rubygems/package_task' 
+require 'rdoc/task' 
 
 load 'dry_crud.gemspec'
 
@@ -49,6 +43,8 @@ namespace :test do
       unless File.exist?(TEST_APP_ROOT)
         sh "rails new #{TEST_APP_ROOT}"
         FileUtils.cp(File.join(File.dirname(__FILE__), 'test', 'templates', 'Gemfile'), TEST_APP_ROOT)
+        sh "cd #{TEST_APP_ROOT}; bundle install" # update Gemfile.lock
+        FileUtils.rm_f(File.join(TEST_APP_ROOT, 'test', 'performance', 'browsing_test.rb'))
       end
     end
       
@@ -96,7 +92,7 @@ task :site => :rdoc do
 end
 
 # :package task
-Rake::GemPackageTask.new(DRY_CRUD_GEMSPEC) do |pkg|
+Gem::PackageTask.new(DRY_CRUD_GEMSPEC) do |pkg|
   if Rake.application.top_level_tasks.include?('release')
     pkg.need_tar_gz = true 
     pkg.need_tar_bz2 = true 
@@ -107,11 +103,7 @@ end
 # :rdoc task
 Rake::RDocTask.new do |rdoc| 
   rdoc.title  = 'Dry Crud' 
-  rdoc.options << '--line-numbers' << '--inline-source'
-  if sdoc
-    rdoc.options << '--fmt' << 'shtml'
-    rdoc.template = 'direct'
-  end
+  rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include(*FileList.new('*') do |list|
     list.exclude(/(^|[^.a-z])[a-z]+/)
     list.exclude('TODO') 

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

data/lib/generators/dry_crud/templates/app/controllers/crud_controller.rb

@@ -1,6 +1,6 @@
 # Abstract controller providing basic CRUD actions.
 # This implementation mainly follows the one of the Rails scaffolding
-# controller and responses to HTML and XML requests. Some enhancements were made to ease extendability.
+# controller and responses to HTML and JSON requests. Some enhancements were made to ease extendability.
 # Several protected helper methods are there to be (optionally) overriden by subclasses.
 # With the help of additional callbacks, it is possible to hook into the action procedures without
 # overriding the entire method.
@@ -31,14 +31,14 @@ class CrudController < ListController
 
   # Show one entry of this model.
   #   GET /entries/1
-  #   GET /entries/1.xml
+  #   GET /entries/1.json
   def show
     respond_with @entry
   end
 
   # Display a form to create a new entry of this model.
   #   GET /entries/new
-  #   GET /entries/new.xml
+  #   GET /entries/new.json
   def new
     @entry.attributes = params[model_identifier]
     respond_with @entry
@@ -49,7 +49,7 @@ class CrudController < ListController
   # To customize the response, you may overwrite this action and call
   # super with a block that gets success and format parameters.
   #   POST /entries
-  #   POST /entries.xml
+  #   POST /entries.json
   def create(&block)
     @entry.attributes = params[model_identifier]
     created = with_callbacks(:create, :save) { @entry.save }
@@ -57,10 +57,10 @@ class CrudController < ListController
     customizable_respond_to(created, block) do |format|
       if created
         format.html { redirect_to_show success_notice }
-        format.xml  { render :xml => @entry, :status => :created, :location => @entry }
+        format.json  { render :json => @entry, :status => :created, :location => @entry }
       else
         format.html { render_with_callback 'new'  }
-        format.xml  { render :xml => @entry.errors, :status => :unprocessable_entity }
+        format.json  { render :json => @entry.errors, :status => :unprocessable_entity }
       end
     end
   end
@@ -76,7 +76,7 @@ class CrudController < ListController
   # To customize the response, you may overwrite this action and call
   # super with a block that gets success and format parameters.
   #   PUT /entries/1
-  #   PUT /entries/1.xml
+  #   PUT /entries/1.json
   def update(&block)
     @entry.attributes = params[model_identifier]
     updated = with_callbacks(:update, :save) { @entry.save }
@@ -84,10 +84,10 @@ class CrudController < ListController
     customizable_respond_to(updated, block) do |format|
       if updated
         format.html { redirect_to_show success_notice }
-        format.xml  { head :ok }
+        format.json  { head :ok }
       else
         format.html { render_with_callback 'edit'  }
-        format.xml  { render :xml => @entry.errors, :status => :unprocessable_entity }
+        format.json  { render :json => @entry.errors, :status => :unprocessable_entity }
       end
     end
   end
@@ -97,20 +97,20 @@ class CrudController < ListController
   # To customize the response, you may overwrite this action and call
   # super with a block that gets success and format parameters.
   #   DELETE /entries/1
-  #   DELETE /entries/1.xml
+  #   DELETE /entries/1.json
   def destroy(&block)
     destroyed = run_callbacks(:destroy) { @entry.destroy }
 
     customizable_respond_to(destroyed, block) do |format|
       if destroyed
         format.html { redirect_to_index success_notice }
-        format.xml  { head :ok }
+        format.json  { head :ok }
       else
         format.html { 
           flash.alert = @entry.errors.full_messages.join('<br/>')
           request.env["HTTP_REFERER"].present? ? redirect_to(:back) : redirect_to_show
         }
-        format.xml  { render :xml => @entry.errors, :status => :unprocessable_entity }
+        format.json  { render :json => @entry.errors, :status => :unprocessable_entity }
       end
     end
   end

data/lib/generators/dry_crud/templates/app/controllers/list_controller.rb

@@ -6,8 +6,6 @@
 # the user the same list as he left it.
 class ListController < ApplicationController
 
-  include RenderInheritable
-
   helper_method :model_class, :models_label
 
   delegate :model_class, :models_label, :to => 'self.class'
@@ -19,7 +17,7 @@ class ListController < ApplicationController
 
   # List all entries of this model.
   #   GET /entries
-  #   GET /entries.xml
+  #   GET /entries.json
   def index
     @entries = list_entries
     respond_with @entries
@@ -36,7 +34,7 @@ class ListController < ApplicationController
   def respond_with(object)
     respond_to do |format|
       format.html { render_with_callback action_name }
-      format.xml  { render :xml => object }
+      format.json  { render :json => object }
     end
   end
 
@@ -135,7 +133,7 @@ class ListController < ApplicationController
     # Enhance the list entries with an optional sort order.
     def list_entries_with_sort
       if params[:sort].present? && sortable?(params[:sort])
-        list_entries_without_sort.except(:order).order(sort_expression)
+        list_entries_without_sort.reorder(sort_expression)
       else
         list_entries_without_sort
       end

data/lib/generators/dry_crud/templates/app/helpers/standard_helper.rb

@@ -27,7 +27,7 @@ module StandardHelper
   # If the value is an associated model, renders the label of this object.
   # Otherwise, calls format_type.
   def format_attr(obj, attr)
-    format_type_attr_method = :"format_#{obj.class.name.underscore}_#{attr.to_s}"
+    format_type_attr_method = obj.class.respond_to?(:model_name) ? :"format_#{obj.class.model_name.underscore}_#{attr.to_s}" : :"format_#{obj.class.name.underscore}_#{attr.to_s}"
     format_attr_method = :"format_#{attr.to_s}"
     if respond_to?(format_type_attr_method)
       send(format_type_attr_method, obj)
@@ -164,9 +164,8 @@ module StandardHelper
     html
   end
 
-  # Translates the passed key by looking it up over the template lookup path
-  # (i.e., usually the controller hierarchy). The key is searched in the following
-  # order:
+  # Translates the passed key by looking it up over the controller hierarchy. 
+  # The key is searched in the following order:
   #  - {controller}.{current_partial}.{key}
   #  - {controller}.{current_action}.{key}
   #  - {controller}.global.{key}
@@ -177,16 +176,16 @@ module StandardHelper
   #  - global.{key}
   def translate_inheritable(key, variables = {})
     defaults = []
-    if controller.class.respond_to?(:template_lookup_path)
-      partial = @_virtual_path ? @_virtual_path.gsub(%r{.*/_?}, "") : nil
-      controller.class.template_lookup_path.each do |folder|
+    partial = @virtual_path ? @virtual_path.gsub(%r{.*/_?}, "") : nil
+    current = controller.class
+    while current < ActionController::Base
+      folder = current.controller_path
+      if folder.present?
         defaults << :"#{folder}.#{partial}.#{key}" if partial
         defaults << :"#{folder}.#{action_name}.#{key}"
         defaults << :"#{folder}.global.#{key}"
       end
-    else
-      defaults << :"#{controller_name}.#{action_name}.#{key}"
-      defaults << :"#{controller_name}.global.#{key}"
+      current = current.superclass
     end
     defaults << :"global.#{key}"
     
@@ -205,9 +204,9 @@ module StandardHelper
   #  - global.associations.{key}
   def translate_association(key, assoc = nil, variables = {})
     primary = if assoc
-      variables[:default] ||= [:"activerecord.associations.#{assoc.klass.name.underscore}.#{key}",
+      variables[:default] ||= [:"activerecord.associations.#{assoc.klass.model_name.underscore}.#{key}",
                                :"global.associations.#{key}"]
-      :"activerecord.associations.models.#{assoc.active_record.name.underscore}.#{assoc.name}.#{key}"
+      :"activerecord.associations.models.#{assoc.active_record.model_name.underscore}.#{assoc.name}.#{key}"
     else
       :"global.associations.#{key}"
     end
@@ -261,7 +260,7 @@ module StandardHelper
 
   # Returns true if no link should be created when formatting the given association.
   def no_assoc_link?(assoc, val)
-    !respond_to?("#{val.class.name.underscore}_path".to_sym)
+    !respond_to?("#{val.class.model_name.underscore}_path".to_sym)
   end
 
   # Returns the association proxy for the given attribute. The attr parameter

data/lib/generators/dry_crud/templates/app/views/layouts/crud.html.erb

@@ -32,7 +32,7 @@
 	</div>
 </div>
 
-<%= javascript_include_tag :defaults, :cache => 'all' %>
+<%= javascript_include_tag 'application' %>
 <%= javascript_tag yield(:javascripts) if content_for?(:javascripts) %>
 
 </body>

data/lib/generators/dry_crud/templates/test/crud_test_model.rb

@@ -130,6 +130,10 @@ module CrudTestHelper
     true
   end
   
+  def h(text)
+    ERB::Util.h(text)
+  end
+  
   protected
 
   # Sets up the test database with a crud_test_models table.

data/lib/generators/dry_crud/templates/test/functional/crud_controller_test_helper.rb

@@ -11,11 +11,11 @@ module CrudControllerTestHelper
     assert_present assigns(:entries)
   end
 
-  def test_index_xml
-    get :index, :format => 'xml'
+  def test_index_json
+    get :index, :format => 'json'
     assert_response :success
     assert_present assigns(:entries)
-    assert @response.body.starts_with?("<?xml")
+    assert @response.body.starts_with?("[{"), @response.body
   end
 
   def test_index_search
@@ -54,11 +54,11 @@ module CrudControllerTestHelper
     assert_equal test_entry, assigns(:entry)
   end
 
-  def test_show_xml
-    get :show, :id => test_entry.id, :format => 'xml'
+  def test_show_json
+    get :show, :id => test_entry.id, :format => 'json'
     assert_response :success
     assert_equal test_entry, assigns(:entry)
-    assert @response.body.starts_with?("<?xml")
+    assert @response.body.starts_with?("{")
   end
 
   def test_show_with_not_existing_id_raises_RecordNotFound
@@ -89,12 +89,12 @@ module CrudControllerTestHelper
     assert_test_attrs_equal
   end
 
-  def test_create_xml
+  def test_create_json
     assert_difference("#{model_class.name}.count") do
-      post :create, model_identifier => test_entry_attrs, :format => 'xml'
+      post :create, model_identifier => test_entry_attrs, :format => 'json'
     end
     assert_response :success
-    assert @response.body.starts_with?("<?xml")
+    assert @response.body.starts_with?("{")
   end
 
   def test_edit
@@ -118,9 +118,9 @@ module CrudControllerTestHelper
     assert_redirected_to assigns(:entry)
   end
 
-  def test_update_xml
+  def test_update_json
     assert_no_difference("#{model_class.name}.count") do
-      put :update, :id => test_entry.id, model_identifier => test_entry_attrs, :format => 'xml'
+      put :update, :id => test_entry.id, model_identifier => test_entry_attrs, :format => 'json'
     end
     assert_response :success
     assert_equal "", @response.body.strip
@@ -133,9 +133,9 @@ module CrudControllerTestHelper
     assert_redirected_to_index
   end
 
-  def test_destroy_xml
+  def test_destroy_json
     assert_difference("#{model_class.name}.count", -1) do
-      delete :destroy, :id => test_entry.id, :format => 'xml'
+      delete :destroy, :id => test_entry.id, :format => 'json'
     end
     assert_response :success
     assert_equal "", @response.body.strip

data/test/templates/Gemfile

@@ -1,34 +1,36 @@
 source 'http://rubygems.org'
 
-gem 'rails'
+gem 'rails', '>= 3.1'
 
 # Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+# gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
 gem 'sqlite3', :platforms => :ruby
 
 gem 'jdbc-sqlite3', '3.6.14.2.056', :platforms => :jruby
 gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
 
+gem 'json'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.1.5.rc.2'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'uglifier', '>= 1.0.3'
+end
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
 # Use unicorn as the web server
 # gem 'unicorn'
 
 # Deploy with Capistrano
 # gem 'capistrano'
 
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
+# To use debugger
 # gem 'ruby-debug'
 # gem 'ruby-debug19', :require => 'ruby-debug'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
-
-# Bundle gems for the local environment. Make sure to
-# put test-only gems in this group so their generators
-# and rake tasks are available in development mode:
-# group :development, :test do
-#   gem 'webrat'
-# end

data/test/templates/app/controllers/cities_controller.rb

@@ -2,8 +2,8 @@ class CitiesController < AjaxController
 
   def show
     respond_to do |format|
-      format.html { redirect_to_index flash }
-      format.xml  { render :xml => @entry }
+      format.html { redirect_to_index flash.to_hash }
+      format.json  { render :json => @entry }
     end
   end
 

data/test/templates/app/views/ajax/ajax.js.erb

@@ -0,0 +1 @@
+$('#response').html("<%= escape_javascript(render 'hello') %>");

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dry_crud
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Pascal Zumkehr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 +02:00
+date: 2011-12-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,9 +47,14 @@ extra_rdoc_files:
 - VERSION
 files: 
 - lib/generators/dry_crud/dry_crud_generator.rb
+- lib/generators/dry_crud/templates/app/assets/images/actions/add.png
+- lib/generators/dry_crud/templates/app/assets/images/actions/delete.png
+- lib/generators/dry_crud/templates/app/assets/images/actions/edit.png
+- lib/generators/dry_crud/templates/app/assets/images/actions/list.png
+- lib/generators/dry_crud/templates/app/assets/images/actions/show.png
+- lib/generators/dry_crud/templates/app/assets/stylesheets/crud.css
 - lib/generators/dry_crud/templates/app/controllers/crud_controller.rb
 - lib/generators/dry_crud/templates/app/controllers/list_controller.rb
-- lib/generators/dry_crud/templates/app/controllers/render_inheritable.rb
 - lib/generators/dry_crud/templates/app/helpers/crud_helper.rb
 - lib/generators/dry_crud/templates/app/helpers/list_helper.rb
 - lib/generators/dry_crud/templates/app/helpers/standard_form_builder.rb
@@ -74,12 +79,6 @@ files:
 - lib/generators/dry_crud/templates/app/views/shared/_labeled.html.erb
 - lib/generators/dry_crud/templates/config/locales/en_crud.yml
 - lib/generators/dry_crud/templates/INSTALL
-- lib/generators/dry_crud/templates/public/images/actions/add.png
-- lib/generators/dry_crud/templates/public/images/actions/delete.png
-- lib/generators/dry_crud/templates/public/images/actions/edit.png
-- lib/generators/dry_crud/templates/public/images/actions/list.png
-- lib/generators/dry_crud/templates/public/images/actions/show.png
-- lib/generators/dry_crud/templates/public/stylesheets/crud.css
 - lib/generators/dry_crud/templates/test/crud_test_model.rb
 - lib/generators/dry_crud/templates/test/custom_assertions.rb
 - lib/generators/dry_crud/templates/test/functional/crud_controller_test_helper.rb
@@ -87,7 +86,6 @@ files:
 - lib/generators/dry_crud/templates/test/unit/custom_assertions_test.rb
 - lib/generators/dry_crud/templates/test/unit/helpers/crud_helper_test.rb
 - lib/generators/dry_crud/templates/test/unit/helpers/list_helper_test.rb
-- lib/generators/dry_crud/templates/test/unit/helpers/render_inheritable_test.rb
 - lib/generators/dry_crud/templates/test/unit/helpers/standard_form_builder_test.rb
 - lib/generators/dry_crud/templates/test/unit/helpers/standard_helper_test.rb
 - lib/generators/dry_crud/templates/test/unit/helpers/standard_table_builder_test.rb
@@ -101,7 +99,7 @@ files:
 - test/templates/app/models/person.rb
 - test/templates/app/views/ajax/_actions_index.html.erb
 - test/templates/app/views/ajax/_hello.html.erb
-- test/templates/app/views/ajax/ajax.js.rjs
+- test/templates/app/views/ajax/ajax.js.erb
 - test/templates/app/views/cities/_form.html.erb
 - test/templates/app/views/cities/_hello.html.erb
 - test/templates/app/views/cities/_list.html.erb

data/lib/generators/dry_crud/templates/app/controllers/render_inheritable.rb

@@ -1,153 +0,0 @@
-# Allows one to render inheritable views and partials.
-# If no view file is found for the current controller, the corresponding file
-# is looked up in its superclass hierarchy. This module must only be
-# included in the root controller of the desired lookup hierarchy.
-#
-# By default, this module only supports direct inheritance over one level. By overriding
-# the method lookup_path, you may define a custom lookup path. By providing an object
-# for the 'with' parameter, this path may even be dynamic.
-module RenderInheritable
-
-  # Add inheritable_root_path method to including controller.
-  def self.included(controller_class)
-    controller_class.send(:extend, ClassMethods)
-
-    controller_class.send(:class_variable_set, :@@inheritable_root_controller, controller_class)
-    controller_class.cattr_reader :inheritable_root_controller
-  end
-
-  # Performs a lookup for the given filename and returns the most specific
-  # folder that contains the file.
-  def find_inheritable_template_folder(name, partial = false)
-    self.class.find_inheritable_template_folder(view_context, name, partial, formats, template_lookup_param)
-  end
-
-  # Override this method to specify a dynamic parameter used in the lookup path.
-  # For the default inheritance lookup, this parameter is not needed.
-  def template_lookup_param
-    nil
-  end
-
-  module ClassMethods
-  
-    # Performs a lookup for the given filename and returns the most specific
-    # folder that contains the file.
-    def find_inheritable_template_folder(view_context, name, partial, formats, param = nil)
-      find_inheritable_template_folder_cached(view_context, name, partial, formats, param) do
-        find_inheritable_artifact(param) do |folder|
-          view_context.template_exists?(name, folder, partial)
-        end
-      end
-    end
-
-    # Performs a lookup for a controller and returns the name of the most specific one found.
-    # This method is primarly usefull when given a 'param' argument that is used
-    # in a custom #template_lookup_path. In this case, no controller class would need to
-    # exist to render templates from corresponding view folders.
-    def inheritable_controller(param = nil)
-      descendants = inheritable_root_controller.descendants
-      c = find_inheritable_artifact(param) do |folder|
-        descendants.any? { |s| s.controller_path == folder }
-      end
-      c || inheritable_root_controller.controller_path
-    end
-
-    # Runs through the lookup path and yields each folder to the passed block.
-    # If the block returns true, this folder is returned and no further lookup
-    # happens. If no folder is found, the nil is returned.
-    def find_inheritable_artifact(param = nil)
-      template_lookup_path(param).each { |folder| return folder if yield(folder) }
-      nil
-    end
-
-    # An array of controller names / folders, ordered from most specific to most general.
-    # May be dynamic dependening on the passed 'param' argument.
-    # You may override this method in an own controller to customize the lookup path.
-    def template_lookup_path(param = nil)
-      inheritance_lookup_path
-    end
-
-    # The inheritance path of controllers that is used as default lookup path.
-    def inheritance_lookup_path
-      path = [self]
-      until path.last == inheritable_root_controller
-        path << path.last.superclass
-      end
-      path.collect(&:controller_path)
-    end
-
-    # Override view context class to include the render inheritable modules.
-    def view_context_class
-      @view_context_class ||= begin
-        Class.new(super) do
-          include RenderInheritable::View
-        end
-      end
-    end
-
-    private
-
-    # Performs a lookup for a template folder using the cache.
-    def find_inheritable_template_folder_cached(view_context, name, partial, formats, param = nil)
-      prefix = inheritable_cache_get(formats, name, partial, param)
-      return prefix if prefix
-
-      prefix = yield
-
-      if prefix
-        template = view_context.find_template_without_lookup(name, prefix, partial)
-        inheritable_cache_set(template.formats, name, partial, param, prefix)
-      end
-      prefix
-    end
-
-    # A simple template lookup cache for each controller.
-    def inheritable_cache #:nodoc:
-      # do not store keys on each access, only return default structure
-      @inheritable_cache ||= Hash.new do |h1, k1|
-        Hash.new do |h2, k2|
-          Hash.new do |h3, k3|
-            Hash.new
-          end
-        end
-      end
-    end
-
-    # Gets the prefix from the cache. Returns nil if it's not there yet.
-    def inheritable_cache_get(formats, name, partial, param)
-      prefixes = formats.collect { |format| inheritable_cache[format.to_sym][partial][name][param] }
-      prefixes.compact!
-      prefixes.empty? ?  nil : prefixes.first
-    end
-
-    # Stores the found prefix in the cache.
-    def inheritable_cache_set(formats, name, partial, param, prefix)
-      formats.each do |format|
-        # assign hash default values to respective key
-        inheritable_cache[format.to_sym] = hf = inheritable_cache[format.to_sym]
-        hf[partial] = hp = hf[partial]
-        hp[name] = hn = hp[name]
-        # finally store prefix in the deepest hash
-        hn[param] = prefix
-      end
-    end
-
-  end
-
-  # Extend ActionView so templates are looked up on a find_template call.
-  module View
-    def self.included(base)
-      base.send :alias_method_chain, :find_template, :lookup
-    end
-
-    # Perform a template lookup if the prefix corresponds to the current controller's path.
-    def find_template_with_lookup(name, prefix = nil, partial = false)
-      if prefix == controller_path
-        folder = controller.find_inheritable_template_folder(name, partial)
-        prefix = folder if folder
-      end
-      find_template_without_lookup(name, prefix, partial)
-    end
-  end
-
-end

data/lib/generators/dry_crud/templates/test/unit/helpers/render_inheritable_test.rb

@@ -1,153 +0,0 @@
-require 'test_helper'
-
-TEST_VIEW_PATH = File.join(Rails.root, 'test', 'test_views')
-
-class RootController < ApplicationController
-  include RenderInheritable
-
-  attr_accessor :default_template_format
-
-  append_view_path(TEST_VIEW_PATH)
-
-  def initialize(*args)
-    super(*args)
-    self.default_template_format = :html
-  end
-
-  def view_paths
-    self.class.view_paths
-  end
-
-end
-
-class ChildrenController < RootController
-
-end
-
-class GrandChildrenController < ChildrenController
-
-end
-
-# mock File object
-class File
-  class << self
-    def touched
-      @touched ||= []
-    end
-
-    alias_method :orig_exists?, :exists?
-    def exists?(filename, *args)
-      touched.include?(filename) || orig_exists?(filename, *args)
-    end
-
-    def touch_template(file)
-      touched << File.join(ActionController::Base.view_paths.first, "#{file}.html.erb")
-    end
-  end
-end
-
-class RenderInheritableTest < ActiveSupport::TestCase
-
-  attr_reader :controller, :grand_controller
-
-  def setup
-    teardown
-    @controller = ChildrenController.new
-    @grand_controller = GrandChildrenController.new
-    ChildrenController.send(:inheritable_cache).clear
-    GrandChildrenController.send(:inheritable_cache).clear
-  end
-
-  def teardown
-    FileUtils.rm_rf(TEST_VIEW_PATH)
-  end
-
-  test "inheritable_root_controller" do
-    assert_equal RootController, RootController.inheritable_root_controller
-    assert_equal RootController, ChildrenController.inheritable_root_controller
-    assert_equal RootController, GrandChildrenController.inheritable_root_controller
-  end
-
-  test "lookup path" do
-    assert_equal ['children', 'root'], ChildrenController.send(:inheritance_lookup_path)
-    assert_equal ['grand_children', 'children', 'root'], GrandChildrenController.send(:inheritance_lookup_path)
-  end
-
-  test "inheritable controller finds controller instance" do
-    assert_equal 'children', ChildrenController.send(:inheritable_controller)
-    assert_equal 'grand_children', GrandChildrenController.send(:inheritable_controller)
-  end
-
-  test "find non-existing inheritable file" do
-    assert_nil @controller.send(:find_inheritable_template_folder, 'foo')
-  end
-
-  test "find inheritable file not overwritten" do
-    touch("root/root.html.erb")
-
-    assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'root')
-    assert_equal 'root', @grand_controller.send(:find_inheritable_template_folder, 'root')
-  end
-
-  test "find inheritable file partially overwritten" do
-    touch("root/child.html.erb")
-    touch("children/child.html.erb")
-
-    assert_equal 'children', @controller.send(:find_inheritable_template_folder, 'child')
-    assert_equal 'children', @grand_controller.send(:find_inheritable_template_folder, 'child')
-  end
-
-  test "find inheritable file partially overwritten with gaps" do
-    touch("root/grandchild.html.erb")
-    touch("grand_children/grandchild.rhtml")
-
-    assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'grandchild')
-    assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'grandchild')
-  end
-
-  test "find inheritable file for js format" do
-    touch("root/_grandchild.js.rjs")
-    touch("grand_children/_grandchild.js.rjs")
-
-    assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'grandchild', true)
-    assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'grandchild', true)
-
-    assert_equal({:js => { true => {'grandchild' => {nil => 'root'}}}}, ChildrenController.send(:inheritable_cache))
-    assert_equal({:js => { true => {'grandchild' => {nil => 'grand_children'}}}}, GrandChildrenController.send(:inheritable_cache))
-  end
-
-  test "find inheritable file for xml format" do
-    touch("root/_grandchild.xml.builder")
-    touch("grand_children/_grandchild.xml.builder")
-
-    assert_equal 'root', @controller.send(:find_inheritable_template_folder, 'grandchild', true)
-    assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'grandchild', true)
-  end
-
-  test "find inheritable file all overwritten" do
-    touch("root/all.html.erb")
-    touch("children/all.rhtml")
-    touch("grand_children/all.html.erb")
-
-    assert_equal 'children', @controller.send(:find_inheritable_template_folder, 'all')
-    assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'all')
-
-    assert_equal({:html => { false => { 'all' => {nil => 'children'}}}}, ChildrenController.send(:inheritable_cache))
-    assert_equal({:html => { false => { 'all' => {nil => 'grand_children'}}}}, GrandChildrenController.send(:inheritable_cache))
-
-    assert_equal 'children', @controller.send(:find_inheritable_template_folder, 'all')
-    assert_equal 'grand_children', @grand_controller.send(:find_inheritable_template_folder, 'all')
-
-    assert_equal({:html => { false => { 'all' => {nil => 'children'}}}}, ChildrenController.send(:inheritable_cache))
-    assert_equal({:html => { false => { 'all' => {nil => 'grand_children'}}}}, GrandChildrenController.send(:inheritable_cache))
-  end
-
-  private
-
-  def touch(file)
-    f = File.join(TEST_VIEW_PATH, file)
-    FileUtils.mkdir_p(File.dirname(f))
-    FileUtils.touch(f)
-  end
-
-end

data/test/templates/app/views/ajax/ajax.js.rjs

@@ -1 +0,0 @@
-page.replace_html(:response, :partial => 'hello')