froala-editor-sdk 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b215ddc9205aff5ce708096e7d5a2b5d919dff1d
-  data.tar.gz: a20709121f413700510b4c5b58046ec2ad066478
+  metadata.gz: c86f7b8547036336a509a375e6c3cffe05b08158
+  data.tar.gz: 4d1f1fc90cb5a151148fa22689f295f8466f0e09
 SHA512:
-  metadata.gz: 04b2db37f9f18f1be79ad2a41e47e62f6552fd962fcfb4d0784ce29f79d967c6cbe04653903af18dac037bbba20a5324faeefedcad920708361754116c80b1c4
-  data.tar.gz: 9d4a1a020fc91cbca4fbbf0f39b88d5159fd6a14d6faa0ca6a64bc03d3f4cf9a2bb312a398272bac504e2efa0c6d1bdc4c2ee07b06c920335b2e9e71e6bdb1dc
+  metadata.gz: 57d7ffbc0e31ea8147d636352811e828bd115687d44ab48e588c908d6f151b1b495f785e657b30fd029e8c0e6f70f67524459f95999bb30403229efa41950be8
+  data.tar.gz: e47944bbf7c724d6f62d3c76ed1e8762dc757c7593355c7d756301d1544fac527f1b6b37e4e91e73f0620af6f3bbd4b09afb5d3a75fc4881281127d205580231

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

@@ -6,7 +6,7 @@ module FroalaEditorSDK
   class File
 
     # Default options that are used if no options are passed to the upload function
-    @@default_options = {
+    @default_options = {
         fieldname: 'file',
         validation: {
             allowedExts: [".txt", ".pdf", ".doc", ".json", ".html"],
@@ -16,7 +16,7 @@ module FroalaEditorSDK
     }
 
     # Default upload path.
-    @@default_upload_path = "public/uploads/files"
+    @default_upload_path = "public/uploads/files"
 
     # Uploads a file to the server.
     # Params:
@@ -24,10 +24,10 @@ module FroalaEditorSDK
     # +upload_path+:: Server upload path, a storage path where the file will be stored.
     # +options+:: Hash object that contains configuration parameters for uploading a file.
     # Returns json object
-    def self.upload(params, upload_path = @@default_upload_path, options = {})
+    def self.upload(params, upload_path = @default_upload_path, options = {})
 
       # Merge options.
-      options = @@default_options.merge(options)
+      options = @default_options.merge(options)
 
       file = params[options[:fieldname]]
 
@@ -97,5 +97,13 @@ module FroalaEditorSDK
       image.path
       image.resize("#{options[:resize][:height]}x#{options[:resize][:width]}")
     end
+
+    class << self
+      attr_reader :var
+    end
+
+    def var
+      self.class.var
+    end
   end
 end

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

@@ -3,7 +3,7 @@ module FroalaEditorSDK
   class Image < File
 
     # Default options that are used if no options are passed to the upload function.
-    @@default_options = {
+    @default_options = {
         fieldname: 'file',
         validation: {
             allowedExts: [".gif", ".jpeg", ".jpg", ".png", ".svg", ".blob"],
@@ -13,7 +13,7 @@ module FroalaEditorSDK
     }
 
     # Default upload path.
-    @@default_upload_path = "public/uploads/images"
+    @default_upload_path = "public/uploads/images"
 
     # Loads the images from a specific path
     # Params:

data/lib/froala-editor-sdk/utils/validation.rb

@@ -22,7 +22,12 @@ module FroalaEditorSDK
 
       mime = file.content_type
       ext = ::File.extname(file.original_filename)
-      if ext(ext, options) && mime(mime, options)
+
+      # Check if there is custom validation.
+      if options[:validation].class != Proc
+        ext(ext, options) && mime(mime, options)
+      else
+        options[:validation].call(file.path, mime)
       end
     end
 

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

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

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

@@ -4,7 +4,7 @@ module FroalaEditorSDK
   class Video < File
 
     # Default options that are used if no options are passed to the upload function
-    @@default_options = {
+    @default_options = {
         fieldname: 'file',
         validation: {
             allowedExts: [".mp4", ".webm", ".ogg"],
@@ -14,6 +14,6 @@ module FroalaEditorSDK
     }
 
     # Default upload path.
-    @@default_upload_path = "public/uploads/videos"
+    @default_upload_path = "public/uploads/videos"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: froala-editor-sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Froala Labs