filepicker-rails 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d2e91d419884443bd5b5e7b78f3ad18515fde9
-  data.tar.gz: c0d4ab38baea1c65377d056e8e72f670f2f1bca9
+  metadata.gz: 3b84369b54427063911d87d865e6e982912b6536
+  data.tar.gz: 1735e9671044f54eaf076b358c5397b41a14e4be
 SHA512:
-  metadata.gz: f09dde007e819de987b599b493fc077ed2133aca55bd723c66de7a43f613238b33d7f47fa0acaa0c1b8dd7856c2d61ee5423d62ee4824eccce74fc6394c476f3
-  data.tar.gz: af1c86fad975850a25696c57155ffb550d0642a59035eb977001bd067001be0125371ebb00c57d51f2eed3d96f6c593bd1b5df5552ce324d4e95c29e41b94898
+  metadata.gz: b18582c1c14ba2cbb2f4674d9ca26e12b65f29fe432d743790f486875265a5a6cdcd6e8744de26f82e28f896e874a4f1486ae8972d1dbae48d8deb5c7595b01e
+  data.tar.gz: f199fd9c056a9c30203ce25f81cfba3687b4b1261949af4af56e7b95e35b5624f5a8063d53bf4658c6f9299f21056503ac8e17d6d08d0a6e412db1d4a14b07e9

data/app/helpers/filepicker_rails/application_helper.rb

@@ -10,7 +10,7 @@ module FilepickerRails
     #     filepicker_js_include_tag
     #     # => <script src="//api.filepicker.io/v1/filepicker.js"></script>
     def filepicker_js_include_tag
-      javascript_include_tag "//api.filepicker.io/v1/filepicker.js"
+      javascript_include_tag "//api.filepicker.io/v2/filepicker.js", type: "text/javascript"
     end
 
     # Creates a filepicker field tag, accepts optional `options` hash for configuration.
@@ -179,22 +179,17 @@ module FilepickerRails
       end
 
       def execute
-        url_with_path = if convert_options.any?
-          "#{cdn_url}/convert"
-        else
-          cdn_url
-        end
-
-        query_params = all_options.merge(policy_config).to_query
+        base_url = url_with_path.split('?').first
+        query_params = all_options.to_query
 
-        [url_with_path, query_params.presence].compact.join('?')
+        [base_url, query_params.presence].compact.join('?')
       end
 
       private
 
         attr_reader :url, :options
 
-        def all_options
+        def valid_options
           options.select { |option| VALID_OPTIONS.include?(option) }
         end
 
@@ -202,8 +197,22 @@ module FilepickerRails
           options.select { |option| CONVERT_OPTIONS.include?(option) }
         end
 
+        def all_options
+          [original_url_options, valid_options, policy_config].inject(&:merge)
+        end
+
+        def original_url_options
+          query_string = url_with_path.split('?')[1]
+
+          if query_string
+            Rack::Utils.parse_nested_query(query_string)
+          else
+            {}
+          end
+        end
+
         def cdn_host
-          ::Rails.application.config.filepicker_rails.cdn_host
+          @cdn_host ||= ::Rails.application.config.filepicker_rails.cdn_host
         end
 
         def cdn_url
@@ -218,6 +227,18 @@ module FilepickerRails
         def policy_config
           Policy.apply
         end
+
+        def url_with_path
+          @url_with_path ||= if append_convert_on_url_path?
+            "#{cdn_url}/convert"
+          else
+            cdn_url
+          end
+        end
+
+        def append_convert_on_url_path?
+          convert_options.any? && !cdn_url.match('/convert')
+        end
     end
     private_constant :FilepickerImageUrl
 

data/lib/filepicker_rails/tag.rb

@@ -1,4 +1,5 @@
 module FilepickerRails
+  # @private
   module Tag
 
     FILEPICKER_OPTIONS_TO_DASHERIZE = [:button_text, :button_class, :mimetypes,

data/lib/filepicker_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filepicker-rails
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Max Tilford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Makes integrating filepicker.io with rails 4 easy