active_scaffold_config_list 3.2.5 → 3.2.6

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  data.tar.gz: b9c3c06903cac90f1b0974235eacc246e3790d94
+  metadata.gz: ccafd3c386ec3738b0ea7b96fb26667e35b48fb2
+SHA512: 
+  data.tar.gz: 56dfb5d16894052d5e341cdebf457b2d8e6d78217ca7375dcece1b56230c209102167c0170fd86cb5ef887728773d904f483af30c6695307d5ede27ac6646ba2
+  metadata.gz: 3117db602b19761b43730b1c1061e630a3c62505528636265472bb0e5c5fbad902ccc77a5ecdfbcf75d29cd033480f8499b83dfbc53f24407330a01329575e95

data/lib/active_scaffold/actions/config_list.rb

@@ -53,7 +53,12 @@ module ActiveScaffold::Actions
       # only override when list_columns is called, so 
       if @list_columns && config_list_record
         @last_modified = [@last_modified, config_list_record.updated_at].compact.maximum if config_list_record.respond_to? :updated_at
-        [super, config_list_record]
+        objects = super
+        if objects.is_a? Hash
+          objects.merge(:etag => [objects[:etag], config_list_record])
+        else
+          [objects, config_list_record]
+        end
       else
         super
       end

data/lib/active_scaffold_config_list/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffoldConfigList
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 5
+    PATCH = 6
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_config_list
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 3
-  - 2
-  - 5
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -15,40 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-09 00:00:00 Z
+date: 2014-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 3
-        - 0
         version: 3.3.0
-  version_requirements: *id001
-  prerelease: false
+  type: :runtime
   name: active_scaffold
+  requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 2
-        - 2
         version: 3.2.2
-  version_requirements: *id002
-  prerelease: false
+  type: :runtime
   name: active_scaffold_sortable
+  requirement: *id002
+  prerelease: false
 description: User may reorder and hide/show list columns
 email: activescaffold@googlegroups.com
 executables: []
@@ -73,35 +55,28 @@ files:
 homepage: http://activescaffold.com
 licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - &id003 
+    - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id003
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: User specific column configuration for ActiveScaffold
 test_files: []