dry_crud 1.7.0 → 2.0.0

data/lib/generators/dry_crud/templates/test/helpers/utility_helper_test.rb

@@ -0,0 +1,63 @@
+# encoding: UTF-8
+require 'test_helper'
+require 'support/crud_test_model'
+
+# Test UtilityHelper
+class UtilityHelperTest < ActionView::TestCase
+
+  include CrudTestHelper
+
+  test 'content_tag_nested escapes safe correctly' do
+    html = content_tag_nested(:div, %w(a b)) { |e| content_tag(:span, e) }
+    assert_equal '<div><span>a</span><span>b</span></div>', html
+  end
+
+  test 'content_tag_nested escapes unsafe correctly' do
+    html = content_tag_nested(:div, %w(a b)) { |e| "<#{e}>" }
+    assert_equal '<div>&lt;a&gt;&lt;b&gt;</div>', html
+  end
+
+  test 'content_tag_nested without block' do
+    html = content_tag_nested(:div, %w(a b))
+    assert_equal '<div>ab</div>', html
+  end
+
+  test 'safe_join without block' do
+    html = safe_join(['<a>', '<b>'.html_safe])
+    assert_equal '&lt;a&gt;<b>', html
+  end
+
+  test 'safe_join with block' do
+    html = safe_join(%w(a b)) { |e| content_tag(:span, e) }
+    assert_equal '<span>a</span><span>b</span>', html
+  end
+
+  test 'default attributes do not include id and password' do
+    assert_equal [:name, :email, :whatever, :children, :companion_id, :rating,
+                  :income, :birthdate, :gets_up_at, :last_seen, :human,
+                  :remarks, :created_at, :updated_at],
+                 default_crud_attrs
+  end
+
+  test 'column types' do
+    reset_db
+    setup_db
+    create_test_data
+
+    m = crud_test_models(:AAAAA)
+    assert_equal :string, column_type(m, :name)
+    assert_equal :integer, column_type(m, :children)
+    assert_equal :integer, column_type(m, :companion_id)
+    assert_equal nil, column_type(m, :companion)
+    assert_equal :float, column_type(m, :rating)
+    assert_equal :decimal, column_type(m, :income)
+    assert_equal :date, column_type(m, :birthdate)
+    assert_equal :time, column_type(m, :gets_up_at)
+    assert_equal :datetime, column_type(m, :last_seen)
+    assert_equal :boolean, column_type(m, :human)
+    assert_equal :text, column_type(m, :remarks)
+
+    reset_db
+  end
+
+end

data/lib/generators/dry_crud/templates/test/{functional → support}/crud_controller_test_helper.rb

@@ -1,80 +1,82 @@
-# A module to include into your functional tests for your crud controller subclasses.
-# Simply implement the two methods :test_entry and :test_entry_attrs to test the basic
-# crud functionality. Override the test methods if you changed the behaviour in your subclass
-# controller.
+# encoding: UTF-8
+
+# A module to include into your functional tests for your crud controller
+# subclasses. Simply implement the two methods #test_entry and
+# #test_entry_attrs to test the basic crud functionality. Override the test
+# methods if you changed the behaviour in your subclass controller.
 module CrudControllerTestHelper
 
-  def test_index
+  def test_index # :nodoc:
     get :index, test_params
     assert_response :success
     assert_template 'index'
-    assert_present entries
+    assert entries.present?
   end
 
-  def test_index_json
-    get :index, test_params(:format => 'json')
+  def test_index_json # :nodoc:
+    get :index, test_params(format: 'json')
     assert_response :success
-    assert_present entries
-    assert @response.body.starts_with?("[{"), @response.body
+    assert entries.present?
+    assert @response.body.starts_with?('[{'), @response.body
   end
 
-  def test_index_search
+  def test_index_search # :nodoc:
     field = @controller.search_columns.first
     val = field && test_entry[field].to_s
     return if val.blank?   # does not support search or no value in this field
 
-    get :index, test_params(:q => val[0..((val.size + 1)/ 2)])
+    get :index, test_params(q: val[0..((val.size + 1) / 2)])
     assert_response :success
-    assert_present entries
+    assert entries.present?
     assert entries.include?(test_entry)
   end
 
-  def test_index_sort_asc
+  def test_index_sort_asc # :nodoc:
     col = model_class.column_names.first
-    get :index, test_params(:sort => col, :sort_dir => 'asc')
+    get :index, test_params(sort: col, sort_dir: 'asc')
     assert_response :success
-    assert_present entries
-    sorted = entries.sort_by &(col.to_sym)
-    assert_equal sorted, entries
+    assert entries.present?
+    sorted = entries.sort_by(&(col.to_sym))
+    assert_equal sorted, entries.to_a
   end
 
-  def test_index_sort_desc
+  def test_index_sort_desc # :nodoc:
     col = model_class.column_names.first
-    get :index, test_params(:sort => col, :sort_dir => 'desc')
+    get :index, test_params(sort: col, sort_dir: 'desc')
     assert_response :success
-    assert_present entries
-    sorted = entries.sort_by &(col.to_sym)
-    assert_equal sorted.reverse, entries
+    assert entries.present?
+    sorted = entries.to_a.sort_by(&(col.to_sym))
+    assert_equal sorted.reverse, entries.to_a
   end
 
-  def test_show
-    get :show, test_params(:id => test_entry.id)
+  def test_show # :nodoc:
+    get :show, test_params(id: test_entry.id)
     assert_response :success
     assert_template 'show'
     assert_equal test_entry, entry
   end
 
-  def test_show_json
-    get :show, test_params(:id => test_entry.id, :format => 'json')
+  def test_show_json # :nodoc:
+    get :show, test_params(id: test_entry.id, format: 'json')
     assert_response :success
     assert_equal test_entry, entry
-    assert @response.body.starts_with?("{")
+    assert @response.body.starts_with?('{')
   end
 
-  def test_show_with_non_existing_id_raises_RecordNotFound
+  def test_show_with_non_existing_id_raises_record_not_found # :nodoc:
     assert_raise(ActiveRecord::RecordNotFound) do
-      get :show, test_params(:id => 9999)
+      get :show, test_params(id: 9999)
     end
   end
 
-  def test_new
+  def test_new # :nodoc:
     get :new, test_params
     assert_response :success
     assert_template 'new'
     assert entry.new_record?
   end
 
-  def test_create
+  def test_create # :nodoc:
     assert_difference("#{model_class.name}.count") do
       post :create, test_params(model_identifier => new_entry_attrs)
     end
@@ -83,66 +85,75 @@ module CrudControllerTestHelper
     assert_attrs_equal(new_entry_attrs)
   end
 
-  def test_create_json
+  def test_create_json # :nodoc:
     assert_difference("#{model_class.name}.count") do
-      post :create, test_params(model_identifier => new_entry_attrs, :format => 'json')
+      post :create, test_params(model_identifier => new_entry_attrs,
+                                format: 'json')
     end
     assert_response :success
-    assert @response.body.starts_with?("{")
+    assert @response.body.starts_with?('{')
   end
 
-  def test_edit
-    get :edit, test_params(:id => test_entry.id)
+  def test_edit # :nodoc:
+    get :edit, test_params(id: test_entry.id)
     assert_response :success
     assert_template 'edit'
     assert_equal test_entry, entry
   end
 
-  def test_update
+  def test_update # :nodoc:
     assert_no_difference("#{model_class.name}.count") do
-      put :update, test_params(:id => test_entry.id, model_identifier => edit_entry_attrs)
+      put :update, test_params(id: test_entry.id,
+                               model_identifier => edit_entry_attrs)
     end
     assert_attrs_equal(edit_entry_attrs)
     assert_redirected_to_show entry
   end
 
-  def test_update_json
+  def test_update_json # :nodoc:
     assert_no_difference("#{model_class.name}.count") do
-      put :update, test_params(:id => test_entry.id, model_identifier => edit_entry_attrs, :format => 'json')
+      put :update, test_params(id: test_entry.id,
+                               model_identifier => edit_entry_attrs,
+                               format: 'json')
     end
     assert_response :success
-    assert_equal "", @response.body.strip
+    assert_equal '', @response.body.strip
   end
 
-  def test_destroy
+  def test_destroy # :nodoc:
     assert_difference("#{model_class.name}.count", -1) do
-      delete :destroy, test_params(:id => test_entry.id)
+      delete :destroy, test_params(id: test_entry.id)
     end
     assert_redirected_to_index
   end
 
-  def test_destroy_json
+  def test_destroy_json # :nodoc:
     assert_difference("#{model_class.name}.count", -1) do
-      delete :destroy, test_params(:id => test_entry.id, :format => 'json')
+      delete :destroy, test_params(id: test_entry.id,
+                                   format: 'json')
     end
     assert_response :success
-    assert_equal "", @response.body.strip
+    assert_equal '', @response.body.strip
   end
 
   private
 
-  def assert_redirected_to_index
-    assert_redirected_to test_params(:action => 'index', :returning => true)
+  def assert_redirected_to_index # :nodoc:
+    assert_redirected_to test_params(action: 'index',
+                                     returning: true)
   end
 
-  def assert_redirected_to_show(entry)
-    assert_redirected_to test_params(:action => 'show', :id => entry.id)
+  def assert_redirected_to_show(entry) # :nodoc:
+    assert_redirected_to test_params(action: 'show',
+                                     id: entry.id)
   end
 
-  def assert_attrs_equal(attrs)
+  def assert_attrs_equal(attrs) # :nodoc:
     attrs.each do |key, value|
       actual = entry.send(key)
-      assert_equal value, actual, "#{key} is expected to be <#{value.inspect}>, got <#{actual.inspect}>"
+      assert_equal value, actual,
+                   "#{key} is expected to be <#{value.inspect}>, " +
+                   "got <#{actual.inspect}>"
     end
   end
 
@@ -150,7 +161,7 @@ module CrudControllerTestHelper
   def model_class
     @controller.model_class
   end
-  
+
   # The param key for model attributes.
   def model_identifier
     @controller.model_identifier
@@ -168,14 +179,14 @@ module CrudControllerTestHelper
 
   # Test object used in several tests.
   def test_entry
-    raise "Implement this method in your test class"
+    raise 'Implement this method in your test class'
   end
 
   # Attribute hash used in several tests.
   def test_entry_attrs
-    raise "Implement this method in your test class"
+    raise 'Implement this method in your test class'
   end
-  
+
   # Attribute hash used in edit/update tests.
   def edit_entry_attrs
     test_entry_attrs
@@ -191,10 +202,10 @@ module CrudControllerTestHelper
     nesting_params.merge(params)
   end
 
+  # For nested controllers, collect hash with parent ids.
   def nesting_params
     params = {}
-    # for nested controllers, add parent ids to each request
-    Array(@controller.nesting).reverse.inject(test_entry) do |parent, p|
+    Array(@controller.nesting).reverse.reduce(test_entry) do |parent, p|
       if p.is_a?(Class) && p < ActiveRecord::Base
         assoc = p.name.underscore
         params["#{assoc}_id"] = parent.send(:"#{assoc}_id")

data/lib/generators/dry_crud/templates/test/{crud_test_model.rb → support/crud_test_model.rb}

@@ -1,18 +1,19 @@
+# encoding: UTF-8
+
 # A dummy model used for general testing.
 class CrudTestModel < ActiveRecord::Base #:nodoc:
 
-  attr_accessible :name, :whatever, :children, :rating, :income, :birthdate, :gets_up_at, :last_seen, :human, :remarks
-          
-  belongs_to :companion, :class_name => 'CrudTestModel'
-  has_and_belongs_to_many :others, :class_name => 'OtherCrudTestModel'
-  has_many :mores, :class_name => 'OtherCrudTestModel', :foreign_key => :more_id
+  belongs_to :companion, class_name: 'CrudTestModel'
+  has_and_belongs_to_many :others, class_name: 'OtherCrudTestModel'
+  has_many :mores, class_name: 'OtherCrudTestModel',
+                   foreign_key: :more_id
 
   before_destroy :protect_if_companion
 
-  validates :name, :presence => true
-  validates :rating, :inclusion => { :in => 1..10 }
+  validates :name, presence: true
+  validates :rating, inclusion: { in: 1..10 }
 
-  default_scope order('name')
+  attr_protected nil if Rails.version < '4.0'
 
   def to_s
     name
@@ -33,12 +34,13 @@ class CrudTestModel < ActiveRecord::Base #:nodoc:
 
 end
 
+# Second dummy model to test associations.
 class OtherCrudTestModel < ActiveRecord::Base #:nodoc:
 
-  attr_protected nil
+  has_and_belongs_to_many :others, class_name: 'CrudTestModel'
+  belongs_to :more, foreign_key: :more_id, class_name: 'CrudTestModel'
 
-  has_and_belongs_to_many :others, :class_name => 'CrudTestModel'
-  belongs_to :more, :foreign_key => :more_id, :class_name => 'CrudTestModel'
+  attr_protected nil if Rails.version < '4.0'
 
   def to_s
     name
@@ -50,7 +52,13 @@ class CrudTestModelsController < CrudController #:nodoc:
   HANDLE_PREFIX = 'handle_'
 
   self.search_columns = [:name, :whatever, :remarks]
-  self.sort_mappings = {:chatty => 'length(remarks)'}
+  self.sort_mappings = { chatty: 'length(remarks)' }
+  self.default_sort = 'name'
+<% if Rails.version >= '4.0' -%>
+  self.permitted_attrs = [:name, :email, :password, :whatever, :children,
+                          :companion_id, :rating, :income, :birthdate,
+                          :gets_up_at, :last_seen, :human, :remarks]
+<% end -%>
 
   before_create :possibly_redirect
   before_create :handle_name
@@ -70,13 +78,13 @@ class CrudTestModelsController < CrudController #:nodoc:
 
   def index
     super do |format|
-      format.js { render :text => 'index js'}
+      format.js { render text: 'index js'}
     end
   end
 
   def show
     super do |format|
-      format.html { render :text => 'custom html' } if entry.name == 'BBBBB'
+      format.html { render text: 'custom html' } if entry.name == 'BBBBB'
     end
   end
 
@@ -91,7 +99,9 @@ class CrudTestModelsController < CrudController #:nodoc:
   def list_entries
     entries = super
     if params[:filter]
-      entries = entries.where(['rating < ?', 3]).except(:order).order('children DESC')
+      entries = entries.where(['rating < ?', 3])
+                       .except(:order)
+                       .order('children DESC')
     end
     entries
   end
@@ -100,29 +110,30 @@ class CrudTestModelsController < CrudController #:nodoc:
 
   def build_entry
     entry = super
-    entry.companion_id = model_params.delete(:companion_id) if model_params
+    if params[model_identifier]
+      entry.companion_id = model_params.delete(:companion_id)
+    end
     entry
   end
 
   # custom callback
   def handle_name
     if entry.name == 'illegal'
-      flash[:alert] = "illegal name"
+      flash[:alert] = 'illegal name'
       false
     end
   end
 
   # callback to redirect if @should_redirect is set
   def possibly_redirect
-    redirect_to :action => 'index' if should_redirect && !performed?
+    redirect_to action: 'index' if should_redirect && !performed?
     !should_redirect
   end
 
   def set_companions
-    @companions = CrudTestModel.all :conditions => {:human => true}
+    @companions = CrudTestModel.where(human: true)
   end
 
-
   # create callback methods that record the before/after callbacks
   [:create, :update, :save, :destroy].each do |a|
     callback = "before_#{a.to_s}"
@@ -139,7 +150,9 @@ class CrudTestModelsController < CrudController #:nodoc:
 
   # handle the called callbacks
   def method_missing(sym, *args)
-    called_callback(sym.to_s[HANDLE_PREFIX.size..-1].to_sym) if sym.to_s.starts_with?(HANDLE_PREFIX)
+    if sym.to_s.starts_with?(HANDLE_PREFIX)
+      called_callback(sym.to_s[HANDLE_PREFIX.size..-1].to_sym)
+    end
   end
 
   # records a callback
@@ -149,14 +162,13 @@ class CrudTestModelsController < CrudController #:nodoc:
   end
 
 end
-  
+
 #:nodoc:
 REGEXP_ROWS = /<tr.+?<\/tr>/m  #:nodoc:
 REGEXP_HEADERS = /<th.+?<\/th>/m  #:nodoc:
-REGEXP_SORT_HEADERS = /<th><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m  #:nodoc:
-REGEXP_ACTION_CELL = /<td class=\"action\"><a href.+?<\/a><\/td>/m  #:nodoc:
-  
-  
+REGEXP_SORT_HEADERS = /<th.*?><a .*?sort_dir=asc.*?>.*?<\/a><\/th>/m  #:nodoc:
+REGEXP_ACTION_CELL = /<td class=\"action\"><a .*?href.+?<\/a><\/td>/m  #:nodoc:
+
 # A simple test helper to prepare the test database with a CrudTestModel model.
 # This helper is used to test the CrudController and various helpers
 # without the need for an application based model.
@@ -199,50 +211,66 @@ module CrudTestHelper
   def setup_db
     without_transaction do
       silence_stream(STDOUT) do
-        ActiveRecord::Base.connection.create_table :crud_test_models, :force => true do |t|
-          t.string   :name, :null => false, :limit => 50
-          t.string   :password
-          t.string   :whatever
-          t.integer  :children
-          t.integer  :companion_id
-          t.float    :rating
-          t.decimal  :income, :precision => 14, :scale => 2
-          t.date     :birthdate
-          t.time     :gets_up_at
-          t.datetime :last_seen
-          t.boolean  :human, :default => true
-          t.text     :remarks
-
-          t.timestamps
-        end
-      end
-      ActiveRecord::Base.connection.create_table :other_crud_test_models, :force => true do |t|
-        t.string   :name, :null => false, :limit => 50
-        t.integer  :more_id
-      end
-      ActiveRecord::Base.connection.create_table :crud_test_models_other_crud_test_models, :force => true do |t|
-        t.belongs_to :crud_test_model
-        t.belongs_to :other_crud_test_model
+        c = ActiveRecord::Base.connection
+
+        create_crud_test_models(c)
+        create_other_crud_test_models(c)
+        create_crud_test_models_other_crud_test_models(c)
       end
 
       CrudTestModel.reset_column_information
     end
   end
 
+  def create_crud_test_models(c)
+    c.create_table :crud_test_models, force: true do |t|
+      t.string   :name, null: false, limit: 50
+      t.string   :email
+      t.string   :password
+      t.string   :whatever
+      t.integer  :children
+      t.integer  :companion_id
+      t.float    :rating
+      t.decimal  :income, precision: 14, scale: 4
+      t.date     :birthdate
+      t.time     :gets_up_at
+      t.datetime :last_seen
+      t.boolean  :human, default: true
+      t.text     :remarks
+
+      t.timestamps
+    end
+  end
+
+  def create_other_crud_test_models(c)
+    c.create_table :other_crud_test_models, force: true do |t|
+      t.string   :name, null: false, limit: 50
+      t.integer  :more_id
+    end
+  end
+
+  def create_crud_test_models_other_crud_test_models(c)
+    c.create_table :crud_test_models_other_crud_test_models,
+                   force: true do |t|
+      t.belongs_to :crud_test_model
+      t.belongs_to :other_crud_test_model
+    end
+  end
+
   # Removes the crud_test_models table from the database.
   def reset_db
     c = ActiveRecord::Base.connection
