filepicker-rails 0.1 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWZhNzRjMzBjODI1OWM0ODUyYzFkZGI5OTRmOTU3MmY2YmYyZmJmNA==
-  data.tar.gz: !binary |-
-    NzY3MDZiNWE0NzA1Y2Y4NGI2OGM4YTkwMDIzN2QyZTJiNGQwNTE4YQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    Zjg2ZTFlZjc5MjJjYWM5YWFhNzZlNTMzZTBhYWM2NTFjMjY3OTJlNTc3ODYy
-    NDc0NjVkNjA4MjUwNWI0MDc5MWQzMzRjZGY4ODRlYzMzY2IyZmFiODY1ZjM3
-    NmI3YTIxZmFmMDlmN2YwYjk5YWZlNTNmMDdlNDlmOTA4ODE4OTY=
-  data.tar.gz: !binary |-
-    Y2NiZWQwN2IwNjEzOGMwYzk0MmVjNjk1MTk3YmY5ZjQ5NGM1ODUxNGE3Nzgw
-    NDM4YTlhMDc0NDEzMWU4ZjU1Y2Q4ZDdiNTA0Yzg1YzM3NjkxMjc0NGRlMTkz
-    NWNhZTU1NzkzOWNkNzhhNjczZDdmMmUwOTUyOGM2NjViMjQ0Mjg=
+SHA1:
+  metadata.gz: 979f8cfcf39dc753cf3ce5c4894c41e22f4f3e8e
+  data.tar.gz: 58f4a611ca888ae433e3ccc0053e75797b52a22d
+SHA512:
+  metadata.gz: af2f3c5751a991c5f92f4e7f1351b1ea98dabde485dd4eae557f9a1ea1bfabf4039bfba84cea899eef3627bbf2ef93b89be8e81da1c9cc9a22e29937b0148d12
+  data.tar.gz: c4cc2ebe154f5c6fef316fd3a115c5c08d0ebd7c67842ebe0a80c5e370c0992ef5e087c49decc459ed79ac15f1e8cc33d1581e31f4f447bbec80cc4641a5568c

data/{LICENSE → MIT-LICENSE}

@@ -1,6 +1,4 @@
-Copyright (c) 2012 Max Tilford
-
-MIT License
+Copyright 2013 YOURNAME
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,4 +17,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,8 @@
 # Filepicker::Rails
+[![RubyGems][gem_version_badge]][ruby_gems]
+[![Travis CI][travis_ci_badge]][travis_ci]
+[![Coveralls][coveralls_badge]][coveralls]
+[![Code Climate][code_climate_badge]][code_climate]
 
 Adds form, image_tag, and download/save helpers to help you get up and running with [filepicker.io](http://filepicker.io) in Rails.
 
@@ -67,11 +71,15 @@ Full options list:
 
 * button_text - The text of the upload button.
 * button_class - The class of the upload button.
+* extensions - The extensions of file types you want to support for this upload. Ex: ".png,.jpg".
 * mimetypes - The file types you want to support for this upload. Ex: "image/png,text/*".
 * container - Where to show the file picker dialog can be "modal", "window" or the
 of an iframe on the page.
 * multiple - (true or false) Whether or not multiple uploads can be saved at once.
 * services - What services your users can upload to. Ex: "BOX, COMPUTER, FACEBOOK".
+* store_path - The path to store the file at within the specified file store.
+* store_location - The file is not copied by default. It remains in the original location. If you wish you have the file copied onto your own storage, you can specify where we should put the copy. The only value at the moment is "S3".
+* store_access - Should the underlying file be publicly available on its S3 link. Options are "public" and "private", defaults to 'private'.
 * dragdrop - (true or false) Whether or not to allow drag-and-drop uploads.
 * drag_text - The text of the dragdrop pane.
 * drag_class - The class of the dragdrop pane.
@@ -125,3 +133,29 @@ of an iframe on the page.
 ### Demo
 
 See a simple demo app [repo](https://github.com/maxtilford/filepicker-rails-demo)
+
+## Versioning
+
+Filepicker::Rails follow the [Semantic Versioning](http://semver.org/).
+
+## Issues
+
+If you have problems, please create a [Github Issue](https://github.com/Ink/filepicker-rails/issues).
+
+## Contributing
+
+Please see [CONTRIBUTING.md](https://github.com/Ink/filepicker-rails/blob/master/CONTRIBUTING.md) for details.
+
+## Credits
+
+Thank you to all the [contributors](https://github.com/Ink/filepicker-rails/graphs/contributors).
+
+[gem_version_badge]: https://badge.fury.io/rb/filepicker-rails.png
+[ruby_gems]: http://rubygems.org/gems/filepicker-rails
+[travis_ci]: http://travis-ci.org/Ink/filepicker-rails
+[travis_ci_badge]: https://secure.travis-ci.org/Ink/filepicker-rails.png
+[code_climate]: https://codeclimate.com/github/Ink/filepicker-rails
+[code_climate_badge]: https://codeclimate.com/github/Ink/filepicker-rails.png
+[coveralls]: https://coveralls.io/r/Ink/filepicker-rails
+[coveralls_badge]: https://coveralls.io/repos/Ink/filepicker-rails/badge.png?branch=master
+

data/Rakefile

@@ -1,2 +1,25 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rdoc/task'
+
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'FilepickerRails'
+  rdoc.options << '--line-numbers'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new
+task :default => [:spec]
+
+Bundler::GemHelper.install_tasks
+

data/app/helpers/filepicker_rails/application_helper.rb

@@ -0,0 +1,76 @@
+module FilepickerRails
+  module ApplicationHelper
+
+    def filepicker_js_include_tag
+      javascript_include_tag "//api.filepicker.io/v1/filepicker.js"
+    end
+
+    def filepicker_save_button(text, url, mimetype, options = {})
+      options[:data] ||= {}
+      container = options.delete(:container)
+      services = options.delete(:services)
+      save_as = options.delete(:save_as_name)
+
+      options[:data]['fp-url'] = url
+      options[:data]['fp-apikey'] = ::Rails.application.config.filepicker_rails.api_key
+      options[:data]['fp-mimetype'] = mimetype
+      options[:data]['fp-option-container'] = container if container
+      options[:data]['fp-option-services'] = Array(services).join(",") if services
+      options[:data]['fp-option-defaultSaveasName'] = save_as if save_as
+      button_tag(text, options)
+    end
+
+    # Allows options to be passed to filepicker_image_url and then falls back to normal Rails options
+    # for image_tag
+    # If specifying html width, height, pass it down to filepicker for optimization
+    def filepicker_image_tag(url, image_options={}, image_tag_options={})
+      image_tag(filepicker_image_url(url, image_options), image_tag_options)
+    end
+
+    # w - Resize the image to this width.
+    #
+    # h - Resize the image to this height.
+    #
+    # fit - Specifies how to resize the image. Possible values are:
+    #       clip: Resizes the image to fit within the specified parameters without
+    #             distorting, cropping, or changing the aspect ratio
+    #       crop: Resizes the image to fit the specified parameters exactly by
+    #             removing any parts of the image that don't fit within the boundaries
+    #       scales: Resizes the image to fit the specified parameters exactly by
+    #               scaling the image to the desired size
+    #       Defaults to "clip".
+    # align - Determines how the image is aligned when resizing and using the "fit" parameter.
+    #         Check API for details.
+    #
+    # cache - Specifies if the image should be cached or not.
+    #
+    # crop - Crops the image to a specified rectangle. The input to this parameter
+    #        should be 4 numbers for 'x,y,width,height' - for example,
+    #        'crop=10,20,200,250' would select the 200x250 pixel rectangle starting
+    #        from 10 pixels from the left edge and 20 pixels from the top edge of the
+    #        image.
+    #
+    # format - Specifies what format the image should be converted to, if any.
+    #          Possible values are "jpg" and "png". For "jpg" conversions, you
+    #          can additionally specify a quality parameter.
+    #
+    # quality - For jpeg conversion, specifies the quality of the resultant image.
+    #           Quality should be an integer between 1 and 100
+    #
+    # watermark - Adds the specified absolute url as a watermark on the image.
+    #
+    # watersize - This size of the watermark, as a percentage of the base
+    #             image (not the original watermark).
+    #
+    # waterposition - Where to put the watermark relative to the base image.
+    #                 Possible values for vertical position are "top","middle",
+    #                 "bottom" and "left","center","right", for horizontal
+    #                 position. The two can be combined by separating vertical
+    #                 and horizontal with a comma. The default behavior
+    #                 is bottom,right
+    def filepicker_image_url(url, options = {})
+      query_params = options.slice(:w, :h, :fit, :align, :cache, :crop, :format, :quality, :watermark, :watersize, :waterposition).to_query
+      [url, "/convert?", query_params].join
+    end
+  end
+end

data/{lib/filepicker/rails/form_builder.rb → app/helpers/filepicker_rails/form_helper.rb}

@@ -1,36 +1,38 @@
-module Filepicker
-  module Rails
-    module FormBuilder
-
-      def filepicker_field(method, options = {})
-        type = options.delete(:dragdrop) ? 'filepicker-dragdrop' : 'filepicker'
-
-        input_options = retrive_legacy_filepicker_options(options)
-        input_options['data-fp-apikey'] ||= ::Rails.application.config.filepicker_rails.api_key
-        input_options.merge!(secure_filepicker) unless input_options['data-fp-policy'].present?
-
-        input_options['type'] = type
-
-        if ::Rails.version.to_i >= 4
-          ActionView::Helpers::Tags::TextField.new(@object_name, method, @template).tag('input', input_options)
-        else
-          ActionView::Helpers::InstanceTag.new(@object_name, method, @template).to_input_field_tag(type, input_options)
-        end
+module FilepickerRails
+  module FormHelper
+
+    def filepicker_field(method, options = {})
+      type = options.delete(:dragdrop) ? 'filepicker-dragdrop' : 'filepicker'
+
+      input_options = retrive_legacy_filepicker_options(options)
+      input_options['data-fp-apikey'] ||= ::Rails.application.config.filepicker_rails.api_key
+      input_options.merge!(secure_filepicker) unless input_options['data-fp-policy'].present?
+      input_options['type'] = type
+
+      if ::Rails.version.to_i >= 4
+        tag = ActionView::Helpers::Tags::TextField.new(@object_name, method, @template, objectify_options(input_options))
+        tag.send(:add_default_name_and_id, input_options)
+        tag.render
+      else
+        ActionView::Helpers::InstanceTag.new(@object_name, method, @template).to_input_field_tag(type, input_options)
       end
+    end
 
-      private
+    private
 
       def retrive_legacy_filepicker_options(options)
         mappings = {
             :button_text    => 'data-fp-button-text',
             :button_class   => 'data-fp-button-class',
             :mimetypes      => 'data-fp-mimetypes',
+            :extensions     => 'data-fp-extensions',
             :container      => 'data-fp-container',
             :services       => 'data-fp-services',
             :drag_text      => 'data-fp-drag-text',
             :drag_class     => 'data-fp-drag-class',
             :store_path     => 'data-fp-store-path',
             :store_location => 'data-fp-store-location',
+            :store_access   => 'data-fp-store-access',
             :multiple       => 'data-fp-multiple',
             :onchange       => 'onchange',
             :class          => 'class',
@@ -50,6 +52,5 @@ module Filepicker
             'data-fp-signature' => grant.signature
         }
       end
-    end
   end
 end

data/lib/filepicker-rails.rb

@@ -1,11 +1,6 @@
-require "filepicker/rails/version"
-require "filepicker/rails/configuration"
-require "filepicker/rails/policy"
-require "filepicker/rails/form_builder"
-require "filepicker/rails/view_helpers"
-require "filepicker/rails/railtie"
+require "filepicker_rails/configuration"
+require "filepicker_rails/policy"
+require "filepicker_rails/engine"
 
-module Filepicker
-  module Rails
-  end
+module FilepickerRails
 end

data/lib/filepicker_rails/configuration.rb

@@ -0,0 +1,17 @@
+module FilepickerRails
+  class Configuration
+    attr_writer :api_key, :secret_key, :default_expiry
+
+    def api_key
+      @api_key or raise "Set config.filepicker_rails.api_key"
+    end
+
+    def secret_key
+      @secret_key
+    end
+
+    def default_expiry
+      @default_expiry ||= 600
+    end
+  end
+end

data/lib/filepicker_rails/engine.rb

@@ -0,0 +1,16 @@
+module FilepickerRails
+  class Engine < ::Rails::Engine
+    config.filepicker_rails = FilepickerRails::Configuration.new
+    isolate_namespace FilepickerRails
+
+    initializer "filepicker_rails.form_builder" do
+      ActionView::Helpers::FormBuilder.send(:include, FilepickerRails::FormHelper)
+    end
+
+    initializer 'filepicker_rails.action_controller' do |app|
+      ActiveSupport.on_load(:action_controller) do
+        helper FilepickerRails::ApplicationHelper
+      end
+    end
+  end
+end

data/lib/filepicker_rails/policy.rb

@@ -0,0 +1,35 @@
+require 'base64'
+require 'openssl'
+
+module FilepickerRails
+  class Policy
+    attr_accessor :expiry, :call, :handle, :maxsize, :minsize, :path
+
+    def initialize(options = {})
+      [:expiry, :call, :handle, :maxsize, :minsize, :path].each do |input|
+        send("#{input}=", options[input]) unless options[input].nil?
+      end
+    end
+
+    def policy
+      Base64.urlsafe_encode64(json_policy)
+    end
+
+    def signature
+      OpenSSL::HMAC.hexdigest('sha256', ::Rails.application.config.filepicker_rails.secret_key, policy)
+    end
+
+    private
+    def json_policy
+      hash = Hash.new
+
+      @expiry ||= Time.now.to_i + ::Rails.application.config.filepicker_rails.default_expiry
+
+      [:expiry, :call, :handle, :maxsize, :minsize, :path].each do |input|
+        hash[input] = send(input) unless send(input).nil?
+      end
+
+      MultiJson.dump(hash)
+    end
+  end
+end

data/lib/filepicker_rails/version.rb

@@ -0,0 +1,3 @@
+module FilepickerRails
+  VERSION = "1.0.0"
+end

metadata

@@ -1,49 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: filepicker-rails
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 1.0.0
 platform: ruby
 authors:
 - Max Tilford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
-    - - <
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  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: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Makes integrating filepicker.io with rails 4 easy
 email:
 - maxtilford@gmail.com
@@ -51,20 +87,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- filepicker-rails.gemspec
+- app/helpers/filepicker_rails/application_helper.rb
+- app/helpers/filepicker_rails/form_helper.rb
 - lib/filepicker-rails.rb
-- lib/filepicker/rails/configuration.rb
-- lib/filepicker/rails/form_builder.rb
-- lib/filepicker/rails/policy.rb
-- lib/filepicker/rails/railtie.rb
-- lib/filepicker/rails/version.rb
-- lib/filepicker/rails/view_helpers.rb
-homepage: https://github.com/Filepicker/filepicker-rails
+- lib/filepicker_rails/configuration.rb
+- lib/filepicker_rails/engine.rb
+- lib/filepicker_rails/policy.rb
+- lib/filepicker_rails/version.rb
+- MIT-LICENSE
+- Rakefile
+- README.md
+homepage: https://github.com/Ink/filepicker-rails
 licenses: []
 metadata: {}
 post_install_message: 
@@ -73,17 +106,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Makes integrating filepicker.io with rails 4 easy

data/.gitignore

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

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec

data/filepicker-rails.gemspec

@@ -1,20 +0,0 @@
-require File.expand_path('../lib/filepicker/rails/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Max Tilford"]
-  gem.email         = ["maxtilford@gmail.com"]
-  gem.description   = %q{Makes integrating filepicker.io with rails 4 easy}
-  gem.summary       = %q{Makes integrating filepicker.io with rails 4 easy}
-  gem.homepage      = "https://github.com/Filepicker/filepicker-rails"
-
-  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.name          = "filepicker-rails"
-  gem.require_paths = ["lib"]
-  gem.version       = Filepicker::Rails::VERSION
-
-  gem.required_rubygems_version = ">= 1.3.6"
-  gem.add_dependency "railties", ">= 3.1.0", "< 5.0"
-  gem.add_dependency 'multi_json', '~> 1.6'
-end

data/lib/filepicker/rails/configuration.rb

@@ -1,19 +0,0 @@
-module Filepicker
-  module Rails
-    class Configuration
-      attr_writer :api_key, :secret_key, :default_expiry
-
-      def api_key
-        @api_key or raise "Set config.filepicker_rails.api_key"
-      end
-
-      def secret_key
-        @secret_key
-      end
-
-      def default_expiry
-        @default_expiry ||= 600
-      end
-    end
-  end
-end

data/lib/filepicker/rails/policy.rb

@@ -1,37 +0,0 @@
-require 'base64'
-require 'openssl'
-
-module Filepicker
-  module Rails
-    class Policy
-      attr_accessor :expiry, :call, :handle, :maxsize, :minsize, :path
-
-      def initialize(options = {})
-        [:expiry, :call, :handle, :maxsize, :minsize, :path].each do |input|
-          send("#{input}=", options[input]) unless options[input].nil?
-        end
-      end
-
-      def policy
-        Base64.urlsafe_encode64(json_policy)
-      end
-
-      def signature
-        OpenSSL::HMAC.hexdigest('sha256', ::Rails.application.config.filepicker_rails.secret_key, policy)
-      end
-
-      private
-      def json_policy
-        hash = Hash.new
-
-        @expiry ||= Time.now.to_i + ::Rails.application.config.filepicker_rails.default_expiry
-
-        [:expiry, :call, :handle, :maxsize, :minsize, :path].each do |input|
-          hash[input] = send(input) unless send(input).nil?
-        end
-
-        MultiJson.dump(hash)
-      end
-    end
-  end
-end

data/lib/filepicker/rails/railtie.rb

@@ -1,18 +0,0 @@
-module Filepicker
-  module Rails
-
-    class Railtie < ::Rails::Railtie
-
-      config.filepicker_rails = Filepicker::Rails::Configuration.new
-
-      initializer "filepicker_rails.view_helpers" do
-        ActionView::Base.send(:include, Filepicker::Rails::ViewHelpers)
-      end
-
-      initializer "filepicker_rails.form_builder" do
-        ActionView::Helpers::FormBuilder.send(:include, Filepicker::Rails::FormBuilder)
-      end
-    end
-
-  end
-end

data/lib/filepicker/rails/version.rb

@@ -1,5 +0,0 @@
-module Filepicker
-  module Rails
-    VERSION = "0.1"
-  end
-end

data/lib/filepicker/rails/view_helpers.rb

@@ -1,75 +0,0 @@
-module Filepicker
-  module Rails
-
-    module ViewHelpers
-      def filepicker_js_include_tag
-        javascript_include_tag "//api.filepicker.io/v1/filepicker.js"
-      end
-
-      def filepicker_save_button(text, url, mimetype, options = {})
-        options[:data] ||= {}
-        container = options.delete(:container)
-        services = options.delete(:services)
-        save_as = options.delete(:save_as_name)
-
-        options[:data]['fp-url'] = url
-        options[:data]['fp-apikey'] = ::Rails.application.config.filepicker_rails.api_key
-        options[:data]['fp-mimetype'] = mimetype
-        options[:data]['fp-option-container'] = container if container
-        options[:data]['fp-option-services'] = Array(services).join(",") if services
-        options[:data]['fp-option-defaultSaveasName'] = save_as if save_as
-        button_tag(text, options)
-      end
-
-      # Allows options to be passed to filepicker_image_url and then falls back to normal Rails options for image_tag
-      # If specifying html width, height, pass it down to filepicker for optimization
-      def filepicker_image_tag(url, image_options={}, image_tag_options={})
-        image_tag(filepicker_image_url(url, image_options), image_tag_options)
-      end
-
-      # w - Resize the image to this width.
-      #
-      # h - Resize the image to this height.
-      #
-      # fit - Specifies how to resize the image. Possible values are:
-      #       clip: Resizes the image to fit within the specified parameters without
-      #             distorting, cropping, or changing the aspect ratio
-      #       crop: Resizes the image to fit the specified parameters exactly by
-      #             removing any parts of the image that don't fit within the boundaries
-      #       scales: Resizes the image to fit the specified parameters exactly by
-      #               scaling the image to the desired size
-      #       Defaults to "clip".
-      # align - Determines how the image is aligned when resizing and using the "fit" parameter. Check API for details.
-      #
-      # crop - Crops the image to a specified rectangle. The input to this parameter
-      #        should be 4 numbers for 'x,y,width,height' - for example,
-      #        'crop=10,20,200,250' would select the 200x250 pixel rectangle starting
-      #        from 10 pixels from the left edge and 20 pixels from the top edge of the
-      #        image.
-      #
-      # format - Specifies what format the image should be converted to, if any.
-      #          Possible values are "jpg" and "png". For "jpg" conversions, you
-      #          can additionally specify a quality parameter.
-      #
-      # quality - For jpeg conversion, specifies the quality of the resultant image.
-      #           Quality should be an integer between 1 and 100
-      #
-      # watermark - Adds the specified absolute url as a watermark on the image.
-      #
-      # watersize - This size of the watermark, as a percentage of the base
-      #             image (not the original watermark).
-      #
-      # waterposition - Where to put the watermark relative to the base image.
-      #                 Possible values for vertical position are "top","middle",
-      #                 "bottom" and "left","center","right", for horizontal
-      #                 position. The two can be combined by separating vertical
-      #                 and horizontal with a comma. The default behavior
-      #                 is bottom,right
-      def filepicker_image_url(url, options = {})
-        query_params = options.slice(:w, :h, :fit, :align, :crop, :format, :quality, :watermark, :watersize, :waterposition).to_query
-        [url, "/convert?", query_params].join
-      end
-
-    end
-  end
-end