dry_crud 2.1.0 → 2.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmM5NzIxMmM5YTE2YzE5YTU1NWRkNDc5OTAxODkxOGU2NjE0NTA4Mg==
+    YzE5OGExYmQyZDhkN2JiNGVmZjNjZGU5NTBlMTliZWU5ZTA5NDVkYw==
   data.tar.gz: !binary |-
-    YjM3NzY0Y2VkMTllMWNmZTUwYjk1ZWRmZTgyOTgyMzA5NWFjOWU0Ng==
+    Yzk1Y2M5ZjJlZDk0MWYwZWUzMjA2NTc4YWMwZmUzMTlmYTdlODFjMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWM1ZmVjY2JlZjg4NjNiMjU1NmNlYTk3NTdlZDQzMTk2NzMzNjY0NWRlMzBm
-    YzJmZTQ2OWNiMmNkMWZmNzllZWVmODA4NGE0Yzc4N2M5NGNmMWRhN2Y5N2U3
-    ODg4YTFmYzNmNjk0ZTUxYWZiM2ViZDllOGZjODI1NjE3OTYyYzA=
+    OThmZjNlNTJhZDRkNWI5M2ZhYTBmYzQ1OGFlYTA0ZTVkYjFlZDkxN2U0MWNk
+    OGQzMzViYWU3OWQwY2EzMjE4ZTc4OWNlYWMwNmVjNmRlNjY3N2VjMjY5YzNk
+    ODhiZDAzZjUzYjVkZTMyM2ZmMDljNDNlYzRmZTM3ZDg4MTZiOWE=
   data.tar.gz: !binary |-
-    NjU1YmUwYjVmYzdjZjg5OGZiYjE2ZmU2NGYzYTA0OTkwNTg4ZmEzM2NkY2M4
-    OWZkNzAzZGJhNzU3NmRjM2I2MDIyZWRlMGNiM2MwNWRhZTQ5NTMxMjEzMTRk
-    ZDUyYTZlZDc1NTk5ZWYyODRiNWUxN2RiMmU5NjJjZTg5MmE2NGE=
+    MThmZTk3YTQ5YWY0YWZlNDI5MDFlMmE3ZjAxZDgxNmU2ZDljN2UyNWFlZWI3
+    OTY2NmQxYWUyMzQyYmZhNGZlMDU3NmYyNmVhYTRmMDc5MzhkNDlmOTkzNzFl
+    ZGQ1OGYxNGIyNDgyY2U1ZGE5YzA5OGY0MWQ4ODMzNGJlOGJiNjM=

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.1.1

data/lib/generators/dry_crud/dry_crud_generator.rb

@@ -37,6 +37,10 @@ class DryCrudGenerator < DryCrudGeneratorBase
     unless exclude_test_dir == 'spec'
       template(File.join('test', 'support', 'crud_test_model.rb'),
                File.join('spec', 'support', 'crud_test_model.rb'))
+      template(File.join('test', 'support', 'crud_test_models_controller.rb'),
+               File.join('spec', 'support', 'crud_test_models_controller.rb'))
+      template(File.join('test', 'support', 'crud_test_helper.rb'),
+               File.join('spec', 'support', 'crud_test_helper.rb'))
     end
   end
 

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

@@ -12,7 +12,11 @@ module CrudControllerTestHelper
     params = scope_params.merge(format: m[:format])
     params.merge!(id: test_entry.id) if m[:id]
     params.merge!(example_params)
-    send(m[:method], m[:action], params)
+    if m[:method] == :get && m[:format] == :js
+      xhr(:get, m[:action], params)
+    else
+      send(m[:method], m[:action], params)
+    end
   end
 
   # If a combine key is given in metadata, only the first request for all

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

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'test_helper'
+require 'support/crud_test_helper'
 require 'support/crud_test_model'
 require 'support/crud_controller_test_helper'
 
@@ -39,7 +40,7 @@ class CrudTestModelsControllerTest < ActionController::TestCase
   end
 
   def test_index_js
-    get :index, test_params(format: 'js')
+    xhr :get, :index, test_params
     assert_response :success
     assert_equal 'index js', @response.body
     assert entries.present?

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

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 require 'test_helper'
 require 'support/crud_test_model'
+require 'support/crud_test_models_controller'
 
 # Test I18nHelper
 class I18nHelperTest < ActionView::TestCase

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

@@ -0,0 +1,188 @@
+# encoding: utf-8
+
+#: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:
+
+# 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.
+module CrudTestHelper
+
+  # Controller helper methods for the tests
+
+  def model_class
+    CrudTestModel
+  end
+
+  def controller_name
+    'crud_test_models'
+  end
+
+  def action_name
+    'index'
+  end
+
+  def params
+    {}
+  end
+
+  def path_args(entry)
+    entry
+  end
+
+  def sortable?(attr)
+    true
+  end
+
+  def h(text)
+    ERB::Util.h(text)
+  end
+
+  private
+
+  # Sets up the test database with a crud_test_models table.
+  # Look at the source to view the column definition.
+  def setup_db
+    without_transaction do
+      silence_stream(STDOUT) do
+        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|
+      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).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
+  def crud_test_models(name)
+    CrudTestModel.find_by_name(name.to_s)
+  end
+
+  def with_test_routing
+    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' }
+      yield
+    end
+  end
+
+  def special_routing
+    # test:unit uses instance variable, rspec the method
+    controller = @controller || @_controller || controller
+    @routes = ActionDispatch::Routing::RouteSet.new
+    _routes = @routes
+
+    controller.singleton_class.send(:include, _routes.url_helpers)
+    controller.view_context_class = Class.new(controller.view_context_class) do
+      include _routes.url_helpers
+    end
+
+    @routes.draw { resources :crud_test_models }
+  end
+
+  def create(index, companion)
+    c = str(index)
+    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.even?,
+      remarks: "#{c} #{str(index + 1)} #{str(index + 2)}\n" *
+                  (index % 3 + 1))
+    m.companion = companion
+    m.save!
+    m
+  end
+
+  def create_other(index)
+    c = str(index)
+    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
+
+  # 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')
+      start_transaction = true
+    end
+
+    yield
+
+    c.execute('BEGIN') if start_transaction
+  end
+
+end

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

@@ -47,305 +47,4 @@ class OtherCrudTestModel < ActiveRecord::Base #:nodoc:
   end
 end
 
-# Controller for the dummy model.
-class CrudTestModelsController < CrudController #:nodoc:
-  HANDLE_PREFIX = 'handle_'
 
-  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
-  before_destroy :handle_name
-
-  before_render_new :possibly_redirect
-  before_render_new :set_companions
-
-  attr_reader :called_callbacks
-  attr_accessor :should_redirect
-
-  hide_action :called_callbacks, :should_redirect, :should_redirect=
-
-  # don't use the standard layout as it may require different routes
-  # than just the test route for this controller
-  layout false
-
-  def index
-    super do |format|
-      format.js { render text: 'index js'}
-    end
-  end
-
-  def show
-    super do |format|
-      format.html { render text: 'custom html' } if entry.name == 'BBBBB'
-    end
-  end
-
-  def create
-    super do |format|
-      flash[:notice] = 'model got created' if entry.persisted?
-    end
-  end
-
-  private
-
-  def list_entries
-    entries = super
-    if params[:filter]
-      entries = entries.where(['rating < ?', 3])
-                       .except(:order)
-                       .order('children DESC')
-    end
-    entries
-  end
-
-  private
-
-  def build_entry
-    entry = super
-    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'
-      false
-    end
-  end
-
-  # callback to redirect if @should_redirect is set
-  def possibly_redirect
-    redirect_to action: 'index' if should_redirect && !performed?
-    !should_redirect
-  end
-
-  def set_companions
-    @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}"
-    send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
-    callback = "after_#{a.to_s}"
-    send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
-  end
-
-  # create callback methods that record the before_render callbacks
-  [:index, :show, :new, :edit, :form].each do |a|
-    callback = "before_render_#{a.to_s}"
-    send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
-  end
-
-  # handle the called callbacks
-  def method_missing(sym, *args)
-    if sym.to_s.starts_with?(HANDLE_PREFIX)
-      called_callback(sym.to_s[HANDLE_PREFIX.size..-1].to_sym)
-    end
-  end
-
-  # records a callback
-  def called_callback(callback)
-    @called_callbacks ||= []
-    @called_callbacks << callback
-  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:
-
-# 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.
-module CrudTestHelper
-
-  # Controller helper methods for the tests
-
-  def model_class
-    CrudTestModel
-  end
-
-  def controller_name
-    'crud_test_models'
-  end
-
-  def action_name
-    'index'
-  end
-
-  def params
-    {}
-  end
-
-  def path_args(entry)
-    entry
-  end
-
-  def sortable?(attr)
-    true
-  end
-
-  def h(text)
-    ERB::Util.h(text)
-  end
-
-  private
-
-  # Sets up the test database with a crud_test_models table.
-  # Look at the source to view the column definition.
-  def setup_db
-    without_transaction do
-      silence_stream(STDOUT) do
-        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|
-      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).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
-  def crud_test_models(name)
-    CrudTestModel.find_by_name(name.to_s)
-  end
-
-  def with_test_routing
-    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' }
-      yield
-    end
-  end
-
-  def special_routing
-    # test:unit uses instance variable, rspec the method
-    controller = @controller || controller
-    @routes = ActionDispatch::Routing::RouteSet.new
-    _routes = @routes
-
-    controller.singleton_class.send(:include, _routes.url_helpers)
-    controller.view_context_class = Class.new(controller.view_context_class) do
-      include _routes.url_helpers
-    end
-
-    @routes.draw { resources :crud_test_models }
-  end
-
-  def create(index, companion)
-    c = str(index)
-    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.even?,
-      remarks: "#{c} #{str(index + 1)} #{str(index + 2)}\n" *
-                  (index % 3 + 1))
-    m.companion = companion
-    m.save!
-    m
-  end
-
-  def create_other(index)
-    c = str(index)
-    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
-
-  # 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')
-      start_transaction = true
-    end
-
-    yield
-
-    c.execute('BEGIN') if start_transaction
-  end
-
-end

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

@@ -0,0 +1,117 @@
+# encoding: utf-8
+
+# Controller for the dummy model.
+class CrudTestModelsController < CrudController #:nodoc:
+  HANDLE_PREFIX = 'handle_'
+
+  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
+  before_destroy :handle_name
+
+  before_render_new :possibly_redirect
+  before_render_new :set_companions
+
+  attr_reader :called_callbacks
+  attr_accessor :should_redirect
+
+  hide_action :called_callbacks, :should_redirect, :should_redirect=
+
+  # don't use the standard layout as it may require different routes
+  # than just the test route for this controller
+  layout false
+
+  def index
+    super do |format|
+      format.js { render text: 'index js'}
+    end
+  end
+
+  def show
+    super do |format|
+      format.html { render text: 'custom html' } if entry.name == 'BBBBB'
+    end
+  end
+
+  def create
+    super do |format|
+      flash[:notice] = 'model got created' if entry.persisted?
+    end
+  end
+
+  private
+
+  def list_entries
+    entries = super
+    if params[:filter]
+      entries = entries.where(['rating < ?', 3])
+                       .except(:order)
+                       .order('children DESC')
+    end
+    entries
+  end
+
+  private
+
+  def build_entry
+    entry = super
+    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'
+      false
+    end
+  end
+
+  # callback to redirect if @should_redirect is set
+  def possibly_redirect
+    redirect_to action: 'index' if should_redirect && !performed?
+    !should_redirect
+  end
+
+  def set_companions
+    @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}"
+    send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
+    callback = "after_#{a.to_s}"
+    send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
+  end
+
+  # create callback methods that record the before_render callbacks
+  [:index, :show, :new, :edit, :form].each do |a|
+    callback = "before_render_#{a.to_s}"
+    send(callback.to_sym, :"#{HANDLE_PREFIX}#{callback}")
+  end
+
+  # handle the called callbacks
+  def method_missing(sym, *args)
+    if sym.to_s.starts_with?(HANDLE_PREFIX)
+      called_callback(sym.to_s[HANDLE_PREFIX.size..-1].to_sym)
+    end
+  end
+
+  # records a callback
+  def called_callback(callback)
+    @called_callbacks ||= []
+    @called_callbacks << callback
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry_crud
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2014-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,7 +134,9 @@ files:
 - lib/generators/dry_crud/templates/test/helpers/table_helper_test.rb
 - lib/generators/dry_crud/templates/test/helpers/utility_helper_test.rb
 - lib/generators/dry_crud/templates/test/support/crud_controller_test_helper.rb
+- lib/generators/dry_crud/templates/test/support/crud_test_helper.rb
 - lib/generators/dry_crud/templates/test/support/crud_test_model.rb
+- lib/generators/dry_crud/templates/test/support/crud_test_models_controller.rb
 - lib/generators/dry_crud/templates/test/support/custom_assertions.rb
 - MIT-LICENSE
 - README.rdoc