froala-editor-sdk 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c51a689daf99ec97c6ccebbb452f66e3c0c217b8
-  data.tar.gz: 4dc43249a447e483c3463103d4e8cebd755ff4a5
+SHA256:
+  metadata.gz: 495ecf38df41fef4489d7ce5608ad8c0b809b2c930ad54bcc29aa9f796eeea55
+  data.tar.gz: 0bb5137357c2dba0cd1e3c71b3b4730970b03047307e19104cd0e2679b28d7ec
 SHA512:
-  metadata.gz: 642103cf3c5b322c4e7d9664c9619ef86503b720b9a1f3827a1bc94544862fce3cabd16cff1ca53045fe6145e3b60d3b0326337b109b10194daa8d7fba1c3e29
-  data.tar.gz: 5b429455276179d3a3dc96ef5f0158ce9b5ebc70afb606a8a47546f304f74f960b9c3f25819f55b8ed3d9cda5d4fdb1bd5f951bbcfb8ce71094d6ed852513b7e
+  metadata.gz: 8bb73be9904214fecc2ba0844f2714345d553d033f00a5dd99794d4a8537351e159f9e6db46d7bbb71955cf055071cfbb4761d7e990f9ab431af3f4fbe050e4b
+  data.tar.gz: e30bd14ba369410e8023d320ad549c619d0554399a60c74801a87e3deacfb968a5d0585745105f8aef8495f4692ad4b087765405308ef8c0b36e11c867ee5430

data/lib/froala-editor-sdk/file.rb

@@ -12,7 +12,8 @@ module FroalaEditorSDK
             allowedExts: [".txt", ".pdf", ".doc", ".json", ".html"],
             allowedMimeTypes: [ "text/plain", "application/msword", "application/x-pdf", "application/pdf", "application/json","text/html" ]
         },
-        resize: nil
+        resize: nil,
+        file_access_path: '/uploads/'
     }
 
     # Default upload path.
@@ -41,7 +42,7 @@ module FroalaEditorSDK
         path = Rails.root.join(upload_path, file_name)
 
         # Saves the file on the server and returns the path.
-        serve_url = save(file, path)
+        serve_url = save(file, path, options[:file_access_path])
 
         resize(options, path) if !options[:resize].nil?
 
@@ -55,7 +56,7 @@ module FroalaEditorSDK
     # Params:
     # +file+:: The uploaded file that will be saved on the server.
     # +path+:: The path where the file will be saved.
-    def self.save (file, path)
+    def self.save (file, path, file_access_path)
 
       # Create directory if it doesn't exist.
       dirname = ::File.dirname(path)
@@ -66,7 +67,7 @@ module FroalaEditorSDK
       if ::File.open(path, "wb") {|f| f.write(file.read)}
 
         # Returns a public accessible server path.
-        return "#{"/uploads/"}#{Utils.get_file_name(path)}"
+        return "#{file_access_path}#{Utils.get_file_name(path)}"
       else
         return "error"
       end
@@ -80,9 +81,13 @@ module FroalaEditorSDK
     def self.delete(file = params[:file], path)
 
       file_path = Rails.root.join(path, ::File.basename(file))
-      if ::File.delete(file_path)
-        return true
-      else
+      begin
+        if ::File.delete(file_path)
+          return true
+        else
+          return false
+        end
+      rescue => exception
         return false
       end
     end
@@ -95,7 +100,7 @@ module FroalaEditorSDK
     def self.resize (options, path)
       image = MiniMagick::Image.new(path)
       image.path
-      image.resize("#{options[:resize][:height]}x#{options[:resize][:width]}")
+      image.resize("#{options[:resize][:width]}x#{options[:resize][:height]}")
     end
 
     class << self

data/lib/froala-editor-sdk/image.rb

@@ -9,7 +9,8 @@ module FroalaEditorSDK
             allowedExts: [".gif", ".jpeg", ".jpg", ".png", ".svg", ".blob"],
             allowedMimeTypes: [ "image/gif", "image/jpeg", "image/pjpeg", "image/x-png", "image/png", "image/svg+xml" ]
         },
-        resize: nil
+        resize: nil,
+        file_access_path: '/uploads/'
     }
 
     # Default upload path.
@@ -19,13 +20,16 @@ module FroalaEditorSDK
     # Params:
     # +path+:: The server path where the images are saved
     # Returns Json object
-    def self.load_images(path)
+    def self.load_images(path, options = {})
+
+      # Merge options.
+      options = @default_options.merge(options)
 
       images = Dir["#{path}*"]
       all_images = []
 
       images.each do |img|
-        all_images.push({url: "#{"/uploads/"}#{Utils.get_file_name(img)}"})
+        all_images.push({url: "#{options[:file_access_path]}#{Utils.get_file_name(img)}"})
       end
 
       return all_images.to_json

data/lib/froala-editor-sdk/s3.rb

@@ -7,12 +7,31 @@ module FroalaEditorSDK
     # Params:
     # +options+:: The configuration params that are needed to compute the signature.
     def self.signature (options = nil)
-      Base64.encode64(
-          OpenSSL::HMAC.digest(
-              OpenSSL::Digest.new('sha1'),
-              options[:secretKey], self.policy(options)
-          )
-      ).gsub("\n", "")
+      OpenSSL::HMAC.hexdigest(
+        "SHA256",
+        self.sign(
+          self.sign(
+            self.sign(
+              self.sign(
+                ("AWS4" + options[:secretKey]).force_encoding(Encoding::UTF_8),
+                options[:'date-string']
+              ),
+              options[:region]
+            ),
+            "s3"
+          ),
+          "aws4_request"
+        ), 
+        self.policy(options)
+      )
+    end
+
+    # Builds a HMAC-SHA256 digest using key and data
+    # Params:
+    # +key+:: Key to use for creating the digest
+    # +data+:: Data to be used for creating the digest
+    def self.sign(key, data)
+      OpenSSL::HMAC.digest(OpenSSL::Digest::SHA256.new, key, data.force_encoding(Encoding::UTF_8))
     end
 
     # Encodes to Base64 the policy data and replaces new lines chars.
@@ -30,8 +49,11 @@ module FroalaEditorSDK
           expiration: 10.hours.from_now.utc.iso8601,
           conditions: [
               ["starts-with", "$key", options[:keyStart]],       # Start key/folder
-              ["starts-with", "$x-requested-with", "xhr"],  # Request type
-              ["starts-with", "$content-type", ""],         # Content type
+              ["starts-with", "$Content-type", ""],         # Content type
+              {"x-requested-with": "xhr"},                  # Request type
+              {"x-amz-algorithm": options[:'x-amz-algorithm']}, # Encrytion Algorithm
+              {"x-amz-date": options[:'x-amz-date']},       # Current Date
+              {"x-amz-credential": options[:'x-amz-credential']}, # Encrypted Credentials
               {bucket: options[:bucket]},                   # Bucket name
               {acl: options[:acl]},                         # ACL property
               {success_action_status: "201"}                # Response status 201 'file created'
@@ -39,21 +61,34 @@ module FroalaEditorSDK
       }
     end
 
+    # Builds the amazon credential by appending access key, x-amz-date, region and 's3/aws4_request'
+    # Params:
+    # +options+:: Configuration params to generate the AWS response
+    def self.getXamzCredential(options = nil)
+      "#{options[:accessKey]}#{"/"}#{options[:'date-string']}#{"/"}#{options[:region]}#{"/"}#{"s3/aws4_request"}"
+    end
+
     # Makes all the request in order and returns AWS hash response
     # Params:
     # +options+:: Configuration params to generate the AWS response.
     def self.data_hash (options = nil)
       options[:region] = 'us-east-1' if options[:region].nil? ||  options[:region] == 's3'
+      options[:'date-string'] = Time.now.strftime("%Y%m%d")
+      options[:'x-amz-algorithm'] = "AWS4-HMAC-SHA256"
+      options[:'x-amz-credential'] = self.getXamzCredential(options)
+      options[:'x-amz-date'] = options[:'date-string'] + "T000000Z"
 
       {
         :bucket => options[:bucket],           # Upload bucket
         :region =>  options[:region] != 'us-east-1' ? "s3-#{options[:region]}" : 's3', # Upload region
         :keyStart => options[:keyStart],       # Start key/folder
         :params => {
-          :signature => self.signature(options), # Defined signature
-          :AWSAccessKeyId => options[:accessKey],     # Your Access key
+          :acl => options[:acl],                 # ACL property 'public-read'
           :policy => self.policy(options),       # Defined policy
-          :acl => options[:acl]                 # ACL property 'public-read'
+          :'x-amz-algorithm' => options[:'x-amz-algorithm'], # Encrytion Algorithm
+          :'x-amz-credential' => options[:'x-amz-credential'],     # Encrypted Credentials
+          :'x-amz-date' => options[:'x-amz-date'],  # Current Date
+          :'x-amz-signature' => self.signature(options), # Defined signature
         }
       }
     end

data/lib/froala-editor-sdk/version.rb

@@ -1,7 +1,7 @@
 module FroalaEditorSDK
   module Version
     Major = 1
-    Minor = 2
+    Minor = 3
     Tiny = 0
 
     String = "#{Major}.#{Minor}.#{Tiny}"

data/lib/froala-editor-sdk/video.rb

@@ -10,7 +10,8 @@ module FroalaEditorSDK
             allowedExts: [".mp4", ".webm", ".ogg"],
             allowedMimeTypes: [ "video/mp4", "video/webm", "video/ogg" ]
         },
-        resize: nil
+        resize: nil,
+        file_access_path: '/uploads/'
     }
 
     # Default upload path.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: froala-editor-sdk
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Froala Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '4.5'
 description: Ruby SDK for Froala Editor
 email: 
 executables: []
@@ -85,8 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails SDK for Froala WYSIWYG Editor.