pragma-decorator 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1f2bd7c761c330889bdc0ade7c83f1e9cd6921fc8c81d5b5fc3352bfdc114a9
-  data.tar.gz: d2bf1594ada1c8793dee81d0bccb0768ad24b8e6b2a797c148e247c0bde2e4be
+  metadata.gz: 1a95d2a912a1328c91c7ba4bd2cb023ebe3772bf67900fed17e7e6119a0e4a1a
+  data.tar.gz: 6fe2f0c3e0a87767d25f31e06b4fa8d3dd00fa420456c98f9b47ddb3ee0185a3
 SHA512:
-  metadata.gz: e149d329a44e39fe7004bd5a79a5612ef2ef8dd9cf0893f871d009ffe47ebb759ad39ee10d98947a3a11948b9403ce1dd0038f93c8940d9dcf6253cb85fc236a
-  data.tar.gz: f879896b77db56e45224138a0e0f59289a7ddf8e602d4b4f876ebb7a60fa04a69b57bba64fc7bc93c1a8aa3f6fd064c0e715b129faa4ca84dc03b377b826d0aa
+  metadata.gz: 4764e283b3fc8f3d5528f648096a4684dba6f322c0fb59f6a6da32399cfe7bf1c1d56ab9b57e0c6dffa5f658f3dfc17a5509d988adcea15091fb439f0be29101
+  data.tar.gz: 1fd589f81ff1e00d7e01ba98fb19ef10a812096ac10e471fe707000f7b71d7feb3604298889b8013503cc418d6c86fcd321578ee9a290cf064d989be0c1ebbc7

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.2.4]
+
+### Fixed
+
+- Fixed an issue where expanding a property would expand properties with the same name in associated objects
+
 ## [2.2.3]
 
 ### Fixed
@@ -74,7 +80,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.2...HEAD
+[Unreleased]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.4...HEAD
+[2.2.4]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.3...v2.2.4
 [2.2.3]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.2...v2.2.3
 [2.2.2]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.1...v2.2.2
 [2.2.1]: https://github.com/pragmarb/pragma-decorator/compare/v2.2.0...v2.2.1

data/README.md

@@ -1,7 +1,6 @@
 # Pragma::Decorator
 
 [![Build Status](https://travis-ci.org/pragmarb/pragma-decorator.svg?branch=master)](https://travis-ci.org/pragmarb/pragma-decorator)
-[![Dependency Status](https://gemnasium.com/badges/github.com/pragmarb/pragma-decorator.svg)](https://gemnasium.com/github.com/pragmarb/pragma-decorator)
 [![Coverage Status](https://coveralls.io/repos/github/pragmarb/pragma-decorator/badge.svg?branch=master)](https://coveralls.io/github/pragmarb/pragma-decorator?branch=master)
 [![Maintainability](https://api.codeclimate.com/v1/badges/e51e8d7489eb72ab97ba/maintainability)](https://codeclimate.com/github/pragmarb/pragma-decorator/maintainability)
 
@@ -184,7 +183,7 @@ Rendering an invoice will now create the following representation:
 }
 ```
 
-You can pass `expand[]=customer` as a request parameter and have the `customer` property expanded 
+You can pass `expand[]=customer` as a request parameter and have the `customer` property expanded
 into a full object!
 
 ```json
@@ -197,7 +196,7 @@ into a full object!
 ```
 
 This also works for nested associations. For instance, if the customer decorator had a `company`
-association, you could pass `expand[]=customer&expand[]=customer.company` to get the company 
+association, you could pass `expand[]=customer&expand[]=customer.company` to get the company
 expanded too.
 
 Note that you will have to pass the associations to expand as a user option when rendering:
@@ -227,9 +226,9 @@ module API
         class Collection < Pragma::Decorator::Base
           include Pragma::Decorator::Collection
           decorate_with Instance # specify the instance decorator
-          
+
           property :total_cents, exec_context: :decorator
-          
+
           def total_cents
             represented.sum(:total_cents)
           end
@@ -266,7 +265,7 @@ about the entire collection (not just the current page) in the response.
 
 ### Pagination
 
-Speaking of pagination, you can use `Pragma::Decorator::Pagination` in combination with 
+Speaking of pagination, you can use `Pragma::Decorator::Pagination` in combination with
 `Collection` to include pagination data in your response:
 
 ```ruby
@@ -277,7 +276,7 @@ module API
         class Collection < Pragma::Decorator::Base
           include Pragma::Decorator::Collection
           include Pragma::Decorator::Pagination
-          
+
           decorate_with Instance
         end
       end
@@ -312,9 +311,33 @@ Which will produce the following JSON:
 }
 ```
 
-It works with both [will_paginate](https://github.com/mislav/will_paginate) and 
+It works with both [will_paginate](https://github.com/mislav/will_paginate) and
 [Kaminari](https://github.com/kaminari/kaminari)!
 
+### Restricting property visibility
+
+If you want to show or hide certain properties programmatically, you can do it with the `if` option:
+
+```ruby
+module API
+  module V1
+    module User
+      module Decorator
+        class Instance < Pragma::Decorator::Base
+          property :id
+          property :first_name
+          property :last_name
+          property :email, if: -> (user_options:, decorated:, **) {
+            # Only show the email to admins or to the same user.
+            user_options[:current_user].admin? || user_options[:current_user] == decorated
+          }
+        end
+      end
+    end
+  end
+end
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/pragmarb/pragma-decorator.

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

@@ -106,12 +106,8 @@ module Pragma
 
           expected_beginning = "#{reflection.property}."
 
-          expand.reject { |value| value.to_s == reflection.property.to_s }.map do |value|
-            if value.start_with?(expected_beginning)
-              value.sub(expected_beginning, '')
-            else
-              value
-            end
+          expand.select { |value| value.start_with?(expected_beginning) }.map do |value|
+            value.sub(expected_beginning, '')
           end
         end
 

data/lib/pragma/decorator/version.rb

@@ -2,6 +2,6 @@
 
 module Pragma
   module Decorator
-    VERSION = '2.2.3'
+    VERSION = '2.2.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pragma-decorator
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roar
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: Convert your API resources into JSON with minimum hassle.