filestack-rails 3.2.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bffb8d92cde257a3277db67692e1a640a0c3b3f2
-  data.tar.gz: db94a7b9b183e97e0bd368e765a3c6bf5ef215e3
+  metadata.gz: 1fd7670b87d71c303e240dd8c0c1665368d59874
+  data.tar.gz: 37b6bd6ce8c568ddfb63dc0829050f938fe103f4
 SHA512:
-  metadata.gz: c95ca50d0891e1aa8bb958b281bb76ec517fb524677d3218bed77266bc7343290f0924c26ba618f01186719f5235ea31edc059c7115424b987ab7e5d5bffca5b
-  data.tar.gz: ebce5740e9be1b1de6970e339a487349b1c94d773ff70aa0b55ea243f66577b167af995f469738aebaf23156cc7dfe73f21f2d9588c99beec8bba9ed71068444
+  metadata.gz: 18fed1f0cd5ea2c2171e175776a333ec21732e2d178d7a7fc7840473803b2770e949e2e93321d2a2575d721682f9db194aefbabaed31cdd166fa2cb30f3caa3d
+  data.tar.gz: 0543564f423fcafbf9d919a3f242b44589473cedcf356d5f186dc836a8e252a989a598b84b4e20a541c71c29cbf57554194d8290368c69ff1398b4fdf3f4cfd1

data/README.md

@@ -12,7 +12,7 @@
 Rails SDK for Filestack API and content management system.
 </p>
 
-**Important: This is the readme for 3.1.0+.**
+**Important: This is the readme for 4.0.0+.**
 
 Note that the [Filestack::Ruby](https://github.com/filestack/filestack-ruby/) dependency has been updated to no longer interfere with namespace. However, if you were using that dependency in your Rails application, you will need to change any `Client` and `Filelink` class declarations to `FilestackClient` and `FilestackFilelink`, as per documented [here](https://github.com/filestack/filestack-ruby/blob/master/README.md).
 
@@ -54,6 +54,16 @@ config.filestack_rails.client_name = 'custom_client_name'
 ```
 The client name defaults to `"filestack_client"` and is injected into your client-side Javascript. This is because v3 of the File Picker lives in the Javascript of your web application.
 
+### Filestack Picker Version
+
+For Filestack Rails SDK v.4.0.0+, the picker `version` is setup by default to `v3`. It means that Javascript version is 1.x.x. If you want to use older Javascript version (0.11.5), you have to configure `version` to `v2` in `config/application.rb`:
+```ruby
+# filestack-js (0.11.5)
+config.filestack_rails.version = 'v2'
+
+# filestack-js (1.x.x)
+config.filestack_rails.version = 'v3'
+```
 ### 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,11 +1,13 @@
 include FilestackRails::Transform
+include FilestackRails::Version
 
 module FilestackRails
   module ApplicationHelper
     def filestack_js_include_tag
-      javascript_include_tag(
-        'https://static.filestackapi.com/v3/filestack.js', type: 'text/javascript'
-      )
+      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)
     end
 
     def filestack_js_init_tag
@@ -52,9 +54,15 @@ module FilestackRails
                     else
                       options.to_json
                     end
-      "(function(){
+      v2 = -> { "(function(){
         #{client_name}.pick(#{json_string}).then(function(data){#{callback}(data)})
-      })()"
+      })()" }
+
+      v3 = -> { json_string = "#{json_string}".slice!(1, json_string.length-2) # removed curly brackets help to generate pickerOptions in js
+                "(function(){
+                  #{client_name}.picker({#{json_string}, onUploadDone: data => #{callback}(data)}).open()
+                })()" }
+      get_filestack_js_result(v2: v2, v3: v3)
     end
 
     def get_client_and_api_key

data/lib/filestack_rails/configuration.rb

@@ -1,6 +1,6 @@
 module FilestackRails
   class Configuration
-    attr_accessor :api_key, :client_name, :secret_key, :security, :expiry, :app_secret, :cname
+    attr_accessor :api_key, :client_name, :secret_key, :security, :expiry, :app_secret, :cname, :version
 
     def api_key
       @api_key or raise "Set config.filestack_rails.api_key"
@@ -10,6 +10,10 @@ module FilestackRails
       @client_name or 'filestack_client'
     end
 
+    def version
+      @version or 'v3'
+    end
+
     def expiry
       @expiry or ( Time.zone.now.to_i + 600 )
     end

data/lib/filestack_rails/version.rb

@@ -1,3 +1,24 @@
+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 = '3.2.2'
+  VERSION = '4.0.0'
+
+  module Version
+    def get_filestack_js_result(results)
+        FilestackVersion.new(results).determine_filestack_js_result
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filestack-rails
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 4.0.0
 platform: ruby
 authors:
 - filestack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails