active_scaffold 3.4.9 → 3.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c83a7d7ce3f57146d10cbf6134cc41c46f4753e3
-  data.tar.gz: 4e19dd8122bde0ded7a956146709fa981d05a9bd
+  metadata.gz: 26af65dba6ac3fe50f666f71c4ed02abb0adda89
+  data.tar.gz: 619b8200bc93ba0f81d123119723ab24c12fbec5
 SHA512:
-  metadata.gz: 397d444554b333a865f9c9302655a3d5519c48dcc1dd768be0317a66e94c29d4b70f087809ac4cca049a2ed295b4b53971811a1fcbd7c3e42a9536bea2b41de2
-  data.tar.gz: 2e5a2a8706e97af1a82f35335e55a4abc6e97c9156e3d23ef2ad093ca868c473f9f8b425ce926600a4d013b9b05d586b31e87e22b5d8b97ab726d4dceb95aaff
+  metadata.gz: ce3969fced5fe06b11f6ac32735ae382f0f494a5087d0a7664eb11b1a15d6952fcf64832f2f585d0408363f10cecab1a8c6617ed90519b04b18d73fbd98cde92
+  data.tar.gz: be56ceb6696c945eb66872fa482166b430d417de66d26f861e6c66d9f68e03ecb1e1c06050d28a1095c7dbbd2071ae3f9b4ee29e3c455533991e54663e7d44a5

data/CHANGELOG

@@ -1,3 +1,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
+- fix record for add_existing_form, so it can be used on options_for_association_conditions
+- :type option for action_link not needed anymore if added with action_links.member.add, it was redundant
+
 = 3.4.9
 - update parent data when changing a column in subform of edit form, so parent has data from form as it works in new form
 - use :only and :except options from resource line on as_routes and as_association_routes, so activescaffold actions can be selected

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

@@ -17,7 +17,7 @@ options = {:id => element_form_id(:action => :add_existing),
   <% end -%>
 
   <label for="<%= "record_#{active_scaffold_config.model}" %>"><%= active_scaffold_add_existing_label %></label>
-  <%= active_scaffold_add_existing_input(:name => 'associated_id', :url_options => url_options, :object => @record) %>
+  <%= active_scaffold_add_existing_input(:name => 'associated_id', :url_options => url_options, :object => nested_parent_record) %>
 
   <p class="form-footer">
     <%= submit_tag as_(:add), :class => "submit" %>

data/lib/active_scaffold/actions/list.rb

@@ -156,7 +156,7 @@ module ActiveScaffold::Actions
       else
         @action_link = active_scaffold_config.action_links[action_name]
         if params[:id]
-          crud_type_or_security_options ||= (request.post? || request.put?) ? :update : :delete
+          crud_type_or_security_options ||= {:crud_type => (request.post? || request.put?) ? :update : :delete, :action => action_name}
           get_row(crud_type_or_security_options)
           unless @record.nil?
             yield @record

data/lib/active_scaffold/attribute_params.rb

@@ -173,7 +173,7 @@ module ActiveScaffold
     def build_record_from_params(params, column, record)
       current = record.send(column.name)
       klass = column.association.klass
-      (column.plural_association? && !column.show_blank_record?(current)) || !attributes_hash_is_empty?(params, klass)
+      column.singular_association? || (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

data/lib/active_scaffold/data_structures/action_links.rb

@@ -1,6 +1,7 @@
 module ActiveScaffold::DataStructures
   class ActionLinks
     include Enumerable
+    attr_accessor :default_type
 
     def initialize
       @set = []
@@ -13,6 +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
         ActiveScaffold::DataStructures::ActionLink.new(action, options)
       end
       # NOTE: this duplicate check should be done by defining the comparison operator for an Action data structure
@@ -130,6 +132,7 @@ module ActiveScaffold::DataStructures
         group = ActiveScaffold::DataStructures::ActionLinks.new
         group.label = label || name
         group.name = name
+        group.default_type = self.name == :root ? (name.to_sym if %w(member collection).include?(name.to_s)) : default_type
         add_to_set group
       end
       group

data/lib/active_scaffold/version.rb

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

data/test/company.rb

@@ -84,6 +84,9 @@ class Company < ActiveRecord::Base
   
   def name
   end
+  def name_before_type_cast
+    self.name.to_s
+  end
 
   def date
     Date.today

data/test/misc/attribute_params_test.rb

@@ -217,7 +217,7 @@ class AttributeParamsTest < MiniTest::Test
 
     model = update_record_from_params(model, :update, :brand, :person, :brand => 'Mercedes', :person => {:first_name => ''})
     assert_equal 'Mercedes', model.brand
-    assert model.person.blank?, 'person should be cleared'
+    refute_equal person.id, model.person.id
     assert model.save
   end
 
@@ -254,14 +254,14 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal 'First', model.first_name
     assert_nil Car.where(:id => car.id).first, 'previous car should be deleted'
     assert model.car.present?
-    refute_equal  car.id, model.car.id
+    refute_equal car.id, model.car.id
     assert model.save
 
     car = model.car.reload
     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'
-    assert model.car.blank?, 'car should be cleared'
+    refute_equal car.id, model.car.id
     assert model.save
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 3.4.10
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rcov
   requirement: !ruby/object:Gem::Requirement
@@ -435,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Rails 3.2 and 4.0 version of activescaffold supporting prototype and jquery