blueprinter 0.23.2 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 783b36c0d89d672f0757327972b95b66f4338a759df7a7b3637cfea50ecc2b18
-  data.tar.gz: 50e796b7d4f125bb415b6dead2ddfeda1785797d6be0fa63df2e1e56e8e390d0
+  metadata.gz: 1ea32b799d411874c19f6fcd40b522e12ac8eca461e3ed518c2ec21d1b2a4980
+  data.tar.gz: 1a9f5d9ce56d46821047bb693975a310abc044ff7a30c3e3c7ca908bcd81b3c2
 SHA512:
-  metadata.gz: 9cfae50a0943d24d402409058d6b8f1e72972eaa7878778c6d1aff50cbd028d08acceba24289ba35d238c6915f607a45d0b94b84b61cb57caaf1f5ad9295e3e9
-  data.tar.gz: 5bf9b8c90f10229245849682975d9a999d6aba0094f785cfa676f3fd02dc91587dab775ba2d874f42ad2ed992e50f47747f3c74347b31b90976727dd56fa0aa6
+  metadata.gz: bf07f48a3baaea65428a36c4751a0014f2178c3b391a69f8ad1f6081737454d62caa642b726ca16a8f6b53e83c5ccb61422dc2e470754d37f4c46bb257fea228
+  data.tar.gz: 5602227efea583382dc8e297151b473a859071cf293908feafdb00d7f50f4753cd53ae17a37e0697a47889543c883a3f0f668b45813ebc4d1bfa23f7c5a29a04

data/CHANGELOG.md

@@ -1,10 +1,25 @@
-## 0.23.2  - 2019/3/16
+## 0.25.1  - 2020/8/18
+* 🚀 [BUGFIX] Raise Blueprinter::BlueprinterError if Blueprint given is not of class Blueprinter::Base. Before it just raised a generic `undefined method 'prepare'`. See [#233](https://github.com/procore/blueprinter/pull/233) thanks to [@caws](https://github.com/caws)
+
+## 0.25.0  - 2020/7/06
+* 🚀 [FEATURE] Enable default `Blueprinter::Transformer`s to be set in the global configuration. [#222](https://github.com/procore/blueprinter/pull/222). Thanks to [@supremebeing7](https://github.com/supremebeing7).
+
+## 0.24.0  - 2020/6/22
+* 🚀 [FEATURE] Add an `options` option to associations to facilitate passing options from one blueprint to another. [#220](https://github.com/procore/blueprinter/pull/220). Thanks to [@mcclayton](https://github.com/mcclayton).
+
+## 0.23.4  - 2020/4/28
+* 🚀 [FEATURE] Public class method `has_view?` on Blueprinter::Base subclasses introduced in [#213](https://github.com/procore/blueprinter/pull/213). Thanks to [@spencerneste](https://github.com/spencerneste).
+
+## 0.23.3  - 2020/4/7
+* 🐛 [BUGFIX] Fixes issue where `exclude` fields in deeply nested views were not respected. Resolved issue [207](https://github.com/procore/blueprinter/issues/207) in [#208](https://github.com/procore/blueprinter/pull/208) by [@tpltn](https://github.com/tpltn).
+
+## 0.23.2  - 2020/3/16
 * 🐛 [BUGFIX] Fixes issue where fields "bled" into other views due to merge side-effects. Resolved issue [205](https://github.com/procore/blueprinter/issues/205) in [#204](https://github.com/procore/blueprinter/pull/204) by [@trevorrjohn](https://github.com/trevorrjohn).
 
-## 0.23.1  - 2019/3/13
+## 0.23.1  - 2020/3/13
 * 🐛 [BUGFIX] Fixes #172 where views would unintentionally ignore `sort_fields_by: :definition` configuration. Resolved in [#197](https://github.com/procore/blueprinter/pull/197) by [@wlkrw](https://github.com/wlkrw).
 
-## 0.23.0  - 2019/1/31
+## 0.23.0  - 2020/1/31
 * 🚀 [FEATURE] Configurable default extractor introduced in [#198](https://github.com/procore/blueprinter/pull/198) by [@wlkrw](https://github.com/wlkrw). You can now set a default extractor like so:
 ```
 Blueprinter.configure do |config|

data/README.md

@@ -355,6 +355,26 @@ Output:
 }
 ```
 
+It is also possible to pass options from one Blueprint to another via an association.
+For example:
+```ruby
+class VehicleBlueprint < Blueprinter::Base
+  identifier :uuid
+  field :full_name do |vehicle, options|
+    "#{vehicle.model} #{options[:trim]}"
+  end
+end
+
+class DriverBlueprint < Blueprinter::Base
+  identifier :uuid
+
+  view :normal do
+    fields :first_name, :last_name
+    association :vehicles, blueprint: VehicleBlueprint, options: { trim: 'LX' }
+  end
+end
+```
+
 ---
 </details>
 
@@ -739,6 +759,25 @@ class UserBlueprint < Blueprinter::Base
 end
 ```
 
+#### Global Transforms
+
+You can also specify global default transformers. Create one or more transformer classes extending from `Blueprinter::Transformer` and set the `default_transformers` configuration
+```ruby
+class LowerCamelTransformer < Blueprinter::Transformer
+  def transform(hash, _object, _options)
+    hash.transform_keys! { |key| key.to_s.camelize(:lower).to_sym }
+  end
+end
+```
+
+```ruby
+Blueprinter.configure do |config|
+  config.default_transformers = [LowerCamelTransformer]
+end
+```
+
+**Note: Any transforms specified on a per-blueprint or per-view level will override the `default_transformers` in the configuration.**
+
 ---
 </details>
 

data/lib/blueprinter/base.rb

@@ -156,7 +156,7 @@ module Blueprinter
     #
     # @return [Field] A Field object
     def self.association(method, options = {}, &block)
-      raise BlueprinterError, 'blueprint required' unless options[:blueprint]
+      validate_blueprint!(options[:blueprint], method)
 
       field(
         method,
@@ -214,7 +214,7 @@ module Blueprinter
     #   # => [{id:1, title: Hello},{id:2, title: My Day}]
     #
     # @return [Hash]
-    def self.render_as_hash(object, options= {})
+    def self.render_as_hash(object, options = {})
       prepare_for_render(object, options)
     end
 
@@ -239,7 +239,7 @@ module Blueprinter
     #   # => [{"id" => "1", "title" => "Hello"},{"id" => "2", "title" => "My Day"}]
     #
     # @return [Hash]
-    def self.render_as_json(object, options= {})
+    def self.render_as_json(object, options = {})
       prepare_for_render(object, options).as_json
     end
 
@@ -279,7 +279,6 @@ module Blueprinter
     end
 
 
-
     # Specify one transformer to be included for serialization.
     # Takes a class which extends Blueprinter::Transformer
     #
@@ -431,5 +430,26 @@ module Blueprinter
       yield
       @current_view = view_collection[:default]
     end
+
+    # Check whether or not a Blueprint supports the supplied view.
+    # It accepts a view name.
+    #
+    # @param view_name [Symbol] the view name
+    #
+    # @example With the following Blueprint
+    #
+    # class ExampleBlueprint < Blueprinter::Base
+    #  view :custom do
+    #  end
+    # end
+    #
+    #  ExampleBlueprint.has_view?(:custom) => true
+    #  ExampleBlueprint.has_view?(:doesnt_exist) => false
+    #
+    # @return [Boolean] a boolean value indicating if the view is
+    # supported by this Blueprint.
+    def self.has_view?(view_name)
+      view_collection.has_view? view_name
+    end
   end
 end

data/lib/blueprinter/configuration.rb

@@ -1,6 +1,6 @@
 module Blueprinter
   class Configuration
-    attr_accessor :association_default, :datetime_format, :field_default, :generator, :if, :method, :sort_fields_by, :unless, :extractor_default
+    attr_accessor :association_default, :datetime_format, :field_default, :generator, :if, :method, :sort_fields_by, :unless, :extractor_default, :default_transformers
 
     VALID_CALLABLES = %i(if unless).freeze
 
@@ -14,6 +14,7 @@ module Blueprinter
       @sort_fields_by = :name_asc
       @unless = nil
       @extractor_default = AutoExtractor
+      @default_transformers = []
     end
 
     def jsonify(blob)

data/lib/blueprinter/extractors/association_extractor.rb

@@ -9,6 +9,8 @@ module Blueprinter
 
     def extract(association_name, object, local_options, options={})
       options_without_default = options.reject { |k,_| k == :default || k == :default_if }
+      # Merge in assocation options hash
+      local_options = local_options.merge(options[:options]) if options[:options].is_a?(Hash)
       value = @extractor.extract(association_name, object, local_options, options_without_default)
       return default_value(options) if use_default_value?(value, options[:default_if])
       view = options[:view] || :default

data/lib/blueprinter/helpers/base_helpers.rb

@@ -8,11 +8,12 @@ module Blueprinter
       include TypeHelpers
 
       private
+
       def prepare_for_render(object, options)
         view_name = options.delete(:view) || :default
         root = options.delete(:root)
         meta = options.delete(:meta)
-        validate_root_and_meta(root, meta)
+        validate_root_and_meta!(root, meta)
         prepare(object, view_name: view_name, local_options: options, root: root, meta: meta)
       end
 
@@ -20,19 +21,19 @@ module Blueprinter
         if array_like?(object)
           object.map do |obj|
             object_to_hash(obj,
-                          view_name: view_name,
-                          local_options: local_options)
+                           view_name: view_name,
+                           local_options: local_options)
           end
         else
           object_to_hash(object,
-                        view_name: view_name,
-                        local_options: local_options)
+                         view_name: view_name,
+                         local_options: local_options)
         end
       end
 
       def prepend_root_and_meta(data, root, meta)
         return data unless root
-        ret = { root => data }
+        ret = {root => data}
         meta ? ret.merge!(meta: meta) : ret
       end
 
@@ -43,15 +44,15 @@ module Blueprinter
       def object_to_hash(object, view_name:, local_options:)
         result_hash = view_collection.fields_for(view_name).each_with_object({}) do |field, hash|
           next if field.skip?(field.name, object, local_options)
-           hash[field.name] = field.extract(object, local_options)
+          hash[field.name] = field.extract(object, local_options)
         end
         view_collection.transformers(view_name).each do |transformer|
-           transformer.transform(result_hash,object,local_options)
+          transformer.transform(result_hash, object, local_options)
         end
         result_hash
       end
 
-      def validate_root_and_meta(root, meta)
+      def validate_root_and_meta!(root, meta)
         case root
         when String, Symbol
           # no-op
@@ -62,6 +63,44 @@ module Blueprinter
         end
       end
 
+      def dynamic_blueprint?(blueprint)
+        blueprint.is_a?(Proc)
+      end
+
+      def validate_blueprint!(blueprint, method)
+        validate_presence_of_blueprint!(blueprint)
+        unless dynamic_blueprint?(blueprint)
+          validate_blueprint_has_ancestors!(blueprint, method)
+          validate_blueprint_has_blueprinter_base_ancestor!(blueprint, method)
+        end
+      end
+
+      def validate_presence_of_blueprint!(blueprint)
+        raise BlueprinterError, 'Blueprint required' unless blueprint
+      end
+
+      def validate_blueprint_has_ancestors!(blueprint, association_name)
+        # If the class passed as a blueprint does not respond to ancestors
+        # it means it, at the very least, does not have Blueprinter::Base as
+        # one of its ancestor classes (e.g: Hash) and thus an error should
+        # be raised.
+        unless blueprint.respond_to?(:ancestors)
+          raise BlueprinterError, "Blueprint provided for #{association_name} "\
+                                'association is not valid.'
+        end
+      end
+
+      def validate_blueprint_has_blueprinter_base_ancestor!(blueprint, association_name)
+        # Guard clause in case Blueprinter::Base is present in the ancestor list
+        # for the blueprint class provided.
+        return if blueprint.ancestors.include? Blueprinter::Base
+
+        # Raise error describing what's wrong.
+        raise BlueprinterError, "Class #{blueprint.name} does not inherit from "\
+                              'Blueprinter::Base and is not a valid Blueprinter '\
+                              "for #{association_name} association."
+      end
+
       def jsonify(blob)
         Blueprinter.configuration.jsonify(blob)
       end

data/lib/blueprinter/version.rb

@@ -1,3 +1,3 @@
 module Blueprinter
-  VERSION = '0.23.2'.freeze
+  VERSION = '0.25.1'.freeze
 end

data/lib/blueprinter/view.rb

@@ -2,18 +2,22 @@ module Blueprinter
   # @api private
   DefinitionPlaceholder = Struct.new :name, :view?
   class View
-    attr_reader :excluded_field_names, :fields, :included_view_names, :name, :transformers, :definition_order
+    attr_reader :excluded_field_names, :fields, :included_view_names, :name, :view_transformers, :definition_order
 
-    def initialize(name, fields: {}, included_view_names: [], excluded_view_names: [],transformers: [])
+    def initialize(name, fields: {}, included_view_names: [], excluded_view_names: [], transformers: [])
       @name = name
       @fields = fields
       @included_view_names = included_view_names
       @excluded_field_names = excluded_view_names
-      @transformers =  transformers
+      @view_transformers = transformers
       @definition_order = []
       @sort_by_definition = Blueprinter.configuration.sort_fields_by.eql?(:definition)
     end
 
+    def transformers
+      view_transformers.empty? ? Blueprinter.configuration.default_transformers : view_transformers
+    end
+
     def track_definition_order(method, is_view = true)
       if @sort_by_definition
         @definition_order << DefinitionPlaceholder.new(method, is_view)
@@ -33,8 +37,8 @@ module Blueprinter
         exclude_field(field_name)
       end
 
-      view.transformers.each do |transformer|
-        self.add_transformer(transformer)
+      view.view_transformers.each do |transformer|
+        add_transformer(transformer)
       end
     end
 
@@ -61,7 +65,7 @@ module Blueprinter
     end
 
     def add_transformer(custom_transformer)
-      transformers << custom_transformer
+      view_transformers << custom_transformer
     end
 
     def <<(field)

data/lib/blueprinter/view_collection.rb

@@ -23,9 +23,10 @@ module Blueprinter
     def fields_for(view_name)
       return identifier_fields if view_name == :identifier
 
-      fields_hash = sortable_fields(view_name)
-      sorted_fields = sort_by_definition ? sort_by_def(view_name, fields_hash) : fields_hash.values.sort_by(&:name)
-      identifier_fields + sorted_fields
+      fields, excluded_fields = sortable_fields(view_name)
+      sorted_fields = sort_by_definition ? sort_by_def(view_name, fields) : fields.values.sort_by(&:name)
+
+      (identifier_fields + sorted_fields).reject { |field| excluded_fields.include?(field.name) }
     end
 
     def transformers(view_name)
@@ -42,20 +43,23 @@ module Blueprinter
       views[:identifier].fields.values
     end
 
+    # @param [String] view_name
+    # @return [Array<(Hash, Hash<String, NilClass>)>] fields, excluded_fields
     def sortable_fields(view_name)
+      excluded_fields = {}
       fields = views[:default].fields
       fields = merge_fields(fields, views[view_name].fields)
       views[view_name].included_view_names.each do |included_view_name|
-        if view_name != included_view_name
-          fields = merge_fields(fields, sortable_fields(included_view_name))
-        end
-      end
+        next if view_name == included_view_name
 
-      views[view_name].excluded_field_names.each do |name|
-        fields.delete(name)
+        view_fields, view_excluded_fields = sortable_fields(included_view_name)
+        fields = merge_fields(fields, view_fields)
+        excluded_fields.merge!(view_excluded_fields)
       end
 
-      fields
+      views[view_name].excluded_field_names.each { |name| excluded_fields[name] = nil }
+
+      [fields, excluded_fields]
     end
 
     # select and order members of fields according to traversal of the definition_orders

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blueprinter
 version: !ruby/object:Gem::Version
-  version: 0.23.2
+  version: 0.25.1
 platform: ruby
 authors:
 - Adam Hess
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_bot
@@ -123,6 +123,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement