uploadcare-rails 1.0.6 → 1.1.0

data/lib/uploadcare/rails/engine.rb

@@ -1,13 +1,13 @@
-require "rails/engine"
-require "uploadcare/rails/settings"
+require 'rails/engine'
+require 'uploadcare/rails/settings'
 
 module Uploadcare
   module Rails
     class Engine < ::Rails::Engine
       initializer 'uploadcare-rails.load' do
         # load actual rails extentions
-        
         # active record extention for stand-alone file models and models has files
+
         ActiveSupport.on_load :active_record do
           require 'uploadcare/rails/active_record/has_file'
           require 'uploadcare/rails/active_record/has_group'

data/lib/uploadcare/rails/formtastic/formtastic.rb

@@ -1,9 +1,9 @@
 module Uploadcare::Rails::Formtastic
   class UploadcareInput < Formtastic::Inputs::HiddenInput
     include Uploadcare::Rails::ActionView::UploaderTags
-    
+
     def role
-      "#{@options[:role]}".strip
+      @options[:role].strip
     end
 
     def input_html_options
@@ -11,12 +11,14 @@ module Uploadcare::Rails::Formtastic
       super.merge role: role, data: @options[:data]
     end
 
-    def is_file?
-      @builder.object.try("has_#{@attribute}_as_uploadcare_file?".to_sym) && !@builder.object.try("has_#{@attribute}_as_uploadcare_group?".to_sym)
+    def file?
+      @builder.object.try("has_#{ @attribute }_as_uploadcare_file?".to_sym) &&
+        !@builder.object.try("has_#{ @attribute }_as_uploadcare_group?".to_sym)
     end
 
-    def is_group?
-      @builder.object.try("has_#{@attribute}_as_uploadcare_file?".to_sym) && !@builder.object.try("has_#{@attribute}_as_uploadcare_group?".to_sym)
+    def group?
+      @builder.object.try("has_#{ @attribute }_as_uploadcare_file?".to_sym) &&
+        !@builder.object.try("has_#{ @attribute }_as_uploadcare_group?".to_sym)
     end
   end
 
@@ -24,22 +26,24 @@ module Uploadcare::Rails::Formtastic
     def input
       @options ||= {}
       @options[:uploadcare] ||= {}
-      if is_file?
-        @options[:uploadcare][:multiple] = false
-      elsif is_group?
-        @options[:uploadcare][:multiple] = true
-      end
+
+      @options[:uploadcare][:multiple] =
+        if file?
+          false
+        elsif group?
+          true
+        end
       super
     end
   end
 
-  class UploadcareSingleUploaderInput < Uploadcare::Rails::Formtastic::UploadcareInput 
+  class UploadcareSingleUploaderInput < Uploadcare::Rails::Formtastic::UploadcareInput
     def input
       @options ||= {}
       @options[:uploadcare] ||= {}
       @options[:uploadcare][:multiple] = false
       super
-    end   
+    end
   end
 
   class UploadcareMultipleUploaderInput < Uploadcare::Rails::Formtastic::UploadcareInput
@@ -48,8 +52,8 @@ module Uploadcare::Rails::Formtastic
       @options[:uploadcare] ||= {}
       @options[:uploadcare][:multiple] = true
       super
-    end 
+    end
   end
 end
 
-Formtastic::Inputs.send :include, Uploadcare::Rails::Formtastic
+Formtastic::Inputs.send :include, Uploadcare::Rails::Formtastic

data/lib/uploadcare/rails/objects/file.rb

@@ -1,37 +1,25 @@
 module Uploadcare
   module Rails
     class File < Uploadcare::Api::File
-
-      # override default to string method
-      # instead of string representation of object it will return simple cdn url of a file
-      def to_s
-        cdn_url
+      def url(operations = nil)
+        cdn_url unless operations
+        cdn_url + prepared_operations(operations)
       end
 
-      # construct image tag for file
-      def image with_operations=true, options={}
-        if with_operations
-          url = cdn_url_with_operations
-        else
-          url = cdn_url
-        end
-        
-        image_tag url, options
+      def prepared_operations(operations)
+        Uploadcare::Rails::Operations.new(operations).to_s
       end
 
-      def load_data
-        super
-        ::Rails.cache.write(cdn_url, self.marshal_dump) if UPLOADCARE_SETTINGS.cache_files
-        self
+      # construct image tag for file
+      def image(operations = nil)
+        image_tag(url(operations))
       end
-      alias_method :load, :load_data
 
-      def load_data!
-        super
-        ::Rails.cache.write(cdn_url, self.marshal_dump) if UPLOADCARE_SETTINGS.cache_files
-        self
+      # override default to string method
+      # instead of string representation of object it will return simple cdn url of a file
+      def to_s
+        cdn_url
       end
-      alias_method :load!, :load_data!
 
       def to_builder
         marshal_dump
@@ -41,7 +29,7 @@ module Uploadcare
         marshal_dump
       end
 
-      def as_json options={}
+      def as_json(_options = {})
         marshal_dump
       end
 

data/lib/uploadcare/rails/objects/group.rb

@@ -2,35 +2,50 @@ module Uploadcare
   module Rails
     class Group < Uploadcare::Api::Group
 
-      # override default to string method
-      # for group we just will return the uuid
-      def to_s
-        uuid
+      # warkaround to build images urls without API request
+      # builds array of image urls including operations
+      def urls(operations = nil)
+        (0..files_count.to_i - 1).to_a.map do |i|
+          [
+            @api.options[:static_url_base],
+            uuid,
+            'nth',
+            i,
+            Operations.new(operations).to_s
+          ].join('/')
+        end
       end
 
       def load_data
-        unless is_loaded?
-          load_data!
-        end
+        load_data! unless is_loaded?
         self
       end
+
       alias_method :load, :load_data
 
       def load_data!
-        data = @api.get "/groups/#{uuid}/"
-        set_data data
-        ::Rails.cache.write(cdn_url, self.marshal_dump) if UPLOADCARE_SETTINGS.cache_groups
+        set_data(@api.get("/groups/#{ uuid }/"))
+        cache_data
         self
       end
+
       alias_method :load!, :load_data!
 
+      def cache_data
+        return unless UPLOADCARE_SETTINGS.cache_groups
+        ::Rails.cache.write(cdn_url, marshal_dump)
+        self
+      end
+
       def marshal_dump
         table = @table.deep_dup.stringify_keys!
-        if table["files"]
-          table["files"].map! do |file|
+
+        if table['files']
+          table['files'].map! do |file|
             file.marshal_dump.stringify_keys
           end
         end
+
         table
       end
 
@@ -38,22 +53,30 @@ module Uploadcare
         marshal_dump
       end
 
-      def as_json options={}
+      def as_json(_options = {})
         marshal_dump
       end
 
+      # override default to string method
+      # for group we just will return the uuid
+      def to_s
+        uuid
+      end
+
       private
-        def map_files data
-          data.stringify_keys!
-          data["files"].map! do |file|
-            unless file.nil?
-              Uploadcare::Rails::File.new(@api, file["uuid"], file)
-            else
-              file
-            end
+
+      def map_files(data)
+        data.stringify_keys!
+        data['files'].map! do |file|
+          if file.nil?
+            file
+          else
+            Uploadcare::Rails::File.new(@api, file['uuid'], file)
           end
-          data
         end
+
+        data
+      end
     end
   end
 end

data/lib/uploadcare/rails/operations.rb

@@ -0,0 +1,57 @@
+module Uploadcare
+  module Rails
+    class Operations
+      def initialize(operations = nil)
+        @operations = operations
+      end
+
+      def to_s
+        return '' unless @operations
+
+        result = @operations.map do |operation, options|
+          next unless respond_to?(operation)
+          send(operation, options)
+        end
+
+        ['-/', result.join('/-/'), '/'].
+          join.
+          gsub(%r{\/+}, '/').
+          to_s
+      end
+
+      def format(options)
+        return unless %w(png jpeg).include?(options.to_s)
+        "format/#{ options }"
+      end
+
+      def progressive(options)
+        return unless %w(yes no).include?(options.to_s)
+        "progressive/#{ options }"
+      end
+
+      def quality(options)
+        available_options = %w(normal better best lighter lightest)
+        return unless available_options.include?(options.to_s)
+        "quality/#{ options }"
+      end
+
+      def preview(options)
+        if option = options[/^\d+x\d+$/]
+          "preview/#{ option }"
+        end
+      end
+
+      def resize(options)
+        if option = options[/^(\d+x\d+)$|^(\d+x)$|^(x\d+)$/]
+          "resize/#{ option }"
+        end
+      end
+
+      alias_method :size, :resize
+
+      def inline(options)
+        options
+      end
+    end
+  end
+end

data/lib/uploadcare/rails/settings.rb

@@ -1,24 +1,25 @@
-require "ostruct"
+require 'ostruct'
 
 module Uploadcare
   module Rails
     class Settings < OpenStruct
-      include ActiveModel::Validations
+      include ::ActiveModel::Validations
 
       # note that i did not include pub and private key even for demo
       # point here to store them in one place and one place only
 
       # settings validation (hey, why not? we already have all rails stack loaded :)
       # so just use the godnes of rails magic and praise the lord!
-      validates :public_key, :presence => true
-      validates :private_key, :presence => true
+      validates :public_key, presence: true
+      validates :private_key, presence: true
 
       # TODO: ALL the keys god damn it
-      PUBLIC_ALLOWED_KEYS = [:public_key,
+      PUBLIC_ALLOWED_KEYS = [
+        :public_key,
         :locale,
-        :images_only,
+        :images_only ,
         :multiple,
-        :multiple_min,
+        :multiple_min ,
         :multiple_max,
         :preview_step,
         :crop,
@@ -30,57 +31,52 @@ module Uploadcare
         :path_value
       ]
 
-      def initialize config
+
+      def initialize(config)
         # extract envaroments settings
-        settings = config["#{::Rails.env}"]
-        raise ArgumentError.new "config is empty or not given at all" unless settings.present?
+        settings = config[::Rails.env]
+        unless settings.present?
+          raise ArgumentError, 'config is empty or not given at all'
+        end
 
         # build settings object (basicly openstruct)
         # merge defaults with actual settings
 
         # strip defaults suplied by uploadcare-ruby gem from private/pub key
-        uc_defaults = Uploadcare::DEFAULT_SETTINGS.except!(:public_key, :private_key)
+        uc_defaults =
+          Uploadcare::DEFAULT_SETTINGS.except!(:public_key, :private_key)
+
         defaults = Uploadcare::Rails::DEFAULT_SETTINGS.merge!(uc_defaults)
         settings = defaults.merge!(settings)
         super settings
 
         # validates settings atributes.
         unless valid?
-          raise ArgumentError.new "Private or public key options was not provided"
+          raise ArgumentError, 'Private or public key options were not provided'
         end
       end
 
-
       def api_settings
         @api_settings ||= build_api_settings
       end
 
-
       def widget_settings
         @widget_settings ||= build_widget_settings
       end
 
-      def build_widget_settings
-        settings = marshal_dump.slice(*PUBLIC_ALLOWED_KEYS)
-      end
-      private :build_widget_settings
-
-
-      def build_api_settings
-        marshal_dump
+      def api
+        @api ||= Uploadcare::Api.new(api_settings)
       end
-      private :build_api_settings
 
+      private
 
-      def api
-        @api ||= build_api
+      def build_widget_settings
+        marshal_dump.slice(*PUBLIC_ALLOWED_KEYS)
       end
 
-
-      def build_api
-        Uploadcare::Api.new api_settings
+      def build_api_settings
+        marshal_dump
       end
-      private :build_api
     end
   end
-end
+end

data/lib/uploadcare/rails/simple_form/simple_form.rb

@@ -2,60 +2,62 @@ module Uploadcare::Rails::SimpleForm
   class UploadcareInput < SimpleForm::Inputs::HiddenInput
     include Uploadcare::Rails::ActionView::UploaderTags
 
-    def input wrapper_options=nil
+    def input(wrapper_options = nil)
       @options = uploadcare_uploader_options(@options)
       super
     end
 
     def role
-      "#{@input_html_options[:role]} uploadcare-uploader".strip
+      "#{ @input_html_options[:role] } uploadcare-uploader".strip
     end
 
     def input_html_options
       @input_html_options.merge role: role, data: @options[:data]
     end
 
-    def is_file?
-      @builder.object.try("has_#{@attribute}_as_uploadcare_file?".to_sym) && !@builder.object.try("has_#{@attribute}_as_uploadcare_group?".to_sym)
+    def file?
+      @builder.object.try("has_#{ @attribute }_as_uploadcare_file?".to_sym) &&
+        !@builder.object.try("has_#{ @attribute }_as_uploadcare_group?".to_sym)
     end
 
-    def is_group?
-      @builder.object.try("has_#{@attribute}_as_uploadcare_file?".to_sym) && !@builder.object.try("has_#{@attribute}_as_uploadcare_group?".to_sym)
+    def group?
+      @builder.object.try("has_#{ @attribute }_as_uploadcare_file?".to_sym) &&
+        !@builder.object.try("has_#{ @attribute }_as_uploadcare_group?".to_sym)
     end
   end
 
-
-
   class UploadcareUploaderInput < Uploadcare::Rails::SimpleForm::UploadcareInput
-    def input wrapper_options=nil
+    def input(wrapper_options = nil)
       @options ||= {}
       @options[:uploadcare] ||= {}
-      if is_file?
-        @options[:uploadcare][:multiple] = false
-      elsif is_group?
-        @options[:uploadcare][:multiple] = true
-      end
+
+      @options[:uploadcare][:multiple] =
+        if file?
+          false
+        elsif group?
+          true
+        end
       super
     end
   end
 
-  class UploadcareSingleUploaderInput < Uploadcare::Rails::SimpleForm::UploadcareInput 
-    def input wrapper_options=nil
+  class UploadcareSingleUploaderInput < Uploadcare::Rails::SimpleForm::UploadcareInput
+    def input(wrapper_options = nil)
       @options ||= {}
       @options[:uploadcare] ||= {}
       @options[:uploadcare][:multiple] = false
       super
-    end   
+    end
   end
 
   class UploadcareMultipleUploaderInput < Uploadcare::Rails::SimpleForm::UploadcareInput
-    def input wrapper_options=nil
+    def input(wrapper_options = nil)
       @options ||= {}
       @options[:uploadcare] ||= {}
       @options[:uploadcare][:multiple] = true
       super
-    end 
+    end
   end
 end
 
-SimpleForm::Inputs.send :include, Uploadcare::Rails::SimpleForm
+SimpleForm::Inputs.send :include, Uploadcare::Rails::SimpleForm