pragma-decorator 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0845e95dd2b1793d4db9ddc6280f62fb9420a385416779de9d0de56573a4ba18'
-  data.tar.gz: 85d1bf273b7748ab953eea1861e3e9935dc548b3d90a6815ffd25fd26c255dbb
+  metadata.gz: 8a89663f2c146dfaccaddf296ff7ea5566b59f6d0b271af10a5a70f750374bc0
+  data.tar.gz: 6165637c124fa28f02182eb992b59eaa6cfc636e9095ab00d45fc176ffa75396
 SHA512:
-  metadata.gz: 596e58d11fc5b7e309ef09a443002d7bd79acb5aada4f7a09eb85b449f357a55995600d0f93ae003d0ef32ef8373c6038c9d187b9a074715c90a91dfa9dc2403
-  data.tar.gz: f36e57ae761386a60c87245182f9f186803300ec77af42c0a7893568dba99967e85258c6cdfa39bfb8d71f7de21330d7d677dec69edfecae6117bd7036a913b7
+  metadata.gz: 87f17f141628bb5f50e5e33365291279fda43a1ce88a7f9448132100d6cbb24359ecdaa879f730739ee71f015e5f03e9040606e45229230214090aa12c992f40
+  data.tar.gz: c318c18bf0107c119978b8505fa7406c0123793c757b6eb93bb6cfb66cc87c564d6152e7e95aa750c5e5ad7c076bd810288350794b085f98200107497950653f

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.2.1]
+
+### Changed
+
+- Use [Adaptor](https://github.com/aldesantis/adaptor.rb) for association and pagination adpators
+
 ## [2.2.0]
 
 ### Added
@@ -56,7 +62,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 First Pragma 2 release.
 
-[Unreleased]: https://github.com/pragmarb/pragma-decorator/compare/v2.1.1...HEAD
+[Unreleased]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.1...HEAD
+[2.2.1]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/pragmarb/pragma-decorator/compare/v2.1.1...v2.2.0
 [2.1.1]: https://github.com/pragmarb/pragma-decorator/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/pragmarb/pragma-decorator/compare/v2.0.0...v2.1.0

data/lib/pragma/decorator/association/adapter/active_record.rb

@@ -9,6 +9,8 @@ module Pragma
         #
         # @api private
         class ActiveRecord < Base
+          include Adaptor
+
           class << self
             # Returns whether the adapter supports the given model.
             #

data/lib/pragma/decorator/association/adapter/base.rb

@@ -11,19 +11,6 @@ module Pragma
         #
         # @api private
         class Base
-          class << self
-            # Returns whether the adapter supports the given model.
-            #
-            # @param _model [Object] a model
-            #
-            # @return [Boolean] whether the adpater supports the model
-            #
-            # @abstract
-            def supports?(_model)
-              fail NotImplementedError
-            end
-          end
-
           # @!attribute [r] bond
           #   @return [Bond] the bond this adapter has been instantiated with
           attr_reader :bond

data/lib/pragma/decorator/association/adapter/poro.rb

@@ -10,6 +10,8 @@ module Pragma
         #
         # @api private
         class Poro < Base
+          include Adaptor
+
           class << self
             # Returns whether the adapter supports the model.
             #

data/lib/pragma/decorator/association/adapter.rb

@@ -8,24 +8,8 @@ module Pragma
       #
       # @api private
       module Adapter
-        # The list of supported adapters, in order of priority.
-        SUPPORTED_ADAPTERS = [ActiveRecord, Poro].freeze
-
-        # Loads the adapter for the given association bond.
-        #
-        # This will try {SUPPORTED_ADAPTERS} in order until it finds an adapter that supports the
-        # bond's model. When the adapter is found, it will return a new instance of it.
-        #
-        # @param bond [Bond] the bond to load the adapter for
-        #
-        # @return [Adapter::Base]
-        #
-        # @see Adapter::Base.supports?
-        def self.load_for(bond)
-          SUPPORTED_ADAPTERS.find do |adapter|
-            adapter.supports?(bond.model)
-          end.new(bond)
-        end
+        include Adaptor::Loader
+        register ActiveRecord, Poro
       end
     end
   end

data/lib/pragma/decorator/association/bond.rb

@@ -98,7 +98,7 @@ module Pragma
         private
 
         def adapter
-          @adapter ||= Adapter.load_for(self)
+          @adapter ||= Adapter.load_adaptor(self)
         end
 
         def flatten_expand(expand)

data/lib/pragma/decorator/pagination/adapter/base.rb

@@ -14,17 +14,6 @@ module Pragma
           #   @return [Object] the collection this adapter is working with
           attr_reader :collection
 
-          class << self
-            # Returns whether this adapter supports the given collection.
-            #
-            # @return [Boolean] whether the adapter supports the given collection
-            #
-            # @see Adapter.load_for
-            def supports?(_collection)
-              fail NotImplementedError
-            end
-          end
-
           # Initializes the adapter.
           #
           # @param collection [Object] the collection to work with

data/lib/pragma/decorator/pagination/adapter/kaminari.rb

@@ -17,7 +17,7 @@ module Pragma
             #
             # @return [Boolean] whether the adapter supports the given collection
             #
-            # @see Adapter.load_for
+            # @see Adapter.load_adaptor
             def supports?(collection)
               Object.const_defined?('Kaminari') && collection.respond_to?(:prev_page)
             end
@@ -65,8 +65,6 @@ module Pragma
             collection.next_page
           end
         end
-
-        adapters << Kaminari
       end
     end
   end

data/lib/pragma/decorator/pagination/adapter/will_paginate.rb

@@ -9,6 +9,8 @@ module Pragma
         #
         # @api private
         class WillPaginate < Base
+          include Adaptor
+
           class << self
             # Returns whether this adapter supports the given collection.
             #
@@ -17,7 +19,7 @@ module Pragma
             #
             # @return [Boolean] whether the adapter supports the given collection
             #
-            # @see Adapter.load_for
+            # @see Adapter.load_adaptor
             def supports?(collection)
               Object.const_defined?('WillPaginate') && collection.respond_to?(:previous_page)
             end
@@ -65,8 +67,6 @@ module Pragma
             collection.next_page
           end
         end
-
-        adapters << WillPaginate
       end
     end
   end

data/lib/pragma/decorator/pagination/adapter.rb

@@ -8,51 +8,8 @@ module Pragma
       #
       # @api private
       module Adapter
-        class << self
-          # Loads the adapter for the given collection.
-          #
-          # This will try {SUPPORTED_ADAPTERS} in order until it finds an adapter that supports the
-          # collection. When the adapter is found, it will return a new instance of it.
-          #
-          # @param collection [Object] the collection to load the adapter for
-          #
-          # @return [Adapter::Base]
-          #
-          # @see Adapter::Base.supports?
-          #
-          # @raise [AdapterError] if no adapter supports the collection
-          def load_for(collection)
-            adapter_klass = adapters.find do |klass|
-              klass.supports?(collection)
-            end
-
-            fail NoAdapterError unless adapter_klass
-
-            adapter_klass.new(collection)
-          end
-
-          # Returns the available pagination adpaters.
-          #
-          # This can be used to register new adapters: just append your class to the collection.
-          #
-          # @return [Array] an array of pagination adapters
-          def adapters
-            @adapters ||= []
-          end
-        end
-
-        # This error is raised when no adapter can be found for a collection.
-        class NoAdapterError < StandardError
-          # Initializes the adapter.
-          def initialize
-            message = <<~MESSAGE.tr("\n", ' ')
-              No adapter found for the collection. The available adapters are:
-              #{SUPPORTED_ADAPTERS.map { |a| a.to_s.split('::').last }.join(', ')}.
-            MESSAGE
-
-            super message
-          end
-        end
+        include Adaptor::Loader
+        register Kaminari, WillPaginate
       end
     end
   end

data/lib/pragma/decorator/pagination.rb

@@ -88,7 +88,7 @@ module Pragma
         private
 
         def pagination_adapter
-          @pagination_adapter ||= Pagination::Adapter.load_for(represented)
+          @pagination_adapter ||= Pagination::Adapter.load_adaptor(represented)
         end
       end
 

data/lib/pragma/decorator/version.rb

@@ -2,6 +2,6 @@
 
 module Pragma
   module Decorator
-    VERSION = '2.2.0'
+    VERSION = '2.2.1'
   end
 end

data/lib/pragma/decorator.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 require 'roar'
+require 'adaptor'
 
 require 'pragma/decorator/version'
+
 require 'pragma/decorator/base'
+
 require 'pragma/decorator/association'
 require 'pragma/decorator/association/reflection'
 require 'pragma/decorator/association/bond'
@@ -12,14 +15,19 @@ require 'pragma/decorator/association/adapter/active_record'
 require 'pragma/decorator/association/adapter/poro'
 require 'pragma/decorator/association/adapter'
 require 'pragma/decorator/association/errors'
+
 require 'pragma/decorator/timestamp'
+
 require 'pragma/decorator/type'
+
 require 'pragma/decorator/collection'
+
 require 'pragma/decorator/pagination'
-require 'pragma/decorator/pagination/adapter'
+
 require 'pragma/decorator/pagination/adapter/base'
 require 'pragma/decorator/pagination/adapter/kaminari'
 require 'pragma/decorator/pagination/adapter/will_paginate'
+require 'pragma/decorator/pagination/adapter'
 
 module Pragma
   # Represent your API resources in JSON with minimum hassle.

data/pragma-decorator.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'roar', '~> 1.0'
   spec.add_dependency 'multi_json', '~> 1.12'
+  spec.add_dependency 'adaptor', '~> 0.1'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pragma-decorator
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roar
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: adaptor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement