acfs 0.42.0 → 0.43.0

data/spec/support/shared/find_callbacks.rb

@@ -2,23 +2,23 @@ shared_examples 'a query method with multi-callback support' do
   let(:cb) { Proc.new }
 
   it 'should invoke callback' do
-    expect { |cb|
+    expect do |cb|
       action.call cb
       Acfs.run
-    }.to yield_with_args
+    end.to yield_with_args
   end
 
   it 'should invoke multiple callbacks' do
-    expect { |cb|
+    expect do |cb|
       object = action.call cb
       Acfs.add_callback object, &cb
       Acfs.run
-    }.to yield_control.exactly(2).times
+    end.to yield_control.exactly(2).times
   end
 
   describe 'callback' do
     it 'should be invoked with resource' do
-      proc = Proc.new { }
+      proc = proc {}
       expect(proc).to receive(:call) do |res|
         expect(res).to equal @object
         expect(res).to be_loaded
@@ -29,8 +29,8 @@ shared_examples 'a query method with multi-callback support' do
     end
 
     it 'should invoke multiple callback with loaded resource' do
-      proc1 = Proc.new { }
-      proc2 = Proc.new { }
+      proc1 = proc {}
+      proc2 = proc {}
       expect(proc1).to receive(:call) do |user|
         expect(user).to equal @object
         expect(user).to be_loaded

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.42.0
+  version: 0.43.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-20 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -134,31 +134,29 @@ files:
 - lib/acfs/middleware/msgpack.rb
 - lib/acfs/middleware/print.rb
 - lib/acfs/middleware/serializer.rb
-- lib/acfs/model.rb
-- lib/acfs/model/attributes.rb
-- lib/acfs/model/attributes/base.rb
-- lib/acfs/model/attributes/boolean.rb
-- lib/acfs/model/attributes/date_time.rb
-- lib/acfs/model/attributes/dict.rb
-- lib/acfs/model/attributes/float.rb
-- lib/acfs/model/attributes/integer.rb
-- lib/acfs/model/attributes/list.rb
-- lib/acfs/model/attributes/string.rb
-- lib/acfs/model/attributes/uuid.rb
-- lib/acfs/model/dirty.rb
-- lib/acfs/model/initialization.rb
-- lib/acfs/model/loadable.rb
-- lib/acfs/model/locatable.rb
-- lib/acfs/model/operational.rb
-- lib/acfs/model/persistence.rb
-- lib/acfs/model/query_methods.rb
-- lib/acfs/model/relations.rb
-- lib/acfs/model/service.rb
-- lib/acfs/model/validation.rb
 - lib/acfs/operation.rb
 - lib/acfs/request.rb
 - lib/acfs/request/callbacks.rb
 - lib/acfs/resource.rb
+- lib/acfs/resource/attributes.rb
+- lib/acfs/resource/attributes/base.rb
+- lib/acfs/resource/attributes/boolean.rb
+- lib/acfs/resource/attributes/date_time.rb
+- lib/acfs/resource/attributes/dict.rb
+- lib/acfs/resource/attributes/float.rb
+- lib/acfs/resource/attributes/integer.rb
+- lib/acfs/resource/attributes/list.rb
+- lib/acfs/resource/attributes/string.rb
+- lib/acfs/resource/attributes/uuid.rb
+- lib/acfs/resource/dirty.rb
+- lib/acfs/resource/initialization.rb
+- lib/acfs/resource/loadable.rb
+- lib/acfs/resource/locatable.rb
+- lib/acfs/resource/operational.rb
+- lib/acfs/resource/persistence.rb
+- lib/acfs/resource/query_methods.rb
+- lib/acfs/resource/service.rb
+- lib/acfs/resource/validation.rb
 - lib/acfs/response.rb
 - lib/acfs/response/formats.rb
 - lib/acfs/response/status.rb
@@ -177,23 +175,23 @@ files:
 - spec/acfs/global_spec.rb
 - spec/acfs/middleware/json_spec.rb
 - spec/acfs/middleware/msgpack_spec.rb
-- spec/acfs/model/attributes/boolean_spec.rb
-- spec/acfs/model/attributes/date_time_spec.rb
-- spec/acfs/model/attributes/dict_spec.rb
-- spec/acfs/model/attributes/float_spec.rb
-- spec/acfs/model/attributes/list_spec.rb
-- spec/acfs/model/attributes/uuid_spec.rb
-- spec/acfs/model/attributes_spec.rb
-- spec/acfs/model/dirty_spec.rb
-- spec/acfs/model/initialization_spec.rb
-- spec/acfs/model/loadable_spec.rb
-- spec/acfs/model/locatable_spec.rb
-- spec/acfs/model/persistance_spec.rb
-- spec/acfs/model/query_methods_spec.rb
-- spec/acfs/model/validation_spec.rb
 - spec/acfs/operation_spec.rb
 - spec/acfs/request/callbacks_spec.rb
 - spec/acfs/request_spec.rb
