filepicker-rails 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 807acef7a7f487b4db552bebc8c084641e4f2730
-  data.tar.gz: fc310857861c323da6c123b00ee22a216c976017
+  metadata.gz: 06d2e91d419884443bd5b5e7b78f3ad18515fde9
+  data.tar.gz: c0d4ab38baea1c65377d056e8e72f670f2f1bca9
 SHA512:
-  metadata.gz: a76e4bb901b528dd717e92a85fe10e9237e209824bc4b020d682de42c3cda743a1b9c33b103874ccd33f05f4e2297ced454a7991f83fdcb9b82f9a24eb489fa1
-  data.tar.gz: da50efe1cd0c2b9cd7a8354a78dcbe19bf6f482aaad5470138c98923a19ce1441cdc05f2c439b0d711539912013419cd893655fcf5581116982ebca388e6f8e0
+  metadata.gz: f09dde007e819de987b599b493fc077ed2133aca55bd723c66de7a43f613238b33d7f47fa0acaa0c1b8dd7856c2d61ee5423d62ee4824eccce74fc6394c476f3
+  data.tar.gz: af1c86fad975850a25696c57155ffb550d0642a59035eb977001bd067001be0125371ebb00c57d51f2eed3d96f6c593bd1b5df5552ce324d4e95c29e41b94898

data/app/helpers/filepicker_rails/application_helper.rb

@@ -1,6 +1,8 @@
 module FilepickerRails
   module ApplicationHelper
 
+    include FilepickerRails::Tag
+
     # Creates a javascript tag to the filepicker JavaScript.
     #
     # #### Examples
@@ -11,6 +13,41 @@ module FilepickerRails
       javascript_include_tag "//api.filepicker.io/v1/filepicker.js"
     end
 
+    # Creates a filepicker field tag, accepts optional `options` hash for configuration.
+    #
+    # #### Options
+    #
+    # - `: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 id 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_container` - The bucket or container in your specified `store_location`. Defaults to the container specified in the developer portal. Does not apply to Dropbox storage.
+    # - `: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.
+    # - `:onchange` - The onchange event.
+    # - `:max_size` - The maximum file size allowed, in bytes.
+    # - `:max_files` - The maximum number of files.
+    # - `:open_to` - Open the picker to the given service. Ex: `COMPUTER`.
+    # - `:class` - Add a class to the input.
+    # - `:value` - Define the value of the input
+    #
+    # #### Examples
+    #
+    #     filepicker_field_tag('user[filepicker_url]')
+    #     # => <input data-fp-apikey="..." id="user_filepicker_url" name="user[filepicker_url]" type="filepicker" />
+    #
+    def filepicker_field_tag(name, options = {})
+      define_input_options(options)
+      tag :input, { 'type' => type, 'name' => name, 'id' => sanitize_to_id(name) }.update(input_options.stringify_keys)
+    end
+
     # Creates a button allowing the user to download a file
     # (or upload it to any of the supported services). Set the content of
     # the button on the `text` parameter. The `url` of the content you want the user to save.

data/app/helpers/filepicker_rails/form_helper.rb

@@ -1,12 +1,7 @@
 module FilepickerRails
   module FormHelper
 
-    FILEPICKER_OPTIONS_TO_DASHERIZE = [:button_text, :button_class, :mimetypes,
-                                       :extensions, :container, :services,
-                                       :drag_text, :drag_class, :store_path,
-                                       :store_location, :store_access, :multiple]
-
-    FILEPICKER_OPTIONS_TO_CAMELIZE = [:max_size]
+    include FilepickerRails::Tag
 
     # Creates a filepicker field, accepts optional `options` hash for configuration.
     #
@@ -21,12 +16,15 @@ module FilepickerRails
     # - `: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_container` - The bucket or container in your specified `store_location`. Defaults to the container specified in the developer portal. Does not apply to Dropbox storage.
     # - `: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.
     # - `:onchange` - The onchange event.
     # - `:max_size` - The maximum file size allowed, in bytes.
+    # - `:max_files` - The maximum number of files.
+    # - `:open_to` - Open the picker to the given service. Ex: `COMPUTER`.
     # - `:class` - Add a class to the input.
     # - `:value` - Define the value of the input
     #
