json_schema_tools 0.0.5 → 0.0.6

data/lib/schema_tools/modules/hash.rb

@@ -40,9 +40,7 @@ module SchemaTools
         fields = opts[:fields]
         # get objects class name without inheritance
         real_class_name = obj.class.name.split('::').last.underscore
-        class_name =  opts[:class_name] || real_class_name
-        # directly return array & hash values
-        return obj if ['array', 'hash'].include? class_name
+        class_name = opts[:class_name] || real_class_name
 
         data = {}
         # get schema
@@ -50,19 +48,37 @@ module SchemaTools
         # iterate over the defined schema fields
         schema['properties'].each do |field, prop|
           next if fields && !fields.include?(field)
+
           if prop['type'] == 'array'
+
             data[field] = [] # always set an empty array
             if obj.respond_to?( field ) && rel_objects = obj.send( field )
               rel_objects.each do |rel_obj|
-                data[field] << from_schema(rel_obj, opts)
+                data[field] << if prop['properties'] && prop['properties']['$ref']
+                                  #got schema describing the objects
+                                  from_schema(rel_obj, opts)
+                                else
+                                  rel_obj
+                                end
               end
             end
+
           elsif prop['type'] == 'object' # a singular related object
+
             data[field] = nil # always set empty val
             if obj.respond_to?( field ) && rel_obj = obj.send( field )
-              #dont nest field to prevent => client=>{client=>{data} }
-              data[field] = from_schema(rel_obj, opts)
+              if prop['properties'] && prop['properties']['$ref']
+                data[field] = from_schema(rel_obj, opts)
+              else
+                # NO recursion directly get values from related object. Does
+                # NOT allow deeper nesting so you MUST define an own schema to be save
+                data[field] = {}
+                prop['properties'].each do |fld, prp|
+                  data[field][fld] = rel_obj.send(fld) if obj.respond_to?(field)
+                end
+              end
             end
+
           else # a simple field is only added if the object knows it
             data[field] = obj.send(field) if obj.respond_to?(field)
           end

data/lib/schema_tools/version.rb

@@ -1,3 +1,3 @@
 module SchemaBuilder
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/spec/fixtures/lead.json

@@ -8,6 +8,25 @@
       "description": "Where did the person come from",
       "type":"string",
       "maxLength": 255
+    },
+    "links_clicked":{
+      "description": "Timestamps of clicks. Just an example to test nested array values without object reference",
+      "type":"array",
+      "properties":{
+        "type": "string"
+      }
+    },
+    "conversion":{
+      "description": "Just an example to test nested object value without object reference",
+      "type":"object",
+      "properties":{
+        "from": {
+          "type": "string"
+        },
+        "to": {
+          "type": "string"
+        }
+      }
     }
   }
 }

data/spec/schema_tools/hash_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 class Client
   attr_accessor :first_name, :last_name, :addresses, :id
-end
+  end
 
 describe SchemaTools::Hash do
 
@@ -41,5 +41,40 @@ describe SchemaTools::Hash do
       hash['client']['first_name'].should be_nil
     end
   end
+
+  context 'with plain nested values' do
+
+    class Lead < Client
+      attr_accessor :links_clicked, :conversion
+    end
+
+    class Conversion
+      attr_accessor :from, :to
+    end
+
+
+    let(:lead){Lead.new}
+    before :each do
+      lead.links_clicked = ['2012-12-12', '2012-12-15', '2012-12-16']
+      conversion = Conversion.new
+      conversion.from = 'whatever'
+      conversion.to = 'whatever'
+      lead.conversion = conversion
+      @hash = SchemaTools::Hash.from_schema(lead)
+    end
+    after :each do
+      SchemaTools::Reader.registry_reset
+    end
+
+    it 'should create array with values' do
+      @hash['lead']['links_clicked'].should == lead.links_clicked
+    end
+
+    it 'should create object with values' do
+      @hash['lead']['conversion']['from'].should == lead.conversion.from
+      @hash['lead']['conversion']['to'].should == lead.conversion.to
+    end
+
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2012-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -301574637564117079
+      hash: 77879165624642168
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -301574637564117079
+      hash: 77879165624642168
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24