acfs 1.6.0 → 1.7.0

data/spec/acfs_spec.rb

@@ -4,57 +4,68 @@ require 'spec_helper'
 
 describe 'Acfs' do
   before do
-    stub_request(:get, 'http://users.example.org/users').to_return response([{id: 1, name: 'Anon', age: 12}, {id: 2, name: 'John', age: 26}])
-    stub_request(:get, 'http://users.example.org/users/2').to_return response(id: 2, name: 'John', age: 26)
-    stub_request(:get, 'http://users.example.org/users/3').to_return response(id: 3, name: 'Miraculix', age: 122)
-    stub_request(:get, 'http://users.example.org/users/100').to_return response(id: 100, name: 'Jimmy', age: 45)
-    stub_request(:get, 'http://users.example.org/users/2/friends').to_return response([{id: 1, name: 'Anon', age: 12}])
-    stub_request(:get, 'http://comments.example.org/comments?user=2').to_return response([{id: 1, text: 'Comment #1'}, {id: 2, text: 'Comment #2'}])
+    stub_request(:get, 'http://users.example.org/users')
+      .to_return response([{id: 1, name: 'Anon', age: 12}, {id: 2, name: 'John', age: 26}])
+
+    stub_request(:get, 'http://users.example.org/users/2')
+      .to_return response(id: 2, name: 'John', age: 26)
+
+    stub_request(:get, 'http://users.example.org/users/3')
+      .to_return response(id: 3, name: 'Miraculix', age: 122)
+
+    stub_request(:get, 'http://users.example.org/users/100')
+      .to_return response(id: 100, name: 'Jimmy', age: 45)
+
+    stub_request(:get, 'http://users.example.org/users/2/friends')
+      .to_return response([{id: 1, name: 'Anon', age: 12}])
+
+    stub_request(:get, 'http://comments.example.org/comments?user=2')
+      .to_return response([{id: 1, text: 'Comment #1'}, {id: 2, text: 'Comment #2'}])
   end
 
-  it 'should update single resource synchronously' do
+  it 'updates single resource synchronously' do
     stub = stub_request(:put, 'http://users.example.org/users/2')
-           .to_return {|request| {body: request.body, headers: {'Content-Type' => request.headers['Content-Type']}} }
+      .to_return {|request| {body: request.body, headers: {'Content-Type' => request.headers['Content-Type']}} }
 
-    @user = MyUser.find 2
+    user = MyUser.find 2
     Acfs.run
 
-    expect(@user).to_not be_changed
-    expect(@user).to be_persisted
+    expect(user).not_to be_changed
+    expect(user).to be_persisted
 
-    @user.name = 'Johnny'
+    user.name = 'Johnny'
 
-    expect(@user).to be_changed
-    expect(@user).to be_persisted
+    expect(user).to be_changed
+    expect(user).to be_persisted
 
-    @user.save
+    user.save
 
     expect(stub).to have_been_requested
-    expect(@user).to_not be_changed
-    expect(@user).to be_persisted
+    expect(user).not_to be_changed
+    expect(user).to be_persisted
   end
 
-  it 'should create a single resource synchronously' do
+  it 'creates a single resource synchronously' do
     stub = stub_request(:post, 'http://users.example.org/sessions').to_return response(id: 'sessionhash', user: 1)
 
     session = Session.create ident: 'Anon'
 
     expect(stub).to have_been_requested
-    expect(session.id).to be == 'sessionhash'
-    expect(session.user).to be == 1
+    expect(session.id).to eq 'sessionhash'
+    expect(session.user).to eq 1
   end
 
-  it 'should load single resource' do
-    @user = MyUser.find(2)
+  it 'loads single resource' do
+    user = MyUser.find(2)
 
-    expect(@user).to_not be_loaded
+    expect(user).not_to be_loaded
 
     Acfs.run
 
-    expect(@user).to be_loaded
-    expect(@user.id).to be == 2
-    expect(@user.name).to be == 'John'
-    expect(@user.age).to be == 26
+    expect(user).to be_loaded
+    expect(user.id).to eq 2
+    expect(user.name).to eq 'John'
+    expect(user.age).to eq 26
   end
 
   describe 'singleton' do
@@ -62,144 +73,151 @@ describe 'Acfs' do
       stub_request(:get, 'http://users.example.org/singles?user_id=5').to_return response(score: 250, user_id: 5)
     end
 
-    it 'should create a singleton resource' do
+    it 'creates a singleton resource' do
       stub = stub_request(:post, 'http://users.example.org/singles').to_return response(score: 250, user_id: 5)
 
-      @single = Single.new user_id: 5, score: 250
-      expect(@single.new?).to eq true
+      single = Single.new user_id: 5, score: 250
+      expect(single.new?).to eq true
 
-      @single.save
+      single.save
       expect(stub).to have_been_requested
 
-      expect(@single.new?).to eq false
-      expect(@single.user_id).to eq 5
-      expect(@single.score).to eq 250
+      expect(single.new?).to eq false
+      expect(single.user_id).to eq 5
+      expect(single.score).to eq 250
     end
 
-    it 'should load singleton resource' do
-      @single = Single.find user_id: 5
+    it 'loads singleton resource' do
+      single = Single.find user_id: 5
       Acfs.run
 
-      expect(@single.score).to eq 250
+      expect(single.score).to eq 250
     end
 
-    it 'should update singleton resource' do
+    it 'updates singleton resource' do
       stub = stub_request(:put, 'http://users.example.org/singles').to_return do |request|
         {
           body: request.body,
-          headers: {'Content-Type' => request.headers['Content-Type']}
+          headers: {'Content-Type' => request.headers['Content-Type']},
         }
       end
 
-      @single = Single.find user_id: 5
+      single = Single.find user_id: 5
       Acfs.run
 
-      expect(@single.score).to eq 250
+      expect(single.score).to eq 250
 
-      @single.score = 300
-      @single.save
+      single.score = 300
+      single.save
 
       expect(stub).to have_been_requested
 
-      expect(@single.score).to eq 300
+      expect(single.score).to eq 300
     end
 
-    it 'should delete singleton resource' do
+    it 'deletes singleton resource' do
       stub = stub_request(:delete, 'http://users.example.org/singles').to_return do |request|
         {
           body: request.body,
-          headers: {'Content-Type' => request.headers['Content-Type']}
+          headers: {'Content-Type' => request.headers['Content-Type']},
         }
       end
 
-      @single = Single.find user_id: 5
+      single = Single.find user_id: 5
       Acfs.run
 
-      expect(@single.new?).to eq false
+      expect(single.new?).to eq false
 
-      @single.delete
+      single.delete
 
       expect(stub).to have_been_requested
     end
 
-    it 'should raise error when calling `all\'' do
+    it 'raises error when calling .all' do
       expect { Single.all }.to raise_error ::Acfs::UnsupportedOperation
     end
   end
 
-  it 'should load multiple single resources' do
-    @users = MyUser.find([2, 3, 100]) do |users|
+  it 'loads multiple single resources' do
+    john = nil
+    mirx = nil
+    jimy = nil
+
+    users = MyUser.find([2, 3, 100]) do |users|
       # This block should be called only after *all* resources are loaded.
-      @john = users[0]
-      @mirx = users[1]
-      @jimy = users[2]
+      john = users[0]
+      mirx = users[1]
+      jimy = users[2]
     end
 
-    expect(@users).to_not be_loaded
+    expect(users).not_to be_loaded
 
     Acfs.run
 
-    expect(@users).to be_loaded
-    expect(@users).to have(3).items
+    expect(users).to be_loaded
+    expect(users).to have(3).items
 
-    expect(@users[0].id).to be == 2
-    expect(@users[0].name).to be == 'John'
-    expect(@users[0].age).to be == 26
-    expect(@users[0]).to be == @john
+    expect(users[0].id).to eq 2
+    expect(users[0].name).to eq 'John'
+    expect(users[0].age).to eq 26
+    expect(users[0]).to eq john
 
-    expect(@users[1].id).to be == 3
-    expect(@users[1].name).to be == 'Miraculix'
-    expect(@users[1].age).to be == 122
-    expect(@users[1]).to be == @mirx
+    expect(users[1].id).to eq 3
+    expect(users[1].name).to eq 'Miraculix'
+    expect(users[1].age).to eq 122
+    expect(users[1]).to eq mirx
 
-    expect(@users[2].id).to be == 100
-    expect(@users[2].name).to be == 'Jimmy'
-    expect(@users[2].age).to be == 45
-    expect(@users[2]).to be == @jimy
+    expect(users[2].id).to eq 100
+    expect(users[2].name).to eq 'Jimmy'
+    expect(users[2].age).to eq 45
+    expect(users[2]).to eq jimy
   end
 
-  it 'should load multiple resources' do
-    @users = MyUser.all
+  it 'loads multiple resources' do
+    users = MyUser.all
 
-    expect(@users).to_not be_loaded
+    expect(users).not_to be_loaded
 
     Acfs.run
 
-    expect(@users).to be_loaded
-    expect(@users).to have(2).items
-    expect(@users[0].name).to be == 'Anon'
-    expect(@users[0].age).to be == 12
-    expect(@users[1].name).to be == 'John'
-    expect(@users[1].age).to be == 26
+    expect(users).to be_loaded
+    expect(users).to have(2).items
+    expect(users[0].name).to eq 'Anon'
+    expect(users[0].age).to eq 12
+    expect(users[1].name).to eq 'John'
+    expect(users[1].age).to eq 26
   end
 
-  it 'should load associated resources' do
+  it 'loads associated resources' do
     pending 'TODO: Implement high level feature'
+    friends = nil
 
-    @user = MyUser.find(2) do |user|
-      @friends = user.friends.all
+    user = MyUser.find(2) do |user|
+      friends = user.friends.all
     end
 
     Acfs.run
 
-    expect(@user.name).to be == 'John'
-    expect(@user.age).to be == 26
+    expect(user.name).to eq 'John'
+    expect(user.age).to eq 26
 
-    expect(@friends).to have(1).items
+    expect(friends).to have(1).items
   end
 
-  it 'should load associated resources from different service' do
-    @user = MyUser.find 2 do |user|
-      expect(user.id).to be == 2
-      @comments = Comment.where({user: user.id})
+  it 'loads associated resources from different service' do
+    comments = nil
+
+    user = MyUser.find 2 do |user|
+      expect(user.id).to eq 2
+      comments = Comment.where({user: user.id})
     end
 
     Acfs.run
 
-    expect(@user.id).to be == 2
-    expect(@user.name).to be == 'John'
-    expect(@user.age).to be == 26
+    expect(user.id).to eq 2
+    expect(user.name).to eq 'John'
+    expect(user.age).to eq 26
 
-    expect(@comments).to have(2).items
+    expect(comments).to have(2).items
   end
 end

data/spec/spec_helper.rb

@@ -35,7 +35,7 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
-  config.before :each do
+  config.before do
     Acfs.runner.clear
     Acfs::Stub.clear
   end

data/spec/support/response.rb

@@ -4,9 +4,9 @@ require 'json'
 
 def response(data = nil, opts = {})
   if data
-    opts.merge! body: JSON.dump(data)
+    opts[:body] = JSON.dump(data)
     opts[:headers] ||= {}
-    opts[:headers].merge! 'Content-Type' => 'application/json'
+    opts[:headers]['Content-Type'] = 'application/json'
   end
   opts
 end

data/spec/support/service.rb

@@ -45,7 +45,7 @@ class Session < Acfs::Resource
   service UserService, path: {
     list: 'users/:user_id/sessions',
     delete: 'users/:user_id/sessions/del/:id',
-    update: nil
+    update: nil,
   }
 
   attribute :id, :string

data/spec/support/shared/find_callbacks.rb

@@ -3,14 +3,14 @@
 shared_examples 'a query method with multi-callback support' do
   let(:cb) { Proc.new }
 
-  it 'should invoke callback' do
+  it 'invokes callback' do
     expect do |cb|
       action.call cb
       Acfs.run
     end.to yield_with_args
   end
 
-  it 'should invoke multiple callbacks' do
+  it 'invokes multiple callbacks' do
     expect do |cb|
       object = action.call cb
       Acfs.add_callback object, &cb
@@ -19,31 +19,35 @@ shared_examples 'a query method with multi-callback support' do
   end
 
   describe 'callback' do
-    it 'should be invoked with resource' do
+    it 'is invoked with resource' do
       proc = proc {}
+      object = nil
+
       expect(proc).to receive(:call) do |res|
-        expect(res).to equal @object
+        expect(res).to equal object
         expect(res).to be_loaded
       end
 
-      @object = action.call proc
+      object = action.call proc
       Acfs.run
     end
 
-    it 'should invoke multiple callback with loaded resource' do
+    it 'invokes multiple callback with loaded resource' do
       proc1 = proc {}
       proc2 = proc {}
+      object = nil
+
       expect(proc1).to receive(:call) do |user|
-        expect(user).to equal @object
+        expect(user).to equal object
         expect(user).to be_loaded
       end
       expect(proc2).to receive(:call) do |user|
-        expect(user).to equal @object
+        expect(user).to equal object
         expect(user).to be_loaded
       end
 
-      @object = action.call proc1
-      Acfs.add_callback(@object, &proc2)
+      object = action.call proc1
+      Acfs.add_callback(object, &proc2)
       Acfs.run
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acfs
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -176,7 +176,7 @@ files:
 - spec/acfs/global_spec.rb
 - spec/acfs/location_spec.rb
 - spec/acfs/middleware/json_spec.rb
-- spec/acfs/middleware/msgpack_spec.rb
+- spec/acfs/middleware/message_pack_spec.rb
 - spec/acfs/operation_spec.rb
 - spec/acfs/request/callbacks_spec.rb
 - spec/acfs/request_spec.rb
@@ -192,7 +192,7 @@ files:
 - 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/persistence_spec.rb
 - spec/acfs/resource/query_methods_spec.rb
 - spec/acfs/resource/validation_spec.rb
 - spec/acfs/response/formats_spec.rb
@@ -212,7 +212,8 @@ files:
 homepage: https://github.com/jgraichen/acfs
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -228,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: An abstract API base client for service oriented application.
@@ -239,7 +240,7 @@ test_files:
 - spec/acfs/global_spec.rb
 - spec/acfs/location_spec.rb
 - spec/acfs/middleware/json_spec.rb
-- spec/acfs/middleware/msgpack_spec.rb
+- spec/acfs/middleware/message_pack_spec.rb
 - spec/acfs/operation_spec.rb
 - spec/acfs/request/callbacks_spec.rb
 - spec/acfs/request_spec.rb
@@ -255,7 +256,7 @@ test_files:
 - 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/persistence_spec.rb
 - spec/acfs/resource/query_methods_spec.rb
 - spec/acfs/resource/validation_spec.rb
 - spec/acfs/response/formats_spec.rb