uploadcare-rails 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df036376b117b7bda8813588aa8d53d61218c6ae
-  data.tar.gz: 7157e8cd38f96ed1b565416e9fa80c4e4834c26f
+  metadata.gz: 0113e45365a82f1af9474db0a516cae93dc19513
+  data.tar.gz: 4fe03ac56616d9adcff45499832871d206f1d23d
 SHA512:
-  metadata.gz: 614bddb524b00e2c66d8894e8a7e6542c6bd8b00459c904ec59ffb5f9d6d1cca7336c0ed3796afd2bfc4a68b493bf99c08d2c2ee8b6298f29fb1babe8acec8be
-  data.tar.gz: 4c3fbe5876596477b91a9c36cc9972686304e4bf854ed0180e614633e88167892659df41d23bea6064a826969a527f03745594456aae922b66df99a7fb4d17a7
+  metadata.gz: 9a112c863d5016ae1d7b191e64cb2a8b0a0c3d86cbac74a18a04abf95e8dbfe37afd30fec8676a39c4afc84622a6aa2d98ff66178ce423d1616c9e473523716f
+  data.tar.gz: de5e0f0f18f2e5ee4f8325bd8e80b368dcce7e7ac899d99fbd08708476005a93618892448bda5aa0dfddbf8c55e9d83506826c5f643d5793766720d589d02eaa

data/config/initializers/uploadcare.rb

@@ -1,27 +1,26 @@
-config_file = "#{Rails.root}/config/uploadcare.yml"
+config_file = Rails.root.join('config', 'uploadcare.yml')
 
-if File.exists?(config_file)
-  # defaults = YAML.load_file(defaults_file)
-  config = YAML.load(ERB.new(File.new(config_file).read).result)
-  UPLOADCARE_SETTINGS = Uploadcare::Rails::Settings.new config
-else
-  # output warning in red color
-  # use default settings just to boot up
-  puts <<-eos
-    \e[31mWarning: no uploadcare.yml config file found.\e[0m
-    \e[31mwhile we will use default settings please run\e[0m
-      \e[36mrails g uploadcare_config\e[0m
-    \e[31mto set up config file.\e[0m
-  eos
+config =
+  if File.exist?(config_file)
+    YAML.load(ERB.new(File.new(config_file).read).result)
+  else
+    # output warning in red color
+    # use default settings just to boot up
+    puts <<-eos
+      \e[31mWarning: no uploadcare.yml config file found.\e[0m
+      \e[31mwhile we will use default settings please run\e[0m
+        \e[36mrails g uploadcare_config\e[0m
+      \e[31mto set up config file.\e[0m
+    eos
 
-  config = {
-    "defaults"    => {"public_key"=>"demopublickey", "private_key"=>"demoprivatekey"},
-    "development" => {"public_key"=>"demopublickey", "private_key"=>"demoprivatekey"},
-    "test"        => {"public_key"=>"demopublickey", "private_key"=>"demoprivatekey"},
-    "production"  => {"public_key"=>"demopublickey", "private_key"=>"demoprivatekey"}
-  }
-  UPLOADCARE_SETTINGS = Uploadcare::Rails::Settings.new config
-end
+    {
+      defaults:    { public_key: :demopublickey, private_key: :demoprivatekey },
+      development: { public_key: :demopublickey, private_key: :demoprivatekey },
+      test:        { public_key: :demopublickey, private_key: :demoprivatekey },
+      production:  { public_key: :demopublickey, private_key: :demoprivatekey }
+    }
+  end
 
+UPLOADCARE_SETTINGS = Uploadcare::Rails::Settings.new(config)
 # shortcut for later usage
-Rails.application.config.uploadcare = UPLOADCARE_SETTINGS
+Rails.application.config.uploadcare = UPLOADCARE_SETTINGS

data/lib/uploadcare-rails.rb

@@ -1,11 +1,12 @@
-require "uploadcare/rails/engine"
-require "uploadcare/rails/settings"
-require "uploadcare"
+require 'uploadcare/rails/engine'
+require 'uploadcare/rails/settings'
+require 'uploadcare/rails/operations'
+require 'uploadcare'
 
 module Uploadcare
   module Rails
     DEFAULT_SETTINGS = {
-      widget_version: "1.5.5"
+      widget_version: '2.9.0'
     }
   end
-end
+end

data/lib/uploadcare/rails/action_view/include_tags.rb

@@ -1,38 +1,47 @@
 module Uploadcare::Rails::ActionView
   module IncludeTags
-    def include_uploadcare_widget_from_cdn options={}
-      settings = {
-        min: true,
-        version: UPLOADCARE_SETTINGS.widget_version
-      }
-
-      settings.merge!(options)
-
-      v = settings[:version]
-      m = settings[:min] ? ".min" : ""
-      url = "https://ucarecdn.com/widget/#{v}/uploadcare/uploadcare-#{v}#{m}.js"
-    
-      javascript_include_tag(url)
+    def include_uploadcare_widget_from_cdn(options = {})
+      settings =
+        {
+          min: true,
+          version: UPLOADCARE_SETTINGS.widget_version
+        }.merge!(options)
+
+      minified = settings[:min] ? 'min' : nil
+
+      path =
+        [
+          'widget',
+          settings[:version],
+          'uploadcare',
+          ['uploadcare', minified, 'js'].compact.join('.')
+        ].join('/')
+
+      url = URI::HTTPS.
+        build(host: 'ucarecdn.com', path: '/' + path, scheme: :https)
+
+      javascript_include_tag(url.to_s)
     end
+
     alias_method :inlude_uploadcare_widget, :include_uploadcare_widget_from_cdn
     alias_method :uplodacare_widget, :include_uploadcare_widget_from_cdn
-    
-    
-    def uploadcare_settings options={}
-      settings = UPLOADCARE_SETTINGS.widget_settings
-      settings.merge!(options)
-      js_settings = String.new
+
+    def uploadcare_settings(options = {})
+      settings = UPLOADCARE_SETTINGS.widget_settings.merge!(options)
+
+      js_settings = ''
       settings.each do |k, v|
-        if v.is_a?(TrueClass) || v.is_a?(FalseClass)
-          js_settings << "UPLOADCARE_#{k.to_s.underscore.upcase} = #{v};\n"
-        else
-          js_settings << "UPLOADCARE_#{k.to_s.underscore.upcase} = \"#{v}\";\n"
-        end
+        js_settings <<
+          if v.is_a?(TrueClass) || v.is_a?(FalseClass)
+            "UPLOADCARE_#{ k.to_s.underscore.upcase } = #{ v };\n"
+          else
+            "UPLOADCARE_#{ k.to_s.underscore.upcase } = \"#{ v }\";\n"
+          end
       end
 
-      uc_settings = javascript_tag(js_settings)
+      javascript_tag(js_settings)
     end
   end
 end
 
-ActionView::Base.send :include, Uploadcare::Rails::ActionView::IncludeTags
+ActionView::Base.send :include, Uploadcare::Rails::ActionView::IncludeTags

data/lib/uploadcare/rails/action_view/uploader_tags.rb

@@ -2,55 +2,54 @@
 
 module Uploadcare::Rails::ActionView
   module UploaderTags
-    def uploadcare_uploader_options options
-      options = options.symbolize_keys.deep_merge({
-        :role => "uploadcare-uploader #{options[:role]}".strip,
-        :data => {:path_value => true}
-      })
-      
+    def uploadcare_uploader_options(options)
+      options = options.symbolize_keys.deep_merge(
+        role: "uploadcare-uploader #{ options[:role] }".strip,
+        data: { path_value: true }
+      )
+
       # merge uploadcare options into data-attributes
       # IMPORTANT: custome data-attrs will be overriden by
       # the uploadcare options in case of collision.
-      if options[:uploadcare]
-        # options[:uploadcare] ||= {}
-        options[:data] = options[:data].merge!(options[:uploadcare])
-        options.tap {|options| options.delete(:uploadcare)}
-      else
-        options
-      end
+      return options unless options[:uploadcare]
+
+      options[:data] = options[:data].merge!(options[:uploadcare])
+      options.except(:uploadcare)
     end
 
-    def uploadcare_uploader_tag name, options = {}
-      options = uploadcare_uploader_options(options)
-      hidden_field_tag(name, nil, options)
+    def uploadcare_uploader_tag(name, options = {})
+      hidden_field_tag(name, nil, uploadcare_uploader_options(options))
     end
 
-    def uploadcare_uploader_field object_name, method, options = {}
-      options = uploadcare_uploader_options(options)
-      hidden_field(object_name, method, options)
+    def uploadcare_uploader_field(object_name, method, options = {})
+      hidden_field(object_name, method, uploadcare_uploader_options(options))
     end
 
-    def self.included(arg)
-      ActionView::Helpers::FormBuilder.send(:include, Uploadcare::Rails::ActionView::FormBuilder)
+    def self.included(_)
+      ActionView::Helpers::FormBuilder.
+        send(:include, Uploadcare::Rails::ActionView::FormBuilder)
     end
   end
 
   module FormBuilder
     # call uploadcare_uploader field for form object
     # none of options will be overriden and given as-is
-    def uploadcare_uploader method, options={}
-      @template.uploadcare_uploader_field(@object_name, method, objectify_options(options))
+    def uploadcare_uploader(method, options = {})
+      @template.
+        uploadcare_uploader_field(
+          @object_name, method, objectify_options(options)
+        )
     end
 
     # forse-set the data-multiple="false" for uploader
-    def uploadcare_single_uploader_field method, options={}
+    def uploadcare_single_uploader_field(method, options = {})
       options[:uploadcare] ||= {}
       options[:uploadcare][:multiple] = false
       uploadcare_uploader(method, options)
     end
 
     # forse-set the data-multiple="true" for uploader
-    def uploadcare_multiple_uploader_field method, options={}
+    def uploadcare_multiple_uploader_field(method, options = {})
       options[:uploadcare] ||= {}
       options[:uploadcare][:multiple] = true
       uploadcare_uploader(method, options)
@@ -60,10 +59,12 @@ module Uploadcare::Rails::ActionView
     # and then choose either multiple or single-file upload.
     # not that this method WILL override custom settings in order
     # to prevent method collisions
-    def uploadcare_field method, options={}
-      if @object.try("has_#{method}_as_uploadcare_file?".to_sym) && !@object.try("has_#{method}_as_uploadcare_group?".to_sym)
+    def uploadcare_field(method, options = {})
+      if @object.try("has_#{ method }_as_uploadcare_file?".to_sym) &&
+          !@object.try("has_#{ method }_as_uploadcare_group?".to_sym)
         uploadcare_single_uploader_field(method, options)
-      elsif !@object.try("has_#{method}_as_uploadcare_file?".to_sym) && @object.try("has_#{method}_as_uploadcare_group?".to_sym)
+      elsif !@object.try("has_#{ method }_as_uploadcare_file?".to_sym) &&
+          @object.try("has_#{ method }_as_uploadcare_group?".to_sym)
         uploadcare_multiple_uploader_field(method, options)
       else
         uploadcare_uploader(method, options)
@@ -71,4 +72,5 @@ module Uploadcare::Rails::ActionView
     end
   end
 end
-ActionView::Base.send :include, Uploadcare::Rails::ActionView::UploaderTags
+
+ActionView::Base.send :include, Uploadcare::Rails::ActionView::UploaderTags

data/lib/uploadcare/rails/active_record/has_file.rb

@@ -3,7 +3,7 @@ require "uploadcare/rails/objects/file"
 module Uploadcare
   module Rails
     module ActiveRecord
-      def has_uploadcare_file attribute, options={}
+      def has_uploadcare_file(attribute, options={})
 
         define_method "has_#{attribute}_as_uploadcare_file?" do
           true
@@ -13,65 +13,53 @@ module Uploadcare
           false
         end
 
-        define_method "build_file" do
+        define_method 'build_file' do
           cdn_url = attributes[attribute.to_s].to_s
           return nil if cdn_url.empty?
 
           api = ::Rails.application.config.uploadcare.api
           cache = ::Rails.cache
 
-          if file_obj = cache.read(cdn_url)
-            file = Uploadcare::Rails::File.new api, cdn_url, file_obj
+          if file_obj ||= cache.read(cdn_url)
+            Uploadcare::Rails::File.new(api, cdn_url, file_obj)
           else
-            file = Uploadcare::Rails::File.new api, cdn_url
+            Uploadcare::Rails::File.new(api, cdn_url)
           end
-
-          file
         end
 
         # attribute method - return file object
         # it is not the ::File but ::Rails::File
         # it has some helpers for rails enviroment
         # but it also has all the methods of Uploadcare::File so no worries.
-        define_method "#{attribute}" do
-          # cdn_url = attributes[attribute.to_s].to_s
-
-          # return nil if cdn_url.empty?
-
-          # api = Rails.application.config.uploadcare
-          # cache = ::Rails.cache
-
-          # if file_obj = cache.read(cdn_url)
-          #   file = Uploadcare::Rails::File.new api, cdn_url, file_obj
-          # else
-          #   file = Uploadcare::Rails::File.new api, cdn_url
-          # end
+        define_method "#{ attribute }" do
           build_file
         end
 
-        define_method "check_#{attribute}_for_uuid" do
-          url = self.attributes[attribute.to_s]
+        define_method "check_#{ attribute }_for_uuid" do
+          url = attributes[attribute.to_s]
           if url.present?
             result = Uploadcare::Parser.parse(url)
-            raise "Invalid Uploadcare file uuid" unless result.is_a?(Uploadcare::Parser::File)
+            raise 'Invalid Uploadcare file uuid' unless result.is_a?(Uploadcare::Parser::File)
           end
         end
 
-        define_method "store_#{attribute}" do
+        define_method "store_#{ attribute }" do
           file = build_file
 
+          return unless file
+
           begin
             file.store
             ::Rails.cache.write(file.cdn_url, file.marshal_dump) if UPLOADCARE_SETTINGS.cache_files
           rescue Exception => e
-            logger.error "\nError while saving a file #{cdn_url}: #{e.class} (#{e.message}):"
+            logger.error "\nError while saving a file #{file.cdn_url}: #{e.class} (#{e.message}):"
             logger.error "#{::Rails.backtrace_cleaner.clean(e.backtrace).join("\n ")}"
           end
 
           file
         end
 
-        define_method "delete_#{attribute}" do
+        define_method "delete_#{ attribute }" do
           file = build_file
 
           begin

data/lib/uploadcare/rails/active_record/has_group.rb

@@ -1,48 +1,49 @@
-require "uploadcare/rails/objects/group"
+require 'uploadcare/rails/objects/group'
 
 module Uploadcare
   module Rails
     module ActiveRecord
-      def has_uploadcare_group attribute, options={}
-
-        define_method "has_#{attribute}_as_uploadcare_file?" do
+      def has_uploadcare_group(attribute, options = {})
+        define_method "has_#{ attribute }_as_uploadcare_file?" do
           false
         end
 
-        define_method "has_#{attribute}_as_uploadcare_group?" do
+        define_method "has_#{ attribute }_as_uploadcare_group?" do
           true
         end
 
-        define_method "build_group" do
+        define_method 'build_group' do
           cdn_url = attributes[attribute.to_s].to_s
           return nil if cdn_url.empty?
-          
+
           api = ::Rails.application.config.uploadcare.api
           cache = ::Rails.cache
 
           if group_obj = cache.read(cdn_url)
-            file = Uploadcare::Rails::Group.new api, cdn_url, group_obj
+            Uploadcare::Rails::Group.new(api, cdn_url, group_obj)
           else
-            file = Uploadcare::Rails::Group.new api, cdn_url
+            Uploadcare::Rails::Group.new(api, cdn_url)
           end
-
-          file
         end
 
         # attribute method - return file object
-        define_method "#{attribute}" do
+        define_method "#{ attribute }" do
           build_group
         end
 
-        define_method "check_#{attribute}_for_uuid" do
-          url = self.attributes[attribute.to_s]
-          unless url.empty?
+        define_method "check_#{ attribute }_for_uuid" do
+          url = attributes[attribute.to_s]
+
+          unless url.blank?
             result = Uploadcare::Parser.parse(url)
-            raise "Invalid group uuid" unless result.is_a?(Uploadcare::Parser::Group)
+
+            unless result.is_a?(Uploadcare::Parser::Group)
+              raise 'Invalid group uuid'
+            end
           end
         end
 
-        define_method "store_#{attribute}" do
+        define_method "store_#{ attribute }" do
           group = build_group
           return unless group.present?
 
@@ -50,12 +51,12 @@ module Uploadcare
             group.store
             ::Rails.cache.write(group.cdn_url, group.marshal_dump) if UPLOADCARE_SETTINGS.cache_groups
           rescue Exception => e
-            logger.error "\nError while storing a group #{group.cdn_url}: #{e.class} (#{e.message}):"
+            logger.error "\nError while storing a group #{ group.cdn_url }: #{ e.class } (#{e.message }):"
             logger.error "#{::Rails.backtrace_cleaner.clean(e.backtrace).join("\n ")}"
           end
         end
 
-        define_method "delete_#{attribute}" do
+        define_method "delete_#{ attribute }" do
           group = build_group
 
           begin
@@ -70,11 +71,11 @@ module Uploadcare
         # before saving we checking what it is a actually file cdn url
         # or uuid. uuid will do.
         # group url or uuid should raise an erorr
-        before_save "check_#{attribute}_for_uuid"
+        before_save "check_#{ attribute }_for_uuid"
 
-        after_save "store_#{attribute}" if UPLOADCARE_SETTINGS.store_after_save
+        after_save "store_#{ attribute }" if UPLOADCARE_SETTINGS.store_after_save
 
-        after_destroy "delete_#{attribute}" if UPLOADCARE_SETTINGS.delete_after_destroy
+        after_destroy "delete_#{ attribute }" if UPLOADCARE_SETTINGS.delete_after_destroy
       end
     end
   end

data/lib/uploadcare/rails/active_record/has_object.rb

@@ -1,10 +1,9 @@
 module Uploadcare
   module Rails
     module ActiveRecord
-
-      # has_object :file, :uc_file as example
-      def has_object type, attribute
+      # has_object(:file, :uc_file) as example
+      def has_object(type, attribute)
       end
     end
   end
-end
+end