praxis-blueprints 3.2 → 3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3679f890d11a1474437b9018c7030a909e050ca
-  data.tar.gz: 61094297c27f94f4add6227d637654fae03ed662
+  metadata.gz: 2baa109dab4f8585d61ee9d5317bc11039cbaa98
+  data.tar.gz: f2bd553cd4f075311155154b0c7fef9aad415b3f
 SHA512:
-  metadata.gz: aa633b4772c07f859fd4024044a618c2243b5b6d95678dd7c0757486811dc1a315eafde12319c4c4215b72571d0d38f7ccdae7d91903183aa14c1baaaa86ae58
-  data.tar.gz: 47e3c62fd5bdfa05c142083e7053687d57d25fd2b08b3a5b2dd913050cbaf94a9ccfb699707e1c1e43f6384ce25e4688beaed9cb81a39038080eff2155e9c979
+  metadata.gz: e52a91a7f9c78b9964650972b09c61a883035903f04e41374e82115d04b6643776f9ff05aebb281a007b7074913c9bfb086328ab6043418bd0df0ec8232ccfc8
+  data.tar.gz: af137419cbb73cceac9e4283a2558d758b0f4425ac009fe9243780328eb6df1091cdcee776147327fb646630a1832573bdbbd7e14b5a9cac8cb4e30d2f31fa5a

data/.rubocop.yml

@@ -0,0 +1,35 @@
+AllCops:
+  TargetRubyVersion: 2.3
+Style/Documentation:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Metrics/LineLength:
+  Max: 200
+Style/RedundantSelf:
+  Enabled: false
+Style/ClassAndModuleChildren:
+  Enabled: false
+Lint/Debugger:
+  Enabled: false
+Metrics/AbcSize:
+  Enabled: false
+Style/CaseEquality:
+  Enabled: false
+Lint/UnusedMethodArgument:
+  AllowUnusedKeywordArguments: true
+Style/FileName:
+  Exclude:
+    - 'lib/praxis-blueprints.rb'
+Style/ClassVars:
+  Exclude:
+    - 'lib/praxis-blueprints/blueprint.rb'
+
+# Offense count: 5
+Metrics/CyclomaticComplexity:
+  Max: 8
+# Offense count: 5
+Metrics/PerceivedComplexity:
+  Max: 12

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-  - 2.1.2
-  - 2.2.2
-script: bundle exec rspec spec
+  - 2.2.5
+  - 2.3.1
+script:
+  - bundle exec rspec spec
+  - bundle exec rubocop --format=clang

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## next
 
+## 3.3
+
+* Include Attributor::Dumpable in Blueprint, so it renders (semi) correctly if
+  rendered with just `true` specified for fields.
+* Fix bug rendering subobjects with nil values (manifested when `include_nil: true` there’s an explicit subsection of fields)
+
 ## 3.2
 
 * Ensure we call `object.dump` in Renderer when fully dumping an instance (or array of instances) that have the Attributor::Dumpable module (i.e., when no subfields were selected)

data/Gemfile

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 source 'https://rubygems.org'
 gemspec

data/Guardfile

@@ -1,11 +1,17 @@
+# frozen_string_literal: true
 # Config file for Guard
 # More info at https://github.com/guard/guard#readme
+group :red_green_refactor, halt_on_fail: true do
+  guard :rspec, cmd: 'bundle exec rspec' do
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^lib/praxis-blueprints/(.+)\.rb$}) { |m| "spec/praxis-blueprints/#{m[1]}_spec.rb" }
+    watch('spec/*.rb') { 'spec' }
+    watch('lib/praxis-blueprints.rb') { 'spec' }
+    watch(%r{^spec/support/(.+)\.rb$}) { 'spec' }
+  end
 
-guard :rspec, cmd: 'bundle exec rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/praxis-blueprints/(.+)\.rb$}) { |m| "spec/praxis-blueprints/#{m[1]}_spec.rb" }
-  watch('spec/*.rb')  { 'spec' }
-  watch('lib/praxis-blueprints.rb') { 'spec' }
-  watch(%r{^spec/support/(.+)\.rb$}) { 'spec' }
+  guard :rubocop, cli: '--auto-correct --display-cop-names' do
+    watch(/.+\.rb$/)
+    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  end
 end
-

data/Rakefile

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
 require 'bundler/setup'
 
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
 require 'bundler/gem_tasks'
 
-desc "Run RSpec code examples with simplecov"
+desc 'Run RSpec code examples with simplecov'
 RSpec::Core::RakeTask.new do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+task default: :spec
 
 require 'yard'
 YARD::Rake::YardocTask.new

data/lib/praxis-blueprints.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require 'json'
 require 'yaml'
 require 'logger'
 
 require 'attributor'
 
-require "praxis-blueprints/version"
+require 'praxis-blueprints/version'
 
 require 'praxis-blueprints/finalizable'
 require 'praxis-blueprints/config_hash'

data/lib/praxis-blueprints/blueprint.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'ostruct'
 
 # Blueprint ==
@@ -7,6 +8,8 @@ require 'ostruct'
 module Praxis
   class Blueprint
     include Attributor::Type
+    include Attributor::Dumpable
+
     extend Finalizable
 
     if RUBY_ENGINE =~ /^jruby/
@@ -18,7 +21,6 @@ module Praxis
 
     @@caching_enabled = false
 
-
     attr_reader :validating
     attr_accessor :object
     attr_accessor :decorators
@@ -34,20 +36,20 @@ module Praxis
       super
 
       klass.instance_eval do
-        @views = Hash.new
-        @options = Hash.new
+        @views = {}
+        @options = {}
         @domain_model = Object
       end
     end
 
     # Override default new behavior to support memoized creation through an IdentityMap
-    def self.new(object, decorators=nil)
+    def self.new(object, decorators = nil)
       if @@caching_enabled && decorators.nil?
         cache = if object.respond_to?(:identity_map) && object.identity_map
-          object.identity_map.blueprint_cache[self]
-        else
-          self.cache
-        end
+                  object.identity_map.blueprint_cache[self]
+                else
+                  self.cache
+                end
 
         return cache[object] ||= begin
           blueprint = self.allocate
@@ -65,14 +67,12 @@ module Praxis
       'hash'
     end
 
-    def self.describe(shallow=false,example: nil, **opts)
+    def self.describe(shallow = false, example: nil, **opts)
       type_name = self.ancestors.find { |k| k.name && !k.name.empty? }.name
 
-      if example
-        example = example.object
-      end
+      example = example.object if example
 
-      description = self.attribute.type.describe(shallow,example: example, **opts).merge!(id: self.id, name: type_name)
+      description = self.attribute.type.describe(shallow, example: example, **opts).merge!(id: self.id, name: type_name)
       description.delete :anonymous # discard the Struct's view of anonymity, and use the Blueprint's one
       description[:anonymous] = @_anonymous unless @_anonymous.nil?
 
@@ -85,37 +85,30 @@ module Praxis
       description
     end
 
-
-    def self.attributes(opts={}, &block)
+    def self.attributes(opts = {}, &block)
       if block_given?
-        if self.const_defined?(:Struct, false)
-          raise "Redefining Blueprint attributes is not currently supported"
-        else
+        raise 'Redefining Blueprint attributes is not currently supported' if self.const_defined?(:Struct, false)
 
-          if opts.has_key?(:reference) && opts[:reference] != self.reference
-            raise "Reference mismatch in #{self.inspect}. Given :reference option #{opts[:reference].inspect}, while using #{self.reference.inspect}"
-          elsif self.reference
-            opts[:reference] = self.reference #pass the reference Class down
-          else
-            opts[:reference] = self
-          end
-
-          @options.merge!(opts)
-          @block = block
+        if opts.key?(:reference) && opts[:reference] != self.reference
+          raise "Reference mismatch in #{self.inspect}. Given :reference option #{opts[:reference].inspect}, while using #{self.reference.inspect}"
+        elsif self.reference
+          opts[:reference] = self.reference # pass the reference Class down
+        else
+          opts[:reference] = self
         end
 
+        @options.merge!(opts)
+        @block = block
+
         return @attribute
       end
 
-      unless @attribute
-        raise "@attribute not defined yet for #{self.name}"
-      end
+      raise "@attribute not defined yet for #{self.name}" unless @attribute
 
       @attribute.attributes
     end
 
-
-    def self.domain_model(klass=nil)
+    def self.domain_model(klass = nil)
       return @domain_model if klass.nil?
       @domain_model = klass
     end
@@ -123,26 +116,25 @@ module Praxis
     def self.check_option!(name, value)
       case name
       when :identity
-        raise Attributor::AttributorException, "Invalid identity type #{value.inspect}" unless value.kind_of?(::Symbol)
+        raise Attributor::AttributorException, "Invalid identity type #{value.inspect}" unless value.is_a?(::Symbol)
         return :ok
       else
         return Attributor::Struct.check_option!(name, value)
       end
     end
 
-
-    def self.load(value,context=Attributor::DEFAULT_ROOT_CONTEXT, **options)
+    def self.load(value, context = Attributor::DEFAULT_ROOT_CONTEXT, **options)
       case value
       when self
         value
       when nil, Hash, String
         # Need to parse/deserialize first
         # or apply default/recursive loading options if necessary
-        if (value = self.attribute.load(value,context, **options))
+        if (value = self.attribute.load(value, context, **options))
           self.new(value)
         end
       else
-        if value.kind_of?(self.domain_model) || value.kind_of?(self::Struct)
+        if value.is_a?(self.domain_model) || value.is_a?(self::Struct)
           # Wrap the value directly
           self.new(value)
         else
@@ -153,7 +145,7 @@ module Praxis
     end
 
     class << self
-      alias_method :from, :load
+      alias from load
     end
 
     def self.caching_enabled?
@@ -175,35 +167,33 @@ module Praxis
 
     def self.valid_type?(value)
       # FIXME: this should be more... ducklike
-      value.kind_of?(self) || value.kind_of?(self.attribute.type)
+      value.is_a?(self) || value.is_a?(self.attribute.type)
     end
 
-    def self.example(context=nil, **values)
+    def self.example(context = nil, **values)
       context = case context
-      when nil
-        ["#{self.name}-#{values.object_id.to_s}"]
-      when ::String
-        [context]
-      else
-        context
-      end
+                when nil
+                  ["#{self.name}-#{values.object_id}"]
+                when ::String
+                  [context]
+                else
+                  context
+                end
 
       self.new(self.attribute.example(context, values: values))
     end
 
-
-    def self.validate(value, context=Attributor::DEFAULT_ROOT_CONTEXT, _attribute=nil)
-      raise ArgumentError, "Invalid context received (nil) while validating value of type #{self.name}" if context == nil
+    def self.validate(value, context = Attributor::DEFAULT_ROOT_CONTEXT, _attribute = nil)
+      raise ArgumentError, "Invalid context received (nil) while validating value of type #{self.name}" if context.nil?
       context = [context] if context.is_a? ::String
 
-      unless value.kind_of?(self)
+      unless value.is_a?(self)
         raise ArgumentError, "Error validating #{Attributor.humanize_context(context)} as #{self.name} for an object of type #{value.class.name}."
       end
 
       value.validate(context)
     end
 
-
     def self.view(name, **options, &block)
       if block_given?
         return self.views[name] = View.new(name, self, **options, &block)
@@ -219,7 +209,7 @@ module Praxis
       object.render(view: view, context: context, **opts)
     end
     class << self
-      alias_method :render, :dump
+      alias render dump
     end
 
     # Internal finalize! logic
@@ -235,7 +225,7 @@ module Praxis
     end
 
     def self.resolve_domain_model!
-      return unless self.domain_model.kind_of?(String)
+      return unless self.domain_model.is_a?(String)
 
       @domain_model = self.domain_model.constantize
     end
@@ -248,7 +238,7 @@ module Praxis
     end
 
     def self.define_readers!
-      self.attributes.each do |name, attribute|
+      self.attributes.each do |name, _attribute|
         name = name.to_sym
 
         # Don't redefine existing methods
@@ -258,7 +248,6 @@ module Praxis
       end
     end
 
-
     def self.define_reader!(name)
       attribute = self.attributes[name]
       # TODO: profile and optimize
@@ -270,18 +259,16 @@ module Praxis
           @decorators.send(name)
         else
           value = @object.__send__(name)
-          return value if value.nil? || value.kind_of?(attribute.type)
+          return value if value.nil? || value.is_a?(attribute.type)
           attribute.load(value)
         end
       end
     end
 
-
-
     def self.generate_master_view!
       attributes = self.attributes
       view :master do
-        attributes.each do | name, attr |
+        attributes.each do |name, _attr|
           # Note: we can freely pass master view for attributes that aren't blueprint/containers because
           # their dump methods will ignore it (they always dump everything regardless)
           attribute name, view: :default
@@ -289,33 +276,29 @@ module Praxis
       end
     end
 
-
-    def initialize(object, decorators=nil)
+    def initialize(object, decorators = nil)
       # TODO: decide what sort of type checking (if any) we want to perform here.
       @object = object
 
-      @decorators = if decorators.kind_of?(Hash) && decorators.any?
-        OpenStruct.new(decorators)
-      else
-        decorators
-      end
+      @decorators = if decorators.is_a?(Hash) && decorators.any?
+                      OpenStruct.new(decorators)
+                    else
+                      decorators
+                    end
 
       @validating = false
     end
 
-
     # Render the wrapped data with the given view
-    def render(view_name=nil, context: Attributor::DEFAULT_ROOT_CONTEXT,renderer: Renderer.new, **opts)
-      if view_name != nil
-        warn "DEPRECATED: please do not pass the view name as the first parameter in Blueprint.render, pass through the view: named param instead."
+    def render(view_name = nil, context: Attributor::DEFAULT_ROOT_CONTEXT, renderer: Renderer.new, **opts)
+      if !view_name.nil?
+        warn 'DEPRECATED: please do not pass the view name as the first parameter in Blueprint.render, pass through the view: named param instead.'
       elsif opts.key?(:view)
         view_name = opts[:view]
       end
 
       fields = opts[:fields]
-      if view_name.nil? && fields.nil?
-        view_name = :default
-      end
+      view_name = :default if view_name.nil? && fields.nil?
 
       if view_name
         unless (view = self.class.views[view_name])
@@ -326,7 +309,7 @@ module Praxis
 
       # Accept a simple array of fields, and transform it to a 1-level hash with true values
       if fields.is_a? Array
-        fields = fields.each_with_object({}) {|field, hash| hash[field] = true }
+        fields = fields.each_with_object({}) { |field, hash| hash[field] = true }
       end
 
       # expand fields
@@ -334,33 +317,31 @@ module Praxis
 
       renderer.render(self, expanded_fields, context: context)
     end
-    alias_method :to_hash, :render
-    alias_method :dump, :render
+    alias to_hash render
+    alias dump render
 
-    def validate(context=Attributor::DEFAULT_ROOT_CONTEXT)
-      raise ArgumentError, "Invalid context received (nil) while validating value of type #{self.name}" if context == nil
+    def validate(context = Attributor::DEFAULT_ROOT_CONTEXT)
+      raise ArgumentError, "Invalid context received (nil) while validating value of type #{self.name}" if context.nil?
       context = [context] if context.is_a? ::String
       keys_with_values = []
 
-      raise "validation conflict" if @validating
+      raise 'validation conflict' if @validating
       @validating = true
 
       errors = []
       self.class.attributes.each do |sub_attribute_name, sub_attribute|
-        sub_context = self.class.generate_subcontext(context,sub_attribute_name)
+        sub_context = self.class.generate_subcontext(context, sub_attribute_name)
         value = self.send(sub_attribute_name)
-        unless value.nil?
-          keys_with_values << sub_attribute_name
-        end
+        keys_with_values << sub_attribute_name unless value.nil?
 
         if value.respond_to?(:validating) # really, it's a thing with sub-attributes
           next if value.validating
         end
-        errors.push(*sub_attribute.validate(value, sub_context))
+        errors.concat(sub_attribute.validate(value, sub_context))
       end
       self.class.attribute.type.requirements.each do |req|
         validation_errors = req.validate(keys_with_values, context)
-        errors.push(*validation_errors) unless validation_errors.empty?
+        errors.concat(validation_errors) unless validation_errors.empty?
       end
       errors
     ensure
@@ -371,7 +352,5 @@ module Praxis
     def _get_attr(name)
       self.send(name)
     end
-
   end
-
 end