praxis-blueprints 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54c80c09733228cb18f5fdc35ae05054bd0727a4
-  data.tar.gz: 90eba917e0f3d2651d840333fe5d81b94a13428b
+  metadata.gz: 97b7352ecab8d56459df9325ca4950ef87f8ebb1
+  data.tar.gz: bde131b221dd5535017d22a7b54c592565a7d27c
 SHA512:
-  metadata.gz: 5f307971333a02b445884d4e3a514b4a20c4bca46fa9fe38aed65e7fec34b717f0a02afbd520ef0ac3d601a396b7554f6af73cfe1a7cc23bb56ef76b0b2ba814
-  data.tar.gz: 1d375284f3af2b1d32ea79b06c0677b3588696d377840297ebfa71a473f79286bbed6ce7d5a4ef85b3c92988f1b4062df108be8cff48b5141aebf8f3d605d5f3
+  metadata.gz: a48ba08bf752647dec66aaf024d230d2e97ad26d157c5e0f2969ace71c23b2d3de14c27d8fd2aa694c717246b47b43b60ee971e0f4ef6102f880b5e636a4e781
+  data.tar.gz: 59ff0611ce4a0322f7bda51af02928a482bc556a4a2f1362a126ab59ddbdbc58612bf5014047ecd06c3821822154b91cd5ca3976f81972101bf09b7a2c384fc0

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## next
 
-* next thing here
+* `Blueprint` readers now always `load` the value for an attribute before returning it.
 
 ## 1.1.0
 

data/lib/praxis-blueprints/blueprint.rb

@@ -82,7 +82,7 @@ module Praxis
             opts[:reference] = self
           end
 
-          @options = opts
+          @options.merge!(opts)
           @block = block
         end
 
@@ -274,21 +274,26 @@ module Praxis
        else
          value = @object.send(name)
          return value if value.nil? || value.kind_of?(attribute.type)
-         attribute.type.new(value)
+         attribute.type.load(value)
        end
       end
     end
 
     def self.define_direct_reader!(name)
-      module_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{name}
-          if @decorators && @decorators.respond_to?(:#{name})
-            @decorators.#{name}
-          else
-            @object.#{name}
-          end
-        end
-      RUBY
+      attribute = self.attributes[name]
+      # TODO: profile and optimize
+      # because we use the attribute in the reader, 
+      # it's likely faster to use define_method here 
+      # than module_eval, but we should make sure.
+      define_method(name) do
+       if @decorators && @decorators.respond_to?(name)
+         @decorators.send(name)
+       else
+         value = @object.__send__(name)
+         return value if value.nil? || value.kind_of?(attribute.type)
+         attribute.load(value)
+       end
+      end
     end
 
     def self.generate_master_view!
@@ -304,14 +309,12 @@ module Praxis
 
 
     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
 
       raise "validation conflict" if @validating
       @validating = true
 
-
       self.class.attributes.each_with_object(Array.new) do |(sub_attribute_name, sub_attribute), errors|
         sub_context = self.class.generate_subcontext(context,sub_attribute_name)
         value = self.send(sub_attribute_name)

data/lib/praxis-blueprints/version.rb

@@ -1,3 +1,3 @@
 module Praxis
-  BLUEPRINTS_VERSION = "1.1.0"
+  BLUEPRINTS_VERSION = "1.1.1"
 end

data/spec/praxis-blueprints/blueprint_spec.rb

@@ -309,7 +309,7 @@ describe Praxis::Blueprint do
       person.address.should_receive(:state).and_raise("Kaboom")
       expect {
         person.render(view_name, context: ['special_root'])
-      }.to raise_error(/Error while dumping attribute state of type Address for context special_root.address .*. Reason: .*Kaboom/)
+      }.to raise_error(/Error while dumping attribute state of type Address for context special_root.address. Reason: .*Kaboom/)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis-blueprints
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Josep M. Blanquer