active_scaffold 3.4.0.1 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ff51aa94fbd9816af72b232b8a66ade37aac935
-  data.tar.gz: 1ca9e81926e02e3a057b819b51196d470126baf1
+  metadata.gz: c53462e9f8376026d9967b86c6e853504641002e
+  data.tar.gz: c7f5e3fdf9da980b02791d0d99d50f6377095070
 SHA512:
-  metadata.gz: 1fee132f4a758bcd29506196d667fb7d7d3cccae4865b0402e4861866070cff9a57866c18c4422e03976abfc11626dcb1feee51fd3df8f7b4d932293455164e5
-  data.tar.gz: 77033023eafda83e3d48478c2ec8067dc9c2ca49ff72478a0e4dae146cd9b55c1bcbd24d91eeb848a5f269acc4ecee12d5da39038deee5730b3402f7fc5ce602
+  metadata.gz: f31c9d71a8ef33e63eae3987cd37a6bbd0327746db8af9f9c241e959be1a765fbd28da7edf25a41785add40a532f9963995052becf89c31870b65eac90cc3db4
+  data.tar.gz: af95b26715e8eaa8808dea19c2ea4b88650893892d1cd863f34e64f3c9db168570313d194cb1166b0e4c2bc1d2843261733672060f7a432a3ff45d520db58b1e

data/CHANGELOG

@@ -1,3 +1,11 @@
+= 3.4.1
+- fix search value when both field_search and search are enabled and a search with field_search is active
+- fix cancan permissions check on subform
+- fix has_one/belongs_to nested with :primary_key option
+- fix display of virtual number columns
+- fix display of serialized columns on list
+- improve tests
+
 = 3.4.0.1
 - Fix record_select on field_search
 

data/app/views/active_scaffold_overrides/_search.html.erb

@@ -7,7 +7,7 @@ options = {:id => element_form_id(:action => 'search'),
            :'data-loading' => true,
            :method => :get}
   form_tag url_options, options %>
-  <%= search_field_tag :search, search_params, :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
+  <%= search_field_tag :search, (search_params if search_params.is_a? String), :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
   <%= submit_tag as_(:search), :class => "submit", :style => ('display:none;' if live_search) %>
   <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} %>
   <%= loading_indicator_tag(:action => :search) %>

data/lib/active_scaffold/actions/list.rb

@@ -77,10 +77,10 @@ module ActiveScaffold::Actions
       self.active_scaffold_references.concat columns_for_joins.map(&:includes).flatten.uniq
     end
 
-    def get_row(crud_type = :read)
+    def get_row(crud_type_or_security_options = :read)
       set_includes_for_columns
       klass = beginning_of_chain.preload(active_scaffold_preload)
-      @record = find_if_allowed(params[:id], crud_type, klass)
+      @record = find_if_allowed(params[:id], crud_type_or_security_options, klass)
     end
 
     # The actual algorithm to prepare for the list view
@@ -148,7 +148,7 @@ module ActiveScaffold::Actions
     #   self.successful = true
     #   flash[:info] = 'Player fired'
     # end
-    def process_action_link_action(render_action = :action_update, crud_type = nil)
+    def process_action_link_action(render_action = :action_update, crud_type_or_security_options = nil)
       if request.get?
         # someone has disabled javascript, we have to show confirmation form first
         @record = find_if_allowed(params[:id], :read) if params[:id] && params[:id].to_i > 0
@@ -156,8 +156,8 @@ module ActiveScaffold::Actions
       else
         @action_link = active_scaffold_config.action_links[action_name]
         if params[:id] && params[:id].to_i > 0
-          crud_type ||= (request.post? || request.put?) ? :update : :delete
-          get_row(crud_type)
+          crud_type_or_security_options ||= (request.post? || request.put?) ? :update : :delete
+          get_row(crud_type_or_security_options)
           unless @record.nil?
             yield @record
           else

data/lib/active_scaffold/actions/nested.rb

@@ -82,7 +82,7 @@ module ActiveScaffold::Actions
         elsif nested.child_association.nil? # without child_association is not possible to add conditions
           active_scaffold_config.model
         elsif nested.child_association.belongs_to?
-          active_scaffold_config.model.where(nested.child_association.foreign_key => nested_parent_record)
+          active_scaffold_config.model.where(nested.child_association.foreign_key => nested_parent_record.send(nested.association.association_primary_key))
         elsif nested.association.belongs_to?
           chain = active_scaffold_config.model.joins(nested.child_association.name)
           table_name = if active_scaffold_config.model == nested.association.active_record

data/lib/active_scaffold/attribute_params.rb

@@ -66,7 +66,7 @@ module ActiveScaffold
               begin
                 parent_record.send "#{column.name}=", value
               rescue ActiveRecord::RecordNotSaved
-                parent_record.association(column.name).target = value
+                parent_record.association(column.name).target = value if column.association
               end
             end
             if column.association && [:has_one, :has_many].include?(column.association.macro) && column.association.reverse

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -111,7 +111,7 @@ module ActiveScaffold::DataStructures
       # skip if this matches a constrained column
       result = true if constraint_columns.include?(column.name.to_sym)
       # skip this field if it's not authorized
-      unless options[:for].authorized_for?(:action => options[:action], :crud_type => options[:crud_type] || self.action.try(:crud_type), :column => column.name)
+      unless options[:for].authorized_for?(:action => options[:action], :crud_type => options[:crud_type] || self.action.try(:crud_type) || :read, :column => column.name)
         self.unauthorized_columns << column.name.to_sym
         result = true
       end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -74,7 +74,8 @@ module ActiveScaffold
       ## Overrides
       ##
       def active_scaffold_column_text(record, column)
