carrierwave-serializable 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 705005ed9d28d521d499fe829da9b35d085b1fc73a48040b63441a36674b4d60
+  data.tar.gz: 96d2e100737e15ca6ec83a37b59eea0c809d2fbcdb0280e5cca56fb1c867358a
+SHA512:
+  metadata.gz: deef3d01ef6cf03e2a8df75578860e0f12b6e9fd1cf2cb028d1287774bdc569689b3af67fcfc6bea5daf60cd1beff06486a7f0668626852440c8088a63c9bfae
+  data.tar.gz: 69ec95ecbcc7ebda4e616f3296a21196627e1e7b3a74b866ff3da25bc7095c3238d2d32c1a773455279e99923792cab65725093df248ad90e6c09fb5fb413893

data/.github/workflows/test.yml

@@ -0,0 +1,23 @@
+name: CI RSpec Tests
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: ['**']
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        ruby: [2.6, 2.7, 3.0, 'head']
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v1
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+uploads

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in carrierwave-serializable.gemspec
 gemspec
+
+gem 'activerecord'
+gem 'sqlite3'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Tima Maslyuchenko
+Copyright (c) 2013 Tim Masliuchenko
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# Carrierwave::Serializable
+# Carrierwave::Serializable ![Build Status](https://github.com/timfjord/carrierwave-serializable/actions/workflows/test.yml/badge.svg)
 
 Carrierwave plugin that allow mount uploader to serialized field
 
@@ -14,13 +14,15 @@ Or install it yourself as:
 
 ## Usage
 
-If you need mount uploader to serialized field, set `serialize_to` option
-to serialized field where you want to store your uplaoder.
+To mount an uploader to the serialized field, set the `serialize_to` option
+to the serialized field where you want to store the uploader.
 
-    class User < ActiveRecord::Base
-      serialize :documents, Hash
-      mount_uploader :document1, DocumentUploader, serialize_to: :documents
-    end
+```ruby
+class User < ActiveRecord::Base
+  serialize :documents, Hash
+  mount_uploader :document1, DocumentUploader, serialize_to: :documents
+end
+```
 
 ## Contributing
 

data/Rakefile

@@ -1 +1,5 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/carrierwave-serializable.gemspec

@@ -4,18 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'carrierwave-serializable/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "carrierwave-serializable"
+  gem.name          = 'carrierwave-serializable'
   gem.version       = CarrierWave::Serializable::VERSION
-  gem.authors       = ["Tima Maslyuchenko"]
-  gem.email         = ["insside@gmail.com"]
+  gem.authors       = ['Tim Masliuchenko']
+  gem.email         = ['timfjord@hey.com']
   gem.description   = %q{Carrierwave plugin that allow mount uploader to serialized field}
   gem.summary       = %q{Carrierwave plugin that allow mount uploader to serialized field}
-  gem.homepage      = "https://github.com/timsly/carrierwave-serializable"
+  gem.homepage      = 'https://github.com/timfjord/carrierwave-serializable'
+  gem.licenses      = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
-  
+  gem.require_paths = ['lib']
+
   gem.add_dependency 'carrierwave'
+
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rake'
 end

data/lib/carrierwave-serializable.rb

@@ -1,5 +1,5 @@
-require "carrierwave"
-require "carrierwave-serializable/version"
-require "carrierwave-serializable/orm/activerecord"
+require 'carrierwave'
+require 'carrierwave-serializable/version'
+require 'carrierwave-serializable/orm/activerecord'
 
-ActiveRecord::Base.extend CarrierWave::ActiveRecord::Serializable if defined?(Rails)
+ActiveRecord::Base.extend CarrierWave::ActiveRecord::Serializable if defined?(ActiveRecord)

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

@@ -1,59 +1,72 @@
 # encoding: utf-8
 
-require "carrierwave/orm/activerecord"
+require 'carrierwave/orm/activerecord'
 
 module CarrierWave
   module ActiveRecord
     module Serializable
       def serialized_uploaders
-        @serialized_uploaders ||= {}
+        @serialized_uploaders ||= read_from_superclass? ? superclass.serialized_uploaders.dup : {}
       end
-    
+
       def serialized_uploader?(column)
-        serialized_uploaders.key?(column) && serialized_attributes.key?(serialized_uploaders[column].to_s)
+        serialized_uploaders.key?(column)
       end
-      
+
       ##
       # See +CarrierWave::Mount#mount_uploader+ for documentation
       #
-      def mount_uploader(column, uploader=nil, options={}, &block)
+      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
         end
-        
-        class_eval <<-RUBY, __FILE__, __LINE__+1
+
+        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]
-              serialized_field[column.to_s] = identifier
+              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
+                self.send("\#{serialized_field_name}=", column.to_s => identifier)
+              end
             else
-              super
+              write_attribute(column, identifier)
             end
           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]
+              serialized_field ? serialized_field[column.to_s] : nil
             else
-              super
+              read_attribute(column)
             end
           end
         RUBY
+
+      end
+
+      private
+
+      def read_from_superclass?
+        superclass != ::ActiveRecord::Base && superclass.respond_to?(:serialized_uploaders)
       end
-    end # Serializable
-  end # ActiveRecord
-end # CarrierWave
+    end
+  end
+end

data/lib/carrierwave-serializable/version.rb

@@ -1,5 +1,5 @@
 module CarrierWave
   module Serializable
-    VERSION = "0.0.2"
+    VERSION = '0.1.0'
   end
 end

data/spec/integration_spec.rb

@@ -0,0 +1,82 @@
+RSpec.describe 'Integration' do
+  ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
+  ActiveRecord::Migration.verbose = false
+
+  class TestMigration < ActiveRecord::Migration[4.2]
+    def self.up
+      create_table :avatars, force: true do |t|
+        t.column :image1, :text
+      end
+
+      create_table :images, force: true do |t|
+        t.column :data, :text
+      end
+    end
+
+    def self.down
+      drop_table :avatars
+      drop_table :images
+    end
+  end
+
+  class ImageUploader < CarrierWave::Uploader::Base; end
+
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+
+    mount_uploader :base_image, ImageUploader, serialize_to: :data
+  end
+
+  class Avatar < ApplicationRecord
+    mount_uploader :image1, ImageUploader
+  end
+
+  class Image < ApplicationRecord
+    serialize :data, Hash
+    mount_uploader :image1, ImageUploader, serialize_to: :data
+  end
+
+  before(:all) { TestMigration.up }
+  after(:all) { TestMigration.down }
+
+  after do
+    Avatar.destroy_all
+    Image.destroy_all
+  end
+
+  let(:image) { Image.new }
+
+  it 'should mount uploader to serialized field' do
+    expect(image.image1).to be_instance_of ImageUploader
+  end
+
+  it 'should upload image and store it to the serialized field' do
+    with_image do |file|
+      image.image1 = file
+      image.save!
+
+      expect(image.data['image1']).to be_present
+    end
+  end
+
+  it 'inherits superclass uploaders' do
+    with_image do |file|
+      image.base_image = file
+      image.save!
+
+      expect(image.data['base_image']).to be_present
+    end
+  end
+
+  describe 'model with the regular uploader and same name as serialized uploader' do
+    before do
+      Image.new
+    end
+
+    it 'mounts uploader to regular field' do
+      avatar = Avatar.new
+
+      expect(avatar.image1).to be_instance_of ImageUploader
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,18 @@
+require 'bundler/setup'
+Bundler.setup
+
+require 'carrierwave-serializable'
+
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
+
+RSpec.configure do |config|
+  config.include FileHelper
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+end

data/spec/support/file_helpder.rb

@@ -0,0 +1,5 @@
+module FileHelper
+  def with_image(name = 'blank.gif', &block)
+    File.open File.expand_path("../../fixtures/#{name}", __FILE__), &block
+  end
+end

metadata

@@ -1,40 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-serializable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
-- Tima Maslyuchenko
-autorequire: 
+- Tim Masliuchenko
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: rake
+  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: Carrierwave plugin that allow mount uploader to serialized field
 email:
-- insside@gmail.com
+- timfjord@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".github/workflows/test.yml"
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -43,28 +70,35 @@ files:
 - lib/carrierwave-serializable.rb
 - lib/carrierwave-serializable/orm/activerecord.rb
 - lib/carrierwave-serializable/version.rb
-homepage: https://github.com/timsly/carrierwave-serializable
-licenses: []
-post_install_message: 
+- spec/fixtures/blank.gif
+- spec/integration_spec.rb
+- spec/spec_helper.rb
+- spec/support/file_helpder.rb
+homepage: https://github.com/timfjord/carrierwave-serializable
+licenses:
+- MIT
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubygems_version: 3.1.4
+signing_key:
+specification_version: 4
 summary: Carrierwave plugin that allow mount uploader to serialized field
-test_files: []
+test_files:
+- spec/fixtures/blank.gif
+- spec/integration_spec.rb
+- spec/spec_helper.rb
+- spec/support/file_helpder.rb