acfs 1.0.0.dev.1.b305 → 1.0.0

data/spec/acfs/resource/attributes/float_spec.rb

@@ -1,20 +1,59 @@
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes::Float do
-  let(:model) { Class.new Acfs::Resource }
-  subject { described_class.new }
+  let(:type) { Acfs::Resource::Attributes::Float.new }
 
-  describe 'cast' do
-    it 'should return same object, if obj is already of float class' do
-      expect(subject.cast(1.3)).to be == 1.3
+  describe '#cast' do
+    subject { -> { type.cast value } }
+
+    context 'with nil' do
+      let(:value) { nil }
+      it { expect(subject.call).to eq nil }
+    end
+
+    context 'with blank string (I)' do
+      let(:value) { '' }
+      it { expect(subject.call).to eq 0.0 }
+    end
+
+    context 'with blank string (II)' do
+      let(:value) { "  \t" }
+      it { expect(subject.call).to eq 0.0 }
+    end
+
+    context 'with float' do
+      let(:value) { 1.7 }
+      it { expect(subject.call).to eq 1.7 }
+    end
+
+    context 'with Infinity' do
+      let(:value) { 'Infinity' }
+      it { expect(subject.call).to eq ::Float::INFINITY }
+    end
+
+    context 'with -Infinity' do
+      let(:value) { '-Infinity' }
+      it { expect(subject.call).to eq -::Float::INFINITY }
+    end
+
+    context 'with NaN' do
+      let(:value) { 'NaN' }
+      it { expect(subject.call).to be_nan }
+    end
+
+    context 'with fixnum' do
+      let(:value) { 1 }
+      it { expect(subject.call).to eq 1.0 }
     end
 
-    it 'should return parsed object, if obj is of Fixnum class' do
-      expect(subject.cast(7)).to be == 7.0
+    context 'with valid string' do
+      let(:value) { '1.7' }
+      it { expect(subject.call).to eq 1.7 }
     end
 
-    it 'should return parsed object, if obj is of String class containing a float' do
-      expect(subject.cast('1.7')).to be == 1.7
+    context 'with invalid string (I)' do
+      let(:value) { '1.7a' }
+      it { is_expected.to raise_error ArgumentError }
     end
   end
 end

data/spec/acfs/resource/attributes/integer_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Acfs::Resource::Attributes::Integer do
+  let(:type) { Acfs::Resource::Attributes::Integer.new }
+
+  describe '#cast' do
+    subject { -> { type.cast value } }
+
+    context 'with nil' do
+      let(:value) { nil }
+      it { expect(subject.call).to eq nil }
+    end
+
+    context 'with empty string' do
+      let(:value) { '' }
+      it { expect(subject.call).to eq 0 }
+    end
+
+    context 'with blank string' do
+      let(:value) { "  \t" }
+      it { expect(subject.call).to eq 0 }
+    end
+
+    context 'with string' do
+      let(:value) { '123' }
+      it { expect(subject.call).to eq 123 }
+    end
+
+    context 'with invalid string' do
+      let(:value) { '123a' }
+      it { is_expected.to raise_error ArgumentError }
+    end
+  end
+end

data/spec/acfs/resource/attributes/list_spec.rb

@@ -1,34 +1,58 @@
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes::List do
-  let(:model) { Class.new Acfs::Resource }
-  subject { described_class.new }
+  let(:type) { Acfs::Resource::Attributes::List.new }
 
-  describe '.cast' do
-    context 'with array' do
-      let(:sample) { %w(abc cde efg) }
+  describe '#cast' do
+    subject { -> { type.cast value } }
 
-      it 'should return unmodified array' do
-        expect(subject.cast(sample)).to be == %w(abc cde efg)
-      end
+    context 'with nil' do
+      let(:value) { nil }
+      it { expect(subject.call).to eq nil }
     end
 
-    context 'with not listable object' do
-      let(:sample) { Object.new }
+    context 'with blank string (I)' do
+      let(:value) { '' }
+      it { expect(subject.call).to eq Array.new }
+    end
 
-      it 'should raise a TypeError' do
-        expect do
-          subject.cast(sample)
-        end.to raise_error TypeError
-      end
+    context 'with blank string (II)' do
+      let(:value) { "  \t" }
+      it { expect(subject.call).to eq Array.new }
     end
 
-    context 'with listable object' do
-      let(:sample) { 5..10 }
+    context 'with array' do
+      let(:value) { %w(abc cde efg) }
+      it { expect(subject.call).to eq value }
+    end
 
-      it 'should cast object to array' do
-        expect(subject.cast(sample)).to be == [5, 6, 7, 8, 9, 10]
+    context 'with convertable object (I)' do
+      let(:value) do
+        Class.new do
+          def to_ary
+            [1, 2, 3]
+          end
+        end.new
       end
+
+      it { expect(subject.call).to eq [1, 2, 3] }
+    end
+
+    context 'with convertable object (II)' do
+      let(:value) do
+        Class.new do
+          def to_a
+            [1, 2, 3]
+          end
+        end.new
+      end
+
+      it { expect(subject.call).to eq [1, 2, 3] }
+    end
+
+    context 'with non castable object' do
+      let(:value) { Object.new }
+      it { expect(subject.call).to eq [value] }
     end
   end
 end

data/spec/acfs/resource/attributes/uuid_spec.rb

@@ -1,63 +1,40 @@
 require 'spec_helper'
 
 describe Acfs::Resource::Attributes::UUID do
-  let(:model) { Class.new Acfs::Resource }
-  let(:params) { {} }
-  let(:instance) { described_class.new params }
-  subject { instance }
-
-  describe '#cast_type' do
-    let(:param) { '450b7a40-94ad-11e3-baa8-0800200c9a66' }
-    let(:action) { instance.cast param }
-    subject { action }
-
-    context 'with String as param' do
-      context 'with valid UUID' do
-        let(:param) { '450b7a40-94ad-11e3-baa8-0800200c9a66' }
-        it { should be_a String }
-        it { should eq param }
-      end
-
-      context 'with invalid UUID' do
-        subject { -> { action } }
-
-        context 'with random non-empty string' do
-          let(:param) { 'invalid string' }
-          it { should raise_error ArgumentError }
-        end
-
-        context 'with UUID string containing invalid characters' do
-          let(:param) { 'xxxxxxxx-yyyy-11e3-baa8-0800200c9a66' }
-          it { should raise_error ArgumentError }
-        end
-
-        context 'with empty string' do
-          let(:param) { '' }
-
-          context 'with allow_nil option' do
-            let(:params) { {allow_nil: true} }
-            subject { action }
-            it { should eq nil }
-          end
-
-          context 'without allow_nil option' do
-            let(:params) { {allow_nil: false} }
-            it { should raise_error ArgumentError }
-          end
-        end
-      end
+  let(:type) { Acfs::Resource::Attributes::UUID.new }
+
+  describe '#cast' do
+    subject { -> { type.cast(value) } }
+
+    context 'with nil' do
+      let(:value) { nil }
+      it { expect(subject.call).to eq nil }
     end
 
-    context 'with non-String as param' do
-      subject { -> { action } }
+    context 'with empty string' do
+      let(:value) { '' }
+      it { expect(subject.call).to eq nil }
+    end
+
+    context 'with blank string' do
+      let(:value) { "  \t" }
+      it { expect(subject.call).to eq nil }
+    end
+
+    context 'with string UUID' do
+      let(:value) { '450b7a40-94ad-11e3-baa8-0800200c9a66' }
+      it { expect(subject.call).to be_a String }
+      it { expect(subject.call).to eq value }
+    end
+
+    context 'with invalid string' do
+      let(:value) { 'invalid string' }
+      it { is_expected.to raise_error TypeError, /invalid UUID/i }
+    end
 
-      invalid_params = {fixnum: 1, float: 3.2, symbol: :invalid, boolean: true}
-      invalid_params.each do |type, incorrect_param|
-        context "with #{type} as param" do
-          let(:param) { incorrect_param }
-          it { should raise_error ArgumentError }
-        end
-      end
+    context 'with invalid UUID' do
+      let(:value) { 'xxxxxxxx-yyyy-11e3-baa8-0800200c9a66' }
+      it { is_expected.to raise_error TypeError, /invalid UUID/i }
     end
   end
 end

data/spec/acfs/resource/attributes_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Acfs::Resource::Attributes do
   let(:model) { Class.new Acfs::Resource }
+  let(:submodel) { Class.new model }
 
   describe '#initialize' do
     before { model.attribute :name, :string, default: 'John' }
@@ -46,15 +47,15 @@ describe Acfs::Resource::Attributes do
       end
     end
     let(:args) { [params] }
-    let(:params){ {name: 'James'} }
+    let(:params) { {name: 'James'} }
     let(:m) { model.new }
-    let(:action) { ->{ m.write_attributes(*args) } }
+    let(:action) { -> { m.write_attributes(*args) } }
     subject { action }
 
     it 'should update attributes'  do
       should change(m, :attributes)
-             .from(name: 'The Great John', age: 25)
-             .to(name: 'The Great James', age: 25)
+        .from(name: 'The Great John', age: 25)
+        .to(name: 'The Great James', age: 25)
     end
 
     context 'without non-hash params' do
@@ -71,8 +72,8 @@ describe Acfs::Resource::Attributes do
 
       it 'should update known attributes and store unknown'  do
         should change(m, :attributes)
-               .from(name: 'The Great John', age: 25)
-               .to(name: 'The Great James', age: 25, born_at: 'today')
+          .from(name: 'The Great John', age: 25)
+          .to(name: 'The Great James', age: 25, born_at: 'today')
       end
 
       context 'with unknown: :raise option' do
@@ -137,7 +138,7 @@ describe Acfs::Resource::Attributes do
   end
 
   describe 'class' do
-    describe '#attribute' do
+    describe '#attributes' do
       it 'should add an attribute to model attribute list' do
         model.send :attribute, :name, :string
 
@@ -150,42 +151,27 @@ describe Acfs::Resource::Attributes do
         expect(model.attributes.symbolize_keys).to eq name: 'John'
       end
 
-      it 'should accept an symbolic type' do
+      it 'should accept a symbolic type' do
         model.send :attribute, :age, :integer, default: '12'
 
         expect(model.attributes.symbolize_keys).to eq age: 12
       end
 
-      it 'should accept an class type' do
+      it 'should accept a class type' do
         model.send :attribute, :age, Acfs::Resource::Attributes::Integer,
-                   default: '12'
+          default: '12'
 
         expect(model.attributes.symbolize_keys).to eq age: 12
       end
 
-      context 'allow nil option' do
-        it 'should allow nil as value' do
-          model.send :attribute, :updated_at, :date_time,
-                     default: DateTime.new, allow_nil: true
-
-          resource = model.new
-          expect(resource.updated_at).to eq DateTime.new
-
-          resource.updated_at = ''
-          expect(resource.updated_at).to eq nil
+      context 'on inherited resources' do
+        before do
+          model.attribute :age, :integer, default: 5
+          submodel.attribute :born_at, :date_time
         end
-      end
-
-      context 'allow blank option' do
-        it 'should allow blank as value' do
-          model.send :attribute, :updated_at, :date_time,
-                     default: DateTime.new, allow_blank: true
-
-          resource = model.new
-          expect(resource.updated_at).to eq DateTime.new
 
-          resource.updated_at = ''
-          expect(resource.updated_at).to eq nil
+        it 'includes superclass attributes' do
+          expect(submodel.attributes.keys).to match_array %w(age born_at)
         end
       end
     end

data/spec/acfs/resource/locatable_spec.rb

@@ -28,7 +28,7 @@ describe Acfs::Resource::Locatable do
 
       context 'without attributes' do
         it 'should raise an error if attribute is missing' do
-          expect{ model.url }.to raise_error ArgumentError
+          expect { model.url }.to raise_error ArgumentError
         end
       end
     end
@@ -59,7 +59,7 @@ describe Acfs::Resource::Locatable do
       context ':update location' do
         let(:action) { :update }
         its(:raw_uri) do
-          expect{ subject }.to raise_error ArgumentError, /update.*disabled/
+          expect { subject }.to raise_error ArgumentError, /update.*disabled/
         end
       end
 

data/spec/acfs/resource/persistance_spec.rb

@@ -3,31 +3,31 @@ require 'spec_helper'
 describe Acfs::Resource::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}')
-      .to_return response({ id: 1, name: 'Idefix', age: 12 })
+                  .with(body: '{"id":1,"name":"Idefix","age":12}')
+                  .to_return response(id: 1, name: 'Idefix', age: 12)
 
     @post_stub = stub_request(:post, 'http://users.example.org/users')
-      .with(body: '{"id":null,"name":"Idefix","age":12}')
-      .to_return response({ id: 5, name: 'Idefix', age: 12 })
+                 .with(body: '{"id":null,"name":"Idefix","age":12}')
+                 .to_return response(id: 5, name: 'Idefix', age: 12)
 
     stub_request(:post, 'http://users.example.org/users')
       .with(body: '{"id":null,"name":"Anon","age":null}')
-      .to_return response({ id: 5, name: 'Anon', age: 12 })
+      .to_return response(id: 5, name: 'Anon', age: 12)
 
     stub_request(:post, 'http://users.example.org/users')
       .with(body: '{id:null,"name":"Idefix","age":12}')
-      .to_return response({ id: 5, name: 'Idefix', age: 12 })
+      .to_return response(id: 5, name: 'Idefix', age: 12)
 
     stub_request(:post, 'http://users.example.org/users')
       .with(body: '{"id":null,"name":null,"age":12}')
-      .to_return response({ errors: { name: [ 'required' ] }}, status: 422)
+      .to_return response({errors: {name: ['required']}}, {status: 422})
 
     @del = stub_request(:delete, 'http://users.example.org/users/1')
-      .with(body: '{}')
-      .to_return response({ id: 1, name: 'Idefix', age: 12 }, status: 200)
+           .with(body: '{}')
+           .to_return response({id: 1, name: 'Idefix', age: 12}, {status: 200})
   end
 
   context 'new model' do
@@ -65,7 +65,7 @@ describe Acfs::Resource::Persistence do
           let!(:req) do
             stub_request(:post, 'http://users.example.org/users')
               .with(body: '{"id":null,"name":"Idefix","age":null,"born_at":"Berlin"}')
-              .to_return response({id: 5, name: 'Idefix', age: 12, wuff: 'woa'})
+              .to_return response(id: 5, name: 'Idefix', age: 12, wuff: 'woa')
           end
           let(:model) { model_class.new name: 'Idefix', born_at: 'Berlin' }
 
@@ -100,12 +100,12 @@ describe Acfs::Resource::Persistence do
 
     describe '#update_attributes' do
       subject { -> { model.update_attributes name: 'John' } }
-      it { expect{ subject.call }.to raise_error Acfs::ResourceNotLoaded }
+      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 }
+      it { expect { subject.call }.to raise_error Acfs::ResourceNotLoaded }
     end
   end
 
@@ -122,22 +122,53 @@ describe Acfs::Resource::Persistence do
       let(:model) { model_class.find 1 }
       before { model; Acfs.run; model.name = 'dhh' }
 
-      it { expect(model).to_not be_persisted }
+      it { expect(model).to be_persisted }
       it { expect(model).to_not be_new }
     end
 
     describe '#delete!' do
       let(:model) { model_class.find 1 }
-      before { model; Acfs.run }
+      let(:before_acfs_run) {}
+
+      describe 'normal delete actions' do
+        before { model; Acfs.run }
+
+        it 'should trigger DELETE request' do
+          model.delete!
+          expect(@del).to have_been_requested
+        end
 
-      it 'should trigger DELETE request' do
-        model.delete!
-        expect(@del).to have_been_requested
+        it 'should be frozen after DELETE' do
+          model.delete!
+          expect(model.__getobj__).to be_frozen
+        end
       end
 
-      it 'should be frozen after DELETE' do
-        model.delete!
-        expect(model.__getobj__).to be_frozen
+      describe 'correct URL generation' do
+        let(:model_class) { PathArguments }
+        let(:model) { model_class.find 1, params: {required_arg: 'some_value'} }
+
+        before :each do
+          resource_url = 'http://users.example.org/some_value/users/1'
+          @my_get_stub = stub_request(:get, resource_url)
+                         .to_return response(id: 1, required_arg: 'some_value')
+          @my_delete_stub = stub_request(:delete, resource_url)
+                            .with(body: '{}')
+                            .to_return response({id: 1, required_arg: 'some_value'}, {status: 200})
+          model
+          Acfs.run
+        end
+
+        it 'should not raise an error on URL generation' do
+          expect do
+            model.delete!
+          end.not_to raise_error
+        end
+
+        it 'should request the delete' do
+          model.delete!
+          expect(@my_delete_stub).to have_been_requested
+        end
       end
     end
 
@@ -156,8 +187,8 @@ describe Acfs::Resource::Persistence do
       end
 
       it 'should pass second hash to save' do
-        expect(model.__getobj__).to receive(:save).with({ bla: 'blub' })
-        model.update_attributes({ name: 'Idefix' }, { bla: 'blub' })
+        expect(model.__getobj__).to receive(:save).with(bla: 'blub')
+        model.update_attributes({name: 'Idefix'}, {bla: 'blub'})
       end
     end
 
@@ -176,8 +207,8 @@ describe Acfs::Resource::Persistence do
       end
 
       it 'should pass second hash to save' do
-        expect(model.__getobj__).to receive(:save!).with({ bla: 'blub' })
-        model.update_attributes!({ name: 'Idefix' }, { bla: 'blub' })
+        expect(model.__getobj__).to receive(:save!).with(bla: 'blub')
+        model.update_attributes!({name: 'Idefix'}, {bla: 'blub'})
       end
     end
   end
@@ -190,13 +221,13 @@ describe Acfs::Resource::Persistence do
       before do
         stub_request(:put, 'http://users.example.org/users/1')
           .with(body: '{"id":1,"name":"","age":12}')
-          .to_return response({ errors: { name: [ 'required' ] }}, status: 422)
+          .to_return response({errors: {name: ['required']}}, {status: 422})
       end
 
       it 'should set local errors hash' do
         model.name = ''
         model.save! rescue nil
-        expect(model.errors.to_hash).to be == { name: %w(required) }
+        expect(model.errors.to_hash).to be == {name: %w(required)}
       end
     end
 
@@ -206,15 +237,15 @@ describe Acfs::Resource::Persistence do
 
       before do
         stub_request(:put, 'http://users.example.org/users/1')
-        .with(body: '{"id":1,"name":"","age":12}')
-        .to_return response({ errors: { name: [ 'required' ] }}, status: 422)
+          .with(body: '{"id":1,"name":"","age":12}')
+          .to_return response({errors: {name: ['required']}}, {status: 422})
       end
     end
   end
 
   describe '.create!' do
     context 'with valid data' do
-      let(:data) { { name: 'Idefix', age: 12 } }
+      let(:data) { {name: 'Idefix', age: 12} }
 
       it 'should create new resource' do
         model = model_class.create! data
@@ -232,9 +263,9 @@ describe Acfs::Resource::Persistence do
       let(:data) { {name: nil, age: 12} }
 
       it 'should raise an error' do
-        expect{ model_class.create! data }.to \
+        expect { model_class.create! data }.to \
           raise_error(::Acfs::InvalidResource) do |error|
-            expect(error.errors).to be == { 'name' => %w(required) }
+            expect(error.errors).to be == {'name' => %w(required)}
           end
       end
     end
@@ -272,13 +303,13 @@ describe Acfs::Resource::Persistence do
       let!(:req) do
         stub_request(:post, 'http://users.example.org/users')
           .with(body: '{"id":null,"name":"Anon","age":9,"born_at":"today"}')
-          .to_return response({id: 5, name: 'Anon', age: 9})
+          .to_return response(id: 5, name: 'Anon', age: 9)
       end
       let(:data) { {age: 9, born_at: 'today'} }
 
       it 'should store them in attributes' do
         expect(subject.attributes).to eq 'id' => 5, 'name' => 'Anon',
-          'age' => 9, 'born_at' => 'today'
+                                         'age' => 9, 'born_at' => 'today'
       end
     end
   end