filepickerio_rails 0.0.1 → 0.0.2

data/README.md

@@ -1,40 +1,55 @@
 filepickerio_rails
 ==================
 
+[Filepicker.io](http://www.filepicker.io) is an easy way to upload files to web applications. Not only does it allow you to upload
+from your local file system, but also from your connected cloud services. Services like Dropbox, Facebook, Flickr, Box.net, etc.
+
+This gem makes for easier integration into the Rails environment, as is the basis of a CarrierWave gem, `carrierwave-filepickerio`.
+
 Installation
 ------------
 
 Add your Filepicker.io API Key to an initialiser (`config/initializer/filepickerio_rails.rb`):
 
-    FilepickerioRails.configure do |config|
-      config.api_key = '[YOUR API KEY FROM FILEPICKER.IO]'
-    end
+```ruby
+FilepickerioRails.configure do |config|
+  config.api_key = '[YOUR API KEY FROM FILEPICKER.IO]'
+end
+```
 
 Include the filepicker.io JavaScript library in your page (such as your application.html.erb layout):
 
-    <%= javascript_include_tag "//api.filepicker.io/v0/filepicker.js" %>
+```erb
+<%= javascript_include_tag "//api.filepicker.io/v0/filepicker.js" %>
+```
 
 ... or, if you're not using the asset pipeline, you can use the expansion:
 
-    <%= javascript_include_tag :filepickerio %>
+```erb
+<%= javascript_include_tag :filepickerio %>
+```
 
-Render a Filepicker.io file upload and save fields using the form tag helper:
+Render Filepicker.io file upload and save fields using the form tag helper:
 
-    <%= fp_file_field_tag :image_url, 'Pick file', 'http://example.com/existing-upload.jpg' %>
-    <%= fp_file_field_tag :image_url, 'Pick file', 'http://example.com/existing-upload.jpg', 'image/jpg' %>
-    <%= fp_file_field_tag :image_url, 'Pick file', 'http://example.com/existing-upload.jpg', 'image/jpg', { class: 'primary btn' } %>
+```erb
+<%= fp_file_field_tag :image_url, 'Pick file', 'http://example.com/existing-upload.jpg' %>
+<%= fp_file_field_tag :image_url, 'Pick file', 'http://example.com/existing-upload.jpg', 'image/jpg' %>
+<%= fp_file_field_tag :image_url, 'Pick file', 'http://example.com/existing-upload.jpg', 'image/jpg', { class: 'primary btn' } %>
 
-    <%= fp_save_button 'Save to Dropbox', 'http://www.filepicker.io/static/img/success.png', 'image/jpg' %>
-    <%= fp_save_button 'Save to Dropbox', 'http://www.filepicker.io/static/img/success.png', 'image/jpg', data: { 'fp-option-services' => 'DROPBOX' } %>
+<%= fp_save_button 'Save to Dropbox', 'http://www.filepicker.io/static/img/success.png', 'image/jpg' %>
+<%= fp_save_button 'Save to Dropbox', 'http://www.filepicker.io/static/img/success.png', 'image/jpg', data: { 'fp-option-services' => 'DROPBOX' } %>
+```
 
 Or use the data-bound form builder methods, fp_file_field, fp_save_button:
 
-    <%= form_for @entry do |f| %>
-      <%= f.fp_file_field :image_url %>
-      <%= f.fp_file_field :lolcat_image_url, "Upload lolcat" %>
+```erb
+<%= form_for @entry do |f| %>
+  <%= f.fp_file_field :image_url %>
+  <%= f.fp_file_field :lolcat_image_url, "Upload lolcat" %>
 
-      <%= f.fp_save_button :image_url, "Save existing image to cloud", 'image/jpg' %>
-    <%- end %>
+  <%= f.fp_save_button :image_url, "Save existing image to cloud", 'image/jpg' %>
+<%- end %>
+```
 
 Filepicker.io Data Params
 -------------------------

data/lib/filepickerio_rails/action_view/form_tag_helper.rb

@@ -34,7 +34,14 @@ module FilepickerioRails
         fp_file_field(object_name, nil, text, options)
       end
 
-      def fp_file_field(object_name, method, text, options)
+      def fp_file_field(object_name, method, text_or_options, options)
+        if text_or_options.is_a? Hash
+          text = nil
+          options = text_or_options
+        else
+          text = text_or_options
+        end
+
         dragdrop = options[:dragdrop] && options[:dragdrop] == true
 
         input_type = if dragdrop
@@ -100,7 +107,7 @@ module FilepickerioRails
     private
 
       def fp_api_key
-        raise "Filepicker.io API Key not set. Check config/initializer/filepickerio_rails.rb" if !FilepickerioRails.config.api_key
+        raise "Filepicker.io API Key not set" if !FilepickerioRails.config.api_key
         FilepickerioRails.config.api_key
       end
 

data/lib/filepickerio_rails/version.rb

@@ -1,3 +1,3 @@
 module FilepickerioRails
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/filepickerio_rails.rb

@@ -5,14 +5,6 @@ rescue LoadError
   #do nothing
 end
 
-$stderr.puts <<-EOC if !defined?(Rails)
-warning: no framework detected.
-would you check out if your Gemfile appropriately configured?
----- e.g. ----
-when Rails:
-    gem 'filepickerio_rails'
-EOC
-
 require "filepickerio_rails/version"
 require 'filepickerio_rails/configuration'
 require 'filepickerio_rails/railtie' if defined?(Rails)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filepickerio_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70225434735840 !ruby/object:Gem::Requirement
+  requirement: &70276161113600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225434735840
+  version_requirements: *70276161113600
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70225434735260 !ruby/object:Gem::Requirement
+  requirement: &70276161113040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225434735260
+  version_requirements: *70276161113040
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70225434734180 !ruby/object:Gem::Requirement
+  requirement: &70276161112420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225434734180
+  version_requirements: *70276161112420
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70225434732980 !ruby/object:Gem::Requirement
+  requirement: &70276161111760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70225434732980
+  version_requirements: *70276161111760
 description: Rails view helpers for Filepicker.io widgets
 email:
 - adam.burmister@gmail.com
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1270750157206818046
+      hash: -4076320744515293650
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1270750157206818046
+      hash: -4076320744515293650
 requirements: []
 rubyforge_project: filepickerio_rails
 rubygems_version: 1.8.15