json_schema_tools 0.0.8 → 0.1.0

data/README.md

@@ -26,6 +26,10 @@ schema.json files are located.
 Read a single schema:
 
     schema = SchemaTools::Reader.read :client
+    
+Read a schema from an existing Ruby hash:
+
+    schema = SchemaTools::Reader.read :client, { ... } 
 
 Read multiple schemas, all *.json files in schema path
 
@@ -46,7 +50,6 @@ Don't like the global path and registry? Go local:
     reader.read :client, 'from/path'
     reader.registry
 
-
 ## Object to Schema JSON
 
 A schema provides a (public) contract about an object definition. Therefore an

data/json_schema_tools.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'json'
-  s.add_dependency 'activesupport'
-  s.add_dependency 'activemodel'
+  s.add_dependency 'activesupport', '~> 3.2.13'
+  s.add_dependency 'activemodel',   '~> 3.2.13'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'simplecov'

data/lib/schema_tools/modules/read.rb

@@ -29,13 +29,25 @@ module SchemaTools
       # round-trips. The cache can be resented with #registry_reset
       #
       # @param [String|Symbol] schema name to be read from schema path directory
-      # @param [String] path
+      # @param [String|Hash] either the path to retrieve schema_name from,
+      #                      or a Schema in Ruby hash form
       # @return[HashWithIndifferentAccess] schema as hash
-      def read(schema_name, path=nil)
+      def read(schema_name, path_or_schema=nil)
         schema_name = schema_name.to_sym
         return registry[schema_name] if registry[schema_name]
-        file_path = File.join(path || SchemaTools.schema_path, "#{schema_name}.json")
-        plain_data = File.open(file_path, 'r'){|f| f.read}
+
+        if path_or_schema.is_a? ::Hash
+          path       = nil
+          plain_data = path_or_schema.to_json
+        elsif path_or_schema.is_a?(::String) || path_or_schema.nil?
+          path       = path_or_schema
+          file_path  = File.join(path || SchemaTools.schema_path, "#{schema_name}.json")
+        else
+          raise ArgumentError, "Second parameter must be a path or a schema!"
+        end
+
+        plain_data ||= File.open(file_path, 'r'){|f| f.read}
+
         schema = ActiveSupport::JSON.decode(plain_data).with_indifferent_access
         if schema[:extends]
           extends = schema[:extends].is_a?(Array) ? schema[:extends] : [ schema[:extends] ]
@@ -64,4 +76,4 @@ module SchemaTools
       end
     end
   end
-end
+end

data/lib/schema_tools/version.rb

@@ -1,3 +1,3 @@
 module SchemaTools
-  VERSION = '0.0.8'
+  VERSION = '0.1.0'
 end

data/spec/schema_tools/reader_spec.rb

@@ -1,6 +1,24 @@
 require 'spec_helper'
 
 describe SchemaTools::Reader do
+  let(:ruby_schema) do
+    {
+      "type"=> "object",
+      "name"=> "numbers",
+      "properties"=> {
+        "numbers"=> {
+          "type"=> "array",
+          "items"=> {
+            "type"=> "number",
+            "minimum"=> 1,
+            "maximum"=> 100
+          },
+          "additionalProperties"=> false
+        }
+      },
+      "additionalProperties"=> false
+    }
+  end
 
   context 'class methods' do
 
@@ -25,6 +43,17 @@ describe SchemaTools::Reader do
       schema[:properties][:lead_source].should_not be_empty
     end
 
+    it 'should read a schema from a Ruby Hash' do
+      schema = SchemaTools::Reader.read(:numbers, ruby_schema)
+
+      SchemaTools::Reader.registry[:numbers].should_not be_empty
+
+      schema[:properties][:numbers].should_not be_empty
+    end
+
+    it 'should enforce correct parameter usage' do
+      expect { SchemaTools::Reader.read(:contact, []) }.to raise_error ArgumentError
+    end
   end
 
   context 'instance methods' do
@@ -38,6 +67,12 @@ describe SchemaTools::Reader do
       reader.registry[:client].should_not be_empty
     end
 
+    it 'should read a single schema from Ruby Hash' do
+      schema = reader.read(:numbers, ruby_schema)
+      schema[:name].should == 'numbers'
+      schema[:properties].should_not be_empty
+    end
+
     it 'should populate instance registry' do
       reader.read(:client)
       reader.read(:address)
@@ -51,7 +86,9 @@ describe SchemaTools::Reader do
       SchemaTools::Reader.registry.should be_empty
     end
 
+    it 'should enforce correct parameter usage' do
+      expect { reader.read(:client, []) }.to raise_error ArgumentError
+    end
   end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_schema_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-05 00:00:00.000000000 Z
+date: 2013-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -32,33 +32,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4078782522717715484
+      hash: -1701013660137054767
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4078782522717715484
+      hash: -1701013660137054767
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24