acfs 0.50.0 → 1.0.0.dev.1.b297

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

@@ -1,4 +1,5 @@
 module Acfs::Resource::Attributes
+
   # @api public
   #
   # DateTime attribute type. Use it in your model as
@@ -15,16 +16,18 @@ module Acfs::Resource::Attributes
     #
     # Cast given object to DateTime.
     #
-    # @param [Object] value Object to cast.
+    # @param [Object] obj Object to cast.
     # @return [DateTime] Casted object as DateTime.
     #
-    def cast_value(value)
-      if value.blank?
+    def cast_type(obj)
+      if nil_allowed? && obj.blank?
         nil
-      elsif value.acts_like?(:time) || value.acts_like?(:date)
-        value.to_datetime
+      elsif obj.is_a? ::DateTime
+        obj
+      elsif obj.is_a?(Time) || obj.is_a?(Date)
+        ::DateTime.iso8601 obj.iso8601
       else
-        ::DateTime.iso8601 value
+        ::DateTime.iso8601 obj
       end
     end
   end

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

@@ -1,4 +1,5 @@
 module Acfs::Resource::Attributes
+
   # @api public
   #
   # Float attribute type. Use it in your model as an attribute type:
@@ -9,23 +10,16 @@ module Acfs::Resource::Attributes
   #   end
   #
   class Float < Base
+
     # @api public
     #
     # Cast given object to float.
     #
-    # @param [Object] value Object to cast.
+    # @param [Object] obj Object to cast.
     # @return [Float] Casted object as float.
     #
-    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
+    def cast_type(obj)
+      Float obj
     end
   end
 end

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

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

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

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

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

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

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

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

data/lib/acfs/resource/dirty.rb

@@ -8,14 +8,26 @@ class Acfs::Resource
 
     # @api private
     #
+    # Resets all changes. Does not touch previous changes.
+    #
     def reset_changes
-      clear_changes_information
+      changed_attributes.clear
+    end
+
+    # @api private
+    #
+    # Save current changes as previous changes and reset
+    # current one.
+    #
+    def swap_changes
+      @previously_changed = changes
+      reset_changes
     end
 
     # @api private
     #
     def save!(*)
-      super.tap {|_| changes_applied }
+      super.tap {|_| swap_changes }
     end
 
     # @api private
@@ -28,7 +40,7 @@ class Acfs::Resource
     # @api private
     #
     def write_raw_attribute(name, value, opts = {})
-      attribute_will_change!(name) if opts[:change].nil? || opts[:change]
+      attribute_will_change! name if opts[:change].nil? || opts[:change]
       super
     end
   end

data/lib/acfs/resource/loadable.rb

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

data/lib/acfs/resource/operational.rb

@@ -1,4 +1,5 @@
 class Acfs::Resource
+
   # @api private
   #
   # Provide methods for creating and processing CRUD operations and
@@ -13,6 +14,7 @@ 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,7 +8,8 @@ class Acfs::Resource
     # @api public
     #
     # Check if the model is persisted. A model is persisted if
-    # it is saved after being created
+    # it is saved after being created or when it was not changed
+    # since it was loaded.
     #
     # @example Newly created resource:
     #   user = User.new name: "John"
@@ -20,14 +21,15 @@ class Acfs::Resource
     #   user2 = User.find 5
     #   user2.persisted? # => true
     #   user2.name = 'Amy'
-    #   user2.persisted? # => true
+    #   user2.persisted? # => false
     #   user2.save
     #   user2.persisted? # => true
     #
-    # @return [Boolean] True if resource has been saved
+    # @return [Boolean] True if resource has no changes and
+    #   is not newly created, false otherwise.
     #
     def persisted?
-      !new?
+      !new? && !changed?
     end
 
     # @api public
@@ -172,7 +174,7 @@ class Acfs::Resource
     #
     def delete!(opts = {})
       opts[:params] ||= {}
-      opts[:params] = attributes_for_url(:delete).merge opts[:params]
+      opts[:params].merge! id: id
 
       operation :delete, opts do |data|
         update_with data
@@ -180,14 +182,9 @@ class Acfs::Resource
       end
     end
 
-    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
@@ -211,8 +208,10 @@ class Acfs::Resource
       #   will be overridden with provided data hash.
       # @see #create
       #
-      def create!(data, _opts = {})
-        new(data).tap(&:save!)
+      def create!(data, opts = {})
+        new(data).tap do |model|
+          model.save!
+        end
       end
 
       # @api public
@@ -235,7 +234,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
@@ -250,8 +249,9 @@ class Acfs::Resource
     end
 
     def check_loaded!(opts = {})
-      return if loaded? || opts[:force]
-      raise ::Acfs::ResourceNotLoaded.new resource: self
+      unless loaded? || opts[:force]
+        raise ::Acfs::ResourceNotLoaded.new resource: self
+      end
     end
   end
 end

data/lib/acfs/resource/query_methods.rb

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

data/lib/acfs/resource/service.rb

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

data/lib/acfs/resource/validation.rb

@@ -1,6 +1,8 @@
 class Acfs::Resource
+
   #
   module Validation
+
     def valid?(*args)
       super
       remote_errors.each {|f, e| errors.add f, e }
@@ -13,10 +15,8 @@ class Acfs::Resource
 
     def remote_errors=(errors)
       (errors || []).each do |field, errs|
-        errs.each do |err|
-          self.errors.add field.to_sym, err
-          remote_errors.add field.to_sym, err
-        end
+        self.errors.set field.to_sym, errs
+        remote_errors.set field.to_sym, errs
       end
     end