dry_crud 2.1.2 → 3.0.0

data/lib/generators/dry_crud/templates/test/controllers/crud_test_models_controller_test.rb

@@ -49,7 +49,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   def test_index_search
     super
     assert_equal 1, entries.size
-    assert_equal({ q: 'AAAA' }, session[:list_params]['/crud_test_models'])
+    assert_equal({ 'q' => 'AAAA' }, session[:list_params]['/crud_test_models'])
   end
 
   def test_index_with_custom_options
@@ -68,7 +68,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert entries.present?
     assert_equal 1, entries.size
     assert_equal [CrudTestModel.find_by_name('BBBBB')], entries
-    assert_equal({ q: 'DDD' }, session[:list_params]['/crud_test_models'])
+    assert_equal({ 'q' => 'DDD' }, session[:list_params]['/crud_test_models'])
   end
 
   def test_sort_given_column
@@ -78,7 +78,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert entries.present?
     assert_equal 6, entries.size
     assert_equal CrudTestModel.all.sort_by(&:children), entries
-    assert_equal({ sort: 'children', sort_dir: 'asc' },
+    assert_equal({ 'sort' => 'children', 'sort_dir' => 'asc' },
                  session[:list_params]['/crud_test_models'])
   end
 
@@ -88,7 +88,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert_template 'index'
     assert entries.present?
     assert_equal 6, entries.size
-    assert_equal({ sort: 'chatty', sort_dir: 'desc' },
+    assert_equal({ 'sort' => 'chatty', 'sort_dir' => 'desc' },
                  session[:list_params]['/crud_test_models'])
 
     # sort order is ambiguous, use index
@@ -108,15 +108,15 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     assert entries.present?
     assert_equal 3, entries.size
     assert_equal %w(CCCCC DDDDD BBBBB), entries.map(&:name)
-    assert_equal({ sort: 'chatty', sort_dir: 'asc', q: 'DDD' },
+    assert_equal({ 'sort' => 'chatty', 'sort_dir' => 'asc', 'q' => 'DDD' },
                  session[:list_params]['/crud_test_models'])
   end
 
   def test_index_returning
     session[:list_params] = {}
-    session[:list_params]['/crud_test_models'] = { q: 'DDD',
-                                                   sort: 'chatty',
-                                                   sort_dir: 'desc' }
+    session[:list_params]['/crud_test_models'] = { 'q' => 'DDD',
+                                                   'sort' => 'chatty',
+                                                   'sort_dir' => 'desc' }
     get :index, returning: true
     assert_response :success
     assert_template 'index'
@@ -234,7 +234,6 @@ class CrudTestModelsControllerTest < ActionController::TestCase
     end
     assert_response :unprocessable_entity
     assert entry.new_record?
-    assert_match(/errors/, @response.body)
     assert_equal [:before_create, :before_save], @controller.called_callbacks
   end
 
@@ -257,7 +256,6 @@ class CrudTestModelsControllerTest < ActionController::TestCase
                  format: 'json'
     assert_response :unprocessable_entity
     assert entry.changed?
-    assert_match(/errors/, @response.body)
     assert flash[:notice].blank?
     assert_equal 20, entry.rating
     assert_equal [:before_update, :before_save], @controller.called_callbacks
@@ -291,7 +289,6 @@ class CrudTestModelsControllerTest < ActionController::TestCase
                                    format: 'json')
     end
     assert_response :unprocessable_entity
-    assert_match(/errors/, @response.body)
     assert flash[:notice].blank?
   end
 

data/lib/generators/dry_crud/templates/test/helpers/dry_crud/form/builder_test.rb

@@ -21,12 +21,7 @@ module DryCrud
 
       def create_form
         @entry = CrudTestModel.first
-        if Rails.version < '4.0'
-          @form = DryCrud::Form::Builder.new(:entry, @entry, self, {},
-                                             ->(form) { form })
-        else
-          @form = DryCrud::Form::Builder.new(:entry, @entry, self, {})
-        end
+        @form = DryCrud::Form::Builder.new(:entry, @entry, self, {})
       end
 
       test 'input_field dispatches string attr to string_field' do

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

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require 'test_helper'
 require 'support/crud_test_model'
+require 'support/crud_test_helper'
 
 # Test FormHelper
 class FormHelperTest < ActionView::TestCase
@@ -23,15 +24,15 @@ class FormHelperTest < ActionView::TestCase
       end
     end
 
-    assert_match(/form .*?action="\/crud_test_models\/#{e.id}"
-                       .*?class="special\ form-horizontal"
+    assert_match(/form .*?class="special\ form-horizontal"
+                       .*?action="\/crud_test_models\/#{e.id}"
                        .*?method="post"/x, f)
-    assert_match(/input .*?name="_method"
-                        .*?type="hidden"
+    assert_match(/input .*?type="hidden"
+                        .*?name="_method"
                         .*?value="(patch|put)"/x, f)
-    assert_match(/input .*?name="crud_test_model\[name\]"
-                        .*?type="text"
-                        .*?value="AAAAA"/x, f)
+    assert_match(/input .*?type="text"
+                        .*?value="AAAAA"
+                        .*?name="crud_test_model\[name\]"/x, f)
   end
 
   test 'standard form' do
@@ -46,22 +47,22 @@ class FormHelperTest < ActionView::TestCase
     end
 
     assert_match(/form .*?action="\/crud_test_models\/#{e.id}"
-                       .*?class="special\ form-horizontal"
-                      .*?method="post"/x, f)
-    assert_match(/input .*?name="_method"
-                        .*?type="hidden"
+                       .*?method="post"/x, f)
+    assert_match(/form .*?class="special\ form-horizontal"/x, f)
+    assert_match(/input .*?type="hidden"
+                        .*?name="_method"
                         .*?value="(patch|put)"/x, f)
-    assert_match(/input .*?name="crud_test_model\[name\]"
-                        .*?type="text"
-                        .*?value="AAAAA"/x, f)
-    assert_match(/input .*?name="crud_test_model\[birthdate\]"
-                        .*?type="date"/x, f)
-    assert_match(/input .*?name="crud_test_model\[children\]"
-                        .*?type="number"
-                        .*?value=\"9\"/x, f)
-    assert_match(/input .*?name="crud_test_model\[human\]"
-                        .*?type="checkbox"/x, f)
-    assert_match(/button\ .*?type="submit"\>
+    assert_match(/input .*?type="text"
+                        .*?value="AAAAA"
+                        .*?name="crud_test_model\[name\]"/x, f)
+    assert_match(/input .*?type="date"
+                        .*?name="crud_test_model\[birthdate\]"/x, f)
+    assert_match(/input .*?type="number"
+                        .*?value=\"9\"
+                        .*?name="crud_test_model\[children\]"/x, f)
+    assert_match(/input .*?type="checkbox"
+                        .*?name="crud_test_model\[human\]"/x, f)
+    assert_match(/button\ .*?type="submit".*\>
                   #{t('global.button.save')}
                   \<\/button\>/x, f)
     assert_match(/\<a\ .*href="\/somewhere".*\>
@@ -84,16 +85,16 @@ class FormHelperTest < ActionView::TestCase
 
     assert_match(/form .*?action="\/crud_test_models\/#{e.id}"
                        .*?method="post"/x, f)
-    assert_match(/input .*?name="_method"
-                        .*?type="hidden"
+    assert_match(/input .*?type="hidden"
+                        .*?name="_method"
                         .*?value="(patch|put)"/x, f)
     assert_match(/div[^>]* id='error_explanation'/, f)
     assert_match(/div\ class="form-group\ has-error"\>.*?
-                  \<input .*?name="crud_test_model\[name\]"
-                          .*?type="text"/x, f)
-    assert_match(/input .*?name="crud_test_model\[birthdate\]"
+                  \<input .*?type="text"
+                          .*?name="crud_test_model\[name\]"/x, f)
+    assert_match(/input .*?value="1910-01-01"
                         .*?type="date"
-                        .*?value="1910-01-01"/x, f)
+                        .*?name="crud_test_model\[birthdate\]"/x, f)
   end
 
   test 'crud form' do
@@ -102,24 +103,24 @@ class FormHelperTest < ActionView::TestCase
     end
 
     assert_match(/form .*?action="\/crud_test_models\/#{entry.id}"/, f)
-    assert_match(/input .*?name="crud_test_model\[name\]"
-                        .*?type="text"/x, f)
-    assert_match(/input .*?name="crud_test_model\[whatever\]"
-                        .*?type="text"/x, f)
-    assert_match(/input .*?name="crud_test_model\[children\]"
-                        .*?type="number"/x, f)
-    assert_match(/input .*?name="crud_test_model\[rating\]"
-                        .*?type="number"/x, f)
-    assert_match(/input .*?name="crud_test_model\[income\]"
-                        .*?type="number"/x, f)
-    assert_match(/input .*?name="crud_test_model\[birthdate\]"
-                        .*?type="date"/x, f)
-    assert_match(/input .*?name="crud_test_model\[gets_up_at\]"
-                        .*?type="time"/x, f)
-    assert_match(/input .*?name="crud_test_model\[last_seen\]"
-                        .*?type="datetime"/x, f)
-    assert_match(/input .*?name="crud_test_model\[human\]"
-                        .*?type="checkbox"/x, f)
+    assert_match(/input .*?type="text"
+                        .*?name="crud_test_model\[name\]"/x, f)
+    assert_match(/input .*?type="text"
+                        .*?name="crud_test_model\[whatever\]"/x, f)
+    assert_match(/input .*?type="number"
+                        .*?name="crud_test_model\[children\]"/x, f)
+    assert_match(/input .*?type="number"
+                        .*?name="crud_test_model\[rating\]"/x, f)
+    assert_match(/input .*?type="number"
+                        .*?name="crud_test_model\[income\]"/x, f)
+    assert_match(/input .*?type="date"
+                        .*?name="crud_test_model\[birthdate\]"/x, f)
+    assert_match(/input .*?type="time"
+                        .*?name="crud_test_model\[gets_up_at\]"/x, f)
+    assert_match(/input .*?type="datetime"
+                        .*?name="crud_test_model\[last_seen\]"/x, f)
+    assert_match(/input .*?type="checkbox"
+                        .*?name="crud_test_model\[human\]"/x, f)
     assert_match(/select .*?name="crud_test_model\[companion_id\]"/, f)
     assert_match(/textarea .*?name="crud_test_model\[remarks\]"/, f)
     assert_match(/a .*href="\/crud_test_models\/#{entry.id}\?returning=true"

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

@@ -96,7 +96,7 @@ class FormatHelperTest < ActionView::TestCase
     assert_equal '9', format_type(m, :children)
 
     m.children = 10_000
-    assert_equal '10000', format_type(m, :children)
+    assert_equal '10,000', format_type(m, :children)
   end
 
   unless ENV['NON_LOCALIZED'] # localization dependent tests

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

@@ -12,7 +12,7 @@ class TableHelperTest < ActionView::TestCase
   include CustomAssertions
   include CrudTestHelper
 
-  setup :reset_db, :setup_db, :create_test_data
+  setup :reset_db, :setup_db, :create_test_data, :empty_params
   teardown :reset_db
 
   attr_reader :entries
@@ -25,13 +25,19 @@ class TableHelperTest < ActionView::TestCase
     "#{f(obj.size)} chars"
   end
 
-  test 'empty table should render message' do
+  def empty_params
+    def params
+      {}
+    end
+  end
+
+  test 'empty table renders message' do
     result = plain_table_or_message([]) {}
     assert result.html_safe?
     assert_match(/\<div class=["']table["']\>.*\<\/div\>/, result)
   end
 
-  test 'non empty table should render table' do
+  test 'non empty table renders table' do
     result = plain_table_or_message(%w(foo bar)) do |t|
       t.attrs :size, :upcase
     end

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

@@ -91,7 +91,7 @@ module CrudControllerTestHelper
                                 format: 'json')
     end
     assert_response :success
-    assert @response.body.starts_with?('{')
+    assert @response.body.starts_with?('{"id":')
   end
 
   def test_edit # :nodoc:
@@ -117,7 +117,7 @@ module CrudControllerTestHelper
                                format: 'json')
     end
     assert_response :success
-    assert_equal '', @response.body.strip
+    assert @response.body.starts_with?('{"id":')
   end
 
   def test_destroy # :nodoc:

data/lib/generators/dry_crud/templates/test/support/crud_test_helper.rb

@@ -75,7 +75,7 @@ module CrudTestHelper
       t.boolean  :human, default: true
       t.text     :remarks
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 

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

@@ -13,8 +13,6 @@ class CrudTestModel < ActiveRecord::Base #:nodoc:
   validates :name, presence: true
   validates :rating, inclusion: { in: 1..10 }
 
-  attr_protected nil if Rails.version < '4.0'
-
   def to_s
     name
   end
@@ -40,8 +38,6 @@ class OtherCrudTestModel < ActiveRecord::Base #:nodoc:
   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
   end

data/lib/generators/dry_crud/templates/test/support/crud_test_models_controller.rb

@@ -7,11 +7,9 @@ class CrudTestModelsController < CrudController #:nodoc:
   self.search_columns = [:name, :whatever, :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
@@ -30,20 +28,17 @@ class CrudTestModelsController < CrudController #:nodoc:
   layout false
 
   def index
-    super do |format|
-      format.js { render text: 'index js' }
-    end
+    entries
+    render text: 'index js' if request.format.js?
   end
 
   def show
-    super do |format|
-      format.html { render text: 'custom html' } if entry.name == 'BBBBB'
-    end
+    render text: 'custom html' if entry.name == 'BBBBB'
   end
 
   def create
-    super do |_format|
-      flash[:notice] = 'model got created' if entry.persisted?
+    super do |_format, success|
+      flash[:notice] = 'model got created' if success
     end
   end
 

metadata

@@ -1,37 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: dry_crud
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-description: ! 'Generates simple and extendable controller, views and helpers that
-  support you
-
+description: |
+  Generates simple and extendable controller, views and helpers that support you
   to DRY up the CRUD code in your Rails project. Start with these elements and
-
   build a clean base to efficiently develop your application upon.
-
-'
 email: spam@codez.ch
 executables: []
 extensions: []
@@ -55,7 +51,6 @@ files:
 - app/controllers/dry_crud/nestable.rb
 - app/controllers/dry_crud/rememberable.rb
 - app/controllers/dry_crud/render_callbacks.rb
-- app/controllers/dry_crud/responder.rb
 - app/controllers/dry_crud/searchable.rb
 - app/controllers/dry_crud/sortable.rb
 - app/controllers/list_controller.rb
@@ -89,6 +84,7 @@ files:
 - app/views/crud/new.html.haml
 - app/views/crud/show.html.erb
 - app/views/crud/show.html.haml
+- app/views/crud/show.json.jbuilder
 - app/views/layouts/_flash.html.erb
 - app/views/layouts/_flash.html.haml
 - app/views/layouts/_nav.html.erb
@@ -103,6 +99,7 @@ files:
 - app/views/list/_search.html.haml
 - app/views/list/index.html.erb
 - app/views/list/index.html.haml
+- app/views/list/index.json.jbuilder
 - app/views/shared/_error_messages.html.erb
 - app/views/shared/_error_messages.html.haml
 - app/views/shared/_labeled.html.erb
@@ -146,26 +143,26 @@ licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
-- ! '"Dry Crud"'
-- --main
+- "--title"
+- '"Dry Crud"'
+- "--main"
 - README.rdoc
-- --line-numbers
+- "--line-numbers"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Generates DRY and specifically extendable CRUD controller, views and helpers