fileclip 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fa875e233d7b35eef0e879d87bfa59834b8c00d
-  data.tar.gz: ff60c7952f7a7e3647099d7afaf89cd7d9f32a3f
+  metadata.gz: 9d40924bf65cf039c91bcceead4b1cf7c74eb45b
+  data.tar.gz: f611297bd1576eba94220544c3b3657a92b0b1d2
 SHA512:
-  metadata.gz: e48638eb79dfcdfc0aec9cabb8ceb69994ce354426408f72d77389d3c813bf6318f76072d1f33f99b1eedfdbba522690d025884349e1e6bf68bd3c434b19e211
-  data.tar.gz: e2e0a1a28fd38252f03a15a5309900b19e337db40bbdbc7a2e906a59326607f9c0649df4cf1ca119f187c6200ffdf8dbfd2dc6e4f018136a455ec1ac4d3c2a17
+  metadata.gz: dc984b5f899557d9fcf6ba87d799cfe094dd8fa2a04e8c12ec92338a63cb87f4445e71ebb2009d08c3190bacc17a45d7b0f1cb994be6f564158ffb29311020f9
+  data.tar.gz: 88cde2cfabb89d4738540c0a2bb4d1e0b09f10495a2e43ccdeee86071fa2bdac9a95b8addf43b8053d05771ec99a59a51febcc121554822e23fcf7c4459818e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fileclip (0.2.2)
+    fileclip (0.2.3)
       paperclip
       paperclip (>= 3.5.1)
       railties (>= 3.0)
@@ -41,7 +41,7 @@ GEM
     builder (3.0.4)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.1)
+    cocaine (0.5.2)
       climate_control (>= 0.0.3, < 1.0)
     diff-lcs (1.2.4)
     erubis (2.7.0)

data/lib/fileclip.rb

@@ -6,6 +6,8 @@ require 'fileclip/railtie'
 require 'fileclip/jobs/resque'
 require 'rest-client'
 
+# TODO: make fileclip methods only load on fileclipped models
+
 module FileClip
   mattr_accessor :change_keys
 
@@ -79,7 +81,7 @@ module FileClip
 
     def delay_process!
       update_column(:"#{attachment_name}_processing", true) if FileClip.delayed?
-      Resque.enqueue(FileClip::Jobs::Resque, self.class.name, self.id)
+      ::Resque.enqueue(FileClip::Jobs::Resque, self.class.name, self.id)
     end
 
     def process_from_filepicker
@@ -96,7 +98,11 @@ module FileClip
       metadata = JSON.parse(::RestClient.get filepicker_url + "/metadata")
 
       self.send(:"#{attachment_name}_content_type=",  metadata["mimetype"])
-      self.send(:"#{attachment_name}_file_name=",     metadata["filename"])
+
+      # Delegate to paperclips filename cleaner
+      filename = self.attachment_object.send(:cleanup_filename, metadata["filename"])
+      self.send(:"#{attachment_name}_file_name=",     filename)
+
       self.send(:"#{attachment_name}_file_size=",     metadata["size"])
     end
 
@@ -107,6 +113,7 @@ module FileClip
     end
 
     def filepicker_url_not_present?
+      return true unless self.class.column_names.include? "filepicker_url"
       !filepicker_url.present?
     end
 

data/lib/fileclip/version.rb

@@ -1,3 +1,3 @@
 module FileClip
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/fileclip/validators_spec.rb

@@ -32,6 +32,7 @@ describe FileClip::Validators do
     describe "with filepicker url" do
       before :each do
         image.filepicker_url = "image.com"
+        image.filepicker_url_not_present?.should be_false
       end
 
       it "observes attachment presence" do
@@ -53,5 +54,34 @@ describe FileClip::Validators do
         image.errors.should be_empty
       end
     end
+
+    describe "for non fileclipped asset" do
+      let(:asset) { Asset.new }
+
+      before :each do
+        Asset.reset_callbacks(:validate)
+        Asset._validators.clear
+      end
+
+      describe "if no filepicker_url" do
+        it "observes attachment presence" do
+          Asset.validates :attachment, :attachment_presence => true
+          asset.save.should be_false
+          asset.errors.first.last.should == "can't be blank"
+        end
+
+        it "observes attachment size" do
+          Asset.validates_attachment :attachment, :size => { :in => 0..1000 }, :presence => true
+          asset.save.should be_false
+          asset.errors.should_not be_empty
+        end
+
+        it "observes attachment content" do
+          Asset.validates_attachment :attachment, :content_type => { :content_type => "image/jpg" }, :presence => true
+          asset.save.should be_false
+          asset.errors.should_not be_empty
+        end
+      end
+    end
   end
 end

data/spec/fileclip_spec.rb

@@ -108,6 +108,26 @@ describe FileClip do
           image.update_from_filepicker!
         end
       end
+
+      context "with delayed paperclip" do
+        let(:delayed_image) { DelayedImage.create }
+
+        before :each do
+          FileClip.stub(:delayed?).and_return true
+          FileClip.stub(:resque_enabled?).and_return true
+          stub_const "Resque", Class.new
+
+          delayed_image.filepicker_url = filepicker_url
+          delayed_image.stub_chain(:previous_changes, :keys).and_return ["filepicker_url"]
+        end
+
+        it "should update processing column" do
+          delayed_image.attachment_processing.should be_false
+          Resque.should_receive(:enqueue).with(FileClip::Jobs::Resque, "DelayedImage", delayed_image.id)
+          delayed_image.update_from_filepicker!
+          delayed_image.attachment_processing.should be_true
+        end
+      end
     end
 
     context "#update_from_filepicker?" do

data/spec/schema.rb

@@ -8,3 +8,23 @@ ActiveRecord::Schema.define :version => 0 do
     t.string  :filepicker_url
   end
 end
+
+ActiveRecord::Schema.define :version => 0 do
+  create_table "delayed_images", :force => true do |t|
+    t.string  :attachment_file_name
+    t.string  :attachment_content_type
+    t.integer :attachment_updated_at
+    t.integer :attachment_file_size
+    t.boolean :attachment_processing, default: false
+    t.string  :filepicker_url
+  end
+end
+
+ActiveRecord::Schema.define :version => 0 do
+  create_table "assets", :force => true do |t|
+    t.string  :attachment_file_name
+    t.string  :attachment_content_type
+    t.integer :attachment_updated_at
+    t.integer :attachment_file_size
+  end
+end

data/spec/spec_helper.rb

@@ -32,3 +32,28 @@ class Image < ActiveRecord::Base
   fileclip :attachment
 
 end
+
+class DelayedImage < ActiveRecord::Base
+
+  has_attached_file :attachment,
+    :storage => :filesystem,
+    :path => "./spec/tmp/:style/:id.:extension",
+    :url => "./spec/tmp/:style/:id.extension"
+
+  # Not testing DelayedPaperclip directly yet
+  # process_in_background :attachment,
+  #                       if: :filepicker_url_not_present?
+
+  fileclip :attachment
+
+end
+
+
+class Asset < ActiveRecord::Base
+
+  has_attached_file :attachment,
+    :storage => :filesystem,
+    :path => "./spec/tmp/:style/:id.:extension",
+    :url => "./spec/tmp/:style/:id.extension"
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileclip
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Scott Carleton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip