essay-carrierwave 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f89ed883ff13eac1fb3e60b21b2080358db8a5fd
-  data.tar.gz: a06588187ed94cb1ebd05b55271aaa7d21718dba
+  metadata.gz: 09203f9f082dc0b8a416c2c8ded987260d6bf72c
+  data.tar.gz: 0c7edf1ba4a4a53d7d32debefc1ffaaec6f931a2
 SHA512:
-  metadata.gz: bd7e6ae01298117ffc5c3438168777f41d171d9e83d70684145322a2d43cbebd1efe80c2ec8e4f979260de4a1ac2db68663a2dd384a4810c048d4e104c381f02
-  data.tar.gz: 24dbcc10e628c4711276edf30141053b581c45f384e7dfcec324fe6dfd9e2156a375ed678705a69988ea9d6271204485e458f1069c3a67619c4548e4679b3d74
+  metadata.gz: 79a3cf72ddc2c1901a404b72b0df274aec4ac07600e67dd75a08d87d0280015ba4d16535711f5c036d2c9222dcee6daefb0c1d18dd841b55cf195c01913cf769
+  data.tar.gz: 9dc4ea47f4bee36ee24f57b8820baeb8f708c3c697d162b3f5c3aaefaea4a3795f641a67758a31b4dbf913a56021e233944f740d1c02cbe4e60d95ab993e0816

data/essay-carrierwave.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name            = 'essay-carrierwave'
-  s.version         = '1.0.1'
+  s.version         = '1.0.2'
   s.authors         = ['Yaroslav Konoplov']
   s.email           = ['eahome00@gmail.com']
   s.summary         = 'essay-carrierwave'
@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.test_files      = `git ls-files -z -- {test,spec,features}/*`.split("\x0")
   s.require_paths   = ['lib']
 
-  s.add_dependency 'carrierwave', '>= 0'
-  s.add_dependency 'essay',       '~> 1.0'
+  s.add_dependency 'carrierwave', '>= 0', '< 1.0'
+  s.add_dependency 'essay',       '~> 1.1'
 end

data/lib/essay-carrierwave/attribute.rb

@@ -7,7 +7,7 @@ class Essay::AttributeFeatures
   end
 
   def has_carrierwave_uploader?
-    !!model_features.with(:carrierwave) { |cw| cw.uploader_for(this_attribute.name) }
+    !!active_record.features.with(:carrierwave) { |cw| cw.uploader_for(this_attribute.name) }
   end
 
   def carrierwave
@@ -17,10 +17,8 @@ class Essay::AttributeFeatures
   end
 
   serialize do
-    {
-      has_carrierwave_uploader: has_carrierwave_uploader?,
-      carrierwave:              carrierwave.try(:to_hash)
-    }
+    { has_carrierwave_uploader: has_carrierwave_uploader?,
+      carrierwave:              carrierwave.try(:to_hash) }
   end
 
   class HasCarrierWaveUploader < Base
@@ -31,7 +29,7 @@ class Essay::AttributeFeatures
     # Article.attribute_features[:poster].carrierwave.uploader => PosterUploader
     #
     def uploader
-      top_feature.uploader_for(this_attribute.name)
+      carrierwave_feature.uploader_for(this_attribute.name)
     end
 
     # class Article
@@ -41,19 +39,17 @@ class Essay::AttributeFeatures
     # Article.attribute_features[:poster].carrierwave.mounted_as => :poster
     #
     def mounted_as
-      top_feature.accessor_for(this_attribute.name)
+      carrierwave_feature.accessor_for(this_attribute.name)
     end
 
     serialize do
-      {
-        uploader:   uploader.name,
-        mounted_as: mounted_as
-      }
+      { uploader:   uploader.name,
+        mounted_as: mounted_as }
     end
 
   private
-    def top_feature
-      model_features.carrierwave
+    def carrierwave_feature
+      active_record.features.carrierwave
     end
   end
 end

data/lib/essay-carrierwave/model.rb

@@ -18,7 +18,7 @@ class Essay::ModelFeatures
   # Article.features.has_translated_carrierwave_uploaders? => false
   #
   def has_own_carrierwave_uploaders?
-    model_class.try(:uploaders).present?
+    active_record.try(:uploaders).present?
   end
 
   # class Article
@@ -30,7 +30,7 @@ class Essay::ModelFeatures
   # Article.features.has_translated_carrierwave_uploaders? => true
   #
   def has_translated_carrierwave_uploaders?
-    !!with(:globalize) { |g| g.model_class_for_translations.features.has_carrierwave_uploaders? }
+    !!with(:globalize) { |g| g.active_record_for_translations.features.has_carrierwave_uploaders? }
   end
 
   def carrierwave
@@ -40,12 +40,10 @@ class Essay::ModelFeatures
   end
 
   serialize do
-    {
-      has_carrierwave_uploaders:            has_carrierwave_uploaders?,
+    { has_carrierwave_uploaders:            has_carrierwave_uploaders?,
       has_own_carrierwave_uploaders:        has_own_carrierwave_uploaders?,
       has_translated_carrierwave_uploaders: has_translated_carrierwave_uploaders?,
-      carrierwave:                          carrierwave.try(:to_hash)
-    }
+      carrierwave:                          carrierwave.try(:to_hash) }
   end
 
   class CarrierWave < Base
@@ -56,7 +54,7 @@ class Essay::ModelFeatures
     # Article.features.carrierwave.table => { poster: PosterUploader }
     #
     def table
-      model_class.uploaders
+      active_record.uploaders
     end
 
     # class Article
@@ -66,7 +64,7 @@ class Essay::ModelFeatures
     # Article.features.carrierwave.options => { poster: { mount_on: :poster_path } }
     #
     def options
-      model_class.uploader_options
+      active_record.uploader_options
     end
 
     # class Article
@@ -75,14 +73,12 @@ class Essay::ModelFeatures
     #
     # Article.features.carrierwave.uploader_for(:poster_path) => PosterUploader
     #
-    def uploader_for(attr_name)
-      attr_name = convert_key(attr_name)
-
-      if pair = pair_for(attr_name)
+    def uploader_for(attribute)
+      if pair = pair_for(attribute.to_sym)
         table[pair.first]
 
       else
-        send_to_translation(:uploader_for, attr_name)
+        send_to_translation(:uploader_for, attribute.to_sym)
       end
     end
 
@@ -92,31 +88,29 @@ class Essay::ModelFeatures
     #
     # Article.features.carrierwave.accessor_for(:poster_path) => :poster
     #
-    def accessor_for(attr_name)
-      attr_name = convert_key(attr_name)
+    def accessor_for(attribute)
+      attribute = attribute.to_sym
 
-      if table.has_key?(attr_name)
-        attr_name
+      if table.has_key?(attribute)
+        attribute
 
-      elsif pair = pair_for(attr_name)
+      elsif pair = pair_for(attribute)
         pair.first
 
       else
-        send_to_translation(:accessor_for, attr_name)
+        send_to_translation(:accessor_for, attribute)
       end
     end
 
     serialize do
-      {
-        table:   table,
-        options: options
-      }
+      { table:   table,
+        options: options }
     end
 
   private
     def pair_for(mounted_on_or_attr_name)
       all_options = options
-      key = convert_key(mounted_on_or_attr_name)
+      key         = mounted_on_or_attr_name.to_sym
 
       if all_options.has_key?(key)
         {key => all_options[key]}
@@ -127,13 +121,9 @@ class Essay::ModelFeatures
       end
     end
 
-    def convert_key(key)
-      key.is_a?(Symbol) ? key : key.to_sym
-    end
-
     def send_to_translation(method, *args)
-      model_features.with(:globalize) do |g|
-        g.model_class_for_translations.features.carrierwave.send(method, *args)
+      active_record.features.with(:globalize) do |g|
+        g.active_record_for_translations.features.carrierwave.send(method, *args)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: essay-carrierwave
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Yaroslav Konoplov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,20 +27,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: essay
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 description: essay-carrierwave
 email:
 - eahome00@gmail.com