fileclip 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d40924bf65cf039c91bcceead4b1cf7c74eb45b
-  data.tar.gz: f611297bd1576eba94220544c3b3657a92b0b1d2
+  metadata.gz: 0676c859073d216852c397b109a24de44013b53f
+  data.tar.gz: 6d017f9ac5d01e0b750144009c432c2583f5192a
 SHA512:
-  metadata.gz: dc984b5f899557d9fcf6ba87d799cfe094dd8fa2a04e8c12ec92338a63cb87f4445e71ebb2009d08c3190bacc17a45d7b0f1cb994be6f564158ffb29311020f9
-  data.tar.gz: 88cde2cfabb89d4738540c0a2bb4d1e0b09f10495a2e43ccdeee86071fa2bdac9a95b8addf43b8053d05771ec99a59a51febcc121554822e23fcf7c4459818e4
+  metadata.gz: ae6c1d30f895d8071d07f693e3913ebb011c0c4dd9455d99af9fb97fd25572c7550680710ca2564132158c424cdab6d3d91d723de87df4961088a86bc8291a06
+  data.tar.gz: 13c7805036a72919a2060226c9a5440ab65411b6dc8716825bd74531eef12b16aa05b7474392cf7905948eef2f7476cb48ee548c12241fa0810af7b0a2c47239

data/Gemfile

@@ -1,6 +1,3 @@
 source "http://rubygems.org"
 
 gemspec
-
-gem 'rails', "3.2.14"
-

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fileclip (0.2.3)
+    fileclip (0.2.4)
       paperclip
       paperclip (>= 3.5.1)
       railties (>= 3.0)
@@ -39,11 +39,21 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
-    cocaine (0.5.2)
+    cocaine (0.5.3)
       climate_control (>= 0.0.3, < 1.0)
+    connection_pool (1.2.0)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     diff-lcs (1.2.4)
+    docile (1.1.0)
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.6.4)
@@ -55,10 +65,10 @@ GEM
     mime-types (1.23)
     mono_logger (1.1.0)
     multi_json (1.7.7)
-    paperclip (3.5.1)
+    paperclip (3.5.2)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (~> 0.5.0)
+      cocaine (~> 0.5.3)
       mime-types
     polyglot (0.3.3)
     rack (1.4.5)
@@ -107,6 +117,17 @@ GEM
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.1)
+    sidekiq (2.14.0)
+      celluloid (>= 0.14.1)
+      connection_pool (>= 1.0.0)
+      json
+      redis (>= 3.0.4)
+      redis-namespace
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     sinatra (1.4.3)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -117,8 +138,12 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.7)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
     thor (0.18.1)
     tilt (1.4.1)
+    timers (1.1.0)
+    tins (0.13.1)
     treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
@@ -130,8 +155,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  coveralls
   fileclip!
-  rails (= 3.2.14)
+  rails
   resque
   rspec
+  sidekiq
   sqlite3

data/README.md

@@ -1,4 +1,4 @@
-FileClip [![Build Status](https://travis-ci.org/ScotterC/fileclip.png?branch=master)](https://travis-ci.org/ScotterC/fileclip)
+FileClip [![Build Status](https://travis-ci.org/ScotterC/fileclip.png?branch=master)](https://travis-ci.org/ScotterC/fileclip) [![Coverage Status](https://coveralls.io/repos/ScotterC/fileclip/badge.png?branch=master)](https://coveralls.io/r/ScotterC/fileclip?branch=master)
 ========
 
 A FilePicker / PaperClip mashup.  Use Filepicker for uploads and paperclip to process them.
@@ -33,6 +33,7 @@ FileClip.configure do |config|
   config.storage_path = "/assets/" # Defaults to "/fileclip/"
   config.mime_types = "images/jpeg" # Defaults to "images/*"
   config.file_access = "private" # Defaults to "public"
+  config.excluded_environments = [] # Defaults to ["test"]
 end
 ````
 

data/TODO.md

@@ -7,13 +7,11 @@ Backend:
 * Normalize filenames
 
 Frontend:
-* Loader for filepicker js only if needed
 * Eliminate need for jQuery
 * make it a form builder function that can accept a different url name
 
 Extra features:
 * Work with DelayedJob
-* Work with Sidekiq
 * Fallback to filepicker url if paperclip url doesn't exist
 * Filepicker converts to match paperclip styles
 * FilePicker droppane support

data/fileclip.gemspec

@@ -24,6 +24,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency "rails"
   s.add_development_dependency 'resque'
+  s.add_development_dependency 'sidekiq'
+  s.add_development_dependency 'coveralls'
   s.add_runtime_dependency(%q<railties>, [">= 3.0"])
 
   s.add_runtime_dependency "paperclip"

data/lib/fileclip.rb

@@ -4,6 +4,7 @@ require 'fileclip/validators'
 require 'fileclip/engine'
 require 'fileclip/railtie'
 require 'fileclip/jobs/resque'
+require 'fileclip/jobs/sidekiq'
 require 'rest-client'
 
 # TODO: make fileclip methods only load on fileclipped models
@@ -26,6 +27,10 @@ module FileClip
       !!(defined? Resque)
     end
 
+    def sidekiq_enabled?
+      !!(defined? Sidekiq)
+    end
+
     def change_keys
       @@change_keys ||= [:filepicker_url]
     end
@@ -72,18 +77,25 @@ module FileClip
       if update_from_filepicker?
         if FileClip.resque_enabled?
           # TODO: self.class.name is webrick ???
-          delay_process!
+          process_with_resque!
+        elsif FileClip.sidekiq_enabled?
+          process_with_sidekiq!
         else
           process_from_filepicker
         end
       end
     end
 
-    def delay_process!
+    def process_with_resque!
       update_column(:"#{attachment_name}_processing", true) if FileClip.delayed?
       ::Resque.enqueue(FileClip::Jobs::Resque, self.class.name, self.id)
     end
 
+    def process_with_sidekiq!
+      update_column(:"#{attachment_name}_processing", true) if FileClip.delayed?
+      FileClip::Jobs::Sidekiq.perform_async(self.class.name, self.id)
+    end
+
     def process_from_filepicker
       self.class.skip_callback :commit, :after, :update_from_filepicker!
       self.send(:"#{attachment_name}=", URI.parse(filepicker_url))

data/lib/fileclip/action_view/helpers.rb

@@ -4,7 +4,7 @@ module FileClip
 
       # Include relevant JS
       def fileclip_js_include_tag
-        javascript_include_tag "//api.filepicker.io/v1/filepicker.js", "fileclip"
+        javascript_include_tag "fileclip"
       end
 
       # Options

data/lib/fileclip/configuration.rb

@@ -2,7 +2,8 @@ module FileClip
   class Configuration
     attr_writer :filepicker_key, :services,
                 :max_size, :storage_path,
-                :mime_types, :file_access
+                :mime_types, :file_access,
+                :excluded_environments
 
     def filepicker_key
       @filepicker_key or raise "Set Filepicker api_key"
@@ -28,6 +29,10 @@ module FileClip
       @file_access or "public"
     end
 
+    def excluded_environments
+      @excluded_environments or ["test"]
+    end
+
   end
 
   class << self

data/lib/fileclip/jobs/sidekiq.rb

@@ -0,0 +1,11 @@
+module FileClip
+  module Jobs
+    class Sidekiq
+      include ::Sidekiq::Worker if defined?(::Sidekiq::Worker)
+
+      def perform(instance_klass, instance_id)
+        FileClip.process(instance_klass, instance_id)
+      end
+    end
+  end
+end

data/lib/fileclip/version.rb

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

data/spec/fileclip_spec.rb

@@ -60,6 +60,17 @@ describe FileClip do
         FileClip.resque_enabled?.should be_true
       end
     end
+
+    describe "sidekiq_enabled?" do
+      it "returns false by default" do
+        FileClip.sidekiq_enabled?.should be_false
+      end
+
+      it "returns true if resque exists" do
+        stub_const "Sidekiq", Class.new
+        FileClip.sidekiq_enabled?.should be_true
+      end
+    end
   end
 
   describe "instance methods" do
@@ -82,7 +93,7 @@ describe FileClip do
 
     context "#update_from_filepicker!" do
 
-      context "without resque" do
+      context "without a background queue" do
         before :each do
           image.filepicker_url = filepicker_url
           image.stub_chain(:previous_changes, :keys).and_return ["filepicker_url"]
@@ -96,17 +107,24 @@ describe FileClip do
         end
       end
 
-      context "with resque" do
+      context "with a background queue" do
         before :each do
           image.filepicker_url = filepicker_url
           image.stub_chain(:previous_changes, :keys).and_return ["filepicker_url"]
         end
 
-        it "enqueues job" do
+        it "enqueues job with Resque" do
           stub_const "Resque", Class.new
           Resque.should_receive(:enqueue).with(FileClip::Jobs::Resque, "Image", nil)
           image.update_from_filepicker!
         end
+
+        it "enqueues job with Sidekiq" do
+          stub_const "Sidekiq", Class.new
+          stub_const "Sidekiq::Worker", Class.new
+          FileClip::Jobs::Sidekiq.should_receive(:perform_async).with("Image", nil)
+          image.update_from_filepicker!
+        end
       end
 
       context "with delayed paperclip" do

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ require 'rubygems' unless defined? Gem
 require 'bundler'
 Bundler.setup
 
+require 'coveralls'
+Coveralls.wear!
+
 # Prepare activerecord
 # require "active_record"
 require 'rails/all'

data/vendor/assets/javascripts/fileclip.js.coffee.erb

@@ -1,7 +1,15 @@
 class window.FileClip
   _clicked_button: ""
 
+  @env = ->
+    "<%= Rails.env %>"
+
   constructor: ->
+    excludedEnvs = <%= FileClip.configuration.excluded_environments %>
+    if @inArray(excludedEnvs, FileClip.env()) != -1
+      return false
+
+    @loadFilepicker()
     filepicker.setKey('<%= FileClip.configuration.filepicker_key %>');
 
   # For filepicker_helper
@@ -53,5 +61,35 @@ class window.FileClip
 
     callback(file, @_clicked_button) if callback
 
+  loadFilepicker: ->
+    ((a) ->
+      return if window.filepicker
+      b = a.createElement("script")
+      b.type = "text/javascript"
+      b.async = not 0
+      b.src = ((if "https:" is a.location.protocol then "https:" else "http:")) + "//api.filepicker.io/v1/filepicker.js"
+      c = a.getElementsByTagName("script")[0]
+      c.parentNode.insertBefore b, c
+      d = {}
+      d._queue = []
+      e = "pick,pickMultiple,pickAndStore,read,write,writeUrl,export,convert,store,storeUrl,remove,stat,setKey,constructWidget,makeDropPane".split(",")
+      f = (a, b) ->
+        ->
+          b.push [a, arguments]
+
+      g = 0
+
+      while g < e.length
+        d[e[g]] = f(e[g], d._queue)
+        g++
+      window.filepicker = d
+    ) document
 
+  inArray: (array, value) ->
+    return array.indexOf(value) if array.indexOf
+    i = 0
 
+    while i < array.length
+      return i  if array[i] is value
+      i++
+    -1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileclip
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Scott Carleton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -94,6 +94,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq
+  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: coveralls
+  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: railties
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +175,7 @@ files:
 - lib/fileclip/configuration.rb
 - lib/fileclip/engine.rb
 - lib/fileclip/jobs/resque.rb
+- lib/fileclip/jobs/sidekiq.rb
 - lib/fileclip/railtie.rb
 - lib/fileclip/validators.rb
 - lib/fileclip/version.rb