praxis-blueprints 3.3 → 3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2baa109dab4f8585d61ee9d5317bc11039cbaa98
-  data.tar.gz: f2bd553cd4f075311155154b0c7fef9aad415b3f
+SHA256:
+  metadata.gz: be204aa4fc34affdeaeb411e506cc6408a1e96fffb6ef7973dbfbb439f192f58
+  data.tar.gz: d8a6a4f096f1250aa072c23c5a06d1151b79dc5b415086119bbb5fdc45b344ab
 SHA512:
-  metadata.gz: e52a91a7f9c78b9964650972b09c61a883035903f04e41374e82115d04b6643776f9ff05aebb281a007b7074913c9bfb086328ab6043418bd0df0ec8232ccfc8
-  data.tar.gz: af137419cbb73cceac9e4283a2558d758b0f4425ac009fe9243780328eb6df1091cdcee776147327fb646630a1832573bdbbd7e14b5a9cac8cb4e30d2f31fa5a
+  metadata.gz: '007365028b06ce14abbf77273d7d2dacf5d68ad6b3d394bb4e0ea6122ea7f7d59ee72d1a098fba9ad0a4b05152de787d8df3e273d427d08207370a1f53fb2631'
+  data.tar.gz: 880f9b005544f1e6185026d249898f739fefede6e99ea0c39e41adf52bd1891195f41f5a6d6d4713aec04b3983f2854e2ab740aac2ffb682079d39ecb481dd4e

data/.travis.yml

@@ -1,9 +1,12 @@
-language: ruby
-cache: bundler
 sudo: false
+language: ruby
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
 script:
   - bundle exec rspec spec
-  - bundle exec rubocop --format=clang
+branches:
+  only:
+    - master

data/README.md

@@ -1,13 +1,14 @@
-# Praxis Blueprints [![TravisCI][travis-img-url]][travis-ci-url] [![Coverage Status][coveralls-img-url]][coveralls-url] [![Dependency Status][gemnasium-img-url]][gemnasium-url]
+# Praxis Blueprints [![TravisCI][travis-img-url]][travis-ci-url] [![Coverage Status][coveralls-img-url]][coveralls-url] 
 
-[travis-img-url]:https://travis-ci.org/rightscale/praxis-blueprints.svg?branch=master
-[travis-ci-url]:https://travis-ci.org/rightscale/praxis-blueprints
-[coveralls-img-url]:https://coveralls.io/repos/rightscale/praxis-blueprints/badge.svg?branch=master&service=github
-[coveralls-url]:https://coveralls.io/github/rightscale/praxis-blueprints?branch=master
+[//]: # ( COMMENTED OUT UNTIL GEMNASIUM CAN SEE THE REPOS: [![Dependency Status][gemnasium-img-url]][gemnasium-url])
+
+[travis-img-url]:https://travis-ci.org/praxis/praxis-blueprints.svg?branch=master
+[travis-ci-url]:https://travis-ci.org/praxis/praxis-blueprints
+[coveralls-img-url]:https://coveralls.io/repos/github/praxis/praxis-blueprints/badge.svg?branch=master
+[coveralls-url]:https://coveralls.io/github/praxis/praxis-blueprints?branch=master
 [gemnasium-img-url]:https://gemnasium.com/rightscale/praxis-blueprints.svg
 [gemnasium-url]:https://gemnasium.com/rightscale/praxis-blueprints
 
-
 Praxis Blueprints is a library that allows for defining a reusable class structures that has a set of typed attributes and a set of views with which to render them. Instantiations of Blueprints resemble ruby Structs which respond to methods of the attribute names. Rendering is format-agnostic in that
 it results in a structured hash instead of an encoded string. Blueprints can automatically generate object structures that follow the attribute definitions.
 

data/lib/praxis-blueprints/blueprint.rb

@@ -275,7 +275,7 @@ module Praxis
         end
       end
     end
-
+    
     def initialize(object, decorators = nil)
       # TODO: decide what sort of type checking (if any) we want to perform here.
       @object = object
@@ -289,6 +289,12 @@ module Praxis
       @validating = false
     end
 
+    # By default we'll use the object identity, to avoid rendering the same object twice
+    # Override, if there is a better way cache things up
+    def _cache_key
+      self.object
+    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?
@@ -317,9 +323,13 @@ module Praxis
 
       renderer.render(self, expanded_fields, context: context)
     end
-    alias to_hash render
+
     alias dump render
 
+    def to_h
+      Attributor.recursive_to_h(@object)
+    end
+
     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

data/lib/praxis-blueprints/renderer.rb

@@ -47,7 +47,7 @@ module Praxis
           render(sub_object, sub_fields, view, context: sub_context)
         end
       elsif object.is_a? Praxis::Blueprint
-        @cache[object.object_id][fields.object_id] ||= _render(object, fields, view, context: context)
+        @cache[object._cache_key][fields] ||= _render(object, fields, view, context: context)
       else
         _render(object, fields, view, context: context)
       end
@@ -76,7 +76,7 @@ module Praxis
           begin
             value = object._get_attr(key)
           rescue => e
-            raise Attributor::DumpError, context: context, name: key, type: object.class, original_exception: e
+            raise Attributor::DumpError.new(context: context, name: key, type: object.class, original_exception: e)
           end
 
           if value.nil?

data/lib/praxis-blueprints/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Praxis
-  BLUEPRINTS_VERSION = '3.3'
+  BLUEPRINTS_VERSION = '3.4'
 end

data/lib/praxis-blueprints/view.rb

@@ -35,8 +35,6 @@ module Praxis
       renderer.render(object, expanded_fields, context: context)
     end
 
-    alias to_hash render # Why did we need this again?
-
     def attribute(name, **opts, &block)
       raise AttributorException, "Attribute names must be symbols, got: #{name.inspect}" unless name.is_a? ::Symbol
 
@@ -78,7 +76,7 @@ module Praxis
       object = schema.example(context)
       opts = {}
       opts[:context] = context if context
-      render(object, opts)
+      render(object, **opts)
     end
 
     def describe

data/praxis-blueprints.gemspec

@@ -28,21 +28,23 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency('randexp', ['~> 0'])
-  spec.add_runtime_dependency('attributor', ['>= 5.1'])
+  spec.add_runtime_dependency('attributor', ['>= 5.4'])
   spec.add_runtime_dependency('activesupport', ['>= 3'])
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
 
   spec.add_development_dependency('redcarpet', ['< 3.0'])
-  spec.add_development_dependency('yard', ['~> 0.8.7'])
+  spec.add_development_dependency('yard')
   spec.add_development_dependency('guard', ['~> 2'])
   spec.add_development_dependency('guard-rspec', ['>= 0'])
-  spec.add_development_dependency('rspec', ['< 2.99'])
-  spec.add_development_dependency('pry', ['~> 0'])
-  spec.add_development_dependency('pry-byebug', ['~> 1'])
-  spec.add_development_dependency('pry-stack_explorer', ['~> 0'])
-  spec.add_development_dependency('fuubar', ['~> 1'])
+  spec.add_development_dependency('rspec')
+  spec.add_development_dependency('rspec-its')
+  spec.add_development_dependency('rspec-collection_matchers')
+  spec.add_development_dependency('pry')
+  spec.add_development_dependency('pry-byebug')
+  spec.add_development_dependency('pry-stack_explorer')
+  spec.add_development_dependency('fuubar')
   spec.add_development_dependency('coveralls')
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'guard-rubocop'

data/spec/praxis-blueprints/blueprint_spec.rb

@@ -102,14 +102,20 @@ describe Praxis::Blueprint do
 
       context 'validation' do
         subject(:errors) { blueprint_class.validate(blueprint_instance) }
-        pending do
-          it { should be_empty }
-        end
+        it { should be_empty }
       end
     end
 
     context 'from Blueprint.example' do
-      subject(:blueprint_instance) { blueprint_class.example }
+      subject(:blueprint_instance) do
+        blueprint_class.example('ExamplePerson', 
+          address: nil,
+          prior_addresses: [],
+          work_address: nil,
+          myself: nil,
+          friends: []
+        )
+      end
       it_behaves_like 'a blueprint instance'
     end
 
@@ -118,7 +124,7 @@ describe Praxis::Blueprint do
         {
           name: 'Bob',
           full_name: FullName.example,
-          address: Address.example,
+          address: nil,
           email: 'bob@example.com',
           aliases: [],
           prior_addresses: [],

data/spec/praxis-blueprints/renderer_spec.rb

@@ -150,7 +150,7 @@ describe Praxis::Renderer do
 
   context 'rendering stuff that breaks badly' do
     it 'does not break badly' do
-      renderer.render(person, tags: [true])
+      renderer.render(person, {tags: [true]})
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis-blueprints
 version: !ruby/object:Gem::Version
-  version: '3.3'
+  version: '3.4'
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -57,28 +57,28 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -99,16 +99,16 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -141,72 +141,100 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-collection_matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -311,8 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Attributes, views, rendering and example generation for common Blueprint
@@ -326,4 +353,3 @@ test_files:
 - spec/praxis-blueprints/view_spec.rb
 - spec/spec_helper.rb
 - spec/support/spec_blueprints.rb
-has_rdoc: