copy_carrierwave_file 1.0.1.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e31dab346d0480a789d011a3792ad317b29cf8bc
-  data.tar.gz: 263e5057fe26f9aa6fbdf83b8e8cc3de48ca2c0f
+  metadata.gz: 7bbcbdf165c676f2df699c6301f514920939bf2e
+  data.tar.gz: 2044f3f7002b743532e6c1f21faacd2dc9ef75fc
 SHA512:
-  metadata.gz: 7fae0c63c655eb7ac72300b6609b68e1dbad04b5459ad5801fa6af74883ea64c1cabebc73cca17f3d85959bb1595c6461fc1becea90a9b7ccba1528518df783f
-  data.tar.gz: 92e68045b0dff3621efd197a103ed88be57de7e96ae1b8ca9bebab2cf2e0c963d11558a71d6e6c534d3b83616b8a2bcfc62820a387443eb85dee7268c0bdc3a6
+  metadata.gz: d2da82d12ae7da6b071224759a5a7687f205fd43fd9e1584cfdf316386323f8546a96221a33531f58654c32e4f24e4b3d6f2b1f0db06e76ea96174158e36980f
+  data.tar.gz: 6515ccf613c39e62364ec9a77eba435fbde3914e8c07065ad9b4140e7581bc0eab7faaf571477b29ff45fb0ac106ff57a3a46a9b33f69567c0a70316f7b6e05b

data/README.md

@@ -10,7 +10,7 @@ It's solving issues with local and remote storage discussed
 
 Add this line to your application's Gemfile:
 
-    gem 'copy_carrierwave_file', github: 'equivalent/copy_carrierwave_file'
+    gem 'copy_carrierwave_file'
 
 And then execute:
 
@@ -25,7 +25,7 @@ You can use service class directly:
     new_resource      = User.new
 
     CopyCarrierwaveFile::CopyFileService.new(original_resource, new_resource, :avatar).set_file
-      # :avatar represents mount point
+      # :avatar represents mount point (field)
    
     new_resource.save
 

data/copy_carrierwave_file.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5"
   spec.add_development_dependency "mocha", "~> 0.14"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "fog"
+  spec.add_development_dependency "pry"
 end

data/lib/copy_carrierwave_file/copy_file_service.rb

@@ -1,5 +1,8 @@
 module CopyCarrierwaveFile
   class CopyFileService
+    NoFileForOriginalResource = Class.new(StandardError)
+    UnknowStorage             = Class.new(StandardError)
+
     attr_reader :original_resource, :resource, :mount_point
 
     def initialize(original_resource, resource, mount_point)
@@ -15,21 +18,26 @@ module CopyCarrierwaveFile
       @resource          = resource
     end
 
-    # Set file from original resource
+    # #set_file
+    #
+    # sets file for given storage type
     #
-    # Founded originally at http://bit.ly/ROGtPR
+    # reason why case is comparing String and not actual storage class
+    # is that user may or may not add gem "fog" => this class may not be
+    # loaded
     #
     def set_file
       if have_file?
-        begin
-          set_file_for_remote_storage
-        rescue Errno::ENOENT
+        case original_resource_mounter.send(:storage).class.name
+        when 'CarrierWave::Storage::File'
           set_file_for_local_storage
-        rescue NoMethodError
-          raise "Original resource has no File"
+        when 'CarrierWave::Storage::Fog'
+          set_file_for_remote_storage
+        else
+          raise UnknowStorage
         end
       else
-        raise "Original resource has no File"
+        raise NoFileForOriginalResource
       end
     end
 
@@ -37,32 +45,17 @@ module CopyCarrierwaveFile
       original_resource_mounter.file.present?
     end
 
-    # Set file when you use remote storage for your files (like S3)
-    #
-    # will try to fetch full remote path of a file with `open-uri`
-    #
-    # If you use local storage, `doc.avatar.url` will return relative path, therefor
-    # this will fail with Errno::ENOENT
-    #
-    # If you have issues with code try alternative code:
-    #
-    #    resource.remote_file_url = original_resource.avatar.url
-    #
     def set_file_for_remote_storage
-      set_resource_mounter_file open(original_resource_mounter.url)
+      resource.send(:"remote_#{mount_point.to_s}_url=", original_resource_mounter.url)
     end
 
     def set_file_for_local_storage
-      set_resource_mounter_file File.open(original_resource_mounter.file.file)
+      resource.send(:"#{mount_point.to_s}=", File.open(original_resource_mounter.file.file))
     end
 
     def original_resource_mounter
       original_resource.send(mount_point)
     end
 
-    def set_resource_mounter_file(file)
-      resource.send( :"#{mount_point.to_s}=", file)
-    end
-
   end
 end

data/lib/copy_carrierwave_file/version.rb

@@ -1,3 +1,3 @@
 module CopyCarrierwaveFile
-  VERSION = "1.0.1.1"
+  VERSION = "1.1.0"
 end

data/test/copy_file_service_wrong_initialization_test.rb

@@ -9,13 +9,13 @@ describe CopyCarrierwaveFile::CopyFileService, 'initialization' do
 
   context 'with resources with uploader and right mount point' do
     it "should not raise an error" do
-      CopyCarrierwaveFile::CopyFileService.new(Document.new, Document.new, :file)
+      CopyCarrierwaveFile::CopyFileService.new(LocalDocument.new, LocalDocument.new, :file)
     end
   end
 
   context 'when original resources without uploader' do
     it "should raise an error" do
-      proc{ CopyCarrierwaveFile::CopyFileService.new(User.new, Document.new, :file) }.
+      proc{ CopyCarrierwaveFile::CopyFileService.new(User.new, LocalDocument.new, :file) }.
         must_raise RuntimeError
     end
   end
@@ -23,14 +23,14 @@ describe CopyCarrierwaveFile::CopyFileService, 'initialization' do
 
   context 'when resources without uploader' do
     it "should raise an error" do
-      proc{ CopyCarrierwaveFile::CopyFileService.new(Document.new, User.new, :file) }.
+      proc{ CopyCarrierwaveFile::CopyFileService.new(LocalDocument.new, User.new, :file) }.
         must_raise RuntimeError
     end
   end
 
   context 'with resources with uploader but wrong mount point' do
     it do
-      proc{ CopyCarrierwaveFile::CopyFileService.new(Document.new, Document.new, :foo) }.
+      proc{ CopyCarrierwaveFile::CopyFileService.new(LocalDocument.new, LocalDocument.new, :foo) }.
         must_raise RuntimeError
     end
   end

data/test/copy_local_storage_file_test.rb

@@ -7,10 +7,10 @@ describe 'CopyCarrierwaveFile', 'copying local storage file' do
     FileUtils.rm_rf(Dir.glob(TEST_DIR+"/tmp/uploads/*"))
   end
 
-  let(:document)    { Document.new }
+  let(:document)    { LocalDocument.new }
   let(:copy_service){ CopyCarrierwaveFile::CopyFileService.new(original_document, document, :file)}
   let(:original_document) do
-    doc = Document.new
+    doc = LocalDocument.new
     doc.file = test_file1
     doc.save
     doc

data/test/copy_remote_storage_file_test.rb

@@ -1,28 +1,29 @@
 require 'test_helper'
+  require 'pry'
 
 describe CopyCarrierwaveFile::CopyFileService, 'copying remote storage file' do
   include UploadedFileMacros
 
-  let(:document)    { Document.new }
-  let(:copy_service){ CopyCarrierwaveFile::CopyFileService.new(original_document, document, :file)}
-  let(:original_document){ Document.create }
+  let(:document) { RemoteDocument.new }
+  let(:original_document) { RemoteDocument.create }
 
   after(:all){ remove_uploaded_test_files }
 
-  subject{ FileUtils.identical?(test_file1, document.file.file.file) }
-
-
   it 'Document file must be identical to Original document file' do
-    mock_file = mock()
-    mock_file.expects(:file).at_least_once.returns('a_file_mock')
-    mock_file.expects(:url).at_least_once.returns('http://foo')
 
-    original_document.stubs(:file).returns(mock_file)
-    CopyCarrierwaveFile::CopyFileService.any_instance.expects(:open).with('http://foo').returns(test_file1)
+    # set any file on original_document so that copy can start
+    original_document.remote_file_url = 'http://mock.com/test.jpg'
+
+    # because we do Fog.mock! storage acts now as local, we return some url
+    original_document
+      .file
+      .stubs(:url)
+      .returns('http://mock.com/test.jpg')
 
-    copy_service.set_file
-    document.save
+    CopyCarrierwaveFile::CopyFileService
+      .new(original_document, document, :file)
+      .set_file
 
-    subject.must_equal true
+    document.file.file.must_be_kind_of CarrierWave::SanitizedFile
   end
 end

data/test/test_helper.rb

@@ -16,11 +16,12 @@ class Minitest::Spec
   end
 end
 
+Fog.mock!
+
 ActiveRecord::Base::establish_connection(adapter: 'sqlite3', database: ':memory:')
 ActiveRecord::Base.connection.execute(%{CREATE TABLE documents (id INTEGER PRIMARY KEY, file STRING );})
 
-
-class FileUploader < CarrierWave::Uploader::Base
+class LocalFileUploader < CarrierWave::Uploader::Base
   storage :file
 
   def root
@@ -28,13 +29,25 @@ class FileUploader < CarrierWave::Uploader::Base
   end
 end
 
+class RemoteFileUploader < CarrierWave::Uploader::Base
+  storage :fog
+
+  def root
+    "#{TEST_DIR}/tmp/" # 
+  end
+end
 
 class Document < ActiveRecord::Base
-  mount_uploader :file, FileUploader
 end
 
-def remove_uploaded_test_files
-  FileUtils.rm_rf(Dir.glob(TEST_DIR+"/tmp/uploads/*"))
+class LocalDocument < Document
+  mount_uploader :file, LocalFileUploader
 end
 
+class RemoteDocument < Document
+  mount_uploader :file, RemoteFileUploader
+end
 
+def remove_uploaded_test_files
+  FileUtils.rm_rf(Dir.glob(TEST_DIR+"/tmp/uploads/*"))
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_carrierwave_file
 version: !ruby/object:Gem::Version
-  version: 1.0.1.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Tomas Valent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog
+  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: pry
+  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: 'Gems main responsibility is to provide service for copying Carrierwave
   files between records '
 email:
@@ -153,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Copy Carrierwave files between records