filestack 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c102fe7fb533cf82413791d4b49e8dd9a76926e0
-  data.tar.gz: 64dd9ae18a850ce6f5fa06b81fab6933973582d3
+  metadata.gz: 07dcc17274c65c4740665bb4fc382cd44e8af337
+  data.tar.gz: 866e63f55957c74c0f374698c8a5c79b400fec2d
 SHA512:
-  metadata.gz: c616fd86fe99d2473f2135af8ad062a35ebbc8e2e1cb658c2dc17784f1d27aae056f6842f5495147e108f037b6a8fb133ae4c8e1fbf789bded36a6386216aaf5
-  data.tar.gz: 2873772fa6e71ea7d8fab34caa6e366a15c3ee829c83b05197f894bcbf78d97d894003fb33255165d75843a9deb4886e803db0f8383be364a60dfb78ba4de37b
+  metadata.gz: a19cfe346bda3974b11a315139f4a51c2108397c21cf55d3848facabbbb12f455d273735806874d51d0e2238cff2324b80de8a75f3a9af73bc38888eaafab145
+  data.tar.gz: 82a7b00a7772903cd892d48e6c691324a88c4b322d38f2269b882fca18aac3c67703b0fe55ddc80a7bff26f2b8497230045188ebfd5c64078bf46de67d5fdd67

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Filestack-Ruby Changelog
 
+## 2.4.0 (August 27, 2018)
+- FS-3813 Convert security options hash with string keys to symbols
+- FS-3903 Add parsing the response body before reading it
+
 ## 2.3.0 (July 26, 2018)
 - FS-3437 Change Unirest library to Typhoeus, and fix warning in rspecs
 

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.4.0

data/lib/filestack.rb

@@ -3,3 +3,4 @@ require 'filestack/models/filestack_client'
 require 'filestack/models/filestack_security'
 require 'filestack/utils/utils'
 require 'filestack/models/filestack_transform'
+require 'filestack/core_ext/hash/keys'

data/lib/filestack/core_ext/hash/keys.rb

@@ -0,0 +1,20 @@
+module Filestack
+  # A helper class for the purpose of implementing a symbolize_keys method
+  # similar to ActiveSupport's symbolize_keys.
+  class Hash
+
+    # Convert a hash to use symbolized keys.
+    #
+    # @param [Hash]   to_symbolize    The hash which contains the keys to be
+    #                                 symbolized
+    #
+    # @return [Hash]
+    def self.symbolize_keys(to_symbolize)
+      symbolized = {}
+      to_symbolize.each_key do |key|
+        symbolized[key.to_sym] = to_symbolize[key]
+      end
+      symbolized
+    end
+  end
+end

data/lib/filestack/mixins/filestack_common.rb

@@ -2,6 +2,7 @@ require 'filestack/config'
 require 'filestack/utils/utils'
 require 'filestack/utils/multipart_upload_utils'
 require 'mimemagic'
+require 'json'
 
 # Module is mixin for common functionalities that all Filestack
 # objects can call.
@@ -88,7 +89,8 @@ module FilestackCommon
     signature = security.signature
     url = "#{FilestackConfig::CDN_URL}/#{task}/"\
       "security=signature:#{signature},policy:#{policy}/#{handle}"
-    UploadUtils.make_call(url, 'get').body[task]
+    response = UploadUtils.make_call(url, 'get')
+    JSON.parse(response.body)[task]
   end
 
   def send_metadata(handle, security = nil, params)
@@ -102,7 +104,7 @@ module FilestackCommon
     response = UploadUtils.make_call(url, 'get', parameters: params)
 
     if response.code == 200
-      return response.body
+      return JSON.parse(response.body)
     end
     raise response.body
   end

data/lib/filestack/models/filelink.rb

@@ -73,7 +73,7 @@ class FilestackFilelink
 
   # Return metadata for file handle
   #
-  # @return [Typhoeus::Response]
+  # @return [Hash]
   def metadata(params = {})
     send_metadata(@handle, @security, params)
   end
@@ -81,7 +81,7 @@ class FilestackFilelink
   # Return true (SFW) or false (NSFW)
   #
   # @return [Bool]
-  def sfw 
+  def sfw
     send_tags('sfw', @handle, @security)
   end
 

data/lib/filestack/models/filestack_av.rb

@@ -1,5 +1,6 @@
 require 'filestack/models/filelink'
 require 'filestack/utils/utils'
+require 'json'
 
 # Class for AV objects -- allows to check status
 # and upgrade to filelink once completed
@@ -18,8 +19,9 @@ class AV
   # @return [Filestack::FilestackFilelink]
   def to_filelink
     return 'Video conversion incomplete' unless status == 'completed'
-    response = UploadUtils.make_call(@url, 'get').body
-    handle = response['data']['url'].split('/').last
+    response = UploadUtils.make_call(@url, 'get')
+    response_body = JSON.parse(response.body)
+    handle = response_body['data']['url'].split('/').last
     FilestackFilelink.new(handle, apikey: @apikey, security: @security)
   end
 
@@ -27,6 +29,8 @@ class AV
   #
   # @return [String]
   def status
-    UploadUtils.make_call(@url, 'get').body['status']
+    response = UploadUtils.make_call(@url, 'get')
+    response_body = JSON.parse(response.body)
+    response_body['status']
   end
 end

data/lib/filestack/models/filestack_security.rb

@@ -43,7 +43,7 @@ class FilestackSecurity
   # @param [String]   secret    Your filestack security secret
   # @param [Hash]     options   Hash of options - see constructor
   def generate(secret, options)
-    policy_json = create_policy_string(options)
+    policy_json = create_policy_string(Filestack::Hash.symbolize_keys(options))
     @policy = Base64.urlsafe_encode64(policy_json)
     @signature = OpenSSL::HMAC.hexdigest('sha256', secret, policy)
   end
@@ -62,6 +62,7 @@ class FilestackSecurity
   #
   # Manage options and convert hash to json string
   #
+
   def create_policy_string(options)
     options[:expiry] = expiry_timestamp(options)
     options.to_json

data/lib/filestack/models/filestack_transform.rb

@@ -1,5 +1,6 @@
 require 'filestack/config'
 require 'filestack/models/filestack_av'
+require 'json'
 
 # Class for creating transformation chains and storing them to Filestack
 class Transform
@@ -64,12 +65,13 @@ class Transform
 
   # Add debug parameter to get information on transformation image
   #
-  # @return [Typhoeus::Response]
+  # @return [Hash]
   def debug
     @transform_tasks.push(
       add_transform_task('debug')
     )
-    UploadUtils.make_call(url, 'get').body
+    response = UploadUtils.make_call(url, 'get')
+    JSON.parse(response.body)
   end
 
   # Stores a transformation URL and returns a filelink
@@ -80,7 +82,8 @@ class Transform
       add_transform_task('store', {})
     )
     response = UploadUtils.make_call(url, 'get')
-    handle = response.body['url'].split('/').last
+    response_body = JSON.parse(response.body)
+    handle = response_body['url'].split('/').last
     FilestackFilelink.new(handle, apikey: @apikey, security: @security)
   end
 

data/lib/filestack/ruby/version.rb

@@ -1,5 +1,5 @@
 module Filestack
   module Ruby
-    VERSION = '2.3.0'.freeze
+    VERSION = '2.4.0'.freeze
   end
 end

data/lib/filestack/utils/multipart_upload_utils.rb

@@ -234,7 +234,7 @@ module MultipartUploadUtils
   # @param [Hash]               options         User-defined options for
   #                                             multipart uploads
   #
-  # @return [Typhoeus::Response]
+  # @return [Hash]
   def multipart_upload(apikey, filepath, security, options, timeout, intelligent: false)
     filename, filesize, mimetype = get_file_info(filepath)
     start_response = multipart_start(
@@ -272,6 +272,6 @@ module MultipartUploadUtils
     rescue
       raise "Upload timed out upon completion. Please try again later"
     end
-    response_complete.body
+    JSON.parse(response_complete.body)
   end
 end

data/lib/filestack/utils/utils.rb

@@ -73,7 +73,7 @@ module UploadUtils
   #                                            multipart uploads
   # @param [String]             storage        Storage destination
   #                                            (s3, rackspace, etc)
-  # @return [Typhoeus::Response]
+  # @return [Hash]
   def send_upload(apikey, filepath: nil, external_url: nil, security: nil, options: nil, storage: 'S3')
     data = if filepath
              { fileUpload: File.open(filepath) }
@@ -93,7 +93,8 @@ module UploadUtils
 
     response = make_call(base, 'post', parameters: data)
     if response.code == 200
-      handle = response.body['url'].split('/').last
+      response_body = JSON.parse(response.body)
+      handle = response_body['url'].split('/').last
       return { 'handle' => handle }
     end
     raise response.body
@@ -390,7 +391,7 @@ module IntelligentUtils
     rescue
       raise 'BACKEND_NETWORK'
     end
-    fs_response = fs_response.body
+    fs_response = JSON.parse(fs_response.body)
 
     # PUT to S3
     begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filestack
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Filestack
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -180,6 +180,7 @@ files:
 - filestack-ruby.gemspec
 - lib/filestack.rb
 - lib/filestack/config.rb
+- lib/filestack/core_ext/hash/keys.rb
 - lib/filestack/mixins/filestack_common.rb
 - lib/filestack/models/filelink.rb
 - lib/filestack/models/filestack_av.rb