active_scaffold 3.4.10 → 3.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26af65dba6ac3fe50f666f71c4ed02abb0adda89
-  data.tar.gz: 619b8200bc93ba0f81d123119723ab24c12fbec5
+  metadata.gz: e19f95fd4ac370c29a8d8774e4b3c94083e6df2a
+  data.tar.gz: 419230d149a695aebf92be0aa1d6c1455868ddac
 SHA512:
-  metadata.gz: ce3969fced5fe06b11f6ac32735ae382f0f494a5087d0a7664eb11b1a15d6952fcf64832f2f585d0408363f10cecab1a8c6617ed90519b04b18d73fbd98cde92
-  data.tar.gz: be56ceb6696c945eb66872fa482166b430d417de66d26f861e6c66d9f68e03ecb1e1c06050d28a1095c7dbbd2071ae3f9b4ee29e3c455533991e54663e7d44a5
+  metadata.gz: d763e9f014fc3b43cfa5f81218d50a5f4f276d56f97522c1631c7771ad9ae6793318ee9b112dc691d73f80541b4a39ab73b8ba6e6f7413fcab4b15510c66c66b
+  data.tar.gz: 77add87ef5f5ce6260296e9272fdae39de94407ff9071fdd3250f5f7219262660a2485889dc6f498ad043cf8da39a696d07095c69d662f56f694b30017f1675c

data/CHANGELOG

@@ -1,3 +1,10 @@
+= 3.4.11
+- Fix refresh-link on main form (not subform)
+- Workaround for counter_cache bug on rails4 (https://github.com/rails/rails/pull/14849)
+- Support create form on nested scaffolds on through association, if through reflection association is included in create form
+- Remove ruby 1.8 support
+- Fix :index member route (list one item), broken on 3.4.9
+
 = 3.4.10
 - singular associations on subform are always created, in other case it's not possible to enable a checkbox without filling text fields.
 - process_action_link_action checks security for crud_type and action now

data/README.md

@@ -2,7 +2,7 @@ Overview
 ========
 [![travis tests](https://travis-ci.org/activescaffold/active_scaffold.png)](https://travis-ci.org/activescaffold/active_scaffold)
 
-ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails 3.2 and 4.x are supported. For rails 4 is recommended >= 4.0.5.
+ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails 3.2 and 4.x are supported, ruby >= 1.9 required. For rails 4 is recommended >= 4.0.5.
 
 Branch Details
 --------------

data/lib/active_scaffold/actions/create.rb

@@ -133,7 +133,11 @@ module ActiveScaffold::Actions
     end
     
     def create_authorized?
-      !(nested? && (nested.readonly? || nested.readonly_through_association?)) && authorized_for?(:crud_type => :create)
+      if nested?
+        nested_authorized = !nested.readonly? && !nested.readonly_through_association?(active_scaffold_config.create.columns)
+        return false unless nested_authorized
+      end
+      authorized_for?(:crud_type => :create)
     end
     private
     def create_authorized_filter

data/lib/active_scaffold/attribute_params.rb

@@ -32,6 +32,36 @@ module ActiveScaffold
   # }
   module AttributeParams
     protected
+    # workaround to update counters when belongs_to changes on persisted record on Rails 3
+    # TODO remove when rails3 support is removed
+    def rails3_counter_cache_hack(parent_record, column, value)
+      association = parent_record.association(column.name)
+      if association.send(:has_cached_counter?)
+        counter_attr = association.send(:cached_counter_attribute_name)
+        difference = value.select(&:persisted?).size - parent_record.send(counter_attr)
+
+        if parent_record.new_record?
+          parent_record.send "#{counter_attr}=", difference
+        else
+          # don't decrement counter for deleted records, on destroy they will update counter
+          difference += (parent_record.send(column.name) - value).size
+          association.send :update_counter, difference unless difference == 0
+        end
+
+        # update counters on old parents if belongs_to is changed
+        value.select(&:persisted?).each do |record|
+          key = record.send(column.association.foreign_key)
+          parent_record.class.decrement_counter counter_attr, key if key != parent_record.id
+        end
+      end
+    end
+
+    # workaround for updating counters twice bug on rails4 (https://github.com/rails/rails/pull/14849)
+    # TODO remove when pull request is merged and no version with bug is supported
+    def counter_cache_hack?(column, value)
+      Rails.version >= '4.0' && column.association.try(:belongs_to?) && column.association.options[:counter_cache] && !value.is_a?(Hash)
+    end
+
     # Takes attributes (as from params[:record]) and applies them to the parent_record. Also looks for
     # association attributes and attempts to instantiate them as associated objects.
     #
@@ -62,8 +92,12 @@ module ActiveScaffold
             value = column_value_from_param_value(parent_record, column, attributes[column.name], avoid_changes)
             if avoid_changes && column.plural_association?
               parent_record.association(column.name).target = value
+            elsif counter_cache_hack?(column, attributes[column.name])
+              parent_record.send "#{column.association.foreign_key}=", value.try(:id)
+              parent_record.association(column.name).target = value
             else
               begin
+                rails3_counter_cache_hack(parent_record, column, value) if Rails.version < '4.0' && column.plural_association?
                 parent_record.send "#{column.name}=", value
               rescue ActiveRecord::RecordNotSaved
                 parent_record.errors.add column.name, :invalid
@@ -150,7 +184,6 @@ module ActiveScaffold
       if column.singular_association?
         manage_nested_record_from_params(parent_record, column, value, avoid_changes)
       elsif column.plural_association?
-        value = value.sort if RUBY_VERSION < '1.9'
         # HACK to be able to delete all associated records, hash will include "0" => ""
         value.collect {|key, value| manage_nested_record_from_params(parent_record, column, value, avoid_changes) unless value == ""}.compact
       else

data/lib/active_scaffold/data_structures/action_links.rb

@@ -14,7 +14,7 @@ module ActiveScaffold::DataStructures
       link = if action.is_a?(ActiveScaffold::DataStructures::ActionLink) || action.is_a?(ActiveScaffold::DataStructures::ActionLinks)
         action
       else
-        options[:type] ||= default_type
+        options[:type] ||= default_type if default_type
         ActiveScaffold::DataStructures::ActionLink.new(action, options)
       end
       # NOTE: this duplicate check should be done by defining the comparison operator for an Action data structure

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -54,7 +54,7 @@ module ActiveScaffold::DataStructures
       has_many? || habtm?
     end
 
-    def readonly_through_association?
+    def readonly_through_association?(columns)
       false
     end
 
@@ -101,9 +101,13 @@ module ActiveScaffold::DataStructures
     end
     
     # A through association with has_one or has_many as source association
-    # create cannot be called in such through association
-    def readonly_through_association?
-      association.options[:through] && association.source_reflection.macro != :belongs_to
+    # create cannot be called in such through association, unless create columns include through reflection of reverse association
+    # e.g. customer -> networks -> firewall, reverse is firewall -> network -> customer,
+    # firewall can be created if create columns include network
+    def readonly_through_association?(columns)
+      through_association? && association.source_reflection.macro != :belongs_to && (
+        !child_association || !columns.include?(child_association.through_reflection.name)
+      )
     end
     
     def through_association?

data/lib/active_scaffold/extensions/routing_mapper.rb

@@ -23,6 +23,7 @@ module ActionDispatch
         end
 
         def as_routes(opts = {:association => true})
+          resource = parent_resource
           resource_scope(:resource, ActiveScaffold.new(parent_resource.name, parent_resource.options)) do
             collection do
               ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection].each do |name, type|
@@ -33,7 +34,7 @@ module ActionDispatch
               ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:member].each do |name, type|
                 match(name, :via => type) if parent_resource.actions.include? name
               end
-              get 'list', :action => :index if parent_resource.actions.include? :index
+              get 'list', :action => :index if resource.actions.include? :index
             end
           end
           as_association_routes if opts[:association]

data/lib/active_scaffold/finder.rb

@@ -376,7 +376,7 @@ module ActiveScaffold
   
       # Converts count to an integer if ActiveRecord returned an OrderedHash
       # that happens when find_options contains a :group key
-      count = count.length if count.is_a?(Hash) || count.is_a?(ActiveSupport::OrderedHash) # TODO remove OrderedHash check when ruby 1.8 or rails3 support is removed
+      count = count.length if count.is_a?(Hash)
       count
     end
 

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -59,7 +59,15 @@ module ActiveScaffold
       end
 
       def association_klass_scoped(association, klass, record)
-        klass
+        if nested? && nested.through_association? && nested.child_association.try(:through_reflection) == association
+          if nested.association.through_reflection.collection?
+            nested_parent_record.send(nested.association.through_reflection.name)
+          else
+            klass.where(association.association_primary_key => nested_parent_record.send(nested.association.through_reflection.name).try(:id))
+          end
+        else
+          klass
+        end
       end
 
       # Sorts the options for select

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -277,7 +277,7 @@ module ActiveScaffold
           link_options['data-update_send_form_selector'] = html_options['data-update_send_form_selector']
         else
           scope = html_options[:name].scan(/^record((\[[^\]]*\])*)\[#{column.name}\]/)[0].try(:first) if html_options[:name]
-          link_options = update_columns_options(column, scope, link_options, true)
+          link_options = update_columns_options(column, scope.presence, link_options, true)
         end
         link_options[:class] = 'refresh-link'
         link_to(as_(:refresh), link_options.delete('data-update_url') || html_options['data-update_url'], link_options)

data/lib/active_scaffold/responds_to_parent.rb

@@ -10,7 +10,6 @@ module ActiveScaffold
       if performed?
         # Either pull out a redirect or the request body
         script =  if response.headers['Location']
-                    #TODO: erase_redirect_results is missing in rails 3.0
                     "document.location.href = '#{self.class.helpers.escape_javascript location.to_s}'"
                   else
                     response.body || ''

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 10
+    PATCH = 11
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/test/extensions/routing_mapper_test.rb

@@ -4,6 +4,7 @@ class RoutingMapperTest < ActionController::TestCase
   test 'rails routes' do
     assert_routing 'addresses', :controller => 'addresses', :action => 'index'
     assert_routing 'addresses/1', :controller => 'addresses', :action => 'show', :id => '1'
+    assert_routing 'addresses/1/list', :controller => 'addresses', :action => 'index', :id => '1'
     assert_routing 'addresses/1/edit', :controller => 'addresses', :action => 'edit', :id => '1'
     assert_routing({:method => :put, :path => 'addresses/1'}, {:controller => 'addresses', :action => 'update', :id => '1'})
     assert_routing({:method => :delete, :path => 'addresses/1'}, {:controller => 'addresses', :action => 'destroy', :id => '1'})

data/test/misc/attribute_params_test.rb

@@ -13,7 +13,6 @@ class AttributeParamsTest < MiniTest::Test
     assert model.save
 
     model.buildings.create(:name => '1st building')
-    model.reload
     model = update_record_from_params(model, :update, :first_name, :last_name, :first_name => 'Name', :last_name => 'Last')
     assert_equal 'Name', model.first_name
     assert_equal 'Last', model.last_name
@@ -69,7 +68,7 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal 0, model.reload.buildings_count
   end
 
-  def test_saving_belongs_to_select
+  def test_saving_belongs_to_select_for_has_one_reverse
     person = Person.create
     assert person.persisted?
     assert_equal 0, person.floors_count
@@ -87,8 +86,44 @@ class AttributeParamsTest < MiniTest::Test
     assert_nil model.tenant, 'tenant should be cleared'
     assert_equal person.id, Floor.find(model.id).tenant_id, 'floor should not be saved yet'
     assert model.save
-    assert_nil Floor.find(model.id).tenant_id, 'floor should not be saved'
+    assert_nil Floor.find(model.id).tenant_id, 'floor should be saved'
     assert_equal 0, person.reload.floors_count
+
+    model = update_record_from_params(model, :create, :number, :tenant, :number => '1', :tenant => person.id.to_s)
+    assert_equal 1, model.number
+    assert_equal person.id, model.tenant_id
+    assert_equal person, model.tenant
+    assert model.save
+    assert_equal 1, person.reload.floors_count
+  end
+
+  def test_saving_belongs_to_select_for_has_many_reverse
+    person = Person.create
+    assert person.persisted?
+    assert_equal 0, person.buildings_count
+
+    model = update_record_from_params(Building.new, :create, :name, :owner, :name => 'Tower', :owner => person.id.to_s)
+    assert_equal 'Tower', model.name
+    assert_equal person.id, model.owner_id
+    assert_equal person, model.owner
+    assert model.save
+    assert_equal 1, person.reload.buildings_count
+
+    model = update_record_from_params(model, :update, :name, :owner, :name => 'Tower', :owner => '')
+    assert_equal 'Tower', model.name
+    assert_nil model.owner_id, 'owner should be cleared'
+    assert_nil model.owner, 'owner should be cleared'
+    assert_equal person.id, Building.find(model.id).owner_id, 'building should not be saved yet'
+    assert model.save
+    assert_nil Building.find(model.id).owner_id, 'building should be saved'
+    assert_equal 0, person.reload.buildings_count
+
+    model = update_record_from_params(model, :create, :name, :owner, :name => 'Tower', :owner => person.id.to_s)
+    assert_equal 'Tower', model.name
+    assert_equal person.id, model.owner_id
+    assert_equal person, model.owner
+    assert model.save
+    assert_equal 1, person.reload.buildings_count
   end
 
   def test_saving_has_one_select
@@ -183,7 +218,7 @@ class AttributeParamsTest < MiniTest::Test
     floor = Floor.create
     people = 2.times.map { Person.create }
     key = Time.now.to_i.to_s
-    floors = {'0' => '', '1' => {:number => '1', :tenant => '', :id => floor.id.to_s}, key => {:number => '2', 'tenant' => people.first.id.to_s}, key.succ => {:number => '4', 'tenant' => people.last.id.to_s}}
+    floors = {'0' => '', floor.id.to_s => {:number => '1', :tenant => '', :id => floor.id.to_s}, key => {:number => '2', 'tenant' => people.first.id.to_s}, key.succ => {:number => '4', 'tenant' => people.last.id.to_s}}
     model = update_record_from_params(Building.new, :create, :name, :floors, :name => 'First', :floors => floors)
     assert_equal 'First', model.name
     assert_equal 3, model.floors.size
@@ -191,11 +226,33 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal [nil, *people.map(&:id)], model.floors.map(&:tenant_id)
     assert model.save
     assert_equal [1, 1], people.map(&:reload).map(&:floors_count)
+    assert_equal 3, model.reload.floors_count
+
+    last_floor = model.floors.last
+    floors = {'0' => '', floor.id.to_s => {:number => '1', :tenant => '', :id => floor.id.to_s}, last_floor.id.to_s => {:number => '4', 'tenant' => people.last.id.to_s, :id => last_floor.id.to_s}}
+    model = update_record_from_params(model, :create, :name, :floors, :name => 'First', :floors => floors)
+    assert_equal 'First', model.name
+    assert_equal 2, model.floors.size
+    assert_equal floor.id, model.floors.first.id
+    assert_equal [nil, last_floor.tenant_id], model.floors.map(&:tenant_id)
+    assert model.save
+    assert_equal 2, model.reload.floors_count
+
+    floors = {'0' => '', floor.id.to_s => {:number => '1', :tenant => '', :id => floor.id.to_s}}
+    new_model = update_record_from_params(Building.create, :create, :name, :floors, :name => 'Last', :floors => floors)
+    assert_equal 'Last', new_model.name
+    assert_equal 1, new_model.floors.size
+    assert_equal floor.id, new_model.floors.first.id
+    assert_equal [nil], new_model.floors.map(&:tenant_id)
+    assert new_model.save
+    assert_equal 1, new_model.reload.floors_count
+    assert_equal 1, model.reload.floors_count
 
     model = update_record_from_params(model, :update, :name, :floors, :name => 'Tower', :floors => {'0' => ''})
     assert_equal 'Tower', model.name
     assert model.floors.blank?, 'floors should be cleared'
     assert model.save
+    assert_equal 0, model.reload.floors_count
   end
 
   def test_saving_belongs_to_crud
@@ -292,6 +349,7 @@ class AttributeParamsTest < MiniTest::Test
     params = columns.extract_options!.with_indifferent_access
     new_record = nil
     record.class.transaction do
+      record = record.class.find(record.id) if record.persisted?
       new_record = @controller.update_record_from_params(record, build_action_columns(record, action, columns), params)
       MODELS.each { |model| model.any_instance.unstub(:save) }
       yield if block_given?

data/test/mock_app/app/models/building.rb

@@ -1,17 +1,8 @@
 class Building < ActiveRecord::Base
-  belongs_to :owner, :class_name => 'Person', :counter_cache => true
-  has_many :floors, :dependent => :delete_all
+  belongs_to :owner, :class_name => 'Person', :counter_cache => true, :inverse_of => :building
+  has_many :floors, :dependent => :destroy, :inverse_of => :building
 
   has_one :address, :as => :addressable
 
   has_many :tenants, :through => :floors, :class_name => 'Person'
-  
-  if Rails.version < '4.1'
-    after_update :update_buildings_count, :if => :owner_id_changed?
-    
-    def update_buildings_count
-      Person.decrement_counter(:buildings_count, owner_id_was) if owner_id_was
-      Person.increment_counter(:buildings_count, owner_id) if owner_id
-    end
-  end
 end

data/test/mock_app/app/models/floor.rb

@@ -1,6 +1,6 @@
 class Floor < ActiveRecord::Base
-  belongs_to :building
-  belongs_to :tenant, :class_name => 'Person', :counter_cache => true
+  belongs_to :building, :counter_cache => true, :inverse_of => :floors
+  belongs_to :tenant, :class_name => 'Person', :counter_cache => true, :inverse_of => :floor
   has_one :address, :through => :building
 
   attr_accessor :number_required

data/test/mock_app/app/models/person.rb

@@ -1,6 +1,6 @@
 class Person < ActiveRecord::Base
-  has_many :buildings, :foreign_key => :owner_id
-  has_one :floor, :foreign_key => :tenant_id
+  has_many :buildings, :foreign_key => :owner_id, :inverse_of => :owner
+  has_one :floor, :foreign_key => :tenant_id, :inverse_of => :tenant
   has_one :address, :through => :floor
   has_one :home, :through => :floor, :source => :building, :class_name => 'Building'
 

data/test/mock_app/config/environments/test.rb

@@ -30,4 +30,5 @@ RailsApp::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+  config.active_support.test_order = :sorted
 end

data/test/mock_app/db/schema.rb

@@ -11,6 +11,7 @@ ActiveRecord::Schema.define do
   create_table 'buildings' do |t|
     t.string 'name'
     t.integer 'owner_id'
+    t.integer 'floors_count', :null => false, :default => 0
     t.datetime "created_at"
     t.datetime "updated_at"
   end

data/test/test_helper.rb

@@ -1,7 +1,5 @@
-if RUBY_VERSION >= '1.9' && RUBY_ENGINE == 'ruby' # remove RUBY_ENGINE test when rubinius-coverage fix is released
-  require 'simplecov'
-  SimpleCov.start { add_filter 'test' }
-end
+require 'simplecov'
+SimpleCov.start { add_filter 'test' }
 
 ENV['RAILS_ENV'] = 'test'
 require "mock_app/config/environment"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.10
+  version: 3.4.11
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -427,7 +427,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -435,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Rails 3.2 and 4.0 version of activescaffold supporting prototype and jquery