carrierwave-serializable 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b60eb5963693bba15ca8f556a5d151b5ce65c441
-  data.tar.gz: e0615f175ed33ad7d337efd90bb11cb7ee023d4a
+  metadata.gz: 82365049a37fc90c0cdf9e0ac27e35a86556c275
+  data.tar.gz: 30037ac9507ba6cb2551566f3db61353d99361d0
 SHA512:
-  metadata.gz: d544436349c1c3288c381b13f32abedaaa6a6430915aa7b928bd347ef5a0d7adb6d95ccf5f4452aaced8ec5551a2ad5cccb1d765b44f9014db5d8768d6c24164
-  data.tar.gz: b1e8219d387464ead134761eb52d595b62d665e0cbce140fc9038e572eef5e9e023d79187574d7130a9de705b1db27470c59e5d90a011c90c9fc4aca3392338b
+  metadata.gz: d227f799b2f810b6736ad0208e51bde94a499432e8bc5160ad7b3d0a4b756e0bd8166a2a2754063528d4cf8599a1f14b9a380c3b6ceb70ab3970ca128f3c93ee
+  data.tar.gz: 2345d755b69a02df0ce3255f3a55f5145dd5e979d0b9f8f28531668d9cae68740f86351c971130a3b874c2482c91992236089da24cac1e74e9652d2096d2c175

data/lib/carrierwave-serializable/orm/activerecord.rb

@@ -6,27 +6,11 @@ module CarrierWave
   module ActiveRecord
     module Serializable
       def serialized_uploaders
-        @serialized_uploaders ||= {}
-      end
-    
-      def serialized_uploader?(column)
-        attribute_name = serialized_uploaders[column].to_s
-        serialized_uploaders.key?(column) && (serialized_attribute?(attribute_name) ||
-                                              hstore_attribute?(attribute_name) ||
-                                              json_attribute?(attribute_name))
-
+        @serialized_uploaders ||= read_from_superclass? ? superclass.serialized_uploaders : {}
       end
 
-      def serialized_attribute?(attribute)
-        serialized_attributes.key?(attribute)
-      end
-
-      def hstore_attribute?(attribute)
-        columns_hash[attribute.to_s].type == :hstore
-      end
-
-      def json_attribute?(attribute)
-        columns_hash[attribute.to_s].type == :json
+      def serialized_uploader?(column)
+        serialized_uploaders.key?(column)
       end
 
       ##
@@ -34,43 +18,53 @@ module CarrierWave
       #
       def mount_uploader(column, uploader=nil, options={}, &block)
         super
-        
+
         serialize_to = options.delete :serialize_to
         if serialize_to
-          serialized_uploaders[column] = serialize_to 
+          serialization_column = options[:mount_on] || column
+          serialized_uploaders[serialization_column] = serialize_to
           class_eval <<-RUBY, __FILE__, __LINE__+1
-            def #{column}_will_change!
+            def #{serialization_column}_will_change!
               #{serialize_to}_will_change!
-              @#{column}_changed = true
+              @#{serialization_column}_changed = true
             end
 
-            def #{column}_changed?
-              @#{column}_changed
+            def #{serialization_column}_changed?
+              @#{serialization_column}_changed
             end
           RUBY
-        
-        
-          class_eval <<-RUBY, __FILE__, __LINE__+1
-            def write_uploader(column, identifier)
-              if self.class.serialized_uploader?(column)
-                serialized_field = self.send self.class.serialized_uploaders[column]
+        end
+        class_eval <<-RUBY, __FILE__, __LINE__+1
+          def write_uploader(column, identifier)
+            if self.class.serialized_uploader?(column)
+              serialized_field_name = self.class.serialized_uploaders[column].to_s
+
+              if serialized_field = self.send(serialized_field_name)
                 serialized_field[column.to_s] = identifier
               else
-                super
+                self.send "\#{serialized_field_name}=", column.to_s => identifier
               end
+            else
+              write_attribute(column, identifier)
             end
-  
-            def read_uploader(column)
-              if self.class.serialized_uploader?(column)
-                serialized_field = self.send self.class.serialized_uploaders[column]
-                serialized_field[column.to_s]
-              else
-                super
-              end
+          end
+
+          def read_uploader(column)
+            if self.class.serialized_uploader?(column)
+              serialized_field = self.send self.class.serialized_uploaders[column]
+              serialized_field ? serialized_field[column.to_s] : nil
+            else
+              read_attribute(column)
             end
-          RUBY
-  
-        end
+          end
+        RUBY
+
+      end
+
+      private
+
+      def read_from_superclass?
+        superclass != ::ActiveRecord::Base && superclass.respond_to?(:serialized_uploaders)
       end
     end # Serializable
   end # ActiveRecord

data/lib/carrierwave-serializable/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Serializable
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-serializable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tima Maslyuchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Carrierwave plugin that allow mount uploader to serialized field
@@ -31,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -50,18 +50,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Carrierwave plugin that allow mount uploader to serialized field
 test_files: []
+has_rdoc: