filestack-rails 4.0.7 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bad0153c8be3d93667eab2aaff101faa8314a04
-  data.tar.gz: 50f7223d85f45c9cca7119ea963d6985592c6715
+  metadata.gz: 4585b209ea7e22c920cf51484b9202c920f893e6
+  data.tar.gz: 5107599301ef1abc00035cfd47a6500eb431f761
 SHA512:
-  metadata.gz: 4e277fa546e32a55e5191956fe99e7158142181bdb769213570871df6d8fe3ba7ba7487eaff64e757424885e6280b176fac8bcf1744c7fdce652e0839b766e59
-  data.tar.gz: ec8963c733fe13bf05033a55b8790e790868856a80ea2698be42dba604b12ce10a001ef74108b8a15a2b75728651be259c555c697d287679d72b82e711b89542
+  metadata.gz: 3cc03c00d69dd1d5ac3a59978081f4fa8b5d0b44767300bfb5638f1dde9aa5267549d3231efe2c8db3793c8be59ec9a6722c4f7bd56244a708e248b2beb36f8a
+  data.tar.gz: d2495c2c7c2779a5b361dbe0f93980a4db048dd864707a6a62304d1b357a22a50927a774ef29c5c0302f777dca85e65d02378793ffe55d82be83ea9c11250c85

data/README.md

@@ -64,6 +64,21 @@ config.filestack_rails.version = 'v2'
 # filestack-js (1.x.x)
 config.filestack_rails.version = 'v3'
 ```
+
+For Filestack Rails SDK v.5.0.0+, you have to provide picker version precisely. By default the picker version is setup to `3.x.x`. If you want to use older filestack-js version (0.11.5), you have to configure `version` to `0.11.5` in `config/application.rb`:
+```ruby
+# filestack-js (0.11.5)
+config.filestack_rails.version = '0.11.5'
+
+# filestack-js (1.x.x)
+config.filestack_rails.version = '1.x.x'
+
+# filestack-js (3.x.x)
+config.filestack_rails.version = '3.x.x'
+```
+
+You can find all available filestack-js versions in [`lib/filestack_rails/version.rb`](./lib/filestack_rails/version.rb)
+
 ### CNAME
 
 If you have set up a custom CNAME, you can add it to your configuration file. The Picker will modify all assets to formatted with your domain origin instead of Filestack's.

data/app/helpers/filestack_rails/application_helper.rb

@@ -1,14 +1,11 @@
 require 'json'
 include FilestackRails::Transform
-include FilestackRails::Version
+include FilestackRails::FilestackJs
 
 module FilestackRails
   module ApplicationHelper
     def filestack_js_include_tag
-      v2 = -> { javascript_include_tag('https://static.filestackapi.com/v3/filestack.js', type: 'text/javascript') }
-      v3 = -> { javascript_include_tag('https://static.filestackapi.com/filestack-js/1.x.x/filestack.min.js', type: 'text/javascript') }
-
-      get_filestack_js_result(v2: v2, v3: v3)
+      javascript_include_tag(get_filestack_js.url, type: 'text/javascript')
     end
 
     def filestack_js_init_tag
@@ -49,31 +46,15 @@ module FilestackRails
     end
 
     def create_javascript_for_picker(callback, options)
-      client_name, _api_key = get_client_and_api_key
+      client_name, api_key = get_client_and_api_key
       other_callbacks = build_callbacks_js(options) if options
-      json_string = if options.nil?
-                      ''
-                    else
-                      options.to_json
-                    end
-      v2 = -> do
-        <<~HTML
-          (function(){
-            #{client_name}.pick(#{json_string}).then(function(data){#{callback}(data)})
-          })()
-        HTML
-      end
+      options = if options.nil?
+                  ''
+                else
+                  options.to_json
+                end
 
-      v3 = -> do
-        json_string = json_string[1..-2] # removed curly brackets help to generate pickerOptions in js
-
-        <<~HTML
-          (function(){
-            #{client_name}.picker({ onUploadDone: data => #{callback}(data)#{other_callbacks}, #{json_string} }).open()
-          })()
-        HTML
-      end
-      get_filestack_js_result(v2: v2, v3: v3)
+      get_filestack_js.picker(client_name, api_key, options, callback, other_callbacks)
     end
 
     def build_callbacks_js(options)
@@ -104,10 +85,7 @@ module FilestackRails
       signature, policy = get_policy_and_signature
 
       if policy && signature
-        signature_and_policy = { signature: signature, policy: policy }
-        v2 = -> { signature_and_policy.to_json }
-        v3 = -> { { security: signature_and_policy }.to_json }
-        get_filestack_js_result(v2: v2, v3: v3)
+        get_filestack_js.security(signature, policy)
       else
         "''"
       end

data/lib/filestack-rails.rb

@@ -2,6 +2,7 @@ require "filestack_rails/configuration"
 require "filestack_rails/transform"
 require "filestack_rails/engine"
 require "filestack_rails/version"
+require "filestack_rails/filestack_js"
 
 module FilestackRails
   # Your code goes here...

data/lib/filestack_rails/configuration.rb

@@ -1,7 +1,11 @@
+require 'net/http'
+
 module FilestackRails
   class Configuration
     attr_accessor :api_key, :client_name, :secret_key, :security, :expiry, :app_secret, :cname, :version
 
+    OUTDATED_VERSION = '0.11.5'
+
     def api_key
       @api_key or raise "Set config.filestack_rails.api_key"
     end
@@ -11,7 +15,7 @@ module FilestackRails
     end
 
     def version
-      @version or 'v3'
+      @version or '3.x.x'
     end
 
     def expiry

data/lib/filestack_rails/filestack_js.rb

@@ -0,0 +1,73 @@
+require 'net/http'
+
+class Picker
+  attr_reader :url
+
+  def initialize
+    raise 'Incorrect config.filestack_rails.version' unless url_exists?(filestack_js_url)
+    @url = filestack_js_url
+  end
+
+  def version
+    ::Rails.application.config.filestack_rails.version
+  end
+
+  def security(signature, policy)
+    { security: { signature: signature, policy: policy } }.to_json
+  end
+
+  def filestack_js_url
+    "https://static.filestackapi.com/filestack-js/#{version}/filestack.min.js"
+  end
+
+  def picker(client_name, api_key, options, callback, other_callbacks = nil)
+    options_string = options[1..-2] # removed curly brackets help to generate pickerOptions in js
+
+    <<~HTML
+      (function(){
+        #{client_name}.picker({ onUploadDone: data => #{callback}(data)#{other_callbacks}, #{options_string} }).open()
+      })()
+    HTML
+  end
+
+   def url_exists?(url)
+     uri = URI(url)
+     request = Net::HTTP.new(uri.host)
+     response = request.request_head(uri.path)
+     response.code.to_i == 200
+   rescue
+     false
+   end
+end
+
+class OutdatedPicker < Picker
+  def filestack_js_url
+    'https://static.filestackapi.com/v3/filestack.js'
+  end
+
+  def picker(client_name, api_key, options, callback, other_callbacks = nil)
+    <<~HTML
+      (function(){
+        #{client_name}.pick(#{options}).then(function(data){#{callback}(data)})
+      })()
+    HTML
+  end
+
+  def security(signature, policy)
+    { signature: signature, policy: policy }.to_json
+  end
+end
+
+module FilestackRails
+  module FilestackJs
+    OUTDATED_VERSION = '0.11.5'
+
+    def get_filestack_js
+      if ::Rails.application.config.filestack_rails.version == OUTDATED_VERSION
+        OutdatedPicker.new
+      else
+        Picker.new
+      end
+    end
+  end
+end

data/lib/filestack_rails/version.rb

@@ -1,24 +1,3 @@
-class FilestackVersion
-  def initialize(results)
-    @version = ::Rails.application.config.filestack_rails.version
-    @results = results
-  end
-
-  def determine_filestack_js_result
-    begin
-      @results[@version.to_sym].call
-    rescue
-      raise 'Set correct version in config.filestack_rails.version'
-    end
-  end
-end
-
 module FilestackRails
-  VERSION = '4.0.7'
-
-  module Version
-    def get_filestack_js_result(results)
-        FilestackVersion.new(results).determine_filestack_js_result
-    end
-  end
+  VERSION = '5.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filestack-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 5.0.0
 platform: ruby
 authors:
 - filestack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - lib/filestack-rails.rb
 - lib/filestack_rails/configuration.rb
 - lib/filestack_rails/engine.rb
+- lib/filestack_rails/filestack_js.rb
 - lib/filestack_rails/transform.rb
 - lib/filestack_rails/version.rb
 - lib/tasks/filestack_rails_tasks.rake