json_schema_tools 0.6.3 → 0.6.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDg0NTQ4YzQwN2QzYjhhYTMzMDM2NmJlMDgzOGM2NDU0MWExOTdlMQ==
-  data.tar.gz: !binary |-
-    ZmQ5MTNhYTUwNWY2NWQ5Zjc3ODk1MTQzMjcwNDk0Yzg3NmM0NzZkMw==
+SHA1:
+  metadata.gz: c51ac19e559376a0c048f7bed77020978dd9c74d
+  data.tar.gz: cf646e960df49539e2b4de0cc30e496f30b2d0f9
 SHA512:
-  metadata.gz: !binary |-
-    YzhlNWJhNTJmYTQyMjc5YzQwZWQxMzkzMDQ4MThhNGI0OTNhYmNiNTI0NjQz
-    ZDU0MjQ3YTExMDlmMGYzZmQzZGNiMmQwNzUzZDlhYjg3MDE5NmI1NmQ1Yjg4
-    NDY3M2NhNjQ1MjMzNjM3NmRkMmMwMzUwN2VlNzI0MmQxYjE2YWI=
-  data.tar.gz: !binary |-
-    OGQ4MTBhYTMzZWI0YTRjYzI5ZWRlOWRiYzBlMWM5ZjYwYzVlM2UyNTVjZTlj
-    ZjM1YTZmN2I3MjA3OTY0MDcxM2YwNDMyZTVkNzI4MWM4NGU0MDM0N2QwNzYw
-    NjQ1MDgwYjkzM2UxYjczNTU5Mzk3MWI2Njk0NTYzNzIxNjM4MjY=
+  metadata.gz: 8ba8fdab723dc2368b1e90a83fb8a433804c7a5edd1f6a905870ef23e4ed33600286009e85f87259694914b831b896cdbe9d7c47b68dec32482db4ad28005c66
+  data.tar.gz: 326ce9672bc078a27f6fb6a3004cab5a3fd370cc60d228a0fd967b23779199e3962db91f02530b761157ef8f3fc3f23ec45b9a15cc055f2aa42fce589130f3d3

data/CHANGELOG.md

@@ -6,6 +6,7 @@ Thanks @VidurMalik
 * use schema definition in nested items array
 * exclude keys for nil(blank) nested objects
 * allow arbitrary key/values for a nested object without properties definition in the schema
+* from_hash/from_json creates objects from nested object/array definitions
 
 ##2015-03
 

data/lib/schema_tools/modules/attributes.rb

@@ -84,25 +84,26 @@ module SchemaTools
           obj ||= new
           hash.each do |key, val|
             next unless obj.respond_to?(key)
+            conv_val = nil
             # set values to raw schema attributes, even if there are no setters
             # assuming this objects comes from a remote site
             field_props = self.schema['properties']["#{key}"]
-            conv_val = if val.nil?
-                         val
-                       elsif field_props['type'] == 'string'
-                         if field_props['format'] == 'date'
-                          Date.parse(val) # or be explicit? Date.strptime('2001-02-03', '%Y-%m-%d')
-                         elsif field_props['format'] == 'date-time'
-                           Time.parse(val) # vs Time.strptime
-                         else
-                          "#{val}"
-                         end
-                       elsif field_props['type'] == 'integer'
-                         val.to_i
-                       else # rely on preceding call e.g from_json for boolean, number
-                         val
-                       end
-                      # TODO if val is a hash / array => look for nested class & cast
+            field_type = field_props['type']
+            unless val.nil?
+              case field_type
+              when 'string'
+                conv_val = process_string_type(field_props['format'], val)
+              when 'integer'
+                conv_val = val.to_i
+              when 'object'
+                conv_val = process_object_type(key, val)
+              when 'array'
+                conv_val = process_array_type(key, val)
+              else
+                conv_val = val
+              end
+            end
+
             obj.schema_attrs["#{key}"] = conv_val
           end
           obj
@@ -116,6 +117,43 @@ module SchemaTools
           @schema
         end
 
+        private
+
+        def process_string_type(field_format, value)
+          if field_format == 'date'
+            Date.parse(value) # or be explicit? Date.strptime('2001-02-03', '%Y-%m-%d')
+          elsif field_format == 'date-time'
+            Time.parse(value) # vs Time.strptime
+          else
+           value.to_s
+          end
+        end
+
+        def process_object_type(field_name, value)
+          if nested_class(field_name)
+            nested_class(field_name).from_hash(value)
+          else
+            value
+          end
+        end
+
+        def process_array_type(field_name, value)
+          if nested_class(field_name.to_s.singularize)
+            value.map do |element|
+              nested_class(field_name.to_s.singularize).from_hash(element)
+            end
+          else
+            value
+          end
+        end
+
+        def nested_class(field_name)
+          "#{base_class}::#{field_name.to_s.camelize}".safe_constantize
+        end
+
+        def base_class
+          self.to_s.deconstantize
+        end
       end
     end
   end

data/lib/schema_tools/version.rb

@@ -1,3 +1,3 @@
 module SchemaTools
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/spec/fixtures/schemata/item.json

@@ -0,0 +1,6 @@
+{
+  "type" : "object",
+  "properties" : {
+    "id" : { "type" : "string" }
+  }
+}

data/spec/fixtures/schemata/item_collection.json

@@ -0,0 +1,11 @@
+{
+  "type" : "object",
+  "properties" : {
+    "items" : {
+      "type" : "array",
+      "properties" : {
+        "$ref" : "item.json#properties"
+      }
+    }
+  }
+}

data/spec/schema_tools/modules/attributes_spec.rb

@@ -15,6 +15,21 @@ class Numbers
   has_schema_attrs :numbers, :schema => schema_as_ruby_object
 end
 
+class WorkAddress
+  include SchemaTools::Modules::Attributes
+  has_schema_attrs :address
+end
+
+class ItemCollection
+  include SchemaTools::Modules::Attributes
+  has_schema_attrs :item_collection
+end
+
+class Item
+  include SchemaTools::Modules::Attributes
+  has_schema_attrs :item
+end
+
 describe SchemaTools::Modules::Attributes do
 
   context 'included' do
@@ -120,6 +135,18 @@ describe SchemaTools::Modules::Attributes do
       expect(obj.created_at.hour).to eq 10
     end
 
+    it 'makes nested objects if there are nested hashes' do
+      hash = {work_address: {}}
+      obj = TestClient.from_hash(hash)
+      expect(obj.work_address).to be_an_instance_of(WorkAddress)
+    end
+
+    it 'makes nested array of objects if there are nested arrays of hashes' do
+      hash = {items: [{}, {}]}
+      obj = ItemCollection.from_hash(hash)
+      expect(obj.items.first).to be_an_instance_of(Item)
+    end
+
     it 'updates an object' do
       obj = TestContact.from_hash( {first_name: 'Frieda'} )
       expect(obj.first_name).to eq 'Frieda'

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Georg Leciejewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         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
   name: simplecov
   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: rspec
   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'
 description: Want to create or read a JSON Schema powered API? This toolset provides
@@ -75,8 +75,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -105,6 +105,8 @@ files:
 - spec/fixtures/schemata/contact.json
 - spec/fixtures/schemata/includes_basic_definitions.json
 - spec/fixtures/schemata/includes_deep_nested_refs.json
+- spec/fixtures/schemata/item.json
+- spec/fixtures/schemata/item_collection.json
 - spec/fixtures/schemata/lead.json
 - spec/fixtures/schemata/nested_object_no_properties.json
 - spec/fixtures/schemata/nested_schemas/person.json
@@ -135,17 +137,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: JSON Schema API tools for server and client side