requisite 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 828a5465ab9ec59c47bda9e6ab72c34e9bdbab05536ab99ad45c3cdaec933f16
-  data.tar.gz: b1c387023439e720d6600310604828d672abd8dd4eabb25d0412bcec423c4529
+  metadata.gz: d57aa5a873c33ad9728bd93491de828de2cd34018e089f11b128ff19e1a8a272
+  data.tar.gz: 30dbe4b2ffb361596cbe4d33243e31e974ad3db83ffa5970bc0ef621db6f9939
 SHA512:
-  metadata.gz: eb0c6e6e4cc10fb351e01334754196f2a65ced999a32980f416a2c226b4ea1a76a77b0a1b0523e408de9b372fc40676ab7e9482290f28d13d983947ae750a9f9
-  data.tar.gz: 3269605161e8264e04dc0640637a107d4db5ef079f635e31c674cc35cb409eb32ccb991a3f17bcebe4f31bedcd6616fbfb09856829a86f5a802f67f998df9ac1
+  metadata.gz: cf0f90b0321b3491753c86aee31bcb3aa5a1000d40d3a7b32f8e9d6438151c21d3fcf68c51b6922495b5e66577461bb6a0bc55604c941ffb614b74c745564f95
+  data.tar.gz: f278d19e225c5b00dbbdd5ef77692a6c5fd4d2fe7477cb05930f8d0c02d47f98659eb235e534b307940dafd904ba89f56af1e9ee7ec000bdb8d16c036190ba85

data/lib/requisite/api_model.rb

@@ -36,7 +36,10 @@ module Requisite
       preprocess_model
       {}.tap do |result|
         self.class.attribute_keys_with_inheritance.each do |key|
-          value = self.send(key)
+          value = nil
+          around_each_attribute(key) do
+            value = self.send(key)
+          end
           result[key] = value if show_nil || !value.nil?
         end
       end
@@ -106,5 +109,9 @@ module Requisite
     def preprocess_model
       # noop
     end
+
+    def around_each_attribute(name)
+      yield
+    end
   end
 end

data/lib/requisite/boundary_object.rb

@@ -4,17 +4,14 @@ module Requisite
       def attribute(name, options={})
         attribute_keys << name
         define_method(name) do
-          result = nil
-          self.send(:around_each_attribute, name) do
-            resolved_name = options[:rename] || name
-            result = self.send(:convert, resolved_name)
-            result = self.send(:parse_typed_hash, resolved_name, options[:typed_hash]) if options[:typed_hash]
-            result = self.send(:parse_scalar_hash, resolved_name) if options[:scalar_hash]
-            result = self.send(:parse_typed_array, resolved_name, options[:typed_array]) if options[:typed_array]
-            result = options[:default] if (options.key?(:default) && empty_result?(result))
-            raise_bad_type_if_type_mismatch(result, options[:type]) if options[:type] && result
-            result = result.to_s if options[:stringify]
-          end
+          resolved_name = options[:rename] || name
+          result = self.send(:convert, resolved_name)
+          result = self.send(:parse_typed_hash, resolved_name, options[:typed_hash]) if options[:typed_hash]
+          result = self.send(:parse_scalar_hash, resolved_name) if options[:scalar_hash]
+          result = self.send(:parse_typed_array, resolved_name, options[:typed_array]) if options[:typed_array]
+          result = options[:default] if (options.key?(:default) && empty_result?(result))
+          raise_bad_type_if_type_mismatch(result, options[:type]) if options[:type] && result
+          result = result.to_s if options[:stringify]
           result
         end
       end
@@ -22,16 +19,13 @@ module Requisite
       def attribute!(name, options={})
         attribute_keys << name
         define_method(name) do
-          result = nil
-          self.send(:around_each_attribute, name) do
-            resolved_name = options[:rename] || name
-            result = self.send(:convert!, resolved_name)
-            result = self.send(:parse_typed_hash, resolved_name, options[:typed_hash]) if options[:typed_hash]
-            result = self.send(:parse_scalar_hash, resolved_name) if options[:scalar_hash]
-            result = self.send(:parse_typed_array, resolved_name, options[:typed_array]) if options[:typed_array]
-            result = result.to_s if options[:stringify]
-            raise_bad_type_if_type_mismatch(result, options[:type]) if options[:type]
-          end
+          resolved_name = options[:rename] || name
+          result = self.send(:convert!, resolved_name)
+          result = self.send(:parse_typed_hash, resolved_name, options[:typed_hash]) if options[:typed_hash]
+          result = self.send(:parse_scalar_hash, resolved_name) if options[:scalar_hash]
+          result = self.send(:parse_typed_array, resolved_name, options[:typed_array]) if options[:typed_array]
+          result = result.to_s if options[:stringify]
+          raise_bad_type_if_type_mismatch(result, options[:type]) if options[:type]
           result
         end
       end
@@ -52,10 +46,6 @@ module Requisite
 
     private
 
-    def around_each_attribute(name)
-      yield
-    end
-
     self.singleton_class.send(:alias_method, :a, :attribute)
     self.singleton_class.send(:alias_method, :a!, :attribute!)
 

data/lib/requisite/version.rb

@@ -1,3 +1,3 @@
 module Requisite
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/test/requisite/api_user_test.rb

@@ -1,6 +1,5 @@
 require 'test_helper'
 require 'benchmark'
-
 # Example Object
 class ApiUser < Requisite::ApiModel
 
@@ -18,6 +17,7 @@ class ApiUser < Requisite::ApiModel
     attribute :custom_data, scalar_hash: true, rename: :custom_attributes
     attribute :company
     attribute :companies
+    attribute :api_version, type: Integer
   end
 
   # Ensure that at least one identifier is passed
@@ -28,6 +28,10 @@ class ApiUser < Requisite::ApiModel
     raise StandardError unless identifier
   end
 
+  def api_version
+    1
+  end
+
   def last_attribute_fetch_time
     @last_attribute_fetch_time
   end
@@ -89,7 +93,8 @@ module Requisite
         :custom_data => {
           :is_cool => true,
           :logins => 77
-        }
+        },
+        :api_version => 1
       })
       user.name.must_equal('Bob')
     end
@@ -135,7 +140,8 @@ module Requisite
         :custom_data => {
           :different => true
         },
-        :new_attribute => 'hi'
+        :new_attribute => 'hi',
+        :api_version => 1
       })
     end
 
@@ -147,7 +153,8 @@ module Requisite
       user.to_hash.must_equal({
         :user_id => 'abcdef',
         :name => 'Bob',
-        :custom_data => {}
+        :custom_data => {},
+        :api_version => 1
       })
       user.name.must_equal('Bob')
     end
@@ -170,7 +177,8 @@ module Requisite
         :new_session => nil,
         :custom_data => {},
         :company => nil,
-        :companies => nil
+        :companies => nil,
+        :api_version => 1
       })
       user.name.must_equal('Bob')
     end
@@ -182,7 +190,7 @@ module Requisite
 
       user.to_hash(show_nil: true)
 
-      user.attribute_names.must_equal [:id, :user_id, :email, :name, :last_seen_user_agent, :last_request_at, :unsubscribed_from_emails, :update_last_request_at, :new_session, :custom_data, :company, :companies]
+      user.attribute_names.must_equal [:id, :user_id, :email, :name, :created_at, :last_seen_user_agent, :last_request_at, :unsubscribed_from_emails, :update_last_request_at, :new_session, :custom_data, :company, :companies, :api_version]
       user.last_attribute_fetch_time.must_be :>, 0
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: requisite
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - James Osler