empty

Author: jhollinger

lib/blueprinter/v2/dsl.rb

@@ -5,21 +5,19 @@ module V2
     # Methods for defining Blueprint fields and views
     module DSL
       #
-      # Define a new child view, which is a subclass of self. If a view with this name already exists, the definition will be
+      # Define a child view, which is a subclass of self. If a view with this name already exists, the definition will be
       # appended.
       #
       # @param name [Symbol] Name of the view
-      # @param fields [Boolean] Inherit fields from parents (default true)
-      # @param options [Boolean] Inherit options from parents (default true)
-      # @param extensions [Boolean] Inherit extensions from parents (default true)
+      # @param empty [Boolean] Don't inherit fields from ancestors (default false)
       # @yield Define the view in the block
       #
-      def view(name, fields: nil, options: nil, extensions: nil, &definition)
+      def view(name, empty: nil, &definition)
         raise Errors::InvalidBlueprint, "View name may not contain '.'" if name.to_s =~ /\./
 
         name = name.to_sym
         partials[name] = definition
-        views[name] = ViewBuilder::Def.new(definition:, fields:, options:, extensions:)
+        views[name] = ViewBuilder::Def.new(definition:, empty:)
       end
 
       #

lib/blueprinter/v2/view_builder.rb

@@ -11,7 +11,7 @@ module V2
     class ViewBuilder
       include Enumerable
 
-      Def = Struct.new(:definition, :fields, :options, :extensions, keyword_init: true)
+      Def = Struct.new(:definition, :empty, keyword_init: true)
 
       # @param parent [Class] A subclass of Blueprinter::V2::Base
       def initialize(parent)
@@ -88,16 +88,12 @@ def reset
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       def build_view(name)
         defs = @pending[name]
-        inherit_fields = defs.reduce(true) { |acc, d| d.fields.nil? ? acc : d.fields }
-        inherit_options = defs.reduce(true) { |acc, d| d.options.nil? ? acc : d.options }
-        inherit_extensions = defs.reduce(true) { |acc, d| d.extensions.nil? ? acc : d.extensions }
+        empty = defs.reduce(false) { |acc, d| d.empty.nil? ? acc : d.empty }
 
         view = Class.new(@parent)
         view.views.reset
         view.append_name(name)
-        view.schema.clear unless inherit_fields
-        view.options.clear unless inherit_options
-        view.extensions.clear unless inherit_extensions
+        view.schema.clear if empty
         defs.each { |d| view.class_eval(&d.definition) if d.definition }
         view
       end

spec/v2/view_builder_spec.rb

@@ -109,6 +109,6 @@
   end
 
   def definition(definition)
-    described_class::Def.new(definition:, fields: true, options: true, extensions: true)
+    described_class::Def.new(definition:, empty: false)
   end
 end

spec/v2/view_spec.rb

@@ -44,7 +44,7 @@
         options[:exclude_if_nil] = true
         extensions << Class.new(Blueprinter::Extension).new
         fields :id
-        view(:identifier, fields: false) { field :id }
+        view(:identifier, empty: true) { field :id }
       end
     end
 
@@ -55,27 +55,25 @@
         view :extended do
           field :description
         end
-
-        view :minimal, options: false, extensions: false
       end
     end
 
-    it "inherits fields by default" do
-      ref = blueprint.reflections
-      expect(ref[:default].fields.keys).to eq %i[id name date]
-      expect(ref[:extended].fields.keys).to eq %i[id name date description]
+    it "inherits options" do
+      expect(blueprint.options).to eq({ exclude_if_nil: true })
+      expect(blueprint[:extended].options).to eq({ exclude_if_nil: true })
     end
 
-    it "inherits options by default" do
-      expect(blueprint.options).to eq({exclude_if_nil: true})
-      expect(blueprint[:extended].options).to eq({exclude_if_nil: true})
-    end
-
-    it "inherits extensions by default" do
+    it "inherits extensions" do
       expect(blueprint.extensions.size).to eq 1
       expect(blueprint[:extended].extensions.size).to eq 1
     end
 
+    it "inherits fields by default" do
+      ref = blueprint.reflections
+      expect(ref[:default].fields.keys).to eq %i[id name date]
+      expect(ref[:extended].fields.keys).to eq %i[id name date description]
+    end
+
     it "can opt out of inheriting fields" do
       expect(application_blueprint.reflections[:identifier].fields.keys).to eq %i[id]
     end
@@ -84,14 +82,6 @@
       expect(blueprint.reflections[:identifier].fields.keys).to eq %i[id]
     end
 
-    it "can opt out of inheriting options" do
-      expect(blueprint[:minimal].options).to eq({})
-    end
-
-    it "can opt out of inheriting extensions" do
-      expect(blueprint[:minimal].extensions).to eq([])
-    end
-
     it "can be extended" do
       bp1 = Class.new(Blueprinter::V2::Base) do
         view(:foo) { fields :id, :name }