json_schema_tools 0.5.2 → 0.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWMyMGVjNDg3M2IwYzhkMjU0N2Y3ZjY4OThjYTYxMTNkODY0MzYxZg==
+    YTU2OGFjZGFhZGI4YzVlNGM4MGI5ZGI4MDI0MjhjMDFiNTc4MjMzYg==
   data.tar.gz: !binary |-
-    NjZjYjhiMmFhZmZhOWNjYjE5MzllZWE5ODllZjQzY2VjOGU1MTRlMQ==
+    NzRkYTVkMjY2M2ZhYjJhMTA3MWUyMzU3MGZmZTQyOWJmODI1YzdkYQ==
 SHA512:
   metadata.gz: !binary |-
-    MDdkNTk5MWMzMmExMDAxZTU0ZTI4MWYyZmU1OGFkZjRlZTRiODhiNDljNzJk
-    YWMxMjA2OTljZWI1ODBiMjY4YjE5MDc3N2JkNGNlMTM1ZWM1YzVmOGRjMWRj
-    ZDE2NzIzZTM0NWNjZDk2MWFmNDBiYzFhYjE4Yjg3NWZjNmJkYWM=
+    ZjM2MzVlMTUwZDgzNDFhMmQyY2Q3ZTBlNWFkNjg4NDQ4NTBhNzNhNWQxY2Q3
+    Mjg1NmUzYTkxYzM1MzEzOTNiYjg4ZTkyZDI3Y2M2MjQxYmUyZGQ4NGI4ZWVm
+    YmE4YWU0OWZkNmU0NzM2MGI4NWI5ZTkxNTBmYjEzMDAyZWI2NWQ=
   data.tar.gz: !binary |-
-    ZWI5YjZjZTU5MzUzZjliNTEwOTU2Nzc4YTRlMjlmNGMxMmYyNGJlODg1YzU4
-    OWU0ODJiYzc4MTBiODM5Yzk4MjYxNGIwODk0NDFkNDk3NzQ3YjYwNjFlOTE1
-    MTI1MjFlNGI3ZWNhMzQ5MzkzNTJhYjFhOWVhYmQxMzk5M2M2ODU=
+    MjUyZjE5NDM2ZDE2MTlkZDIzZWRhOGQ5Y2FmOGFmMjQ2Yzg4YTVkMDZlODFj
+    MDI1YmQ2ZTNhNzRhZWU3MWU5NDAxN2UwN2Q2YjIxZTlmMWI1ZWM4N2M4YmQw
+    OTBkYmFjMzdlOGMxYzJiYWE2Nzk0ZWE1M2I1ZWFlMTJjNTJhMmQ=

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog JSON Schema Tools
 
+##2015-01
+
+* add :reader option for Obj.as_schema_hash to use a custom reader instance(with its own schema registry), instead of the global one
+
 ##2014-12
 
 * object.as_schema_hash converts values to types defined in the schema e.g  strings, integers

data/README.md

@@ -84,7 +84,8 @@ schema = SchemaTools::Reader.read :client, 'my/path/to/json-files'
 schemata = SchemaTools::Reader.read_all 'my/path/to/json-files'
 ```
 
-Don't like the global path and registry? Go local:
+Don't like the global path and registry? Create an instance and your save with
+a local registry. Use if you have schema with same names but different markup!
 
 ```ruby
 reader = SchemaTools::Reader.new
@@ -164,6 +165,14 @@ Set a custom schema path
 peter.as_schema_json( path: 'path-to/json-files/')
 ```
 
+Use your custom reader (preferred over path usage)
+
+```ruby
+reader = SchemaTools::Reader.new
+reader.read_all '/your/custom/path-to-schema-json/
+peter.as_schema_json( reader: reader)
+```
+
 By default the object hash has the class name (client) and the link-section on
 root level. This divides the data from the available methods and makes a clear
 statement about the object type(it's class).

data/lib/schema_tools/modules/hash.rb

@@ -33,6 +33,8 @@ module SchemaTools
       # @options opts [Array<String>] :fields to return. If not set all schema
       # properties are used.
       # @options opts [String] :path of the schema files overriding global one
+      # @options opts [String] :reader instance to read the schemas from instead
+      # of the global one
       # @options opts [String] :base_url used in all links
       # @options opts [Boolean] :links if set the object hash gets its _links
       # array inline.
@@ -44,9 +46,15 @@ module SchemaTools
         # get objects class name without inheritance
         real_class_name = obj.class.name.split('::').last.underscore
         class_name = opts[:class_name] || real_class_name
-        # get schema
-        inline_schema = opts.delete(:schema) if opts[:schema].present?
-        schema =  inline_schema || SchemaTools::Reader.read(class_name, opts[:path])
+        schema =  if opts[:reader].present?
+                    opts[:reader].read(class_name)
+                  elsif opts[:schema].present?
+                    # TODO inline schema can be problematic with nested resource types,
+                    # use a local reader instance until we figured it out
+                    opts.delete(:schema)
+                  else
+                    SchemaTools::Reader.read(class_name, opts[:path])
+                  end
 
         # iterate over the defined schema fields
         data = parse_properties(obj, schema, opts)

data/lib/schema_tools/version.rb

@@ -1,3 +1,3 @@
 module SchemaTools
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/spec/schema_tools/hash_spec.rb

@@ -60,6 +60,20 @@ describe SchemaTools::Hash do
       hash.keys.should_not include('birthday')
     end
 
+    it 'should use custom reader' do
+      reader = SchemaTools::Reader.new
+      reader.read_all File.expand_path('../../fixtures/schemata', __FILE__)
+      client = Client.new
+      client.first_name = 'Egon'
+      a1 = Address.new
+      a1.city = 'Cologne'
+      client.addresses = [a1]
+      # use a object with nesting as this is problematic
+      hash = SchemaTools::Hash.from_schema(client, reader: reader)
+      hash['first_name'].should == 'Egon'
+      hash['addresses'][0]['city'].should == 'Cologne'
+    end
+
     it 'should use custom schema path' do
       custom_path = File.expand_path('../../fixtures/schemata', __FILE__)
       hash = SchemaTools::Hash.from_schema(contact, path: custom_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Georg Leciejewski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json