+- spec/acfs/resource/attributes/boolean_spec.rb
+- spec/acfs/resource/attributes/date_time_spec.rb
+- spec/acfs/resource/attributes/dict_spec.rb
+- spec/acfs/resource/attributes/float_spec.rb
+- spec/acfs/resource/attributes/list_spec.rb
+- spec/acfs/resource/attributes/uuid_spec.rb
+- spec/acfs/resource/attributes_spec.rb
+- spec/acfs/resource/dirty_spec.rb
+- spec/acfs/resource/initialization_spec.rb
+- spec/acfs/resource/loadable_spec.rb
+- spec/acfs/resource/locatable_spec.rb
+- spec/acfs/resource/persistance_spec.rb
+- spec/acfs/resource/query_methods_spec.rb
+- spec/acfs/resource/validation_spec.rb
 - spec/acfs/response/formats_spec.rb
 - spec/acfs/response/status_spec.rb
 - spec/acfs/runner_spec.rb
@@ -204,6 +202,7 @@ files:
 - spec/acfs_spec.rb
 - spec/fixtures/config.yml
 - spec/spec_helper.rb
+- spec/support/hash.rb
 - spec/support/response.rb
 - spec/support/service.rb
 - spec/support/shared/find_callbacks.rb
@@ -227,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: An abstract API base client for service oriented application.
@@ -238,23 +237,23 @@ test_files:
 - spec/acfs/global_spec.rb
 - spec/acfs/middleware/json_spec.rb
 - spec/acfs/middleware/msgpack_spec.rb
-- spec/acfs/model/attributes/boolean_spec.rb
-- spec/acfs/model/attributes/date_time_spec.rb
-- spec/acfs/model/attributes/dict_spec.rb
-- spec/acfs/model/attributes/float_spec.rb
-- spec/acfs/model/attributes/list_spec.rb
-- spec/acfs/model/attributes/uuid_spec.rb
-- spec/acfs/model/attributes_spec.rb
-- spec/acfs/model/dirty_spec.rb
-- spec/acfs/model/initialization_spec.rb
-- spec/acfs/model/loadable_spec.rb
-- spec/acfs/model/locatable_spec.rb
-- spec/acfs/model/persistance_spec.rb
-- spec/acfs/model/query_methods_spec.rb
-- spec/acfs/model/validation_spec.rb
 - spec/acfs/operation_spec.rb
 - spec/acfs/request/callbacks_spec.rb
 - spec/acfs/request_spec.rb
+- spec/acfs/resource/attributes/boolean_spec.rb
+- spec/acfs/resource/attributes/date_time_spec.rb
+- spec/acfs/resource/attributes/dict_spec.rb
+- spec/acfs/resource/attributes/float_spec.rb
+- spec/acfs/resource/attributes/list_spec.rb
+- spec/acfs/resource/attributes/uuid_spec.rb
+- spec/acfs/resource/attributes_spec.rb
+- spec/acfs/resource/dirty_spec.rb
+- spec/acfs/resource/initialization_spec.rb
+- spec/acfs/resource/loadable_spec.rb
+- spec/acfs/resource/locatable_spec.rb
+- spec/acfs/resource/persistance_spec.rb
+- spec/acfs/resource/query_methods_spec.rb
+- spec/acfs/resource/validation_spec.rb
 - spec/acfs/response/formats_spec.rb
 - spec/acfs/response/status_spec.rb
 - spec/acfs/runner_spec.rb
@@ -265,6 +264,7 @@ test_files:
 - spec/acfs_spec.rb
 - spec/fixtures/config.yml
 - spec/spec_helper.rb
+- spec/support/hash.rb
 - spec/support/response.rb
 - spec/support/service.rb
 - spec/support/shared/find_callbacks.rb

data/lib/acfs/model.rb

@@ -1,43 +0,0 @@
-require 'active_model'
-
-# @api public
-#
-module Acfs::Model
-  require 'acfs/model/initialization'
-  require 'acfs/model/attributes'
-  require 'acfs/model/dirty'
-  require 'acfs/model/loadable'
-  require 'acfs/model/locatable'
-  require 'acfs/model/operational'
-  require 'acfs/model/persistence'
-  require 'acfs/model/query_methods'
-  require 'acfs/model/relations'
-  require 'acfs/model/service'
-  require 'acfs/model/validation'
-
-  extend ActiveSupport::Concern
-
-  included do
-    if ActiveModel::VERSION::MAJOR >= 4
-      include ActiveModel::Model
-    else
-      extend  ActiveModel::Naming
-      extend  ActiveModel::Translation
-      include ActiveModel::Conversion
-      include ActiveModel::Validations
-    end
-
-    include Initialization
-
-    include Attributes
-    include Loadable
-    include Persistence
-    include Locatable
-    include Operational
-    include QueryMethods
-    include Relations
-    include Service
-    include Dirty
-    include Validation
-  end
-end

data/lib/acfs/model/attributes/boolean.rb

@@ -1,38 +0,0 @@
-module Acfs::Model
-  module Attributes
-
-    # @api public
-    #
-    # Boolean attribute type. Use it in your model as an attribute type:
-    #
-    # @example
-    #   class User
-    #     include Acfs::Model
-    #     attribute :name, :boolean
-    #   end
-    #
-    # Given objects will be converted to string. The following strings
-    # are considered true, everything else false:
-    #
-    #  true, on, yes
-    #
-    class Boolean < Base
-
-      TRUE_VALUES = %w(true on yes 1)
-
-      # @api public
-      #
-      # Cast given object to boolean.
-      #
-      # @param [Object] obj Object to cast.
-      # @return [TrueClass, FalseClass] Casted boolean.
-      #
-      def cast_type(obj)
-        return true if obj.is_a? TrueClass
-        return false if obj.is_a? FalseClass
-
-        TRUE_VALUES.include? obj.to_s
-      end
-    end
-  end
-end

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

@@ -1,30 +0,0 @@
-module Acfs::Model::Attributes
-
-  # @api public
-  #
-  # DateTime attribute type. Use it in your model as an attribute type:
-  #
-  # @example
-  #   class User
-  #     include Acfs::Model
-  #     attribute :name, :date_time
-  #   end
-  #
-  class DateTime < Base
-
-    # @api public
-    #
-    # Cast given object to DateTime.
-    # Expect
-    #
-    # @param [Object] obj Object to cast.
-    # @return [DateTime] Casted object as DateTime.
-    #
-    def cast_type(obj)
-      return nil if nil_allowed? and obj.blank?
-      return obj if obj.is_a? ::DateTime
-      return ::DateTime.iso8601(obj.iso8601) if obj.is_a? Time or obj.is_a? Date
-      return ::DateTime.iso8601(obj)
-    end
-  end
-end

data/lib/acfs/model/dirty.rb

@@ -1,49 +0,0 @@
-module Acfs
-  module Model
-
-    # Thin wrapper around ActiveModel::Dirty
-    #
-    module Dirty
-      extend ActiveSupport::Concern
-      include ActiveModel::Dirty
-
-      # @api private
-      #
-      # Resets all changes. Does not touch previous changes.
-      #
-      def reset_changes
-        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 { |_| swap_changes }
-      end
-
-      # @api private
-      #
-      def loaded!
-        reset_changes
-        super
-      end
-
-      # @api private
-      #
-      def write_raw_attribute(name, value, opts = {}) # :nodoc:
-        attribute_will_change! name if opts[:change].nil? or opts[:change]
-        super
-      end
-    end
-  end
-end

data/lib/acfs/model/persistence.rb

@@ -1,243 +0,0 @@
-module Acfs
-  module Model
-
-    # Allow to track the persistence state of a model.
-    #
-    module Persistence
-      extend ActiveSupport::Concern
-
-      # @api public
-      #
-      # Check if the model is persisted. A model is persisted if
-      # it is saved after being created
-      #
-      # @example Newly created resource:
-      #   user = User.new name: "John"
-      #   user.persisted? # => false
-      #   user.save
-      #   user.persisted? # => true
-      #
-      # @example Modified resource:
-      #   user2 = User.find 5
-      #   user2.persisted? # => true
-      #   user2.name = 'Amy'
-      #   user2.persisted? # => true
-      #   user2.save
-      #   user2.persisted? # => true
-      #
-      # @return [Boolean] True if resource has been saved
-      #
-      def persisted?
-        !new?
-      end
-
-      # @api public
-      #
-      # Return true if model is a new record and was not saved yet.
-      #
-      # @return [Boolean] True if resource is newly created, false otherwise.
-      #
-      def new?
-        !loaded?
-      end
-      alias :new_record? :new?
-
-      # @api public
-      #
-      # Saves the resource.
-      #
-      # It will PUT to the service to update the resource or send
-      # a POST to create a new one if the resource is new.
-      #
-      # Saving a resource is a synchronous operation.
-      #
-      # @return [Boolean] True if save operation was successful, false otherwise.
-      # @see #save! See #save! for available options.
-      #
-      def save(*args)
-        save! *args
-        true
-      rescue Acfs::Error
-        false
-      end
-
-      # @api public
-      #
-      # Saves the resource. Raises an error if something happens.
-      #
-      # Saving a resource is a synchronous operation.
-      #
-      # @param [Hash] opts Hash with additional options.
-      # @option opts [Hash] :data Data to send to remote service. Default will be resource attributes.
-      #
-      # @raise [Acfs::InvalidResource]
-      #   If remote services respond with 422 response. Will fill errors with data from response
-      # @raise [Acfs::ErroneousResponse]
-      #   If remote service respond with not successful response.
-      #
-      # @see #save
-      #
-      def save!(opts = {})
-        opts[:data] = attributes unless opts[:data]
-
-        operation (new? ? :create : :update), opts do |data|
-          update_with data
-        end
-      rescue InvalidResource => err
-        self.remote_errors = err.errors
-        raise err
-      end
-
-      # @api public
-      #
-      # Update attributes with given data and save resource.
-      #
-      # Saving a resource is a synchronous operation.
-      #
-      # @param [Hash] attrs Hash with attributes to write.
-      # @param [Hash] opts Options passed to `save`.
-      #
-      # @return [Boolean] True if save operation was successful, false otherwise.
-      #
-      # @see #save
-      # @see #attributes=
-      # @see #update_attributes!
-      #
-      def update_attributes(attrs, opts = {})
-        check_loaded! opts
-
-        self.attributes = attrs
-        save opts
-      end
-
-      # @api public
-      #
-      # Update attributes with given data and save resource.
-      #
-      # Saving a resource is a synchronous operation.
-      #
-      # @param [Hash] attrs Hash with attributes to write.
-      # @param [Hash] opts Options passed to `save!`.
-      #
-      # @raise [Acfs::InvalidResource]
-      #   If remote services respond with 422 response. Will fill errors with data from response
-      # @raise [Acfs::ErroneousResponse]
-      #   If remote service respond with not successful response.
-      #
-      # @see #save!
-      # @see #attributes=
-      # @see #update_attributes
-      #
-      def update_attributes!(attrs, opts = {})
-        check_loaded! opts
-
-        self.attributes = attrs
-        save! opts
-      end
-
-      # @api public
-      #
-      # Destroy resource by sending a DELETE request.
-      #
-      # Deleting a resource is a synchronous operation.
-      #
-      # @return [Boolean]
-      # @see #delete!
-      #
-      def delete(opts = {})
-        delete! opts
-        true
-      rescue Acfs::Error
-        false
-      end
-
-      # @api public
-      #
-      # Destroy resource by sending a DELETE request.
-      # Will raise an error in case something goes wrong.
-      #
-      # Deleting a resource is a synchronous operation.
-
-      # @raise [Acfs::ErroneousResponse]
-      #   If remote service respond with not successful response.
-      # @return [undefined]
-      # @see #delete
-      #
-      def delete!(opts = {})
-        opts[:params] ||= {}
-        opts[:params] = attributes_for_url(:delete).merge opts[:params]
-
-        operation :delete, opts do |data|
-          update_with data
-          freeze
-        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
-        # created an error will be thrown.
-        #
-        # Saving a resource is a synchronous operation.
-        #
-        # @param [Hash{Symbol, String => Object}] data Data to send in create request.
-        # @return [self] Newly resource object.
-        #
-        # @raise [Acfs::InvalidResource]
-        #   If remote services respond with 422 response. Will fill errors with data from response
-        # @raise [Acfs::ErroneousResponse]
-        #   If remote service respond with not successful response.
-        #
-        # @see Acfs::Model::Persistence#save! Available options. `:data` will be overridden with provided data hash.
-        # @see #create
-        #
-        def create!(data, opts = {})
-          new(data).tap do |model|
-            model.save!
-          end
-        end
-
-        # @api public
-        #
-        # Create a new resource sending given data. If resource cannot be
-        # create model will be returned and error hash contains response
-        # errors if available.
-        #
-        # Saving a resource is a synchronous operation.
-        #
-        # @param [Hash{Symbol, String => Object}] data Data to send in create request.
-        # @return [self] Newly resource object.
-        #
-        # @raise [Acfs::ErroneousResponse]
-        #   If remote service respond with not successful response.
-        #
-        # @see Acfs::Model::Persistence#save! Available options. `:data` will be overridden with provided data hash.
-        # @see #create!
-        #
-        def create(data, opts = {})
-          model = new data
-          model.save
-          model
-        end
-      end
-
-      private
-      def update_with(data)
-        self.attributes = data
-        loaded!
-      end
-
-      def check_loaded!(opts = {})
-        raise ResourceNotLoaded.new resource: self unless loaded? or opts[:force]
-      end
-    end
-  end
-end