acfs 0.23.2 → 0.24.0.b210

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: df206319b5c8ed76be17036d7d9aba9fa7be6ee5
-  data.tar.gz: 4527b5b268b86c9c97fe4054918e59c893bc8d9c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmM5ZDRlOGNlODlhYzMzMTY0MjM0OTVmNmZkOWRhYWU1MzkyMjI0Zg==
+  data.tar.gz: !binary |-
+    ZDQ1YWIwOTBjNDA4NDM0MDI1MGNiMDc5NWVjMzE5NTQ1ZjI0OWY3Ng==
 SHA512:
-  metadata.gz: 1952d07e7558d6989cb781561ac08fede50723723db53f3e976bc803ea1a7f6587791ec2eff46cf702ed01e6dd0c2dbe7e4b281a21535fbc461b63efbffafbbf
-  data.tar.gz: a41330102704b7bddf4471e65d58c6840ffeb9456b497f198b9ba824578c4c9e07238b249bd2fc25f2b2bc7510bc114c57f08bc9910b06a8938ed7482defe00c
+  metadata.gz: !binary |-
+    YWJiMzlkMWFiYTc3YjhlMWYwZWQ1MGQ3MzgzZDZkMjFmZTY3MWQ3MzhkNWNl
+    ZGMzZjE2MzJmY2Y4ODczZGYxOTRkNmMxZjQ5YjA0NGM0Y2IzY2VjN2Q5NDNi
+    ZTdjMjA1MmI4NzIxNmVjMjA4NTMxNWIyOTRjYmZiNjFmYmEzYWM=
+  data.tar.gz: !binary |-
+    Zjg5Mzk0MGE1OWQ2Y2ZkNmQwYTY2NzVmNDdmYzU4Mzc3NTY2ODYwZTVkNjQ0
+    N2M0ODczM2Q3NDBkNGRiNjNiZjEyYTA0Y2RhNTg4YmQ1MGUxZmE2NzNlNmU0
+    YWZkMzY3YjFiN2U5OGM1ZDc1YThhYTY1ZTE1YjFiM2FkYWFkOTI=

data/.travis.yml

@@ -4,7 +4,7 @@ rvm:
 - 2.0.0
 - 1.9.3
 - jruby
-- rbx-19mode
+- rbx
 gemfile:
 - gemfiles/Gemfile.rails-4-0
 - gemfiles/Gemfile.rails-3-2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.24.0
+
+* Fix issues with stubs using type inheritance
+* Allow '1' as true value for bool attributes (Tino Junge)
+
 ## 0.23.2
 
 * Fix regression in delegator usage by #find due to resource type inheritance.

data/Gemfile

@@ -6,7 +6,7 @@ gem 'webmock', '~> 1.7'
 gem 'rake'
 gem 'rspec'
 gem 'coveralls'
-gem 'json', '~> 1.7.7'
+gem 'json', '~> 1.8.1'
 
 # Doc
 group :development do
@@ -19,6 +19,10 @@ end
 
 # Platform specific development dependencies
 #
+platform :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-coverage'
+end
 gem 'msgpack', platform: :ruby
 gem 'msgpack-jruby', require: 'msgpack', platform: :jruby
 

data/README.md

@@ -5,7 +5,7 @@
 [![Coverage Status](https://coveralls.io/repos/jgraichen/acfs/badge.png?branch=master)](https://coveralls.io/r/jgraichen/acfs)
 [![Code Climate](https://codeclimate.com/github/jgraichen/acfs.png)](https://codeclimate.com/github/jgraichen/acfs)
 [![Dependency Status](https://gemnasium.com/jgraichen/acfs.png)](https://gemnasium.com/jgraichen/acfs)
-[![RubyDoc Documentation](https://raw.github.com/jgraichen/shields/master/rubydoc.png)](http://rubydoc.info/github/jgraichen/acfs/master/frames)
+[![RubyDoc Documentation](http://b.repl.ca/v1/rubydoc-here-blue.png)](http://rubydoc.info/github/jgraichen/acfs/master/frames)
 
 Acfs is a library to develop API client libraries for single services within a larger service oriented application.
 

data/acfs.gemspec

@@ -22,7 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'activemodel', '>= 3.1'
   spec.add_runtime_dependency 'actionpack', '>= 3.1'
   spec.add_runtime_dependency 'multi_json'
-  spec.add_runtime_dependency 'typhoeus'
+
+  # Bundle update w/o version resolves to 0.3.3 ...
+  spec.add_runtime_dependency 'typhoeus', '>= 0.6.5'
+
   spec.add_runtime_dependency 'rack'
 
   spec.add_development_dependency 'bundler', '~> 1.3'

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

@@ -18,7 +18,7 @@ module Acfs::Model
     #
     class Boolean < Base
 
-      TRUE_VALUES = %w(true on yes)
+      TRUE_VALUES = %w(true on yes 1)
 
       # @api public
       #

data/lib/acfs/operation.rb

@@ -8,6 +8,7 @@ module Acfs
   class Operation
     attr_reader :action, :params, :resource, :data, :callback
     delegate :service, to: :resource
+    delegate :call, to: :callback
 
     def initialize(resource, action, opts = {}, &block)
       @resource = resource

data/lib/acfs/stub.rb

@@ -11,7 +11,10 @@ module Acfs
 
     def initialize(opts)
       @opts = opts
-      @opts[:with].stringify_keys! if @opts[:with].respond_to? :stringify_keys
+
+      @opts[:with].stringify_keys! if @opts[:with].is_a? Hash
+      @opts[:return].stringify_keys! if @opts[:return].is_a? Hash
+      @opts[:return].map! { |h| h.stringify_keys! if h.is_a? Hash } if @opts[:return].is_a? Array
     end
 
     def accept?(op)
@@ -20,7 +23,7 @@ module Acfs
       params = op.full_params.stringify_keys
       data   = op.data.stringify_keys
 
-      opts[:with] == params || data == opts[:with]
+      opts[:with] == params || data == opts[:with] || (opts[:with].nil? && params.empty? && data.empty?)
     end
 
     def calls
@@ -38,7 +41,7 @@ module Acfs
       if (err = opts[:raise])
         raise_error op, err, opts[:return]
       elsif (data = opts[:return])
-        op.callback.call data
+        op.call data
       else
         raise ArgumentError, 'Unsupported stub.'
       end

data/lib/acfs/version.rb

@@ -1,8 +1,8 @@
 module Acfs
   module VERSION
     MAJOR = 0
-    MINOR = 23
-    PATCH = 2
+    MINOR = 24
+    PATCH = 0
     STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.')

data/spec/acfs/model/attributes/boolean_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Acfs::Model::Attributes::Boolean do
+  subject { Acfs::Model::Attributes::Boolean.new }
+
+  describe 'cast' do
+    it 'should preserve boolean values' do
+      expect(subject.cast(false)).to eq false
+      expect(subject.cast(true)).to eq true
+    end
+
+    it 'should cast TRUE_VALUES to true' do
+      expect(subject.cast('yes')).to eq true
+      expect(subject.cast('on')).to eq true
+      expect(subject.cast('true')).to eq true
+      expect(subject.cast('1')).to eq true
+    end
+
+    it 'should cast any other value to false' do
+      expect(subject.cast('')).to eq false
+      expect(subject.cast('wrong')).to eq false
+      expect(subject.cast('random')).to eq false
+    end
+  end
+end

data/spec/acfs/stub_spec.rb

@@ -10,10 +10,6 @@ describe Acfs::Stub do
 
   before do
     Acfs::Stub.allow_requests = false
-
-    #Acfs::Stub.read(MyUser).with(id: 5).and_return({ id: 5, name: 'John', age: 32 })
-    #Acfs::Stub.read(MyUser).with(id: 6).and_raise(:not_found)
-    #Acfs::Stub.create(MyUser).with(name: '', age: 12).and_return(:invalid, errors: { name: [ 'must be present ']})
   end
 
   describe '#called?' do
@@ -82,6 +78,23 @@ describe Acfs::Stub do
           expect { Acfs.run }.to raise_error(Acfs::ResourceNotFound)
         end
       end
+
+      context 'with type parameter' do
+        before do
+          Acfs::Stub.resource Computer, :read, with: { id: 1 }, return: { id: 1, type: 'PC' }
+          Acfs::Stub.resource Computer, :read, with: { id: 2 }, return: { id: 2, type: 'Mac' }
+        end
+
+        it 'should create inherited type' do
+          pc = Computer.find 1
+          mac = Computer.find 2
+
+          Acfs.run
+
+          expect(pc).to be_a PC
+          expect(mac).to be_a Mac
+        end
+      end
     end
 
     context 'with create action' do
@@ -104,6 +117,45 @@ describe Acfs::Stub do
       end
     end
 
+    context 'with list action' do
+      before do
+        Acfs::Stub.resource MyUser, :list,
+          return: [{ id: 1, name: 'John Smith', age: 32 }, { id: 2, name: 'Anon', age: 12 }]
+      end
+
+      it 'should return collection' do
+        users = MyUser.all
+        Acfs.run
+
+        expect(users).to have(2).items
+      end
+
+      it 'should return defined resources' do
+        users = MyUser.all
+        Acfs.run
+
+        expect(users[0].id).to eq 1
+        expect(users[1].id).to eq 2
+        expect(users[0].name).to eq 'John Smith'
+        expect(users[1].name).to eq 'Anon'
+      end
+
+      context 'with type parameter' do
+        before do
+          Acfs::Stub.resource Computer, :list,
+            return: [{id: 1, type: 'PC'}, {id: 2, type: 'Mac'}]
+        end
+
+        it 'should create inherited type' do
+          computers = Computer.all
+          Acfs.run
+
+          expect(computers.first).to be_a PC
+          expect(computers.last).to be_a Mac
+        end
+      end
+    end
+
     context 'with update action' do
       before do
         Acfs::Stub.resource MyUser, :read, with: { id: 1 }, return: { id: 1, name: 'John Smith', age: 32 }

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 0.23.2
+  version: 0.24.0.b210
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -179,6 +179,7 @@ files:
 - spec/acfs/configuration_spec.rb
 - spec/acfs/middleware/json_decoder_spec.rb
 - spec/acfs/middleware/msgpack_decoder_spec.rb
+- spec/acfs/model/attributes/boolean_spec.rb
 - spec/acfs/model/attributes/date_time_spec.rb
 - spec/acfs/model/attributes/float_spec.rb
 - spec/acfs/model/attributes/list_spec.rb
@@ -212,17 +213,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: An abstract API base client for service oriented application.
@@ -230,6 +231,7 @@ test_files:
 - spec/acfs/configuration_spec.rb
 - spec/acfs/middleware/json_decoder_spec.rb
 - spec/acfs/middleware/msgpack_decoder_spec.rb
+- spec/acfs/model/attributes/boolean_spec.rb
 - spec/acfs/model/attributes/date_time_spec.rb
 - spec/acfs/model/attributes/float_spec.rb
 - spec/acfs/model/attributes/list_spec.rb
@@ -253,4 +255,3 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/response.rb
 - spec/support/service.rb
-has_rdoc: