pupa 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77d431c205df726539ae647437d320f79bf4a2c6
-  data.tar.gz: 9a8ab849b2865d4211d86cb6b7e86fe959e8edde
+  metadata.gz: b9732b4a0ea1dbd2eb9d8fff1d533bbfd397db6a
+  data.tar.gz: 659874bfd458daa7c09be7f0f2a5feeb9deec005
 SHA512:
-  metadata.gz: 0c43992f870cd679e8b4ede85413d871b3018d4e30cb6d55c0e4eb208099bfadf7febaaf1a54bbedc19ea7baa470877de74516aaa49a09c738dcb8e75dce7390
-  data.tar.gz: f885fb7ffee30f5be495bd02cced6423494055a0b7c2a4b6ff1ca5eb8dbc97436a7d21be42039ec6d20a20e606445d1c1379b75ee5bcb31d818fbe0dd456a2bf
+  metadata.gz: f24268480ad0447df95bbfa82a86c13d4d82e015309932571b102b73813d480e52d35124ca900f94d9740d58d1b8f3f84e2b9b484dc8c3b879ab6efec8593683
+  data.tar.gz: e09836eb51002368554645177bbfbee70e91b3dd5900746e26aa10f3196adb5651e455b1d3a87617e325381169367debc5af0b3d3f2ace604aa8d517c8fc585a

data/lib/pupa/models/base.rb

@@ -152,7 +152,7 @@ module Pupa
     def validate!
       if self.class.json_schema
         # JSON::Validator#initialize_data runs fastest if given a hash.
-        JSON::Validator.validate!(self.class.json_schema, to_h.deep_stringify_keys)
+        JSON::Validator.validate!(self.class.json_schema, stringify_keys(to_h))
       end
     end
 
@@ -183,5 +183,24 @@ module Pupa
       b.delete(:_id)
       a == b
     end
+
+  private
+
+    def stringify_keys(object)
+      case object
+      when Hash
+        {}.tap do |hash|
+          object.each do |key,value|
+            hash[key.to_s] = stringify_keys(value)
+          end
+        end
+      when Array
+        object.map do |value|
+          stringify_keys(value)
+        end
+      else
+        object
+      end
+    end
   end
 end

data/lib/pupa/version.rb

@@ -1,3 +1,3 @@
 module Pupa
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/models/base_spec.rb

@@ -6,20 +6,26 @@ describe Pupa::Base do
       self.schema = {
         '$schema' => 'http://json-schema.org/draft-03/schema#',
         'properties' => {
-          'url' => {
-            'type' => 'string',
-            'format' => 'uri',
+          'links' => {
+            'items' => {
+              'properties' => {
+                'url' => {
+                  'type' => 'string',
+                  'format' => 'uri',
+                },
+              },
+            },
           },
         },
       }
-      attr_accessor :name, :url, :label, :founding_date, :inactive, :label_id, :manager_id
+      attr_accessor :name, :label, :founding_date, :inactive, :label_id, :manager_id, :links
       foreign_key :label_id, :manager_id
       foreign_object :label
     end
   end
 
   let :properties do
-    {name: 'Moderat', url: 'http://moderat.fm/', label: {name: 'Mute'}, inactive: false, manager_id: '1'}
+    {name: 'Moderat', label: {name: 'Mute'}, inactive: false, manager_id: '1', links: [{url: 'http://moderat.fm/'}]}
   end
 
   let :object do
@@ -28,7 +34,7 @@ describe Pupa::Base do
 
   describe '#attr_accessor' do
     it 'should add properties' do
-      Music::Band.properties.to_a.should == [:_id, :_type, :extras, :name, :url, :label, :founding_date, :inactive, :label_id, :manager_id]
+      Music::Band.properties.to_a.should == [:_id, :_type, :extras, :name, :label, :founding_date, :inactive, :label_id, :manager_id, :links]
     end
   end
 
@@ -61,9 +67,15 @@ describe Pupa::Base do
       Music::Band.json_schema.should == {
         '$schema' => 'http://json-schema.org/draft-03/schema#',
         'properties' => {
-          'url' => {
-            'type' => 'string',
-            'format' => 'uri',
+          'links' => {
+            'items' => {
+              'properties' => {
+                'url' => {
+                  'type' => 'string',
+                  'format' => 'uri',
+                },
+              },
+            },
           },
         },
       }
@@ -89,7 +101,10 @@ describe Pupa::Base do
 
     it 'should set properties' do
       object.name.should == 'Moderat'
-      object.url.should == 'http://moderat.fm/'
+      object.label.should == {name: 'Mute'}
+      object.inactive.should == false
+      object.manager_id.should == '1'
+      object.links.should == [{url: 'http://moderat.fm/'}]
     end
   end
 
@@ -135,7 +150,7 @@ describe Pupa::Base do
 
   describe '#fingerprint' do
     it 'should return the fingerprint' do
-      object.fingerprint.should == {_type: 'music/band', name: 'Moderat', url: 'http://moderat.fm/', inactive: false, manager_id: '1'}
+      object.fingerprint.should == {_type: 'music/band', name: 'Moderat', inactive: false, manager_id: '1', links: [{url: 'http://moderat.fm/'}]}
     end
   end
 
@@ -159,18 +174,18 @@ describe Pupa::Base do
     end
 
     it 'should raise an error if the object is invalid' do
-      object[:url] = 'invalid'
+      object[:links][0][:url] = 'invalid'
       expect{object.validate!}.to raise_error(JSON::Schema::ValidationError)
     end
   end
 
   describe '#to_h' do
     it 'should not include foreign objects by default' do
-      object.to_h.should == {_id: object._id, _type: 'music/band', name: 'Moderat', url: 'http://moderat.fm/', inactive: false, manager_id: '1'}
+      object.to_h.should == {_id: object._id, _type: 'music/band', name: 'Moderat', inactive: false, manager_id: '1', links: [{url: 'http://moderat.fm/'}]}
     end
 
     it 'should include foreign objects if desired' do
-      object.to_h(include_foreign_objects: true).should == {_id: object._id, _type: 'music/band', name: 'Moderat', url: 'http://moderat.fm/', label: {name: 'Mute'}, inactive: false, manager_id: '1'}
+      object.to_h(include_foreign_objects: true).should == {_id: object._id, _type: 'music/band', name: 'Moderat', label: {name: 'Mute'}, inactive: false, manager_id: '1', links: [{url: 'http://moderat.fm/'}]}
     end
 
     it 'should not include blank properties' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupa
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Open North