acfs 1.7.0 → 2.0.0

data/lib/acfs/collections/paginatable.rb

@@ -5,7 +5,7 @@ module Acfs::Collections
     extend ActiveSupport::Concern
 
     included do
-      def self.operation(_action, **opts, &_block)
+      def self.operation(_action, **opts, &)
         opts[:url]
       end
 
@@ -17,26 +17,26 @@ module Acfs::Collections
       setup_headers response.headers
     end
 
-    def next_page(&block)
-      page 'next', &block
+    def next_page(&)
+      page('next', &)
     end
 
-    def prev_page(&block)
-      page 'prev', &block
+    def prev_page(&)
+      page('prev', &)
     end
 
-    def first_page(&block)
-      page 'first', &block
+    def first_page(&)
+      page('first', &)
     end
 
-    def last_page(&block)
-      page 'last', &block
+    def last_page(&)
+      page('last', &)
     end
 
-    def page(rel, &block)
+    def page(rel, &)
       return unless relations[rel]
 
-      @resource_class.all nil, url: relations[rel], &block
+      @resource_class.all(nil, url: relations[rel], &)
     end
 
     private

data/lib/acfs/configuration.rb

@@ -123,7 +123,7 @@ module Acfs
       if YAML.respond_to?(:safe_load_file)
         YAML.safe_load_file(path, aliases: true)
       else
-        YAML.safe_load(File.read(path), [], [], true)
+        YAML.safe_load_file(path, [], [], true)
       end
     end
   end

data/lib/acfs/errors.rb

@@ -6,7 +6,7 @@ module Acfs
   class Error < StandardError
     def initialize(opts = {}, message = nil)
       opts[:message] = message if message
-      super opts[:message]
+      super(opts[:message])
     end
   end
 
@@ -20,7 +20,7 @@ module Acfs
 
       message = "#{message}: #{request.method.upcase} #{request.url}"
 
-      super message: message
+      super(message: message)
     end
   end
 
@@ -40,13 +40,13 @@ module Acfs
 
       message = if response
                   (opts[:message] ? "#{opts[:message]}:" : 'Received') +
-                    " #{response.code} for #{response.request.method.upcase}" \
-                    " #{response.request.url} #{response.request.format}"
+                    " #{response.code} for #{response.request.method.upcase} " \
+                    "#{response.request.url} #{response.request.format}"
                 else
                   opts[:message] || 'Received erroneous response'
                 end
 
-      super opts, message
+      super(opts, message)
     end
   end
 
@@ -63,7 +63,7 @@ module Acfs
                 "on #{operation.resource}.\n" +
                 stubs.map {|s| "  #{s.opts.pretty_inspect}" }.join
 
-      super opts, message
+      super(opts, message)
     end
   end
 

data/lib/acfs/global.rb

@@ -41,8 +41,8 @@ module Acfs
     # @return [undefined]
     # @see Configuration#configure
     #
-    def configure(&block)
-      Configuration.current.configure(&block)
+    def configure(&)
+      Configuration.current.configure(&)
     end
 
     # @api public

data/lib/acfs/location.rb

@@ -8,7 +8,7 @@ module Acfs
   class Location
     attr_reader :arguments, :raw, :struct, :vars
 
-    REGEXP = /^:([A-z][A-z0-9_]*)$/.freeze
+    REGEXP = /^:([A-z][A-z0-9_]*)$/
 
     def initialize(uri, vars = {})
       @raw       = URI.parse uri

data/lib/acfs/resource/attributes/uuid.rb

@@ -11,7 +11,7 @@ module Acfs::Resource::Attributes
   #   end
   #
   class UUID < Base
-    UUID_REGEXP = /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/i.freeze
+    UUID_REGEXP = /[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}/i
 
     # @api public
     #

data/lib/acfs/resource/attributes.rb

@@ -264,7 +264,7 @@ end
 
 # Load attribute type classes.
 #
-Dir[File.join(__dir__, 'attributes/*.rb')].sort.each do |path|
+Dir[File.join(__dir__, 'attributes/*.rb')].each do |path|
   filename = File.basename(path)
   require "acfs/resource/attributes/#{filename}"
 end

data/lib/acfs/resource/dirty.rb

@@ -17,7 +17,7 @@ class Acfs::Resource
     # @api private
     #
     def save!(**kwargs)
-      super(**kwargs).tap {|_| changes_applied }
+      super.tap {|_| changes_applied }
     end
 
     # @api private

data/lib/acfs/resource/operational.rb

@@ -12,14 +12,14 @@ class Acfs::Resource
   module Operational
     extend ActiveSupport::Concern
 
-    def operation(*args, **kwargs, &block)
-      self.class.operation(*args, **kwargs, &block)
+    def operation(...)
+      self.class.operation(...)
     end
 
     module ClassMethods
       # Invoke CRUD operation.
-      def operation(action, **opts, &block)
-        Acfs.runner.process ::Acfs::Operation.new(self, action, **opts, &block)
+      def operation(...)
+        Acfs.runner.process ::Acfs::Operation.new(self, ...)
       end
     end
   end

data/lib/acfs/resource/query_methods.rb

@@ -56,11 +56,11 @@ class Acfs::Resource
       #
       #   @return [Collection] Collection of requested resources.
       #
-      def find(id_or_ids, **opts, &block)
+      def find(id_or_ids, **opts, &)
         if id_or_ids.respond_to? :each
-          find_multiple id_or_ids, opts, &block
+          find_multiple(id_or_ids, opts, &)
         else
-          find_single id_or_ids, opts, &block
+          find_single(id_or_ids, opts, &)
         end
       end
 

data/lib/acfs/response/status.rb

@@ -9,7 +9,7 @@ module Acfs
       # request was not executed or failed on client side.
       #
       def status_code
-        return @status.to_i if defined? :@status
+        @status.to_i if defined?(@status)
         # return response.response_code unless response.nil?
         # 0
       end

data/lib/acfs/service/middleware.rb

@@ -35,9 +35,9 @@ module Acfs
         #   @param [Proc] block Block passed to klass initialize
         #   @return [undefined]
         #
-        def use(klass, *args, &block)
+        def use(klass, ...)
           # Backward compatible behavior
-          middleware.insert(0, klass, *args, &block)
+          middleware.insert(0, klass, ...)
         end
 
         # @api private

data/lib/acfs/singleton_resource.rb

@@ -59,8 +59,8 @@ module Acfs
       #
       #   @return [ self ] Resource object.
       #
-      def find(*attrs, &block)
-        find_single nil, params: attrs.extract_options!, &block
+      def find(*attrs, &)
+        find_single(nil, params: attrs.extract_options!, &)
       end
 
       # @api public

data/lib/acfs/stub.rb

@@ -102,7 +102,7 @@ module Acfs
       # Stub a resource with given handler block. An already created handler
       # for same resource class will be overridden.
       #
-      def resource(klass, action, opts = {}, &_block)
+      def resource(klass, action, opts = {}, &)
         action = action.to_sym
         unless ACTIONS.include? action
           raise ArgumentError.new "Unknown action `#{action}`."

data/lib/acfs/version.rb

@@ -2,8 +2,8 @@
 
 module Acfs
   module VERSION
-    MAJOR = 1
-    MINOR = 7
+    MAJOR = 2
+    MINOR = 0
     PATCH = 0
     STAGE = nil
 

data/lib/acfs/yard.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # YARD macros
 
 # @!macro [new] experimental

data/spec/acfs/adapter/typhoeus_spec.rb

@@ -29,7 +29,7 @@ describe Acfs::Adapter::Typhoeus do
     request = Acfs::Request.new 'http://example.org'
     adapter.queue request
 
-    expect { adapter.run(request) }.to raise_error(::Acfs::TimeoutError) do |err|
+    expect { adapter.run(request) }.to raise_error(Acfs::TimeoutError) do |err|
       expect(err.message).to eq 'Timeout reached: GET http://example.org'
     end
   end
@@ -40,7 +40,7 @@ describe Acfs::Adapter::Typhoeus do
     request = Acfs::Request.new 'http://should-never-exists.example.org'
     adapter.queue request
 
-    expect { adapter.run(request) }.to raise_error(::Acfs::RequestError) do |err|
+    expect { adapter.run(request) }.to raise_error(Acfs::RequestError) do |err|
       expect(err.message).to eq 'Couldn\'t resolve host name: GET http://should-never-exists.example.org'
     end
   end
@@ -48,7 +48,7 @@ describe Acfs::Adapter::Typhoeus do
   it 'passes arguments to typhoeus hydra' do
     value = {key: 1, key2: 2}
 
-    expect(::Typhoeus::Hydra).to receive(:new).with(value)
+    expect(Typhoeus::Hydra).to receive(:new).with(value)
 
     described_class.new(**value).send :hydra
   end

data/spec/acfs/configuration_spec.rb

@@ -34,7 +34,7 @@ describe Acfs::Configuration do
 
     context 'with RACK_ENV' do
       around do |example|
-        env = ENV['RACK_ENV']
+        env = ENV.fetch('RACK_ENV', nil)
         ENV['RACK_ENV'] = 'production'
         example.run
       ensure

data/spec/acfs/global_spec.rb

@@ -12,11 +12,11 @@ class NotificationCollector
   end
 end
 
-describe ::Acfs::Global do
-  let(:adapter) { ::NullAdapter.new }
+describe Acfs::Global do
+  let(:adapter) { NullAdapter.new }
   let(:runner) { double 'runner' }
   let(:collector) { NotificationCollector.new }
-  let(:acfs) { Object.new.tap {|o| o.extend ::Acfs::Global } }
+  let(:acfs) { Object.new.tap {|o| o.extend Acfs::Global } }
 
   describe 'instrumentation' do
     before do
@@ -26,7 +26,7 @@ describe ::Acfs::Global do
 
     describe '#run' do
       before do
-        ::ActiveSupport::Notifications.subscribe 'acfs.run', collector
+        ActiveSupport::Notifications.subscribe 'acfs.run', collector
       end
 
       it 'triggers event' do
@@ -37,7 +37,7 @@ describe ::Acfs::Global do
 
     describe '#reset' do
       before do
-        ::ActiveSupport::Notifications.subscribe 'acfs.reset', collector
+        ActiveSupport::Notifications.subscribe 'acfs.reset', collector
       end
 
       it 'triggers event' do

data/spec/acfs/location_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::Acfs::Location do
+describe Acfs::Location do
   let(:location) { described_class.new(uri, args) }
   let(:uri)      { 'http://localhost/users/:id' }
   let(:args)     { {'id' => 4} }

data/spec/acfs/middleware/json_spec.rb

@@ -61,7 +61,7 @@ describe Acfs::Middleware::JSON do
       let(:body)    { data.to_json[4..-4] }
 
       it 'raises an error' do
-        expect { request.complete! response }.to raise_error(::JSON::ParserError)
+        expect { request.complete! response }.to raise_error(JSON::ParserError)
       end
     end
 

data/spec/acfs/middleware/message_pack_spec.rb

@@ -45,7 +45,7 @@ describe Acfs::Middleware::MessagePack do
     it 'decodes body data' do
       request.complete! response
 
-      expect(response.data).to be == data.map(&:stringify_keys)
+      expect(response.data).to eq data.map(&:stringify_keys)
     end
   end
 

data/spec/acfs/operation_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe ::Acfs::Operation do
+describe Acfs::Operation do
   let(:operation) { described_class.new MyUser, :read, params: {id: 0} }
 
   describe '#request' do

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

@@ -7,52 +7,52 @@ describe Acfs::Resource::Attributes::Boolean do
 
   describe '#cast' do
     it 'casts nil' do
-      expect(type.cast(nil)).to eq nil
+      expect(type.cast(nil)).to be_nil
     end
 
     it 'casts empty string to false' do
-      expect(type.cast('')).to eq nil
+      expect(type.cast('')).to be_nil
     end
 
     it 'casts blank string to false' do
-      expect(type.cast("  \t")).to eq nil
+      expect(type.cast("  \t")).to be_nil
     end
 
     it 'preserves boolean values' do
-      expect(type.cast(false)).to eq false
-      expect(type.cast(true)).to eq true
+      expect(type.cast(false)).to be false
+      expect(type.cast(true)).to be true
     end
 
     it 'casts falsy values to false' do
-      expect(type.cast(false)).to eq false
-      expect(type.cast(0)).to eq false
-      expect(type.cast('0')).to eq false
-      expect(type.cast('no')).to eq false
-      expect(type.cast('NO')).to eq false
-      expect(type.cast('off')).to eq false
-      expect(type.cast('OFF')).to eq false
-      expect(type.cast('false')).to eq false
-      expect(type.cast('FALSE')).to eq false
-      expect(type.cast('f')).to eq false
-      expect(type.cast('F')).to eq false
+      expect(type.cast(false)).to be false
+      expect(type.cast(0)).to be false
+      expect(type.cast('0')).to be false
+      expect(type.cast('no')).to be false
+      expect(type.cast('NO')).to be false
+      expect(type.cast('off')).to be false
+      expect(type.cast('OFF')).to be false
+      expect(type.cast('false')).to be false
+      expect(type.cast('FALSE')).to be false
+      expect(type.cast('f')).to be false
+      expect(type.cast('F')).to be false
     end
 
     it 'casts any other value to true' do
-      expect(type.cast(true)).to eq true
-      expect(type.cast(1)).to eq true
-      expect(type.cast('1')).to eq true
-      expect(type.cast('yes')).to eq true
-      expect(type.cast('YES')).to eq true
-      expect(type.cast('on')).to eq true
-      expect(type.cast('ON')).to eq true
-      expect(type.cast('true')).to eq true
-      expect(type.cast('TRUE')).to eq true
-      expect(type.cast('t')).to eq true
-      expect(type.cast('T')).to eq true
-
-      expect(type.cast(2)).to eq true
-      expect(type.cast('wrong')).to eq true
-      expect(type.cast('random')).to eq true
+      expect(type.cast(true)).to be true
+      expect(type.cast(1)).to be true
+      expect(type.cast('1')).to be true
+      expect(type.cast('yes')).to be true
+      expect(type.cast('YES')).to be true
+      expect(type.cast('on')).to be true
+      expect(type.cast('ON')).to be true
+      expect(type.cast('true')).to be true
+      expect(type.cast('TRUE')).to be true
+      expect(type.cast('t')).to be true
+      expect(type.cast('T')).to be true
+
+      expect(type.cast(2)).to be true
+      expect(type.cast('wrong')).to be true
+      expect(type.cast('random')).to be true
     end
   end
 end

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

@@ -6,54 +6,54 @@ describe Acfs::Resource::Attributes::DateTime do
   let(:type) { Acfs::Resource::Attributes::DateTime.new }
 
   describe '#cast' do
-    subject(:cast) { -> { type.cast value } }
+    subject(:cast) { type.cast value }
 
     context 'with nil' do
       let(:value) { nil }
 
-      it { expect(cast.call).to eq nil }
+      it { expect(cast).to be_nil }
     end
 
     context 'with empty string' do
       let(:value) { '' }
 
-      it { expect(cast.call).to eq nil }
+      it { expect(cast).to be_nil }
     end
 
     context 'with blank string' do
       let(:value) { "  \t" }
 
-      it { expect(cast.call).to eq nil }
+      it { expect(cast).to be_nil }
     end
 
     context 'with DateTime' do
       let(:value) { DateTime.now }
 
-      it { expect(cast.call).to eq value }
+      it { expect(cast).to eq value }
     end
 
     context 'with Time' do
       let(:value) { Time.now }
 
-      it { expect(cast.call).to eq value.to_datetime }
+      it { expect(cast).to eq value.to_datetime }
     end
 
     context 'with Date' do
       let(:value) { Date.today }
 
-      it { expect(cast.call).to eq value.to_datetime }
+      it { expect(cast).to eq value.to_datetime }
     end
 
     context 'with ISO8601' do
       let(:value) { DateTime.now.iso8601 }
 
-      it { expect(cast.call.iso8601).to eq value }
+      it { expect(cast.iso8601).to eq value }
     end
 
     context 'with invalid string' do
       let(:value) { 'qwe123' }
 
-      it { is_expected.to raise_error ArgumentError }
+      it { expect { cast }.to raise_error ArgumentError }
     end
   end
 end

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

@@ -6,36 +6,36 @@ describe Acfs::Resource::Attributes::Dict do
   let(:type) { Acfs::Resource::Attributes::Dict.new }
 
   describe '#cast' do
-    subject(:cast) { -> { type.cast value } }
+    subject(:cast) { type.cast value }
 
     context 'with nil' do
       let(:value) { nil }
 
-      it { expect(cast.call).to eq nil }
+      it { expect(cast).to be_nil }
     end
 
     context 'with blank string (I)' do
       let(:value) { '' }
 
-      it { expect(cast.call).to eq({}) }
+      it { expect(cast).to eq({}) }
     end
 
     context 'with blank string (II)' do
       let(:value) { "  \t" }
 
-      it { expect(cast.call).to eq({}) }
+      it { expect(cast).to eq({}) }
     end
 
     context 'with hash' do
       let(:value) { {3 => true, abc: 4} }
 
-      it { expect(cast.call).to eq value }
+      it { expect(cast).to eq value }
     end
 
     context 'with non hashable object' do
       let(:value) { Object.new }
 
-      it { is_expected.to raise_error TypeError }
+      it { expect { cast }.to raise_error TypeError }
     end
 
     context 'with hashable object (I)' do
@@ -47,7 +47,7 @@ describe Acfs::Resource::Attributes::Dict do
         end.new
       end
 
-      it { expect(cast.call).to eq id: value.object_id }
+      it { expect(cast).to eq id: value.object_id }
     end
 
     context 'with hashable object (II)' do
@@ -59,7 +59,7 @@ describe Acfs::Resource::Attributes::Dict do
         end.new
       end
 
-      it { expect(cast.call).to eq id: value.object_id }
+      it { expect(cast).to eq id: value.object_id }
     end
 
     context 'with serializable object' do
@@ -71,13 +71,13 @@ describe Acfs::Resource::Attributes::Dict do
         end.new
       end
 
-      it { expect(cast.call).to eq id: value.object_id }
+      it { expect(cast).to eq id: value.object_id }
     end
 
     context 'with hash subclass object' do
       let(:value) { HashWithIndifferentAccess.new test: :foo }
 
-      it { expect(cast.call).to be value }
+      it { expect(cast).to be value }
     end
   end
 end

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

@@ -6,66 +6,66 @@ describe Acfs::Resource::Attributes::Float do
   let(:type) { Acfs::Resource::Attributes::Float.new }
 
   describe '#cast' do
-    subject(:cast) { -> { type.cast value } }
+    subject(:cast) { type.cast value }
 
     context 'with nil' do
       let(:value) { nil }
 
-      it { expect(cast.call).to eq nil }
+      it { expect(cast).to be_nil }
     end
 
     context 'with blank string (I)' do
       let(:value) { '' }
 
-      it { expect(cast.call).to eq 0.0 }
+      it { expect(cast).to eq 0.0 }
     end
 
     context 'with blank string (II)' do
       let(:value) { "  \t" }
 
-      it { expect(cast.call).to eq 0.0 }
+      it { expect(cast).to eq 0.0 }
     end
 
     context 'with float' do
       let(:value) { 1.7 }
 
-      it { expect(cast.call).to eq 1.7 }
+      it { expect(cast).to eq 1.7 }
     end
 
     context 'with Infinity' do
       let(:value) { 'Infinity' }
 
-      it { expect(cast.call).to eq ::Float::INFINITY }
+      it { expect(cast).to eq Float::INFINITY }
     end
 
     context 'with -Infinity' do
       let(:value) { '-Infinity' }
 
-      it { expect(cast.call).to eq(-::Float::INFINITY) }
+      it { expect(cast).to eq(-Float::INFINITY) }
     end
 
     context 'with NaN' do
       let(:value) { 'NaN' }
 
-      it { expect(cast.call).to be_nan }
+      it { expect(cast).to be_nan }
     end
 
     context 'with fixnum' do
       let(:value) { 1 }
 
-      it { expect(cast.call).to eq 1.0 }
+      it { expect(cast).to eq 1.0 }
     end
 
     context 'with valid string' do
       let(:value) { '1.7' }
 
-      it { expect(cast.call).to eq 1.7 }
+      it { expect(cast).to eq 1.7 }
     end
 
     context 'with invalid string (I)' do
       let(:value) { '1.7a' }
 
-      it { is_expected.to raise_error ArgumentError }
+      it { expect { cast }.to raise_error ArgumentError }
     end
   end
 end