active_scaffold 3.4.31 → 3.4.32

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Njc3MTJmNmJkOTRhZjNjYzQzZjc3ZTQ5NDM4ZjA3YzY4NTQ4ODE0Ng==
-  data.tar.gz: !binary |-
-    Y2IzMjdhNDI5ZDlmNjRjZTY2OWJhYTY2MjlkYmNiMDViNjUwMjU1Zg==
+SHA1:
+  metadata.gz: 6004a079b687a908646771e73d99729c021c96ee
+  data.tar.gz: eac7053cc13b120de1dc2103238b30244c591cde
 SHA512:
-  metadata.gz: !binary |-
-    YzE2YWM2M2M2MzY1YWU1NGNiYzIxNDdmZTgwN2E2YmZjYzJlMGVkYmJjY2U3
-    N2NjZjUyYjkyMzBmODZlNDFhYWE2MDE3ODBlNWY1NjZmYTI5YmFhOGQ5OWI0
-    NWI3N2Q3ZTRkMmNhZjE1MzllYWZiMTEwMjk2ZTVkYmQ1ZWE0YmY=
-  data.tar.gz: !binary |-
-    Nzk2OWRhNTk5OWU4YjE3OTBlODc0OWJkODllZjAzYjliODVmM2QzNTQwYTEy
-    NWE5MTk1Njc5MWRiYzhiNjMxOTg5OTFjZjljN2M0ZjIxM2U0NzhmZmVhMTM1
-    ZmUxZGJmOWM0NTU3OTdlM2M3NzAwNGZmYTcyN2E2MDlkMzU0ZDA=
+  metadata.gz: 825c92099164fb09b36c7bc96a949658b189bd53a135767b17e12051f35eeb7ac5ab5683aa3f6f82394d98e29778d5fc6dfa3862263fff5418e18d76268f1b21
+  data.tar.gz: 5bced1d19c67d2c2b6d9d7eb0abe8c41445ff82acc5932a35e6b58ade664b401a94d4844a7e250a2bd0ce4233b35193647f216cf3895b7e1b19585113f85cc79

data/CHANGELOG

@@ -1,3 +1,8 @@
+- Add ActiveScaffold.reload_embedded JS method, to reload an embedded scaffold
+- Fix nested on composite primary key associations
+- Fix render :super on partials rendered with :collection (like _list_record)
+- Fix required on paperclip, carrierwave and dragonfly bridges, when file is already saved
+
 = 3.4.31
 - fix multiple support for :select form_ui with non-association columns
 - remove yaml response support, not used in rails usually and no support for respond_to :yaml

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

@@ -451,6 +451,12 @@ var ActiveScaffold = {
       });
     });
   },
+  reload_embedded: function(element_or_selector) {
+    var item = jQuery(element_or_selector);
+    item.load(item.data('refresh'), function() {
+      jQuery(this).trigger('as:element_updated');
+    });
+  },
 
   records_for: function(tbody_id) {
     if (typeof(tbody_id) == 'string') tbody_id = '#' + tbody_id;

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

@@ -397,6 +397,10 @@ var ActiveScaffold = {
       new Ajax.Updater(item.up('.active-scaffold-component'), item.readAttribute('href'), {method: 'get', evalScripts: true});
     });
   },
+  reload_embedded: function(element) {
+    var item = $(element)
+    new Ajax.Updater(item, item.readAttribute('data-refresh'), {method: 'get', evalScripts: true});
+  },
   
   records_for: function(tbody_id) {
     var rows = [];

data/lib/active_scaffold/bridges/carrierwave/form_ui.rb

@@ -9,7 +9,7 @@ module ActiveScaffold
 
         carrierwave = record.send("#{column.name}")
         if !carrierwave.file.blank?
-
+          required = options.delete(:required)
           remove_field_options = {
             :name => options[:name].gsub(/\[#{column.name}\]$/, "[remove_#{column.name}]"),
             :id => 'remove_' + options[:id],
@@ -23,10 +23,10 @@ module ActiveScaffold
 
           case ActiveScaffold.js_framework
           when :jquery
-            js_remove_file_code = "jQuery(this).prev('input#remove_#{options[:id]}').val('true'); jQuery(this).parent().hide().next().show(); return false;"
+            js_remove_file_code = "jQuery(this).prev('input#remove_#{options[:id]}').val('true'); jQuery(this).parent().hide().next().show()#{".find('input').attr('required', 'required')" if required}; return false;"
             js_dont_remove_file_code = "jQuery(this).parents('div.carrierwave_controls').find('input#remove_#{options[:id]}').val('false'); return false;"
           when :prototype
-            js_remove_file_code = "$(this).previous('input#remove_#{options[:id]}').value='true'; $(this).up().hide().next().show(); return false;"
+            js_remove_file_code = "$(this).previous('input#remove_#{options[:id]}').value='true'; $(this).up().hide().next().show()#{".down().writeAttribute('required', 'required')" if required}; return false;"
             js_dont_remove_file_code = "$(this).up('div.carrierwave_controls').down('input#remove_#{options[:id]}').value='false'; return false;"
           end
 

data/lib/active_scaffold/bridges/dragonfly/form_ui.rb

@@ -6,15 +6,16 @@ module ActiveScaffold
         ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in html_options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
         record ||= @record # TODO: Remove when relying on @record is removed
         options = active_scaffold_input_text_options(options.merge(column.options))
+        dragonfly = record.send("#{column.name}")
 
+        required = options.delete(:required) if dragonfly.present?
         input = file_field(:record, column.name, options)
-        dragonfly = record.send("#{column.name}")
         if dragonfly.present?
           case ActiveScaffold.js_framework
           when :jquery
-            js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;"
+            js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show()#{".find('input').attr('required', 'required')" if required}; return false;"
           when :prototype
-            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;"
+            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show()#{".down().writeAttribute('required', 'required')" if required}; return false;"
           end
 
           content = active_scaffold_column_dragonfly(record, column)

data/lib/active_scaffold/bridges/paperclip/form_ui.rb

@@ -6,15 +6,16 @@ module ActiveScaffold
         ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in html_options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
         record ||= @record # TODO: Remove when relying on @record is removed
         options = active_scaffold_input_text_options(options.merge(column.options))
+        paperclip = record.send("#{column.name}")
 
+        required = options.delete(:required) if paperclip.file?
         input = file_field(:record, column.name, options)
-        paperclip = record.send("#{column.name}")
         if paperclip.file?
           case ActiveScaffold.js_framework
           when :jquery
-            js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;"
+            js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show()#{".find('input').attr('required', 'required')" if required}; return false;"
           when :prototype
-            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;"
+            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show()#{".down().writeAttribute('required', 'required')" if required}; return false;"
           end
 
           object_name, method = options[:name].split(/\[(#{column.name})\]/)

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -134,7 +134,7 @@ module ActiveScaffold::DataStructures
 
     def iterate_model_associations(model)
       @constrained_fields = []
-      constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
+      constrained_fields << Array(association.foreign_key).map(&:to_sym) unless association.belongs_to?
       return if (reverse = association.reverse(model)).nil?
       @child_association = model.reflect_on_association(reverse)
       constrained_fields << @child_association.name unless @child_association == association

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -82,6 +82,7 @@ module ActionView::Helpers #:nodoc:
 
       elsif args.first == :super
         @_view_paths ||= lookup_context.view_paths.clone
+        @_last_template ||= lookup_context.last_template
         parts = @virtual_path.split('/')
         template = parts.pop
         prefix = parts.join('/')
@@ -103,6 +104,7 @@ module ActionView::Helpers #:nodoc:
         end
         result = render_without_active_scaffold options
         lookup_context.view_paths = @_view_paths if @_view_paths
+        lookup_context.last_template = @_last_template if @_last_template
         result
       else
         @_view_paths ||= lookup_context.view_paths.clone

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.31
+  version: 3.4.32
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -42,7 +42,7 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.18
     - - <
@@ -52,7 +52,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.18
     - - <
@@ -62,28 +62,28 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Save time and headaches, and create a more easily maintainable set of
@@ -448,17 +448,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails 3.2, 4.0, 4.1 and 4.2 versions of ActiveScaffold supporting prototype