-        clean_column_value(truncate(record.send(column.name), :length => column.options[:truncate] || 50))
+        # `to_s` is necessary to convert objects in serialized columns to string before truncation.
+        clean_column_value(truncate(record.send(column.name).to_s, :length => column.options[:truncate] || 50))
       end
 
       def active_scaffold_column_fulltext(record, column)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -484,7 +484,7 @@ module ActiveScaffold
         @_column_classes[column.name] ||= begin
           classes = "#{column.name}-column "
           classes << 'sorted ' if active_scaffold_config.list.user.sorting.sorts_on?(column)
-          classes << 'numeric ' if column.column and [:decimal, :float, :integer].include?(column.column.type)
+          classes << 'numeric ' if column.number?
           classes << column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
         end
         classes = "#{@_column_classes[column.name]} "

data/lib/active_scaffold/version.rb

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

data/test/misc/active_record_permissions_test.rb

@@ -2,9 +2,7 @@ require 'test_helper'
 
 class PermissionModel < ActiveRecord::Base
   include ActiveScaffold::ActiveRecordPermissions::ModelUserAccess::Model
-  def self.columns; [] end
-  def self.column_types; [] end
-  def self.columns_hash; {} end
+  def self.columns; @columns ||= [ColumnMock.new('id', '', 'int(11)')] + %w(a1 a2 a3 b1 b2 b3 c1 c2 c3).map {|c| ColumnMock.new(c, '', 'varchar(255)')}; end
 
   def authorized_for_read?; true; end
   def authorized_for_update?; false; end

data/test/misc/attribute_params_test.rb

@@ -13,11 +13,13 @@ 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
     assert model.buildings.present?, 'buildings should not be cleared'
     assert model.save
+    assert_equal 1, model.buildings_count
   end
 
   def test_saving_unexpected_column_is_ignored
@@ -46,6 +48,7 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal buildings.map(&:id), model.building_ids
     assert_equal buildings, model.buildings
     assert model.save
+    assert_equal 2, model.reload.buildings_count
 
     model = update_record_from_params(model, :update, :first_name, :last_name, :buildings, :first_name => 'Name', :last_name => 'Last', :buildings => ['']) { raise ActiveRecord::Rollback }
     assert_equal 'Name', model.first_name
@@ -53,8 +56,9 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal [model.id]*2, buildings.map{|b| b.reload.owner_id}, 'owners should not be saved'
     assert model.building_ids.blank?, 'buildings should be cleared'
     assert model.buildings.blank?, 'buildings should be cleared'
+    assert_equal 0, model.buildings.size
+    assert_equal 2, model.reload.buildings_count
 
-    model.reload
     model = update_record_from_params(model, :update, :first_name, :last_name, :buildings, :first_name => 'Name', :last_name => 'Last', :buildings => [''])
     assert_equal 'Name', model.first_name
     assert_equal 'Last', model.last_name
@@ -62,17 +66,20 @@ class AttributeParamsTest < MiniTest::Test
     assert model.buildings.blank?, 'buildings should be cleared'
     assert_equal [nil]*2, buildings.map{|b| b.reload.owner_id}, 'buildings should be saved'
     assert model.save
+    assert_equal 0, model.reload.buildings_count
   end
 
   def test_saving_belongs_to_select
     person = Person.create
     assert person.persisted?
+    assert_equal 0, person.floors_count
 
     model = update_record_from_params(Floor.new, :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
 
     model = update_record_from_params(model, :update, :number, :tenant, :number => '1', :tenant => '')
     assert_equal 1, model.number
@@ -81,6 +88,7 @@ class AttributeParamsTest < MiniTest::Test
     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_equal 0, person.reload.floors_count
   end
 
   def test_saving_has_one_select
@@ -182,6 +190,7 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal floor.id, model.floors.first.id
     assert_equal [nil, *people.map(&:id)], model.floors.map(&:tenant_id)
     assert model.save
+    assert_equal [1, 1], people.map(&:reload).map(&:floors_count)
 
     model = update_record_from_params(model, :update, :name, :floors, :name => 'Tower', :floors => {'0' => ''})
     assert_equal 'Tower', model.name

data/test/misc/convert_numbers_format_test.rb

@@ -2,9 +2,8 @@ require 'test_helper'
 
 class NumberModel < ActiveRecord::Base
   include ActiveScaffold::ActiveRecordPermissions::ModelUserAccess::Model
-  abstract_class = true
   def self.columns
-    @columns ||= [ColumnMock.new('number', '', 'double(10,2)')]
+    @columns ||= [ColumnMock.new('id', '', 'int(11)'), ColumnMock.new('number', '', 'double(10,2)')]
   end
   def self.columns_hash
     @hash ||= Hash[@columns.map{|c| [c.name, c]}]

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

@@ -1,8 +1,17 @@
 class Building < ActiveRecord::Base
-  belongs_to :owner, :class_name => 'Person'
+  belongs_to :owner, :class_name => 'Person', :counter_cache => true
   has_many :floors, :dependent => :delete_all
 
   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'
+  belongs_to :tenant, :class_name => 'Person', :counter_cache => true
   has_one :address, :through => :building
 
   attr_accessor :number_required

data/test/mock_app/db/schema.rb

@@ -44,6 +44,8 @@ ActiveRecord::Schema.define do
   create_table 'people' do |t|
     t.string 'first_name'
     t.string 'last_name'
+    t.integer 'buildings_count', :null => false, :default => 0
+    t.integer 'floors_count', :null => false, :default => 0
     t.datetime "created_at"
     t.datetime "updated_at"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.0.1
+  version: 3.4.1
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda