fileclip 0.1.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 435bef9bd97c9e7a5a77ab0f26e68b2977d9cd48
-  data.tar.gz: 2ffee75c354221079689f99cb4f86e13af632e5d
+  metadata.gz: f40a90259ac27e876f6cf56f326ab18279b476f5
+  data.tar.gz: decfde8e4d6ac8580cb2d86ec1c3394f37ca9333
 SHA512:
-  metadata.gz: 36ecf1b9637d0e5bd6e1a8bb88e12aede0e7bfc310b1283d473d2c8029ee804742a1d154033c0f0f93626d206ac4ca8050c8601c5e88304e4eec4f2c2edd7f92
-  data.tar.gz: cceec767215643332fe54b0f11fa0dbb538a8ffc21c5edf8a9f67d3d15ddc5a76d76d5b526444e052a3ac977306b6c69639bede4af1c0098ceb80fdeee3e09fb
+  metadata.gz: 9b1f34aef2c3516b4db6e14ae09ab4c6d1a08ade820374c71b9e64d33224b7336028f8104d4aa435095a367f6660619a174d92df3c65cc967cd3bf1d431aee96
+  data.tar.gz: 5b1c57b57955c4b3253dd8362d18b6c9b30ef0df73ef010cd3888ed9303ee59c5edb5d6996c108ef29d7fb4715bd4ef283f95caf843189788121b4b9c95d0b21

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.bundle
+.config
+coverage
+InstalledFiles
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/

data/.rspec

@@ -0,0 +1 @@
+--color

data/.ruby-gemset

@@ -0,0 +1 @@
+fileclip

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p247

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 2.0.0
+
+script:
+- bundle exec rspec spec
+
+notifications:
+  email:
+    - scott@artsicle.com

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fileclip (0.0.3)
+    fileclip (0.2.1)
       paperclip
-      paperclip (>= 3.3.0)
+      paperclip (>= 3.5.1)
       railties (>= 3.0)
       rest-client
 
@@ -53,8 +53,9 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.23)
+    mono_logger (1.1.0)
     multi_json (1.7.7)
-    paperclip (3.5.0)
+    paperclip (3.5.1)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.0)
@@ -63,6 +64,8 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-protection (1.5.0)
+      rack
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
@@ -85,6 +88,15 @@ GEM
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
+    redis (3.0.4)
+    redis-namespace (1.3.0)
+      redis (~> 3.0.0)
+    resque (1.24.1)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.2)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
@@ -95,6 +107,10 @@ GEM
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.1)
+    sinatra (1.4.3)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -107,6 +123,8 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
 
 PLATFORMS
   ruby
@@ -114,5 +132,6 @@ PLATFORMS
 DEPENDENCIES
   fileclip!
   rails (= 3.2.14)
+  resque
   rspec
   sqlite3

data/README.md

@@ -1,4 +1,4 @@
-FileClip
+FileClip [![Build Status](https://travis-ci.org/ScotterC/fileclip.png?branch=master)](https://travis-ci.org/ScotterC/fileclip)
 ========
 
 A FilePicker / PaperClip mashup.  Use Filepicker for uploads and paperclip to process them.
@@ -28,6 +28,22 @@ end
 # config/initializers/fileclip.rb
 FileClip.configure do |config|
   config.filepicker_key = 'XXXXXXXXXXXXXXXXXXX'
+  config.services = ["COMPUTER", "DROPBOX"] # Defaults to ["COMPUTER"]
+  config.max_size = 20 # Megabytes, defaults to 20
+  config.storage_path = "/assets/" # Defaults to "/fileclip/"
+  config.mime_types = "images/jpeg" # Defaults to "images/*"
+  config.file_access = "private" # Defaults to "public"
+end
+````
+
+### In Model
+````
+# models/image.rb
+class Image << ActiveRecord::Base
+
+  has_attached_file :attachment
+
+  fileclip :attachment
 end
 ````
 
@@ -48,10 +64,21 @@ end
 ````
 
 #### Current FilePicker options hardcoded
-* mimetypes are image/*
 * container modal
-* service Computer
-* maxsize is 20 mb
 * location is S3
-* path is "/fileclip"
-* access is public
+
+Features:
+* Unobtrusive.  Normal paperclip uploads still work
+
+
+#### Gotchas
+
+This paperclip validation will return errors even if filepicker url is present:
+````
+  validates :attachment, :attachment_presence => true
+````
+
+However, this will work fine.  It'll skip the attachment check if a filepicker url is present and validate if it's not.
+````
+  validates_attachment :attachment, :size => { :in => 0..1000 }, :presence => true
+````

data/TODO.md

@@ -0,0 +1,28 @@
+TODO:
+
+Backend:
+* handle multiple attachments on a model, prefix column with attachment name
+* create generator for migration
+* create generator for intializer
+* Normalize filenames
+* Change keys as an option.  defaults to filepicker_url
+
+Frontend:
+* Allow overriding of filepicker options
+* Fileclip link to automatically set fields and call it
+* link should act like a normal link helper
+* Minimal amount of JS
+* 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 Delayed Paperclip
+* Work with Resque
+* Work with DelayedJob
+* Work with Sidekiq
+* Fallback to filepicker url if paperclip url doesn't exist
+* Filepicker converts to match paperclip styles
+* Configure Filepicker options
+* FilePicker droppane support
+

data/fileclip.gemspec

@@ -2,41 +2,28 @@ $:.push File.expand_path("../lib", __FILE__)
 require "fileclip/version"
 
 Gem::Specification.new do |s|
-  s.name = "fileclip"
-  s.version = FileClip::VERSION
+  s.name          = "fileclip"
+  s.version       = FileClip::VERSION
+  s.platform      = Gem::Platform::RUBY
+  s.authors       = ["Scott Carleton"]
+  s.summary       = "A FilePicker / PaperClip mashup."
+  s.description   = "A FilePicker / PaperClip mashup.  Use Filepicker for uploads and paperclip to process them."
+  s.email         = "scott@artsicle.com"
+  s.license       = "MIT"
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.homepage      = "http://github.com/ScotterC/fileclip"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Scott Carleton"]
-  s.date = "2013-07-26"
-  s.description = "A FilePicker / PaperClip mashup.  Use Filepicker for uploads and paperclip to process them."
-  s.email = "scott@artsicle.com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "fileclip.gemspec",
-    "lib/fileclip.rb",
-    "lib/fileclip/version.rb"
-  ]
-  s.homepage = "http://github.com/ScotterC/fileclip"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
   s.rubygems_version = "2.0.3"
-  s.summary = "A FilePicker / PaperClip mashup."
 
-  s.add_dependency 'paperclip', [">= 3.3.0"]
+  s.add_dependency 'paperclip', [">= 3.5.1"]
   s.add_dependency 'rest-client'
 
   s.add_development_dependency "rspec"
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency "rails"
+  s.add_development_dependency 'resque'
   s.add_runtime_dependency(%q<railties>, [">= 3.0"])
 
   s.add_runtime_dependency "paperclip"

data/lib/fileclip.rb

@@ -1,75 +1,66 @@
-# TODO
-#
-# Allowance for normal attached images through file_field:
-#  only do attachment validation if it's there if remote url is not present
-#  only do process_in_background if remote_url is not present
-#
-# Expose FilePicked to all classes that have Paperclip images
-#
-# Handle multiple attachments in single model
-#  Crux of this is finding the name of the attachment we're dealing with
-#
-# Fallback if none are defined
-#
-# What can we separate out into it's own class
-# What should be a part of attachment
-#
-# Migration generator
-#
-# Configuration to take Filepicker API key
-#
-# Javascript inclusion
-#
-# Add delayed aspect
-#
-# Queue job for image assignment
 require 'fileclip/configuration'
 require 'fileclip/action_view/helpers'
+require 'fileclip/validators'
 require 'fileclip/engine'
 require 'fileclip/railtie'
+require 'fileclip/jobs/resque'
 require 'rest-client'
 
 module FileClip
 
+  mattr_accessor :change_keys
+
+  def self.change_keys
+    @@change_keys ||= [:filepicker_url]
+  end
+
+  def self.delayed?
+    defined?(DelayedPaperclip)
+    # TODO: replace with checking for delayed options?
+  end
+
+  class << self
+
+    def resque_enabled?
+      !!(defined? Resque)
+    end
+
+    def process(klass, instance_id)
+      klass.constantize.find(instance_id).process_from_filepicker
+    end
+
+  end
+
   module Glue
     def self.included(base)
-      base.extend(ClassMethods)
+      base.extend ClassMethods
+      base.extend FileClip::Validators::HelperMethods
       base.send :include, InstanceMethods
-      base.add_callbacks
     end
   end
 
   module ClassMethods
-    def add_callbacks
+    def fileclip(name)
       attr_accessible :filepicker_url
+      after_commit  :update_from_filepicker!
 
-      # if respond_to?(:after_commit)
-        after_commit  :update_from_filepicker!
-      # else
-      #   after_save    :update_from_filepicker!
-      # end
+      set_fileclipped(name)
+    end
 
-      # TODO:
-      # skip validates_attachment_presence if filepicker url present
-      # Save without this particular vaildation
+    def fileclipped
+      @attachment_name
     end
 
-    def paperclip_definitions
-      @paperclip_definitions ||= if Paperclip::VERSION.to_f < 3.5
-        attachment_definitions
-      elsif Paperclip::VERSION == "3.5.0"
-        Paperclip::Tasks::Attachments.definitions_for(self)
-      else
-        Paperclip::AttachmentRegistry.definitions_for(self)
-      end
+    def set_fileclipped(name)
+      @attachment_name = name
     end
   end
 
   module InstanceMethods
 
-    # TODO: can't handle multiples, just first
+    # TODO: can't handle multiples, just given
     def attachment_name
-      @attachment_name ||= self.class.paperclip_definitions.keys.first
+      @attachment_name ||= self.class.fileclipped
     end
 
     def attachment_object
@@ -77,14 +68,28 @@ module FileClip
     end
 
     def update_from_filepicker!
-      process_from_filepicker if update_from_filepicker?
+      if update_from_filepicker?
+        if FileClip.resque_enabled?
+          # TODO: self.class.name is webrick ???
+          delay_process!
+        else
+          process_from_filepicker
+        end
+      end
+    end
+
+    def delay_process!
+      update_column(:"#{attachment_name}_processing", true) if FileClip.delayed?
+      Resque.enqueue(FileClip::Jobs::Resque, 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))
       self.set_metadata
+      self.attachment_object.save_with_prepare_enqueueing if FileClip.delayed?
       self.save
+      self.enqueue_delayed_processing if FileClip.delayed?
       self.class.set_callback :commit, :after, :update_from_filepicker!
     end
 
@@ -97,7 +102,7 @@ module FileClip
     end
 
     def update_from_filepicker?
-      filepicker_url_previously_changed? &&
+      fileclip_previously_changed? &&
       filepicker_url.present? &&
       !filepicker_only?
     end
@@ -106,8 +111,8 @@ module FileClip
       !filepicker_url.present?
     end
 
-    def filepicker_url_previously_changed?
-      previous_changes.keys.include?('filepicker_url')
+    def fileclip_previously_changed?
+      !(previous_changes.keys.map(&:to_sym) & FileClip.change_keys).empty?
     end
 
     # To be overridden in model if specific logic for not

data/lib/fileclip/action_view/helpers.rb

@@ -0,0 +1,69 @@
+module FileClip
+  module ActionView
+    module Helpers
+
+      # Include relevant JS
+      def fileclip_js_include_tag
+        javascript_include_tag "//api.filepicker.io/v1/filepicker.js", "fileclip"
+      end
+
+      # Options
+      # js to activate it on the spot, defaults to true
+      # class to add css classes
+      def link_to_fileclip(text, form_object, options={}, &block)
+        form_object, options = text, form_object if block_given?
+
+        id = fileclip_id(form_object)
+        classes = fileclip_css_classes(options[:class])
+
+        # Got to be a cleaner way to do this
+        link = if block_given?
+          link_to "javascript:void(0)", class: classes, id: id, &block
+        else
+          link_to text, "javascript:void(0)", class: classes, id: id
+        end
+
+        fileclip_link_builder(link, form_object, options, id)
+      end
+
+      # Add js-fileclip to existing classes
+      def fileclip_css_classes(given_classes)
+        return "js-fileclip" if given_classes.nil?
+        css_classes = [].push(given_classes.split)
+        css_classes << "js-fileclip"
+        css_classes
+      end
+
+      # Object id for link
+      def fileclip_id(form_object)
+        new_object = form_object.object
+        attachment_name = new_object.attachment_name
+        "#{attachment_name}_#{new_object.object_id}"
+      end
+
+      # Return empty tag if it's nil or true
+      def activation(js, id)
+        return javascript_tag unless js.nil? || js
+
+        javascript_tag("(function() {
+                          (new FileClip).button('##{id}');
+                        })();")
+      end
+
+      # Options
+      # Activate (defaults to true) to set own javascript
+      def fileclip_link_builder(link, form_object, options, id)
+        # Get attachment name
+        attachment_name = form_object.object.attachment_name
+
+        js = activation(options[:js], id)
+
+        js + link +
+        form_object.hidden_field(:filepicker_url,
+                                  class: "js-fileclip_url",
+                                  data: { type: attachment_name })
+      end
+
+    end
+  end
+end

data/lib/fileclip/configuration.rb

@@ -0,0 +1,42 @@
+module FileClip
+  class Configuration
+    attr_writer :filepicker_key, :services,
+                :max_size, :storage_path,
+                :mime_types, :file_access
+
+    def filepicker_key
+      @filepicker_key or raise "Set Filepicker api_key"
+    end
+
+    def services
+      @services or ["COMPUTER"]
+    end
+
+    def max_size
+      @max_size or 20
+    end
+
+    def storage_path
+      @storage_path or "/fileclip/"
+    end
+
+    def mime_types
+      @mime_types or "image/*"
+    end
+
+    def file_access
+      @file_access or "public"
+    end
+
+  end
+
+  class << self
+    def configure
+      yield configuration
+    end
+
+    def configuration
+      @configuration ||= FileClip::Configuration.new
+    end
+  end
+end

data/lib/fileclip/engine.rb

@@ -0,0 +1,11 @@
+module FileClip
+  module Rails
+    class Engine < ::Rails::Engine
+      initializer 'fileclip.insert_into_active_record' do
+        ::ActiveSupport.on_load :active_record do
+          FileClip::Railtie.insert
+        end
+      end
+    end
+  end
+end

data/lib/fileclip/jobs/resque.rb

@@ -0,0 +1,11 @@
+module FileClip
+  module Jobs
+    class Resque
+      @queue = :fileclip
+
+      def self.perform(instance_klass, instance_id)
+        FileClip.process(instance_klass, instance_id)
+      end
+    end
+  end
+end

data/lib/fileclip/railtie.rb

@@ -0,0 +1,11 @@
+module FileClip
+  class Railtie
+    # Glue includes FileClip into ActiveRecord
+    # TODO: only include it in models that have paperclip attachments
+    # Will require restart of server for it to pick up the class on edit
+    def self.insert
+      ::ActiveRecord::Base.send(:include, FileClip::Glue)
+      ::ActionView::Base.send(:include, FileClip::ActionView::Helpers)
+    end
+  end
+end

data/lib/fileclip/validators.rb

@@ -0,0 +1,24 @@
+module FileClip
+  module Validators
+
+    module HelperMethods
+
+      def validates_attachment_content_type(*attr_names)
+        attr_names.last.merge!({ :if => :filepicker_url_not_present? })
+        super(*attr_names)
+      end
+
+      def validates_attachment_presence(*attr_names)
+        attr_names.last.merge!({ :if => :filepicker_url_not_present? })
+        super(*attr_names)
+      end
+
+      def validates_attachment_size(*attr_names)
+        attr_names.last.merge!({ :if => :filepicker_url_not_present? })
+        super(*attr_names)
+      end
+
+    end
+
+  end
+end

data/lib/fileclip/version.rb

@@ -1,3 +1,3 @@
 module FileClip
-  VERSION = "0.1.0"
+  VERSION = "0.2.2"
 end

data/spec/fileclip/configuration_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe FileClip::Configuration do
+
+  describe "filepicker_key" do
+    it "should be nil to start" do
+      expect { FileClip.configuration.filepicker_key }.to raise_error
+    end
+
+    it "should be set by block" do
+      FileClip.configure do |config|
+        config.filepicker_key = "XXX-XXX"
+      end
+      FileClip.configuration.filepicker_key.should == "XXX-XXX"
+    end
+  end
+end

data/spec/fileclip/engine_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'rails/initializable'
+
+
+describe FileClip::Rails::Engine do
+
+  describe "include on initialzation" do
+    it "should insert fileclip and include view helpers on rails initialzation" do
+      pending
+      FileClip::Railtie.should_receive(:insert)
+      ::ActionView::Base.should_receive(:send).with(:include, FileClip::ActionView::Helpers)
+      FileClip::Rails::Engine.run_initializers
+    end
+  end
+
+end

data/spec/fileclip/railtie_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe FileClip::Railtie do
+  describe "insert" do
+    it "should include the glue" do
+      ActiveRecord::Base.should_receive(:send).with(:include, FileClip::Glue)
+      ActionView::Base.should_receive(:send).with(:include, FileClip::ActionView::Helpers)
+      FileClip::Railtie.insert
+    end
+  end
+end

data/spec/fileclip/validators_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe FileClip::Validators do
+  let(:image) { Image.new }
+
+  describe "validations" do
+    before :each do
+      Image.reset_callbacks(:validate)
+      Image._validators.clear
+    end
+
+    describe "if no filepicker_url" do
+      it "observes attachment presence" do
+        Image.validates :attachment, :attachment_presence => true
+        image.save.should be_false
+        image.errors.first.last.should == "can't be blank"
+      end
+
+      it "observes attachment size" do
+        Image.validates_attachment :attachment, :size => { :in => 0..1000 }, :presence => true
+        image.save.should be_false
+        image.errors.should_not be_empty
+      end
+
+      it "observes attachment content" do
+        Image.validates_attachment :attachment, :content_type => { :content_type => "image/jpg" }, :presence => true
+        image.save.should be_false
+        image.errors.should_not be_empty
+      end
+    end
+
+    describe "with filepicker url" do
+      before :each do
+        image.filepicker_url = "image.com"
+      end
+
+      it "observes attachment presence" do
+        pending
+        Image.validates :attachment, :attachment_presence => true
+        image.save.should be_true
+        image.errors.should be_empty
+      end
+
+      it "observes attachment size" do
+        Image.validates_attachment :attachment, :size => { :in => 0..1000 }, :presence => true
+        image.save.should be_true
+        image.errors.should be_empty
+      end
+
+      it "observes attachment content" do
+        Image.validates_attachment :attachment, :content_type => { :content_type => "image/jpg" }, :presence => true
+        image.save.should be_true
+        image.errors.should be_empty
+      end
+    end
+  end
+end

data/spec/fileclip_spec.rb

@@ -0,0 +1,214 @@
+require 'spec_helper'
+
+describe FileClip do
+  let(:filepicker_url) { "https://www.filepicker.io/api/file/ibOold9OQfqbmzgP6D3O" }
+  let(:image) { Image.new }
+  let(:uri) { URI.parse(filepicker_url) }
+
+  describe "change keys" do
+    it "defaults to just fileclip_url" do
+      FileClip.change_keys.should == [:filepicker_url]
+    end
+
+    it "can be added to" do
+      FileClip.change_keys << :file_name
+      FileClip.change_keys.should == [:filepicker_url, :file_name]
+    end
+  end
+
+  describe ".delayed?" do
+    it "returns false without delayed paperclip" do
+      FileClip.delayed?.should be_false
+    end
+
+    it "returns true if delayed paperclip exists" do
+      stub_const("DelayedPaperclip", true)
+      FileClip.delayed?.should be_true
+    end
+  end
+
+  describe "class_methods" do
+    describe "fileclip" do
+      it "should register callback when called" do
+        Image.fileclip :attachment
+        Image._commit_callbacks.first.filter.should == :update_from_filepicker!
+      end
+
+      it "registers after save callback if commit is not available" do
+        pending # Skipping either callback
+        Image._save_callbacks.first.filter.should_not == :update_from_filepicker!
+        Image.stub(:respond_to?).with(:after_commit).and_return false
+        FileClip::Glue.included(Image)
+        Image._save_callbacks.first.filter.should == :update_from_filepicker!
+      end
+
+      it "adds name to fileclipped" do
+        Image.fileclipped.should == :attachment
+        Image.fileclip(:image)
+        Image.fileclipped.should == :image
+        Image.fileclip(:attachment) # set it back for other tests
+      end
+    end
+
+    describe "resque_enabled?" do
+      it "returns false by default" do
+        FileClip.resque_enabled?.should be_false
+      end
+
+      it "returns true if resque exists" do
+        stub_const "Resque", Class.new
+        FileClip.resque_enabled?.should be_true
+      end
+    end
+  end
+
+  describe "instance methods" do
+    context "#attachment_name" do
+      context "image" do
+        it "should return :attachment" do
+          image.attachment_name.should == :attachment
+        end
+      end
+    end
+
+    context "#attachment_object" do
+      context "image" do
+        it "should receive attachment" do
+          image.should_receive(:attachment)
+          image.attachment_object
+        end
+      end
+    end
+
+    context "#update_from_filepicker!" do
+
+      context "without resque" do
+        before :each do
+          image.filepicker_url = filepicker_url
+          image.stub_chain(:previous_changes, :keys).and_return ["filepicker_url"]
+        end
+
+        context "image" do
+          it "should process image" do
+            image.should_receive(:process_from_filepicker)
+            image.update_from_filepicker!
+          end
+        end
+      end
+
+      context "with resque" do
+        before :each do
+          image.filepicker_url = filepicker_url
+          image.stub_chain(:previous_changes, :keys).and_return ["filepicker_url"]
+        end
+
+        it "enqueues job" do
+          stub_const "Resque", Class.new
+          Resque.should_receive(:enqueue).with(FileClip::Jobs::Resque, "Image", nil)
+          image.update_from_filepicker!
+        end
+      end
+    end
+
+    context "#update_from_filepicker?" do
+      it "should be false with only a filepicker url" do
+        image.filepicker_url = filepicker_url
+        image.update_from_filepicker?.should be_false
+      end
+
+      it "should be false without a filepicker" do
+        image.stub_chain(:previous_changes, :keys).and_return ["filepicker_url"]
+        image.update_from_filepicker?.should be_false
+      end
+
+      it "should be true if filepicker url exists and is changed" do
+        image.filepicker_url = filepicker_url
+        image.stub_chain(:previous_changes, :keys).and_return ["filepicker_url"]
+        image.update_from_filepicker?.should be_true
+      end
+    end
+
+    context "#process_from_filepicker" do
+      context "not delayed" do
+        context "image" do
+          before :each do
+            image.filepicker_url = filepicker_url
+          end
+
+          it "should set attachment and save" do
+            image.should_receive(:attachment=).with(uri)
+            image.should_receive(:save)
+            image.process_from_filepicker
+          end
+        end
+      end
+    end
+
+    context "#filepicker_url_not_present?" do
+      it "should return true" do
+        image.filepicker_url_not_present?.should == true
+      end
+
+      context "with filepicker url" do
+        before :each do
+          image.filepicker_url = filepicker_url
+        end
+
+        it "should return false" do
+          image.filepicker_url_not_present?.should == false
+        end
+      end
+    end
+
+    context "#fileclip_previously_changed?" do
+      it "should return true with previous changed filepicker_url" do
+        image.stub_chain(:previous_changes, :keys).and_return ["filepicker_url"]
+        image.fileclip_previously_changed?.should be_true
+      end
+
+      it "should return false without previously changed filepicker_url" do
+        image.stub_chain(:previous_changes, :keys).and_return []
+        image.fileclip_previously_changed?.should be_false
+      end
+    end
+
+    def raw_data
+      "{\"mimetype\": \"image/gif\", \"uploaded\": 1374701729162.0, \"writeable\": true, \"filename\": \"140x100.gif\", \"location\": \"S3\", \"path\": \"tmp/tMrYkwI0RWOv0R13hALu_140x100.gif\", \"size\": 449}"
+    end
+
+    def metadata
+      {"mimetype"   => "image/gif",
+       "uploaded"   => 1374701729162.0,
+       "writeable"  => true,
+       "filename"   => "140x100.gif",
+       "location"   => "S3",
+       "path"       => "tmp/tMrYkwI0RWOv0R13hALu_140x100.gif",
+       "size"       => 449 }
+    end
+
+
+    context "assign metadata" do
+      before :each do
+        image.filepicker_url = filepicker_url
+        RestClient.stub(:get).with(image.filepicker_url + "/metadata").and_return raw_data
+      end
+
+      it "sets metadata from filepicker" do
+        image.set_metadata
+        image.attachment_content_type.should == "image/gif"
+        image.attachment_file_name.should == "140x100.gif"
+        image.attachment_file_size.should == 449
+      end
+
+      context "process_from_filepicker" do
+        it "sets data and uploads attachment" do
+          image.process_from_filepicker
+          image.attachment_content_type.should == "image/gif"
+          image.attachment_file_name.should == "140x100.gif"
+          image.attachment_file_size.should == 449
+        end
+      end
+    end
+
+  end
+end

data/spec/schema.rb

@@ -0,0 +1,10 @@
+ActiveRecord::Schema.define :version => 0 do
+  create_table "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.string  :attachment_meta
+    t.string  :filepicker_url
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,34 @@
+require 'rubygems' unless defined? Gem
+require 'bundler'
+Bundler.setup
+
+# Prepare activerecord
+# require "active_record"
+require 'rails/all'
+
+# Connect to sqlite
+ActiveRecord::Base.establish_connection(
+  "adapter" => "sqlite3",
+  "database" => ":memory:"
+)
+
+ActiveRecord::Migration.verbose = false
+load(File.join(File.dirname(__FILE__), 'schema.rb'))
+
+require 'paperclip'
+ActiveRecord::Base.send(:include, Paperclip::Glue)
+
+require 'fileclip'
+ActiveRecord::Base.send(:include, FileClip::Glue)
+
+
+class Image < ActiveRecord::Base
+
+  has_attached_file :attachment,
+    :storage => :filesystem,
+    :path => "./spec/tmp/:style/:id.:extension",
+    :url => "./spec/tmp/:style/:id.extension"
+
+  fileclip :attachment
+
+end

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

@@ -0,0 +1,57 @@
+class window.FileClip
+  _clicked_button: ""
+
+  constructor: ->
+    filepicker.setKey('<%= FileClip.configuration.filepicker_key %>');
+
+  # For filepicker_helper
+  # Accepts button that to be clicked and optional callback
+  button: (target, callback) ->
+    $(document).on "click", target, =>
+      @buttonHandler(target, callback)
+
+  # Handler to set which button was clicked and to pass on callback
+  # To puicker
+  buttonHandler: (target, callback) ->
+    @_clicked_button = $(target)
+    @picker(callback)
+
+  picker: (callback) =>
+    filepicker.pickAndStore
+      mimetypes: "<%= FileClip.configuration.mime_types %>"
+      container: "modal"
+      services: <%= FileClip.configuration.services %>
+      maxSize: (<%= FileClip.configuration.max_size %> * 1024 * 1024)
+    ,
+      location: "S3"
+      path: "<%= FileClip.configuration.storage_path %>"
+      access: "<%= FileClip.configuration.file_access %>"
+    , (fpfile) =>
+      @imageHandler fpfile, callback
+    , (error) =>
+      console.log error.code
+
+  # Accepts a filepicker file and optional callback
+  # Passes file and button clicked to a callback
+  # Target if passed in
+  # id to look up the link where it should be going
+  # or clicked button's next input
+  imageHandler: (fpfile, callback, target) ->
+    file = fpfile[0]
+
+    $file_target = if not @_clicked_button
+      $(target).find(".js-fileclip_url")
+    else if @_clicked_button.data("id")
+      $("##{@_clicked_button.data("id")}").next(".js-fileclip_url")
+    else
+      @_clicked_button.next(".js-fileclip_url")
+
+    if $file_target.length > 0
+      $file_target.val file.url
+    else
+      console.log "File Failed to Save"
+
+    callback(file, @_clicked_button) if callback
+
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileclip
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Scott Carleton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: resque
+  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
@@ -113,19 +127,37 @@ description: A FilePicker / PaperClip mashup.  Use Filepicker for uploads and pa
 email: scott@artsicle.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
-- README.md
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
+- .rspec
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - fileclip.gemspec
 - lib/fileclip.rb
+- lib/fileclip/action_view/helpers.rb
+- lib/fileclip/configuration.rb
+- lib/fileclip/engine.rb
+- lib/fileclip/jobs/resque.rb
+- lib/fileclip/railtie.rb
+- lib/fileclip/validators.rb
 - lib/fileclip/version.rb
+- spec/fileclip/configuration_spec.rb
+- spec/fileclip/engine_spec.rb
+- spec/fileclip/railtie_spec.rb
+- spec/fileclip/validators_spec.rb
+- spec/fileclip_spec.rb
+- spec/schema.rb
+- spec/spec_helper.rb
+- vendor/assets/javascripts/fileclip.js.coffee.erb
 homepage: http://github.com/ScotterC/fileclip
 licenses:
 - MIT
@@ -150,4 +182,11 @@ rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: A FilePicker / PaperClip mashup.
-test_files: []
+test_files:
+- spec/fileclip/configuration_spec.rb
+- spec/fileclip/engine_spec.rb
+- spec/fileclip/railtie_spec.rb
+- spec/fileclip/validators_spec.rb
+- spec/fileclip_spec.rb
+- spec/schema.rb
+- spec/spec_helper.rb