fileclip 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0676c859073d216852c397b109a24de44013b53f
-  data.tar.gz: 6d017f9ac5d01e0b750144009c432c2583f5192a
+  metadata.gz: dd3ea5bcac57332d3c61a6bb49d6797fd9a951a4
+  data.tar.gz: 4c60a540c5a9efc0659647440c9157ae4bd5070b
 SHA512:
-  metadata.gz: ae6c1d30f895d8071d07f693e3913ebb011c0c4dd9455d99af9fb97fd25572c7550680710ca2564132158c424cdab6d3d91d723de87df4961088a86bc8291a06
-  data.tar.gz: 13c7805036a72919a2060226c9a5440ab65411b6dc8716825bd74531eef12b16aa05b7474392cf7905948eef2f7476cb48ee548c12241fa0810af7b0a2c47239
+  metadata.gz: 2dad98668a3926098921d618eb722b87a454fb288384ebc5848b1741a089b5272f78d935f689765770ef2ce2795a947e63c74fa9ac825c67d6764d34aff8625e
+  data.tar.gz: 00bea97058444bd69b18eca7e400c09bd56cd64eba156631a0036495c2d0b50a25b3fe73c2c9c1118c74f41a512f5f642e1506e5eafada8868f519e44494b208

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fileclip (0.2.4)
+    fileclip (0.3.0)
       paperclip
       paperclip (>= 3.5.1)
       railties (>= 3.0)

data/README.md

@@ -28,12 +28,13 @@ 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"
-  config.excluded_environments = [] # Defaults to ["test"]
+  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"
+  config.excluded_environments = []             # Defaults to ["test"]
+  config.default_service = "DROPBOX"            # Defaults to "COMPUTER"
 end
 ````
 
@@ -62,6 +63,16 @@ end
   <%= f.submit %>
 <% end %>
 
+# Specify a callback function that gets called when Filepicker completes
+<%= link_to_fileclip "Choose a File", f, :callback => 'window.MyApp.filepickerCallback' %>
+
+# For more control you can disable automatic Javascript initialization.
+# You'll need to initialize the FileClip element yourself.
+<%= link_to_fileclip "Choose a File", f, :class => '.my-filepicker', :js => false %>
+
+# In your Javascript framework
+(new FileClip).button('.my-filepicker');
+
 ````
 
 #### Current FilePicker options hardcoded

data/lib/fileclip/action_view/helpers.rb

@@ -42,11 +42,11 @@ module FileClip
       end
 
       # Return empty tag if it's nil or true
-      def activation(js, id)
+      def activation(js, id, callback)
         return javascript_tag unless js.nil? || js
 
         javascript_tag("(function() {
-                          (new FileClip).button('##{id}');
+                          (new FileClip).button('##{id}', #{callback || 'null'});
                         })();")
       end
 
@@ -56,7 +56,7 @@ module FileClip
         # Get attachment name
         attachment_name = form_object.object.attachment_name
 
-        js = activation(options[:js], id)
+        js = activation(options[:js], id, options[:callback])
 
         js + link +
         form_object.hidden_field(:filepicker_url,

data/lib/fileclip/configuration.rb

@@ -3,7 +3,7 @@ module FileClip
     attr_writer :filepicker_key, :services,
                 :max_size, :storage_path,
                 :mime_types, :file_access,
-                :excluded_environments
+                :excluded_environments, :default_service
 
     def filepicker_key
       @filepicker_key or raise "Set Filepicker api_key"
@@ -33,6 +33,10 @@ module FileClip
       @excluded_environments or ["test"]
     end
 
+    def default_service
+      @default_service or "COMPUTER"
+    end
+
   end
 
   class << self

data/lib/fileclip/version.rb

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

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

@@ -4,7 +4,9 @@ class window.FileClip
   @env = ->
     "<%= Rails.env %>"
 
-  constructor: ->
+  constructor: (pickerOptions) ->
+    @pickerOptions = pickerOptions || {}
+
     excludedEnvs = <%= FileClip.configuration.excluded_environments %>
     if @inArray(excludedEnvs, FileClip.env()) != -1
       return false
@@ -25,12 +27,16 @@ class window.FileClip
     @picker(callback)
 
   picker: (callback) =>
-    filepicker.pickAndStore
+    pickerOptions =
       mimetypes: "<%= FileClip.configuration.mime_types %>"
       container: "modal"
       services: <%= FileClip.configuration.services %>
       maxSize: (<%= FileClip.configuration.max_size %> * 1024 * 1024)
-    ,
+      openTo: "<%= FileClip.configuration.default_service %>"
+
+    $.extend(pickerOptions, @pickerOptions)
+
+    filepicker.pickAndStore pickerOptions,
       location: "S3"
       path: "<%= FileClip.configuration.storage_path %>"
       access: "<%= FileClip.configuration.file_access %>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fileclip
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Scott Carleton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip