acfs 1.0.0.dev.1.b305 → 1.0.0

data/lib/acfs/resource/attributes/float.rb

@@ -1,5 +1,4 @@
 module Acfs::Resource::Attributes
-
   # @api public
   #
   # Float attribute type. Use it in your model as an attribute type:
@@ -10,16 +9,23 @@ module Acfs::Resource::Attributes
   #   end
   #
   class Float < Base
-
     # @api public
     #
     # Cast given object to float.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [Float] Casted object as float.
     #
-    def cast_type(obj)
-      Float obj
+    def cast_value(value)
+      return 0.0 if value.blank?
+
+      case value
+        when ::Float then value
+        when "Infinity" then ::Float::INFINITY
+        when "-Infinity" then -::Float::INFINITY
+        when "NaN" then ::Float::NAN
+        else Float(value)
+      end
     end
   end
 end

data/lib/acfs/resource/attributes/integer.rb

@@ -1,5 +1,4 @@
 module Acfs::Resource::Attributes
-
   # @api public
   #
   # Integer attribute type. Use it in your model as an attribute type:
@@ -10,16 +9,19 @@ module Acfs::Resource::Attributes
   #   end
   #
   class Integer < Base
-
     # @api public
     #
     # Cast given object to integer.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [Fixnum] Casted object as fixnum.
     #
-    def cast_type(obj)
-      Integer obj
+    def cast_value(value)
+      if value.blank?
+        0
+      else
+        Integer(value)
+      end
     end
   end
 end

data/lib/acfs/resource/attributes/list.rb

@@ -1,5 +1,4 @@
 module Acfs::Resource::Attributes
-
   # @api public
   #
   # List attribute type. Use it in your model as an attribute type:
@@ -10,18 +9,26 @@ module Acfs::Resource::Attributes
   #   end
   #
   class List < Base
-
     # @api public
     #
     # Cast given object to a list.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [Fixnum] Casted object as list.
     # @raise [TypeError] If object cannot be casted to a list.
     #
-    def cast_type(obj)
-      return obj.to_a if obj.respond_to? :to_a
-      raise TypeError.new "Cannot cast #{obj.inspect} to array."
+    def cast_value(value)
+      return [] if value.blank?
+
+      if value.is_a?(::Array)
+        value
+      elsif value.respond_to?(:to_ary)
+        value.to_ary
+      elsif value.respond_to?(:to_a)
+        value.to_a
+      else
+        Array(value)
+      end
     end
   end
 end

data/lib/acfs/resource/attributes/string.rb

@@ -1,5 +1,4 @@
 module Acfs::Resource::Attributes
-
   # @api public
   #
   # String attribute type. Use it in your model as
@@ -11,16 +10,15 @@ module Acfs::Resource::Attributes
   #   end
   #
   class String < Base
-
     # @api public
     #
     # Cast given object to string.
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [String] Casted string.
     #
-    def cast_type(obj)
-      obj.to_s
+    def cast_value(value)
+      value.to_s
     end
   end
 end

data/lib/acfs/resource/attributes/uuid.rb

@@ -1,5 +1,4 @@
 module Acfs::Resource::Attributes
-
   # @api public
   #
   # UUID attribute type. Use it in your model as an attribute type:
@@ -10,9 +9,8 @@ module Acfs::Resource::Attributes
   #   end
   #
   class UUID < Base
-
     #
-    REGEXP = /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/i
+    UUID_REGEXP = /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/i
 
     # @api public
     #
@@ -30,23 +28,16 @@ module Acfs::Resource::Attributes
     #   |     4 | 4      |
     #   |     5 | 12     |
     #
-    # @param [Object] obj Object to cast.
+    # @param [Object] value Object to cast.
     # @return [String] Casted object as UUID.
     #
-    def cast_type(obj)
-      cast_string obj.to_s
-    end
-
-    private
-
-    def cast_string(str)
-      if nil_allowed? && str.blank?
-        return nil
-      elsif str =~ REGEXP
-        str
+    def cast_value(value)
+      if value.blank?
+        nil
+      elsif value.to_s =~ UUID_REGEXP
+        value
       else
-        raise ArgumentError.new "given String `#{str}` " \
-                                "does not look like a UUID"
+        raise TypeError.new "Invalid UUID: `#{value.to_s}'"
       end
     end
   end

data/lib/acfs/resource/loadable.rb

@@ -1,5 +1,4 @@
 class Acfs::Resource
-
   # Provides method to check for loading state of resources.
   # A resource that is created but not yet fetched will be loaded
   # after running {Acfs::Global#run Acfs.run}.

data/lib/acfs/resource/locatable.rb

@@ -1,5 +1,4 @@
 class Acfs::Resource
-
   # Provide methods for generation URLs for resources.
   #
   # @example
@@ -14,7 +13,6 @@ class Acfs::Resource
 
     #
     module ClassMethods
-
       # @overload url(suffix)
       #   @deprecated
       #   Return URL for this class of resource. Given suffix
@@ -90,8 +88,6 @@ class Acfs::Resource
             return path
           when :read, :update, :delete
             return "#{path}/:id"
-          else
-            nil
         end
       end
     end

data/lib/acfs/resource/operational.rb

@@ -1,5 +1,4 @@
 class Acfs::Resource
-
   # @api private
   #
   # Provide methods for creating and processing CRUD operations and
@@ -14,7 +13,6 @@ class Acfs::Resource
 
     #
     module ClassMethods
-
       # Invoke CRUD operation.
       def operation(action, opts = {}, &block)
         Acfs.runner.process ::Acfs::Operation.new self, action, opts, &block

data/lib/acfs/resource/persistence.rb

@@ -8,8 +8,7 @@ class Acfs::Resource
     # @api public
     #
     # Check if the model is persisted. A model is persisted if
-    # it is saved after being created or when it was not changed
-    # since it was loaded.
+    # it is saved after being created
     #
     # @example Newly created resource:
     #   user = User.new name: "John"
@@ -21,15 +20,14 @@ class Acfs::Resource
     #   user2 = User.find 5
     #   user2.persisted? # => true
     #   user2.name = 'Amy'
-    #   user2.persisted? # => false
+    #   user2.persisted? # => true
     #   user2.save
     #   user2.persisted? # => true
     #
-    # @return [Boolean] True if resource has no changes and
-    #   is not newly created, false otherwise.
+    # @return [Boolean] True if resource has been saved
     #
     def persisted?
-      !new? && !changed?
+      !new?
     end
 
     # @api public
@@ -174,7 +172,7 @@ class Acfs::Resource
     #
     def delete!(opts = {})
       opts[:params] ||= {}
-      opts[:params].merge! id: id
+      opts[:params] = attributes_for_url(:delete).merge opts[:params]
 
       operation :delete, opts do |data|
         update_with data
@@ -182,9 +180,14 @@ class Acfs::Resource
       end
     end
 
-    #
-    module ClassMethods
+    private
 
+    def attributes_for_url(action)
+      arguments_for_url = self.class.location(action: action).arguments
+      attributes.slice(*arguments_for_url)
+    end
+
+    module ClassMethods
       # @api public
       #
       # Create a new resource sending given data. If resource cannot be
@@ -208,10 +211,8 @@ class Acfs::Resource
       #   will be overridden with provided data hash.
       # @see #create
       #
-      def create!(data, opts = {})
-        new(data).tap do |model|
-          model.save!
-        end
+      def create!(data, _opts = {})
+        new(data).tap(&:save!)
       end
 
       # @api public
@@ -234,7 +235,7 @@ class Acfs::Resource
       #   will be overridden with provided data hash.
       # @see #create!
       #
-      def create(data, opts = {})
+      def create(data, _opts = {})
         model = new data
         model.save
         model
@@ -249,9 +250,8 @@ class Acfs::Resource
     end
 
     def check_loaded!(opts = {})
-      unless loaded? || opts[:force]
-        raise ::Acfs::ResourceNotLoaded.new resource: self
-      end
+      return if loaded? || opts[:force]
+      raise ::Acfs::ResourceNotLoaded.new resource: self
     end
   end
 end

data/lib/acfs/resource/query_methods.rb

@@ -1,5 +1,4 @@
 class Acfs::Resource
-
   # Methods providing the query interface for finding resouces.
   #
   # @example
@@ -17,7 +16,6 @@ class Acfs::Resource
 
     #
     module ClassMethods
-
       # @api public
       #
       # @overload find(id, opts = {})
@@ -139,7 +137,7 @@ class Acfs::Resource
       def find_by!(params, &block)
         find_by params do |m|
           if m.nil?
-            raise Acfs::ResourceNotFound.new message: "Recieved erronious " \
+            raise Acfs::ResourceNotFound.new message: 'Received erroneous ' \
               "response: no `#{name}` with params #{params} found"
           end
           block.call m unless block.nil?
@@ -225,9 +223,9 @@ class Acfs::Resource
           collection.__callbacks__ << block unless block.nil?
 
           counter = 0
-          ids.each do |id|
+          ids.each_with_index do |id, index|
             find_single id, opts do |resource|
-              collection << resource
+              collection[index] = resource
               if (counter += 1) == ids.size
                 collection.loaded!
                 collection.__invoke__

data/lib/acfs/resource/service.rb

@@ -1,5 +1,4 @@
 class Acfs::Resource
-
   # Included by Acfs::Model. Allows to configure the service
   # a resource belongs to.
   #
@@ -8,7 +7,6 @@ class Acfs::Resource
 
     #
     module ClassMethods
-
       # @api public
       #
       # @overload service()

data/lib/acfs/resource/validation.rb

@@ -1,8 +1,6 @@
 class Acfs::Resource
-
   #
   module Validation
-
     def valid?(*args)
       super
       remote_errors.each {|f, e| errors.add f, e }

data/lib/acfs/response.rb

@@ -3,7 +3,6 @@ require 'acfs/response/status'
 require 'active_support/core_ext/module/delegation'
 
 module Acfs
-
   # This represents a response. In addition to an standard HTTP
   # it has a field `data` for storing the encoded body.
   #
@@ -14,7 +13,7 @@ module Acfs
     include Response::Formats
     include Response::Status
 
-    #delegate :status, :status_message, :success?, :modified?, :timed_out?,
+    # delegate :status, :status_message, :success?, :modified?, :timed_out?,
     #         :response_body, :response_headers, :response_code, :headers,
     #         to: :response
 

data/lib/acfs/response/formats.rb

@@ -2,10 +2,8 @@ require 'action_dispatch'
 
 module Acfs
   class Response
-
     # Quick accessors for format handling.
     module Formats
-
       def content_type
         @content_type ||= read_content_type
       end
@@ -15,6 +13,7 @@ module Acfs
       end
 
       private
+
       def read_content_type
         return 'text/plain' unless headers && headers['Content-Type']
 

data/lib/acfs/response/status.rb

@@ -1,19 +1,17 @@
 module Acfs
   class Response
-
     # Method to fetch information about response status.
     #
     module Status
-
       # Return response status code. Will return zero if
       # request was not executed or failed on client side.
       #
       def status_code
         return @status.to_i if defined? :@status
-        #return response.response_code unless response.nil?
-        #0
+        # return response.response_code unless response.nil?
+        # 0
       end
-      alias :code :status_code
+      alias_method :code, :status_code
 
       # Return true if response was successful indicated by
       # response status code.

data/lib/acfs/runner.rb

@@ -1,7 +1,6 @@
 require 'acfs/service/middleware'
 
 module Acfs
-
   # @api private
   #
   class Runner
@@ -17,6 +16,7 @@ module Acfs
     # and parallel operations will be queued.
     #
     def process(op)
+      ::ActiveSupport::Notifications.instrument 'acfs.operation.before_process', operation: op
       op.synchronous? ? run(op) : enqueue(op)
     end
 
@@ -24,7 +24,7 @@ module Acfs
     #
     def run(op)
       ::ActiveSupport::Notifications.instrument 'acfs.runner.sync_run', operation: op do
-        op_request(op) { |req| adapter.run req }
+        op_request(op) {|req| adapter.run req }
       end
     end
 
@@ -39,7 +39,7 @@ module Acfs
     def enqueue(op)
       ::ActiveSupport::Notifications.instrument 'acfs.runner.enqueue', operation: op do
         if running?
-          op_request(op) { |req| adapter.queue req }
+          op_request(op) {|req| adapter.queue req }
         else
           queue << op
         end
@@ -55,15 +55,13 @@ module Acfs
     # Start processing queued operations.
     #
     def start
-      enqueue_operations
+      return if running?
 
-      @running = true
-      adapter.start
+      enqueue_operations
+      start_all
     rescue
       queue.clear
       raise
-    ensure
-      @running = false
     end
 
     def clear
@@ -73,15 +71,27 @@ module Acfs
     end
 
     private
+
+    def start_all
+      @running = true
+      adapter.start
+    ensure
+      @running = false
+    end
+
     def enqueue_operations
       while (op = queue.shift)
-        op_request(op) { |req| adapter.queue req }
+        op_request(op) {|req| adapter.queue req }
       end
     end
 
     def op_request(op)
-      return if Acfs::Stub.enabled? and Acfs::Stub.stubbed(op)
-      yield prepare op.service.prepare op.request
+      return if Acfs::Stub.enabled? && Acfs::Stub.stubbed(op)
+      req = op.service.prepare op.request
+      return unless req.is_a? Acfs::Request
+      req = prepare req
+      return unless req.is_a? Acfs::Request
+      yield req
     end
   end
 end