-    [:crud_test_models, :other_crud_test_models, :crud_test_models_other_crud_test_models].each do |table|
-      if c.table_exists?(table)
-        c.drop_table(table) rescue nil
-      end
+    [:crud_test_models,
+     :other_crud_test_models,
+     :crud_test_models_other_crud_test_models].each do |table|
+      c.drop_table(table) if c.table_exists?(table)
     end
   end
 
   # Creates 6 dummy entries for the crud_test_models table.
   def create_test_data
-    (1..6).inject(nil) {|prev, i| create(i, prev) }
-    (1..6).each {|i| create_other(i) }
+    (1..6).reduce(nil) { |a, e| create(e, a) }
+    (1..6).each { |i| create_other(i) }
   end
 
   # Fixture-style accessor method to get CrudTestModel instances by name
@@ -254,13 +282,14 @@ module CrudTestHelper
     with_routing do |set|
       set.draw { resources :crud_test_models }
       # used to define a controller in these tests
-      set.default_url_options = {:controller => 'crud_test_models'}
+      set.default_url_options = { controller: 'crud_test_models' }
       yield
     end
   end
 
   def special_routing
-    controller = @controller || controller  # test:unit uses instance variable, rspec the method
+    # test:unit uses instance variable, rspec the method
+    controller = @controller || controller
     @routes = ActionDispatch::Routing::RouteSet.new
     _routes = @routes
 
@@ -274,18 +303,19 @@ module CrudTestHelper
 
   def create(index, companion)
     c = str(index)
-    m = CrudTestModel.new(:name => c,
-                          :children => 10 - index,
-                          :rating => "#{index}.#{index}".to_f,
-                          :income => 10000000 * index + 0.1 * index,
-                          :birthdate => "#{1900 + 10 * index}-#{index}-#{index}",
-                          # store entire date to avoid time zone issues
-                          :gets_up_at => RUBY_VERSION.include?('1.9.') ?
-                                            Time.local(2000,1,1,index,index) :
-                                            Time.utc(2000,1,1,index,index),
-                          :last_seen => "#{2000 + 10 * index}-#{index}-#{index} 1#{index}:2#{index}",
-                          :human => index % 2 == 0,
-                          :remarks => "#{c} #{str(index + 1)} #{str(index + 2)}\n" * (index % 3 + 1))
+    m = CrudTestModel.new(
+      name: c,
+      children: 10 - index,
+      rating: "#{index}.#{index}".to_f,
+      income: 10_000_000 * index + 0.1111 * index,
+      birthdate: "#{1900 + 10 * index}-#{index}-#{index}",
+      # store entire date to avoid time zone issues
+      gets_up_at: Time.zone.local(2000, 1, 1, index, index),
+      last_seen: "#{2000 + 10 * index}-#{index}-#{index} " +
+                    "1#{index}:2#{index}",
+      human: index % 2 == 0,
+      remarks: "#{c} #{str(index + 1)} #{str(index + 2)}\n" *
+                  (index % 3 + 1))
     m.companion = companion
     m.save!
     m
@@ -293,27 +323,29 @@ module CrudTestHelper
 
   def create_other(index)
     c = str(index)
-    others = CrudTestModel.all[index..(index+2)]
-    OtherCrudTestModel.create!(:name => c, :other_ids => others.collect(&:id), :more_id => others.first.try(:id))
+    others = CrudTestModel.all[index..(index + 2)]
+    OtherCrudTestModel.create!(name: c,
+                               other_ids: others.map(&:id),
+                               more_id: others.first.try(:id))
   end
 
   def str(index)
      (index + 64).chr * 5
   end
 
-  # hack to avoid ddl in transaction issues with mysql.
+  # A hack to avoid ddl in transaction issues with mysql.
   def without_transaction
     c = ActiveRecord::Base.connection
     start_transaction = false
     if c.adapter_name.downcase.include?('mysql') && c.open_transactions > 0
       # in transactional tests, we may simply rollback
-      c.execute("ROLLBACK")
+      c.execute('ROLLBACK')
       start_transaction = true
     end
 
     yield
 
-    c.execute("BEGIN") if start_transaction
+    c.execute('BEGIN') if start_transaction
   end
 
 end