lib/uploadcare/rails/settings.rb in uploadcare-rails-1.0.6 vs lib/uploadcare/rails/settings.rb in uploadcare-rails-1.1.0

@@ -1,26 +1,27 @@
-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,
         :clearable,
         :tabs,
@@ -28,59 +29,54 @@
         :live,
         :manual_start,
         :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)
+      def api
+        @api ||= Uploadcare::Api.new(api_settings)
       end
-      private :build_widget_settings
 
+      private
 
+      def build_widget_settings
+        marshal_dump.slice(*PUBLIC_ALLOWED_KEYS)
+      end
+
       def build_api_settings
         marshal_dump
       end
-      private :build_api_settings
-
-
-      def api
-        @api ||= build_api
-      end
-
-
-      def build_api
-        Uploadcare::Api.new api_settings
-      end
-      private :build_api
     end
   end
-end
\ No newline at end of file
+end