filestack-rails 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4585b209ea7e22c920cf51484b9202c920f893e6
-  data.tar.gz: 5107599301ef1abc00035cfd47a6500eb431f761
+  metadata.gz: c631c08561aa591604aaf478a36bc704b89fcc27
+  data.tar.gz: cc82fc8b32042d9bc09df2501106df1f045944ce
 SHA512:
-  metadata.gz: 3cc03c00d69dd1d5ac3a59978081f4fa8b5d0b44767300bfb5638f1dde9aa5267549d3231efe2c8db3793c8be59ec9a6722c4f7bd56244a708e248b2beb36f8a
-  data.tar.gz: d2495c2c7c2779a5b361dbe0f93980a4db048dd864707a6a62304d1b357a22a50927a774ef29c5c0302f777dca85e65d02378793ffe55d82be83ea9c11250c85
+  metadata.gz: 578f21e06f6656f44c97592abae5f44d7c99460e0cdec830edde22a99f4fdcd5255e9511508d59868da74e9b5e23633ecfe7180de2aa84a196511ba1f84ac0ea
+  data.tar.gz: 8e4205702a128597afef8e334a839b43ad431a9f7944bfeeec5150e52a7cf374090a9854e439f76c6dbd0a89dd8c2ff1f46abee993fc861c70db0d012a3e99d7

data/README.md

@@ -77,8 +77,6 @@ config.filestack_rails.version = '1.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/lib/filestack_rails/configuration.rb

@@ -1,11 +1,11 @@
 require 'net/http'
 
 module FilestackRails
+  OUTDATED_VERSION = '0.11.5'
+
   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
@@ -15,7 +15,10 @@ module FilestackRails
     end
 
     def version
-      @version or '3.x.x'
+      @version ||= '3.x.x'
+
+      raise 'Incorrect config.filestack_rails.version' unless version_exists?
+      @version
     end
 
     def expiry
@@ -32,5 +35,36 @@ module FilestackRails
     def app_secret
       @app_secret or nil
     end
+
+    def url
+      @url
+    end
+
+    def version_exists?
+      @url = filestack_js_url
+
+      if @version == OUTDATED_VERSION
+        @url = outdated_filestack_js_url
+      end
+
+      url_exists?(@url)
+    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
+      raise 'Invalid URI'
+    end
+
+    def outdated_filestack_js_url
+      'https://static.filestackapi.com/v3/filestack.js'
+    end
+
+    def filestack_js_url
+      "https://static.filestackapi.com/filestack-js/#{@version}/filestack.min.js"
+    end
   end
 end

data/lib/filestack_rails/filestack_js.rb

@@ -1,23 +1,8 @@
-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"
+    @url = ::Rails.application.config.filestack_rails.url
   end
 
   def picker(client_name, api_key, options, callback, other_callbacks = nil)
@@ -30,21 +15,12 @@ class Picker
     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
+  def security(signature, policy)
+    { security: { signature: signature, policy: policy } }.to_json
+  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(){
@@ -60,10 +36,8 @@ end
 
 module FilestackRails
   module FilestackJs
-    OUTDATED_VERSION = '0.11.5'
-
     def get_filestack_js
-      if ::Rails.application.config.filestack_rails.version == OUTDATED_VERSION
+      if ::Rails.application.config.filestack_rails.version == FilestackRails::OUTDATED_VERSION
         OutdatedPicker.new
       else
         Picker.new

data/lib/filestack_rails/version.rb

@@ -1,3 +1,3 @@
 module FilestackRails
-  VERSION = '5.0.0'
+  VERSION = '5.1.0'
 end

metadata

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