@@ -54,16 +52,7 @@ module FilepickerRails
 
     private
 
-      attr_reader :input_options, :method, :type, :object_name, :template
-
-      def define_input_options(options)
-        @type = options.delete(:dragdrop) ? 'filepicker-dragdrop' : 'filepicker'
-        @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
-        @input_options
-      end
+      attr_reader :method, :object_name, :template
 
       def rails_greater_than_4_input
         tag = ActionView::Helpers::Tags::TextField.new(object_name, method, template, objectify_options(input_options))
@@ -78,24 +67,5 @@ module FilepickerRails
       def rails_greater_than_4?
         ::Rails.version.to_i >= 4
       end
-
-      def filepicker_prefix
-        'data-fp-'
-      end
-
-      def retrieve_legacy_filepicker_options(options)
-        mappings = {}
-        FILEPICKER_OPTIONS_TO_DASHERIZE.each do |option|
-          mappings[option] = "#{filepicker_prefix}#{option.to_s.dasherize}"
-        end
-        FILEPICKER_OPTIONS_TO_CAMELIZE.each do |option|
-          mappings[option] = "#{filepicker_prefix}#{option.to_s.camelize(:lower)}"
-        end
-        Hash[options.map {|k, v| [mappings[k] || k, v] }]
-      end
-
-      def secure_filepicker
-        Policy.apply([:pick, :store], ['data-fp-policy', 'data-fp-signature'])
-      end
   end
 end

data/lib/filepicker-rails.rb

@@ -1,6 +1,7 @@
 require "filepicker_rails/configuration"
 require "filepicker_rails/policy"
 require "filepicker_rails/engine"
+require "filepicker_rails/tag"
 
 module FilepickerRails
 end

data/lib/filepicker_rails/policy.rb

@@ -39,7 +39,7 @@ module FilepickerRails
         hash[input] = send(input) unless send(input).nil?
       end
 
-      MultiJson.dump(hash)
+      hash.to_json
     end
   end
   private_constant :Policy

data/lib/filepicker_rails/tag.rb

@@ -0,0 +1,44 @@
+module FilepickerRails
+  module Tag
+
+    FILEPICKER_OPTIONS_TO_DASHERIZE = [:button_text, :button_class, :mimetypes,
+                                       :extensions, :container, :services,
+                                       :drag_text, :drag_class, :store_path,
+                                       :store_location, :store_access,
+                                       :store_container, :multiple]
+
+    FILEPICKER_OPTIONS_TO_CAMELIZE = [:max_size, :max_files, :open_to]
+
+    private
+
+      attr_reader :input_options, :type
+
+      def define_input_options(options)
+        @type = options.delete(:dragdrop) ? 'filepicker-dragdrop' : 'filepicker'
+        @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
+        @input_options
+      end
+
+      def filepicker_prefix
+        'data-fp-'
+      end
+
+      def retrieve_legacy_filepicker_options(options)
+        mappings = {}
+        FILEPICKER_OPTIONS_TO_DASHERIZE.each do |option|
+          mappings[option] = "#{filepicker_prefix}#{option.to_s.dasherize}"
+        end
+        FILEPICKER_OPTIONS_TO_CAMELIZE.each do |option|
+          mappings[option] = "#{filepicker_prefix}#{option.to_s.camelize(:lower)}"
+        end
+        Hash[options.map {|k, v| [mappings[k] || k, v] }]
+      end
+
+      def secure_filepicker
+        Policy.apply([:pick, :store], ['data-fp-policy', 'data-fp-signature'])
+      end
+  end
+end

data/lib/filepicker_rails/version.rb

@@ -1,3 +1,3 @@
 module FilepickerRails
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filepicker-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Max Tilford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,6 +152,7 @@ files:
 - lib/filepicker_rails/configuration.rb
 - lib/filepicker_rails/engine.rb
 - lib/filepicker_rails/policy.rb
+- lib/filepicker_rails/tag.rb
 - lib/filepicker_rails/version.rb
 homepage: https://github.com/Ink/filepicker-rails
 licenses: