custom_fields 2.10.0.beta2 → 2.10.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b88b8f37bf162d1b2a3bb28e88fc97299498c018b546066cfb51ee23764f338
-  data.tar.gz: b2085cf064dce105c4215155f51b9e2c4e1a84e688fadb8b9b460bf8dca36d8e
+  metadata.gz: 92008a0e4adc50b36d45541d2e9a552f5a933c668fda3c563cb44f6da98938a8
+  data.tar.gz: 74b7e9231c7f25b2c814f24491a00228111c16002bf3f0a9c28ec1589db17536
 SHA512:
-  metadata.gz: 075c7f7ee4b5af9a689810a55a3645aa894e4e64891c55596b83ad4e76b9fb57962bcb47a68375fa8a3864e735bbea088c3b18875fba25b7a6cfc0cf04c31dbb
-  data.tar.gz: 618e69bd1b7e398499dc6db8eaed8b8e5a9cceff8166063e8e7120174d2c925df992c50e2150a86ed77ebc14cb2ba68035ced9f539eb9a15eee44c5ffd0ada7e
+  metadata.gz: 72cde13cf67b46cc86c44c858072d10e209e1e3496d1ae32e0ba9736aefac849003d830ad8b15562796b3a5d66251b276ec8a8aaa693ba97d277b9f528960f71
+  data.tar.gz: 7e55cb358cdca1cddacb4791f14eefa3cc67991765d1d27f17131a1bf7cf45093f2174c049b3e1ca85eac9c262975e35319b61483f71f6a3f4bff8a73a82a037

data/lib/custom_fields/extensions/carrierwave.rb

@@ -8,9 +8,10 @@ module CarrierWave
       mount_uploader_without_localization(column, uploader, options, &block)
 
       define_method(:read_uploader) do |name|
-        # puts "read_uploader #{name} / #{read_attribute(name.to_sym).inspect}" # DEBUG
+        # puts "read_uploader #{name} / #{read_attribute(name.to_sym).inspect} / #{::Mongoid::Fields::I18n.locale.inspect}" # DEBUG
 
         value = read_attribute(name.to_sym)
+
         unless value.nil?
           self.class.fields[name.to_s].demongoize(value)
         else
@@ -26,15 +27,30 @@ module CarrierWave
 
   class Mounter
 
-    def remove_previous_with_localization(before=nil, after=nil)
-      _after = after
+    def remove_previous_with_localization(before = nil, after = nil)
+      _before, _after = before, after
+      locale = ::Mongoid::Fields::I18n.locale.to_s
+
+      # custom case:
+      # the record owns a localized file field. A new file has been attached to it
+      # in the default locale. Now, we want to upload a file in another locale with
+      # a different name.
+      # We absolutely don't want to erase the file in the default locale
+      if  record.class.fields[column.to_s].localized? &&
+          record.changes[column]&.first == '_new_'
+        _before = [nil]
+      end
+
+      # FIXME: can't reproduce this behavior locally but it happens in production
+      if before && before.first.is_a?(Hash)
+        _before = [before.first[locale]]
+      end
 
       if after && after.first.is_a?(Hash)
-        locale = ::Mongoid::Fields::I18n.locale.to_s
         _after = [after.first[locale]]
       end
 
-      remove_previous_without_localization(before, _after)
+      remove_previous_without_localization(_before, _after)
     end
 
     alias_method :remove_previous_without_localization, :remove_previous

data/lib/custom_fields/types/file.rb

@@ -87,6 +87,15 @@ module CustomFields
 
         process :set_size_in_model
 
+        def filename
+          if original_filename && model.fields[mounted_as.to_s].localized?
+            _original_filename, extension = original_filename.split('.')
+            ["#{_original_filename}_#{::Mongoid::Fields::I18n.locale}", extension].compact.join('.')
+          else
+            original_filename
+          end
+        end
+
         def set_size_in_model
           size_field_name = :"#{mounted_as}_size"
 

data/lib/custom_fields/version.rb

@@ -1,5 +1,5 @@
 module CustomFields #:nodoc
 
-  VERSION = '2.10.0.beta2'
+  VERSION = '2.10.0.beta3'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: custom_fields
 version: !ruby/object:Gem::Version
-  version: 2.10.0.beta2
+  version: 2.10.0.beta3
 platform: ruby
 authors:
 - Didier Lafforgue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -163,12 +163,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Custom fields extension for Mongoid.