filestack-rails 5.1.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c631c08561aa591604aaf478a36bc704b89fcc27
-  data.tar.gz: cc82fc8b32042d9bc09df2501106df1f045944ce
+SHA256:
+  metadata.gz: 5552cc2bca2433a129013994ca3cc84a87a9921faf22bf1736546b3c07211f6e
+  data.tar.gz: a3714640635244fe1dfc03b0789f2aea8492755037df7ba0eeff27979b3d77bc
 SHA512:
-  metadata.gz: 578f21e06f6656f44c97592abae5f44d7c99460e0cdec830edde22a99f4fdcd5255e9511508d59868da74e9b5e23633ecfe7180de2aa84a196511ba1f84ac0ea
-  data.tar.gz: 8e4205702a128597afef8e334a839b43ad431a9f7944bfeeec5150e52a7cf374090a9854e439f76c6dbd0a89dd8c2ff1f46abee993fc861c70db0d012a3e99d7
+  metadata.gz: 2e42dc9c415471c880f29c8df4ae26d9320c90bf31384777418a80e987210ea9a4f72dceaae758aedc3f11015b4486aad860a800d63daf60b3b2bcf0a67bd582
+  data.tar.gz: bfd1fe7db0cb0f86017eb2a9bb38beabbc18e895adc71b93b5cefc52e76467bc230329c264a1eae12cd00fa409bf8f20caeb9415582f5fa8be2e21608a63c39b

data/README.md

@@ -77,6 +77,8 @@ config.filestack_rails.version = '1.x.x'
 config.filestack_rails.version = '3.x.x'
 ```
 
+Please take a look on available versions in [filestack-js](https://github.com/filestack/filestack-js) repository.
+
 ### 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.
@@ -180,6 +182,19 @@ Filestack::Rails now has access to the full list of image transforms through our
 ```erb
 <%= filestack_image @user.filepicker_url, transform: filestack_transform.resize(width:100, height:100).flip.enhance %>
 ```
+
+You can also add attributes to `image_tag`, for instance:
+```erb
+<%= filestack_image @user.filepicker_url, size: "160x100", alt: "Picture" %>
+```
+
+### Fetching a converted Filestack image URL with Filestack Transformations:
+The `filestack_image_url` method accepts the original Filestack image URL and an optional `filestack_transform` chain:
+
+```erb
+<%= image_tag @user.filepicker_url, data: { transformed_image_url: filestack_image_url(@user.filepicker_url, filestack_transform.resize(width: 100, height: 100).flip.enhance) } %>
+```
+
 ## Migrating from 2.x to 3.x
 Filestack::Rails 3.x is a significant and breaking change. Users wishing to upgrade will need to change their current implementation in order to use the plugin correctly.
 
@@ -199,6 +214,7 @@ The `filestack_image` tag wraps the generic Rails `image_tag` and generates a ne
 ```erb
 <%= @user.filestack_url, transform: filestack_transform.resize(width:100, height:100).enhance %>
 ```
+For a list of valid transformations, please see [here](https://www.filestack.com/docs/api/processing/).
 
 ### Ruby SDK
 Filestack::Rails injects the Filestack Ruby SDK into your application for use anywhere. You can use it to access the rest of the Filestack API and find its documentation [here](https://github.com/filestack/filestack-ruby).

data/app/helpers/filestack_rails/application_helper.rb

@@ -29,14 +29,15 @@ module FilestackRails
     end
 
     def filestack_image(url, options = {})
-      transform_object = options[:transform]
-      options.delete(:transform)
-      if transform_object
-        transform_object.add_external_url url
-        image_tag transform_object.fs_url, options
-      else
-        image_tag url
-      end
+      transform_object = options.delete(:transform)
+
+      image_tag(filestack_image_url(url, transform_object), options)
+    end
+
+    def filestack_image_url(url, transform_object = nil)
+      return url unless transform_object
+      transform_object.add_external_url(url)
+      transform_object.fs_url
     end
 
     private
@@ -78,11 +79,11 @@ module FilestackRails
         signature = security.signature
         policy = security.policy
       end
-      [signature, policy]
+      [policy, signature]
     end
 
     def get_policy_and_signature_string
-      signature, policy = get_policy_and_signature
+      policy, signature = get_policy_and_signature
 
       if policy && signature
         get_filestack_js.security(signature, policy)

data/lib/filestack-rails.rb

@@ -3,6 +3,8 @@ require "filestack_rails/transform"
 require "filestack_rails/engine"
 require "filestack_rails/version"
 require "filestack_rails/filestack_js"
+require_relative "../app/helpers/filestack_rails/application_helper"
+require_relative "../app/helpers/filestack_rails/form_helper"
 
 module FilestackRails
   # Your code goes here...

data/lib/filestack_rails/configuration.rb

@@ -1,8 +1,6 @@
 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
 
@@ -15,10 +13,7 @@ module FilestackRails
     end
 
     def version
-      @version ||= '3.x.x'
-
-      raise 'Incorrect config.filestack_rails.version' unless version_exists?
-      @version
+      @version or '3.x.x'
     end
 
     def expiry
@@ -35,36 +30,5 @@ 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

@@ -2,7 +2,19 @@ class Picker
   attr_reader :url
 
   def initialize
-    @url = ::Rails.application.config.filestack_rails.url
+    @url = filestack_js_url
+  end
+
+  def filestack_js_url
+    "https://static.#{domain}/filestack-js/#{version}/filestack.min.js"
+  end
+
+  def version
+    ::Rails.application.config.filestack_rails.version
+  end
+
+  def domain
+    ::Rails.application.config.filestack_rails.cname || 'filestackapi.com'
   end
 
   def picker(client_name, api_key, options, callback, other_callbacks = nil)
@@ -21,6 +33,10 @@ class Picker
 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(){
@@ -36,8 +52,10 @@ end
 
 module FilestackRails
   module FilestackJs
+    OUTDATED_VERSION = '0.11.5'
+
     def get_filestack_js
-      if ::Rails.application.config.filestack_rails.version == FilestackRails::OUTDATED_VERSION
+      if ::Rails.application.config.filestack_rails.version == OUTDATED_VERSION
         OutdatedPicker.new
       else
         Picker.new

data/lib/filestack_rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filestack-rails
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.3.1
 platform: ruby
 authors:
 - filestack
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2020-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -57,6 +57,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
   type: :development
@@ -64,6 +67,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.6
 - !ruby/object:Gem::Dependency
@@ -117,7 +123,7 @@ homepage: https://www.filestack.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,9 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Filestack plugin for Rails 4+
 test_files: []