praxis-blueprints 2.1 → 2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14169dd33330be68f4e42c2db5ed8884e243b893
-  data.tar.gz: c4fb566937d470785645d7899ba7351dfa174289
+  metadata.gz: c0621988651c28b2a7067510da6b334b3bb788fd
+  data.tar.gz: f89f81316cb31874e7353cf86b85e5f29552112e
 SHA512:
-  metadata.gz: 23dbe2797e5ce3575608d619f56908e21fad55baa53934c2a78dccf594231def06d18b28dc24110b8f09b79a290284eae7cf68d313129925eb8ffd8b32a91c0a
-  data.tar.gz: 4dc85caab7023389dcda2a6974328e815850c07adfbc17ce32ffed83423c58803462bbf5cedb3e799d3fe8b72ecf7d7f46451c1d805f56686e8fa6d7baa8dbcb
+  metadata.gz: a9d0c616bb141113114edadd7aa8446ad686da969bb0bb7f4b018b5999a7190cb8f8f570b003503728849841dfbee17be1c5bd21a14e50cd9a1e147e58724f82
+  data.tar.gz: e5c20f1b9577216b1a480cabfbf1fcb0941391f3937b0096ce0f1e7c11212e6eba64e60aad6b3be0b4403a6f6584a4ba83d561c53bc3591d6e017d0e1deff60c

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## next
 
+## 2.2
+
+* Added instrumentation through `ActiveSupport::Notifications`
+  * Use the 'praxis.blueprint.render to subscribe to `Blueprint#render` calls
+
 
 ## 2.1
 
@@ -9,7 +14,7 @@
 * Bumped attributor dependnecy to >= 4.0.1
 
 
-## 2.0.1 
+## 2.0.1
 
 * relaxed attributor dependency to >= 3.0
 

data/lib/praxis-blueprints/blueprint.rb

@@ -300,7 +300,7 @@ module Praxis
         raise "view with name '#{view_name.inspect}' is not defined in #{self.class}"
       end
 
-      rendered_key = if fields = opts[:fields]
+      rendered_key = if (fields = opts[:fields])
         if fields.is_a? Array
           # Accept a simple array of fields, and transform it to a 1-level hash with nil values
           opts[:fields] = opts[:fields].each_with_object({}) {|field, hash| hash[field] = nil }
@@ -315,7 +315,15 @@ module Praxis
       return CIRCULAR_REFERENCE_MARKER if @active_renders.include?(rendered_key)
       @active_renders << rendered_key
 
-      @rendered_views[rendered_key] = view.dump(self, context: context,**opts)
+      notification_payload = {
+        blueprint: self,
+        view: view,
+        fields: fields
+      }
+
+      ActiveSupport::Notifications.instrument 'praxis.blueprint.render'.freeze,  notification_payload do
+        @rendered_views[rendered_key] = view.dump(self, context: context,**opts)
+      end
     ensure
       @active_renders.delete rendered_key
     end

data/lib/praxis-blueprints/version.rb

@@ -1,3 +1,3 @@
 module Praxis
-  BLUEPRINTS_VERSION = "2.1"
+  BLUEPRINTS_VERSION = "2.2"
 end

data/lib/praxis-blueprints/view.rb

@@ -29,7 +29,6 @@ module Praxis
       @contents
     end
 
-
     def dump(object, context: Attributor::DEFAULT_ROOT_CONTEXT,**opts)
       fields = opts[:fields]
       # Restrict which attributes to output if we receive a fields parameter
@@ -92,7 +91,6 @@ module Praxis
 
     end
 
-
     def example(context=nil)
       object = self.schema.example(context)
       opts = {}
@@ -114,7 +112,7 @@ module Praxis
     end
 
     private
-    def add_subfield_options( fields, name, existing_options)
+    def add_subfield_options(fields, name, existing_options)
       sub_opts = if fields && fields[name]
         {fields: fields[name] }
       else

data/spec/praxis-blueprints/blueprint_spec.rb

@@ -101,6 +101,19 @@ describe Praxis::Blueprint do
         it 'has the right values' do
           subject[:name].should eq(expected_name)
         end
+
+        it 'sends the correct ActiveSupport::Notification' do
+          notification_payload = {
+            blueprint: blueprint_instance,
+            view: blueprint_class.views[:name_only],
+            fields: nil
+          }
+          ActiveSupport::Notifications.should_receive(:instrument).
+            with('praxis.blueprint.render',notification_payload).
+            and_call_original
+
+            blueprint_instance.render(view: :name_only)
+        end
       end
 
       context 'validation' do
@@ -217,7 +230,7 @@ describe Praxis::Blueprint do
       end
     end
   end
-  
+
   context '.validate' do
     let(:hash) { {name: 'bob'} }
     let(:person) { Person.load(hash) }

data/spec/support/spec_blueprints.rb

@@ -34,6 +34,9 @@ class Person < Praxis::Blueprint
     attribute :address
   end
 
+  view :name_only do
+    attribute :name
+  end
 
   view :extended do
     attribute :name
@@ -76,7 +79,7 @@ end
 
 
 class FullName < Attributor::Model
-  
+
   attributes do
     attribute :first, String, example: /[:first_name:]/
     attribute :last, String, example: /[:last_name:]/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis-blueprints
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.2'
 platform: ruby
 authors:
 - Josep M. Blanquer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Attributes, views, rendering and example generation for common Blueprint