acfs 0.20.0.dev.b184 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7f62eaa2b5584729416f2b77d93cc21ee4903a8
-  data.tar.gz: b2cda0de25131aa71694a4df70e0dda699c517cc
+  metadata.gz: a4e5e93e4dee6f02a8b6a830f83a710bd98a7134
+  data.tar.gz: 9833f7ea561dfe761689915f61daf25a33e25ca1
 SHA512:
-  metadata.gz: 81ca070389fb2f288e34a56a792ee95c5918f10f99a4edc0179f760ac89cd48eb4ce9dccd60aa3cc528f559dc0b7c3ba9c2269af8c4a8b8a18ac6eb71a7354a0
-  data.tar.gz: 22dec0fbe72fac7e0215674ea5d7ac6ddeab1c60ab4ca8e2e362a154152838e50473586014f991a1f4bdc28a0c1743fc6ffb11216b92e3e4eacc5319547c099c
+  metadata.gz: 20fae6a5edfd9e81f9f893846951d907226f6c77866cb20938c926dbad8f3b21842c051314cfb91268cdee3e98875e836456436a024be9505148562deabe79c1
+  data.tar.gz: 7eb8bf6e3bd84961a550201d77f2f6e2fe85779108045a4fe991b4537d50cdabedf916e35361b80027022f2e43d141e8e116201ebd859d23b780fc004e48cc76

data/.travis.yml

@@ -1,22 +1,15 @@
 language: ruby
 bundler_args: --without development
 rvm:
-- 2.0.0
-- 1.9.3
-- jruby
-- rbx-19mode
+  - 2.0.0
+  - 1.9.3
+  - jruby
+  - rbx-19mode
+
 gemfile:
-- gemfiles/Gemfile.rails-4-0
-- gemfiles/Gemfile.rails-3-2
-- gemfiles/Gemfile.rails-3-1
+  - gemfiles/Gemfile.rails-3-1
+  - gemfiles/Gemfile.rails-3-2
+  - gemfiles/Gemfile.rails-4-0
+
 services:
-- rabbitmq
-deploy:
-  provider: rubygems
-  api_key:
-    secure: gNudZK0JaRRweudmkpdkJjUMydItTSW5cXjpYdYCfahqd/cD0xPjxotr2TCHrJibfVauoT/PytbQWcP3jnOYytp6oS0up5Y+uKpGmbqVYx/rZvShWALszcBs71lUh/IZpDXNHc+yo/01HCn10/uQUFRtrjWgMwHtHxXb09xE4wQ=
-  gem: acfs
-  on:
-    branch: master
-    repo: jgraichen/acfs
-    rvm: 2.0.0
+  - rabbitmq

data/CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## 0.21.0.dev
-
-* Add update_attributes
-* Add validation check to `save` method
-* Inherit attributes to subclasses
-
 ## 0.20.0
 
 * Remove messaging

data/acfs.gemspec

@@ -26,6 +26,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rack'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-
-  spec.version = "#{spec.version}.b#{ENV['TRAVIS_BUILD_NUMBER']}" if ENV['TRAVIS_BUILD_NUMBER']
 end

data/lib/acfs.rb

@@ -4,30 +4,35 @@ require 'active_support/core_ext/class'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/module'
 
+require 'acfs/version'
+require 'acfs/errors'
+require 'acfs/global'
+
 module Acfs
   extend ActiveSupport::Autoload
-  require 'acfs/version'
-  require 'acfs/errors'
-  require 'acfs/global'
-
-  require 'acfs/collection'
-  require 'acfs/configuration'
-  require 'acfs/model'
-  require 'acfs/operation'
-  require 'acfs/request'
-  require 'acfs/resource'
-  require 'acfs/response'
-  require 'acfs/runner'
-  require 'acfs/service'
-
   extend Global
 
+  autoload :Collection
+  autoload :Model
+  autoload :Request
+  autoload :Response
+  autoload :Service
   autoload :Stub
+  autoload :Operation
+  autoload :Runner
+  autoload :Configuration
+
+  module Messaging
+    extend ActiveSupport::Autoload
+
+    autoload :Client
+    autoload :Receiver
+  end
 
   module Middleware
     extend ActiveSupport::Autoload
-    require 'acfs/middleware/base'
 
+    autoload :Base
     autoload :Print
     autoload :Logger
     autoload :JsonDecoder
@@ -37,8 +42,10 @@ module Acfs
   end
 
   module Adapter
-    require 'acfs/adapter/base'
-    require 'acfs/adapter/typhoeus'
+    extend ActiveSupport::Autoload
+
+    autoload :Base
+    autoload :Typhoeus
   end
 end
 

data/lib/acfs/errors.rb

@@ -3,52 +3,46 @@ module Acfs
   # Acfs base error.
   #
   class Error < StandardError
-    def initialize(opts = {}, message = nil)
-      opts.merge! message: message if message
-      super opts[:message]
-    end
   end
 
   # Response error containing the responsible response object.
   #
   class ErroneousResponse < Error
-    attr_reader :response
+    attr_accessor :response
 
-    def initialize(opts = {})
-      @response = opts[:response]
-      message = 'Received erroneous response'
-      if response
-        message << ": #{response.code}"
-        if response.data
-          message << "\n  with content:\n    "
-          message << response.data.map{|k,v| "#{k.inspect}: #{v.inspect}"}.join("\n    ")
-        end
-        if response.headers.any?
-          message << "\n  with headers:\n    "
-          message << response.headers.map{|k,v| "#{k}: #{v}"}.join("\n    ")
-        end
-        message << "\nbased on request: #{response.request.method.upcase} #{response.request.url} #{response.request.format}"
-        if response.request.data
-          message << "\n  with content:\n    "
-          message << response.request.data.map{|k,v| "#{k.inspect}: #{v.inspect}"}.join("\n    ")
-        end
-        if response.request.headers.any?
-          message << "\n  with headers:\n    "
-          message << response.request.headers.map{|k,v| "#{k}: #{v}"}.join("\n    ")
-        end
+    def initialize(data = {})
+      self.response = data[:response]
+      message = ''
+      message << "Received erroneous response: #{response.code}"
+      if response.data
+        message << "\n  with content:\n    "
+        message << response.data.map{|k,v| "#{k.inspect}: #{v.inspect}"}.join("\n    ")
+      end
+      if response.headers.any?
+        message << "\n  with headers:\n    "
+        message << response.headers.map{|k,v| "#{k}: #{v}"}.join("\n    ")
+      end
+      message << "\nbased on request: #{response.request.method.upcase} #{response.request.url} #{response.request.format}"
+      if response.request.data
+        message << "\n  with content:\n    "
+        message << response.request.data.map{|k,v| "#{k.inspect}: #{v.inspect}"}.join("\n    ")
       end
-      super opts, message
+      if response.request.headers.any?
+        message << "\n  with headers:\n    "
+        message << response.request.headers.map{|k,v| "#{k}: #{v}"}.join("\n    ")
+      end
+      super message
     end
   end
 
   class AmbiguousStubError < Error
     attr_reader :stubs, :operation
 
-    def initialize(opts = {})
-      @stubs     = opts.delete :stubs
-      @operation = opts.delete :operation
+    def initialize(stubs, operation)
+      @stubs     = stubs
+      @operation = operation
 
-      super opts, 'Ambiguous stubs.'
+      super 'Ambiguous stubs.'
     end
 
   end
@@ -59,27 +53,10 @@ module Acfs
   end
 
   class InvalidResource < ErroneousResponse
-    attr_reader :errors, :resource
-
-    def initialize(opts = {})
-      @errors   = opts.delete :errors
-      @resource = opts.delete :resource
-      super
-    end
-  end
-
-  # A ResourceNotLoaded error will be thrown when calling some
-  # modifing methods on not loaded resources as it is usally
-  # unwanted to call e.g. `update_attributes` on a not loaded
-  # resource.
-  # Correct solution is to first run `Acfs.run` to fetch the
-  # resource and then update the resource.
-  #
-  class ResourceNotLoaded < Error
-    attr_reader :resource
+    attr_accessor :errors
 
-    def initialize(opts = {})
-      @resource = opts.delete :resource
+    def initialize(data)
+      self.errors = data[:errors]
       super
     end
   end

data/lib/acfs/model.rb

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

data/lib/acfs/model/attributes.rb

@@ -187,7 +187,7 @@ module Acfs::Model
       # @return [ Hash{ String => Object, Proc } ] Attributes with default values.
       #
       def attributes
-        @attributes ||= {}.merge superclass.respond_to?(:attributes) ? superclass.attributes : {}
+        @attributes ||= {}
       end
 
       # @api public
@@ -205,7 +205,7 @@ module Acfs::Model
       # @return [ Hash{ Symbol => Class } ] Attributes and their types.
       #
       def attribute_types
-        @attribute_types ||= {}.merge superclass.respond_to?(:attribute_types) ? superclass.attribute_types : {}
+        @attribute_types ||= {}
       end
 
       private

data/lib/acfs/model/persistence.rb

@@ -26,7 +26,7 @@ module Acfs
       #   user2.save
       #   user2.persisted? # => true
       #
-      # @return [Boolean] True if resource has no changes and is not newly created, false otherwise.
+      # @return [TrueClass, FalseClass] True if resource has no changes and is not newly created, false otherwise.
       #
       def persisted?
         !new? && !changed?
@@ -36,7 +36,7 @@ module Acfs
       #
       # Return true if model is a new record and was not saved yet.
       #
-      # @return [Boolean] True if resource is newly created, false otherwise.
+      # @return [TrueClass, FalseClass] True if resource is newly created, false otherwise.
       #
       def new?
         read_attribute(:id).nil?
@@ -52,7 +52,7 @@ module Acfs
       #
       # Saving a resource is a synchronous operation.
       #
-      # @return [Boolean] True if save operation was successful, false otherwise.
+      # @return [TrueClass, FalseClass] True if save operation was successful, false otherwise.
       # @see #save! See #save! for available options.
       #
       def save(*args)
@@ -79,6 +79,8 @@ module Acfs
       # @see #save
       #
       def save!(opts = {})
+        #raise ::Acfs::InvalidResource errors: errors.to_a unless valid?
+
         opts[:data] = attributes unless opts[:data]
 
         operation (new? ? :create : :update), opts do |data|
@@ -86,60 +88,13 @@ module Acfs
         end
       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]
+      # @return [TrueClass, FalseClass]
       # @see #delete!
       #
       def delete(opts = {})
@@ -231,10 +186,6 @@ module Acfs
         self.attributes = data
         loaded!
       end
-
-      def check_loaded!(opts = {})
-        raise ResourceNotLoaded, resource: self unless loaded? or opts[:force]
-      end
     end
   end
 end

data/lib/acfs/stub.rb

@@ -98,7 +98,7 @@ module Acfs
 
         accepted_stubs = stubs.select { |stub| stub.accept? op }
 
-        raise AmbiguousStubError.new stubs: accepted_stubs, operation: op if accepted_stubs.size > 1
+        raise AmbiguousStubError.new accepted_stubs, op if accepted_stubs.size > 1
 
         accepted_stubs.first
       end

data/lib/acfs/version.rb

@@ -3,7 +3,7 @@ module Acfs
     MAJOR = 0
     MINOR = 20
     PATCH = 0
-    STAGE = :dev
+    STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')
 

data/spec/acfs/model/attributes_spec.rb

@@ -109,7 +109,7 @@ describe Acfs::Model::Attributes do
 
     it 'should cast values' do
       o = model.new
-      o.age = '28'
+      o.age = "28"
 
       expect(o.age).to be == 28
     end

data/spec/acfs/model/persistance_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Acfs::Model::Persistence do
   let(:model_class) { MyUser }
   before do
-    @get_stub = stub_request(:get, 'http://users.example.org/users/1').to_return response({ id: 1, name: 'Anon', age: 12 })
+    @get_stub = stub_request(:get, 'http://users.example.org/users/1').to_return response({ id: 1, name: "Anon", age: 12 })
 
     @patch_stub = stub_request(:put, 'http://users.example.org/users/1')
       .with(body: '{"id":1,"name":"Idefix","age":12}')
@@ -71,20 +71,6 @@ describe Acfs::Model::Persistence do
     end
   end
 
-  context 'unloaded model' do
-    let!(:model) { model_class.find 1 }
-
-    describe '#update_attributes' do
-      subject { -> { model.update_attributes name: 'John' } }
-      it { expect{ subject.call }.to raise_error Acfs::ResourceNotLoaded }
-    end
-
-    describe '#update_attributes!' do
-      subject { -> { model.update_attributes! name: 'John' } }
-      it { expect{ subject.call }.to raise_error Acfs::ResourceNotLoaded }
-    end
-  end
-
   context 'loaded model' do
     context 'without changes' do
       let(:model) { model_class.find 1 }
@@ -116,46 +102,6 @@ describe Acfs::Model::Persistence do
         expect(model).to be_frozen
       end
     end
-
-    describe '#update_atributes!' do
-      let(:model) { model_class.find 1 }
-      before { model; Acfs.run }
-
-      it 'should set attributes' do
-        model.update_attributes name: 'Idefix'
-        expect(model.attributes.symbolize_keys).to eq id: 1, name: 'Idefix', age: 12
-      end
-
-      it 'should save resource' do
-        expect(model).to receive(:save).with({})
-        model.update_attributes name: 'Idefix'
-      end
-
-      it 'should pass second hash to save' do
-        expect(model).to receive(:save).with({ bla: 'blub' })
-        model.update_attributes({ name: 'Idefix' }, { bla: 'blub' })
-      end
-    end
-
-    describe '#update_atributes' do
-      let(:model) { model_class.find 1 }
-      before { model; Acfs.run }
-
-      it 'should set attributes' do
-        model.update_attributes! name: 'Idefix'
-        expect(model.attributes.symbolize_keys).to eq id: 1, name: 'Idefix', age: 12
-      end
-
-      it 'should save resource' do
-        expect(model).to receive(:save!).with({})
-        model.update_attributes! name: 'Idefix'
-      end
-
-      it 'should pass second hash to save' do
-        expect(model).to receive(:save!).with({ bla: 'blub' })
-        model.update_attributes!({ name: 'Idefix' }, { bla: 'blub' })
-      end
-    end
   end
 
   describe '.create!' do
@@ -179,7 +125,7 @@ describe Acfs::Model::Persistence do
 
       it 'should raise an error' do
         expect { model_class.create! data }.to raise_error ::Acfs::InvalidResource do |error|
-          expect(error.errors).to be == { name: %w(required) }.stringify_keys
+          expect(error.errors).to be == { name: ['required'] }.stringify_keys
         end
       end
     end
@@ -211,7 +157,7 @@ describe Acfs::Model::Persistence do
 
       it 'should contain error hash' do
         model = model_class.create data
-        expect(model.errors.to_hash).to be == { name: %w(required) }.stringify_keys
+        expect(model.errors.to_hash).to be == { name: [ "required" ]}.stringify_keys
       end
     end
   end

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  config.order = "random"
 
   config.expect_with :rspec do |c|
     # Only allow expect syntax

data/spec/support/service.rb

@@ -16,7 +16,8 @@ class CommentService < Acfs::Service
   use Acfs::Middleware::JsonDecoder
 end
 
-class MyUser < Acfs::Resource
+class MyUser
+  include Acfs::Model
   service UserService, path: 'users'
 
   attribute :id, :integer
@@ -24,23 +25,16 @@ class MyUser < Acfs::Resource
   attribute :age, :integer
 end
 
-class MyUserInherited < MyUser
-
-end
-
-class MyUserWithValidations < MyUser
-  validates_presence_of :name, :age
-  validates_format_of :name, with: /\A\w+\s+\w+.?\z/
-end
-
-class Session < Acfs::Resource
+class Session
+  include Acfs::Model
   service UserService
 
   attribute :id, :string
   attribute :user, :integer
 end
 
-class Comment < Acfs::Resource
+class Comment
+  include Acfs::Model
   service CommentService
 
   attribute :id, :integer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.20.0.dev.b184
+  version: 0.20.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -160,7 +160,6 @@ files:
 - 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
@@ -188,7 +187,6 @@ files:
 - 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/request/callbacks_spec.rb
 - spec/acfs/request_spec.rb
 - spec/acfs/response/formats_spec.rb
@@ -216,9 +214,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -239,7 +237,6 @@ test_files:
 - 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/request/callbacks_spec.rb
 - spec/acfs/request_spec.rb
 - spec/acfs/response/formats_spec.rb
@@ -252,3 +249,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/response.rb
 - spec/support/service.rb
+has_rdoc: 

data/lib/acfs/model/validation.rb

@@ -1,13 +0,0 @@
-module Acfs::Model
-
-  #
-  #
-  module Validation
-
-    def save!(*_)
-      raise ::Acfs::InvalidResource.new resource: self, errors: errors.to_a unless valid? :save
-
-      super
-    end
-  end
-end

data/spec/acfs/model/validation_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe Acfs::Model::Validation do
-  let(:params) { {} }
-  let(:model) { MyUserWithValidations.new params }
-
-  describe '#valid?' do
-    context 'with valid attributes' do
-      let(:params) { {name: 'john smith', age: 24} }
-      subject { model }
-
-      it { should be_valid }
-    end
-
-    context 'with invalid attributes' do
-      let(:params) { {name: 'invname'} }
-      subject { model }
-
-      it { should_not be_valid }
-    end
-  end
-
-  describe '#errors' do
-    context 'with valid attributes' do
-      let(:params) { {name: 'john smith', age: 24} }
-      before { model.valid? }
-      subject { model.errors }
-
-      it { should be_empty }
-    end
-
-    context 'with invalid attributes' do
-      let(:params) { {name: 'john'} }
-      before { model.valid? }
-      subject { model.errors }
-
-      it { should_not be_empty }
-      it { should have(2).items }
-
-      it 'should contain a list of error messages' do
-        expect(subject.to_hash).to eq age: ["can't be blank"], name: ['is invalid']
-      end
-    end
-  end
-
-  describe '#save!' do
-    context 'with invalid attributes' do
-      let(:params) { {name: 'john'} }
-      subject { -> { model.save! } }
-
-      it { expect { subject.call }.to raise_error Acfs::InvalidResource }
-    end
-  end
-end