filepicker-rails 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 979f8cfcf39dc753cf3ce5c4894c41e22f4f3e8e
-  data.tar.gz: 58f4a611ca888ae433e3ccc0053e75797b52a22d
+  metadata.gz: bdbbd40e9ca36cb245058decb551050c07409f09
+  data.tar.gz: 18ed7a4fef1e29641a14c3fe44f5b3d53da5da13
 SHA512:
-  metadata.gz: af2f3c5751a991c5f92f4e7f1351b1ea98dabde485dd4eae557f9a1ea1bfabf4039bfba84cea899eef3627bbf2ef93b89be8e81da1c9cc9a22e29937b0148d12
-  data.tar.gz: c4cc2ebe154f5c6fef316fd3a115c5c08d0ebd7c67842ebe0a80c5e370c0992ef5e087c49decc459ed79ac15f1e8cc33d1581e31f4f447bbec80cc4641a5568c
+  metadata.gz: d78b7710a6a81288be4d5e29cfe06c469ecd64cafffabf983fea1f25b4f10ce22b750a7b632b67b0cdafcc1d78fc6df74360031cf9b25629e6ab63ba1bf5c35c
+  data.tar.gz: b3e3f5984ab5b101a1e4f5560066a3e9775b926b46353f97accf3b06e77e0b917bf47b37c7926e44cd1b0ce5da10a70e765c65ec9b38b2051b555db4a7204ced

data/README.md

@@ -34,8 +34,22 @@ Set your API Key in config/application.rb:
 config.filepicker_rails.api_key = "Your filepicker.io API Key"
 ```
 
+Set your Secret Key in config/application.rb for signed request support:
+
+```ruby
+config.filepicker_rails.secret_key = "Your filepicker.io Secret Key"
+```
+
+Set your CDN Path in config/production.rb ([CDN usage](https://developers.inkfilepicker.com/docs/cdn/)):
+
+```ruby
+config.filepicker_rails.cdn_host = "Your CDN host name"
+```
+
 ## Usage
+
 ### First create a migration to add the field that will hold your filepicker.io URL
+
 Run the Rails migration generator from the command line:
 
     $ rails g migration AddNameOfAttrForFilepickerUrlToUser
@@ -54,7 +68,6 @@ class AddNameOfAttrForFilepickerUrlToUser < ActiveRecord::Migration
 end
 ```
 
-
 ### Adding an upload field to your form:
 
 ```erb
@@ -67,6 +80,7 @@ end
   <%= f.submit %>
 <% end %>
 ```
+
 Full options list:
 
 * button_text - The text of the upload button.
@@ -87,7 +101,22 @@ of an iframe on the page.
 
 ### Accessing FilePicker File with OnChange:
 
-When the dialog finishes uploading the file, the javascript code in the onchange field will be run with a special 'event' variable. The variable has a fpfiles (or if not multiple, also fpfile) attribute with information about the files (jQuery users: look under event.originalEvent).
+Javascript code in the onchange field acts as a callback, which is
+called on upload completion. You can specify onchange either in the ERB
+template (as shown below), or unobtrusively via jQuery's change event.
+
+```erb
+<%= form_for @user do |f| %>
+  <div>
+    <%= f.label :filepicker_url, "Upload Your Avatar:" %>
+    <%= f.filepicker_field :filepicker_url, onchange: 'onPhotoUpload(event)' %>
+  </div>
+
+  <%= f.submit %>
+<% end %>
+```
+
+The callback is called with a special 'event' variable. The variable has a fpfiles (or if not multiple, also fpfile) attribute with information about the files (jQuery users: look under event.originalEvent).
 
 Example fpfiles object:
 ```javascript
@@ -116,7 +145,6 @@ Example fpfiles object:
 
 See [the filepicker.io documentation](https://developers.filepicker.io/docs/web/#fpurl-images) for the full options list.
 
-
 ### Allowing the user to download a file (or upload it to any of the supported services)
 
 ```erb
@@ -153,7 +181,7 @@ Thank you to all the [contributors](https://github.com/Ink/filepicker-rails/grap
 [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
+[travis_ci_badge]: https://travis-ci.org/Ink/filepicker-rails.svg?branch=master
 [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

data/Rakefile

@@ -1,5 +1,6 @@
 begin
   require 'bundler/setup'
+  require 'appraisal'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end

data/app/helpers/filepicker_rails/application_helper.rb

@@ -42,6 +42,10 @@ module FilepickerRails
     # align - Determines how the image is aligned when resizing and using the "fit" parameter.
     #         Check API for details.
     #
+    # rotate - Rotate the image. Default is no rotation.
+    #          rotate="exif" will rotate the image automatically based on the exif data in the image.
+    #          Other valid values are integers between 0 and 359, for degrees of rotation.
+    #
     # cache - Specifies if the image should be cached or not.
     #
     # crop - Crops the image to a specified rectangle. The input to this parameter
@@ -69,8 +73,18 @@ module FilepickerRails
     #                 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
+      query_params = options.slice(:w, :h, :fit, :align, :rotate, :cache, :crop, :format, :quality, :watermark, :watersize, :waterposition).to_query
+
+      if ::Rails.application.config.filepicker_rails.cdn_host
+        uri = URI.parse(url)
+        url.gsub!("#{uri.scheme}://#{uri.host}", ::Rails.application.config.filepicker_rails.cdn_host)
+      end
+
+      if query_params.blank?
+        [url, query_params]
+      else
+        [url, "/convert?", query_params]
+      end.join
     end
   end
 end

data/app/helpers/filepicker_rails/form_helper.rb

@@ -4,7 +4,7 @@ module FilepickerRails
     def filepicker_field(method, options = {})
       type = options.delete(:dragdrop) ? 'filepicker-dragdrop' : 'filepicker'
 
-      input_options = retrive_legacy_filepicker_options(options)
+      input_options = retrieve_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
@@ -20,7 +20,7 @@ module FilepickerRails
 
     private
 
-      def retrive_legacy_filepicker_options(options)
+      def retrieve_legacy_filepicker_options(options)
         mappings = {
             :button_text    => 'data-fp-button-text',
             :button_class   => 'data-fp-button-class',
@@ -34,6 +34,7 @@ module FilepickerRails
             :store_location => 'data-fp-store-location',
             :store_access   => 'data-fp-store-access',
             :multiple       => 'data-fp-multiple',
+            :max_size       => 'data-fp-maxSize',
             :onchange       => 'onchange',
             :class          => 'class',
             :value          => 'value'

data/lib/filepicker_rails/configuration.rb

@@ -1,15 +1,12 @@
 module FilepickerRails
   class Configuration
-    attr_writer :api_key, :secret_key, :default_expiry
+    attr_writer :api_key, :default_expiry
+    attr_accessor :secret_key, :cdn_host
 
     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

data/lib/filepicker_rails/version.rb

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

metadata

@@ -1,83 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: filepicker-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Max Tilford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: 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: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: capybara
+  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: Makes integrating filepicker.io with rails 4 easy
@@ -87,6 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.md
+- Rakefile
 - app/helpers/filepicker_rails/application_helper.rb
 - app/helpers/filepicker_rails/form_helper.rb
 - lib/filepicker-rails.rb
@@ -94,11 +125,9 @@ files:
 - 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: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -106,17 +135,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: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Makes integrating filepicker.io with rails 4 easy