active_scaffold 3.4.21.1 → 3.4.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2641f0115e9a352a90a64c42516c93cb70ad96ae
-  data.tar.gz: b4e82f29dba536593087b6571ec625bd54ce3fe5
+  metadata.gz: 5e3c5d2bad80f3ddbf5610ba433594ce55fc3373
+  data.tar.gz: a37268b8a8c4633e5324154e9c764ace3feecb94
 SHA512:
-  metadata.gz: c225344ba6e0af85bd7241d6acaa6f159f7948b5827339f019393d0b8c6306f0b929101db99344446b1ee7001b3df223465bfc54e48031cac12f82b69ed94591
-  data.tar.gz: 3afa6ed037ae641dea1539a983a9c1dad535df70e783b1582376841508154156fab0a736a35ab836eaebf0b75f85be79d6cae97a2c9e2f36d790adc649744559
+  metadata.gz: b05685d5fbbe603c317c6b01f5d2b6af1ba7fb44b8e246d6b2ac54675699d08f4263c529ed36042ba8135990b377b340b98371040bb3ebbde270db7f70651650
+  data.tar.gz: 838826402a406aada754ab436857ba53b3c4026a00466417d64970f9a52057154083bf006643d7e302b8db6f7891e0c101aba7b7fc477778c89b709a067ac9f1

data/CHANGELOG

@@ -1,3 +1,10 @@
+= 3.4.22
+- fix has_one/many tableless model through association
+- fix check default value for checkboxes, so if record in subform, with checkbox, is left as default, is not saved, but setting checkbox would save record
+- singular associations on subform are not always created, so you can leave default values on fields and skip creation, in other case some validations could fail and force to create singular associations
+- fix counter cache on polymorphic for rails 4.2.1
+- fix set cursor at end when focusing first element of form
+
 = 3.4.21.1
 - Fix field_search when contains is used on rails 4.2
 

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -613,7 +613,7 @@ var ActiveScaffold = {
     if (typeof(form_element) == 'string') form_element = '#' + form_element;
     if (typeof(form_selector) == 'undefined') form_selector = jQuery(form_element).is('form') ? '' : 'form ';
     var input = jQuery(form_selector + ":input:visible:first", jQuery(form_element)).focus();
-    if (input[0].value) input[0].selectionStart = input[0].selectionEnd = input[0].value.length;
+    try { if (input[0] && input[0].value) input[0].selectionStart = input[0].selectionEnd = input[0].value.length; } catch(e) {}
   },
 
   create_record_row: function(active_scaffold_id, html, options) {

data/lib/active_scaffold/attribute_params.rb

@@ -35,19 +35,19 @@ module ActiveScaffold
 
     # workaround to update counters when belongs_to changes on persisted record on Rails 3
     # workaround to update counters when polymorphic has_many changes on persisted record
-    # TODO: remove when rails3 support is removed and counter cache for polymorphic has_many association works on rails4 (works on rails4.2)
+    # TODO: remove when rails3 support is removed and counter cache for polymorphic has_many association works on rails4
     def hack_for_has_many_counter_cache(parent_record, column, value)
       association = parent_record.association(column.name)
       counter_attr = association.send(:cached_counter_attribute_name)
       difference = value.select(&:persisted?).size - parent_record.send(counter_attr)
 
       if parent_record.new_record?
-        if Rails.version < '4.2'
-          parent_record.send "#{counter_attr}=", difference
-          parent_record.send "#{column.name}=", value
-        else
+        if Rails.version == '4.2.0'
           parent_record.send "#{column.name}=", value
           parent_record.send "#{counter_attr}_will_change!"
+        else # < 4.2 or > 4.2.0
+          parent_record.send "#{counter_attr}=", difference
+          parent_record.send "#{column.name}=", value
         end
       else
         # don't decrement counter for deleted records, on destroy they will update counter
@@ -232,7 +232,7 @@ module ActiveScaffold
     def build_record_from_params(params, column, record)
       current = record.send(column.name)
       klass = column.association.klass
-      column.singular_association? || (column.plural_association? && !column.show_blank_record?(current)) || !attributes_hash_is_empty?(params, klass)
+      (column.plural_association? && !column.show_blank_record?(current)) || !attributes_hash_is_empty?(params, klass)
     end
 
     # Attempts to create or find an instance of the klass of the association in parent_column from the
@@ -274,21 +274,23 @@ module ActiveScaffold
     # Determines whether the given attributes hash is "empty".
     # This isn't a literal emptiness - it's an attempt to discern whether the user intended it to be empty or not.
     def attributes_hash_is_empty?(hash, klass)
-      ignore_column_types = [:boolean]
+      # old style date form management... ignore them too
+      part_ignore_column_types = [:datetime, :date, :time]
+
       hash.all? do |key, value|
         # convert any possible multi-parameter attributes like 'created_at(5i)' to simply 'created_at'
         parts = key.to_s.split('(')
-        # old style date form management... ignore them too
-        ignore_column_types = [:boolean, :datetime, :date, :time] if parts.length > 1
         column_name = parts.first
         column = klass.columns_hash[column_name]
 
         # booleans and datetimes will always have a value. so we ignore them when checking whether the hash is empty.
         # this could be a bad idea. but the current situation (excess record entry) seems worse.
-        next true if column && ignore_column_types.include?(column.type)
+        next true if column && parts.length > 1 && part_ignore_column_types.include?(column.type)
 
         # defaults are pre-filled on the form. we can't use them to determine if the user intends a new row.
-        next true if value == column_default_value(column_name, klass, column)
+        default_value = column_default_value(column_name, klass, column)
+        casted_value = column ? ActiveScaffold::Core.column_type_cast(value, column) : value
+        next true if casted_value == default_value
 
         if value.is_a?(Hash)
           attributes_hash_is_empty?(value, klass)
@@ -301,7 +303,12 @@ module ActiveScaffold
     end
 
     def column_default_value(column_name, klass, column)
-      column.default.to_s if column
+      return unless column
+      if Rails.version < '4.2'
+        column.default
+      else
+        column.type_cast_from_database(column.default)
+      end
     end
   end
 end

data/lib/active_scaffold/core.rb

@@ -215,7 +215,7 @@ module ActiveScaffold
       if Rails.version < '4.2'
         column.type_cast value
       else
-        column.cast_type.type_cast_from_user value
+        column.type_cast_from_user value
       end
     end
   end

data/lib/active_scaffold/tableless.rb

@@ -5,7 +5,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
       if table_name == klass.table_name
         klass.columns_hash[column_name]
       else
-        super
+        association.klass.columns_hash[column_name]
       end
     end
 

data/lib/active_scaffold/version.rb

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

data/test/bridges/tiny_mce_test.rb

@@ -12,10 +12,10 @@ class TinyMceTest < ActionView::TestCase
 
   def test_form_ui
     config = ActiveScaffold::Config::Core.new(:company)
-    @record = Company.new
+    record = Company.new
     expects(:request).returns(stub(:xhr? => true))
 
-    assert_dom_equal %{<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\">\n</textarea>\n<script#{' type="text/javascript"' if Rails::VERSION::MAJOR < 4}>\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"modern\"};tinyMCE.execCommand('mceAddEditor', false, 'record_name');\n//]]>\n</script>}, active_scaffold_input_text_editor(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => @record)
+    assert_dom_equal %{<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\">\n</textarea>\n<script#{' type="text/javascript"' if Rails::VERSION::MAJOR < 4}>\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"modern\"};tinyMCE.execCommand('mceAddEditor', false, 'record_name');\n//]]>\n</script>}, active_scaffold_input_text_editor(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => record)
   end
 
   protected

data/test/company.rb

@@ -82,6 +82,7 @@ class Company < ActiveRecord::Base
   def name_before_type_cast
     name.to_s
   end
+  def name_came_from_user?; end
 
   def date
     Date.today

data/test/misc/attribute_params_test.rb

@@ -218,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' => '', 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}}
+    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}, key.succ.succ => {:number => '', 'tenant' => ''}}
     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
@@ -274,10 +274,23 @@ class AttributeParamsTest < MiniTest::Test
 
     model = update_record_from_params(model, :update, :brand, :person, :brand => 'Mercedes', :person => {:first_name => ''})
     assert_equal 'Mercedes', model.brand
-    refute_equal person.id, model.person.id
+    assert_nil model.person
     assert model.save
   end
 
+  def test_saving_belongs_to_crud_with_boolean
+    model = update_record_from_params(Car.new, :create, :brand, :person, :brand => 'Ford', :person => {:first_name => '', :adult => '0'})
+    assert_equal 'Ford', model.brand
+    assert model.save
+    assert_nil model.person
+
+    model = update_record_from_params(model, :update, :brand, :person, :brand => 'Mercedes', :person => {:first_name => '', :adult => '1'})
+    assert_equal 'Mercedes', model.brand
+    assert model.person.present?
+    assert model.save
+    assert model.person.persisted?
+  end
+
   def test_saving_has_one_crud
     car = Car.create :brand => 'Renault'
     assert car.persisted?
@@ -318,7 +331,7 @@ class AttributeParamsTest < MiniTest::Test
     model = update_record_from_params(model, :update, :first_name, :car, :first_name => 'Name', :car => {:brand => ''})
     assert_equal 'Name', model.first_name
     assert_nil Car.where(:id => car.id).first, 'previous car should be deleted'
-    refute_equal car.id, model.car.id
+    assert_nil model.car
     assert model.save
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.21.1
+  version: 3.4.22
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman