pragma-decorator 2.2.6 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98b91700778dde7caf78fca62ad944dd136d8c2ce8d48bb598b085ad8567c741
-  data.tar.gz: 9d428e1e9e9c0c6eb00a0e128728da271375d939c60230fe67f7c62466086cc2
+  metadata.gz: 67f54c6658ab7c26683372702f60dbf57d1b387b36e4f76906aa43564a895f3c
+  data.tar.gz: 1e6dda3d51df96252a20f5be71fac7c97bfcafdcd6da3f9557dd114fc9ffd350
 SHA512:
-  metadata.gz: 72b88fd97948adf0f682469ab5854cb302fd967d09da55afc04974d5a2200748dbf70d36699b810eb4d9999723b72e7088d5a0074846b64d17639ad6167becdb
-  data.tar.gz: c7c96cce6da9dff0946e003a0ab990013ccf1dfc02e77656b31e4ebd747007e79341c7fc8d042f981c14e8e3d6cc80e6a0dc6ce345bb9fec8fd58d43dc7c71bb
+  metadata.gz: 034e2d52748a517a49d795f62c5f7eef4853687ecf1129a7a252d568a85d64d888910f1233e113e05908d3600b0f30f405582669b9939ff57ee49001ffc2ee9a
+  data.tar.gz: ce705e07d802802cb6517f70fc70d433812a014fdbdb587bc83b19b4ca67f3ebca1736c4a6d0e051cf8841dfb9138f7cb5d11aecbc43a0cb58e27abaf5c20fcd

data/.rubocop.yml

@@ -36,16 +36,16 @@ Metrics/LineLength:
   Max: 100
   AllowURI: true
 
-Layout/FirstParameterIndentation:
+Layout/IndentFirstArgument:
   Enabled: false
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
 
-Layout/IndentArray:
+Layout/IndentFirstArrayElement:
   EnforcedStyle: consistent
 
-Layout/IndentHash:
+Layout/IndentFirstHashElement:
   EnforcedStyle: consistent
 
 Style/SignalException:
@@ -97,9 +97,6 @@ Capybara/FeatureMethods:
 Metrics/ClassLength:
   Enabled: false
 
-Style/GuardClause:
-  Enabled: false
-
 Naming/FileName:
   Exclude:
     - 'pragma-decorator.gemspec'

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.3.0]
+
+### Added
+
+- `Collection` now assumes the instance decorator is `Instance`
+
 ## [2.2.6]
 
 ### Fixed
@@ -93,7 +99,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.2.6...HEAD
+[Unreleased]: https://github.com/pragmarb/pragma-decorator/compare/v2.3.0...HEAD
+[2.3.0]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.6...v2.3.0
 [2.2.6]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.5...v2.2.6
 [2.2.5]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.4...v2.2.5
 [2.2.4]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.3...v2.2.4

data/README.md

@@ -118,7 +118,13 @@ module API
 end
 ```
 
-Note: `array` is already overridden with the more language-agnostic `list`.
+`Array` and `ActiveRecord::Relation` are already overridden as `list` to avoid exposing internal
+details. If you want to specify your own global overrides, you can do it by adding entries to the
+`Pragma::Decorator::Type.overrides` hash:
+
+```ruby
+Pragma::Decorator::Type.overrides['Article'] = 'post'
+```
 
 ### Timestamps
 
@@ -244,7 +250,7 @@ module API
       module Decorator
         class Collection < Pragma::Decorator::Base
           include Pragma::Decorator::Collection
-          decorate_with Instance # specify the instance decorator
+          decorate_with Instance # this is optional, the default is 'Instance'
 
           property :total_cents, exec_context: :decorator
 

data/lib/pragma/decorator/association.rb

@@ -118,6 +118,7 @@ module Pragma
 
           expand.each do |property|
             next if self.class.associations.key?(property.to_sym) || property.include?('.')
+
             fail Association::AssociationNotFound, property
           end
         end

data/lib/pragma/decorator/collection.rb

@@ -11,8 +11,6 @@ module Pragma
     #   class ArticlesDecorator < Pragma::Decorator::Base
     #     include Pragma::Decorator::Collection
     #
-    #     decorate_with ArticleDecorator
-    #
     #     property :total_count, exec_context: :decorator
     #
     #     def total_count
@@ -60,10 +58,6 @@ module Pragma
       end
 
       module ClassMethods # :nodoc:
-        # @!attribute [r]
-        #   @return [Class\Proc] the instance decorator to use
-        attr_reader :instance_decorator
-
         # Defines the decorator to use for each resource in the collection.
         #
         # @param decorator [Class|Proc] a decorator class, or a callable accepting a represented
@@ -71,6 +65,18 @@ module Pragma
         def decorate_with(decorator)
           @instance_decorator = decorator
         end
+
+        # Returns the instance decorator for this collection.
+        #
+        # If no decorator was set manually with {#decorate_with}, this assumes the decorator is in
+        # the same namespace as the current class and is called +Instance+.
+        #
+        # @return [Class\Proc] the instance decorator to use
+        def instance_decorator
+          @instance_decorator ||= Object.const_get((
+            name.split('::')[0..-2] + ['Instance']
+          ).join('::'))
+        end
       end
     end
   end

data/lib/pragma/decorator/version.rb

@@ -2,6 +2,6 @@
 
 module Pragma
   module Decorator
-    VERSION = '2.2.6'
+    VERSION = '2.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pragma-decorator
 version: !ruby/object:Gem::Version
-  version: 2.2.6
+  version: 2.3.0
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roar