json_schema_tools 0.5.3 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTU2OGFjZGFhZGI4YzVlNGM4MGI5ZGI4MDI0MjhjMDFiNTc4MjMzYg==
+    ZWY5YzJhODNmZTc5NWFhNmI0NTM3N2I2Mzg3MzcwNGI0MDkxMTQzNg==
   data.tar.gz: !binary |-
-    NzRkYTVkMjY2M2ZhYjJhMTA3MWUyMzU3MGZmZTQyOWJmODI1YzdkYQ==
+    Mzk5MmQxZGMyM2E2MDQ3MTU2MzE0ZWY3NmU1ODVmN2JjMDlhNGMzMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjM2MzVlMTUwZDgzNDFhMmQyY2Q3ZTBlNWFkNjg4NDQ4NTBhNzNhNWQxY2Q3
-    Mjg1NmUzYTkxYzM1MzEzOTNiYjg4ZTkyZDI3Y2M2MjQxYmUyZGQ4NGI4ZWVm
-    YmE4YWU0OWZkNmU0NzM2MGI4NWI5ZTkxNTBmYjEzMDAyZWI2NWQ=
+    YmYzNWEzYzI2ZjQ5ZWFmYzNhM2I5ZjA2MTk1MTZhYmJlNzlmMmU2Njk1Yzc3
+    NGVlYzFkYjJhMzc2NWQxZmVhY2E2NTgyMDUwYmU4ODljNTExOGQ5YjJiMTI0
+    MWQ3NGJmZTZmNTY1NzFmMTMzZWJmOWNkY2NkODZkMTlmYjQ3ZmQ=
   data.tar.gz: !binary |-
-    MjUyZjE5NDM2ZDE2MTlkZDIzZWRhOGQ5Y2FmOGFmMjQ2Yzg4YTVkMDZlODFj
-    MDI1YmQ2ZTNhNzRhZWU3MWU5NDAxN2UwN2Q2YjIxZTlmMWI1ZWM4N2M4YmQw
-    OTBkYmFjMzdlOGMxYzJiYWE2Nzk0ZWE1M2I1ZWFlMTJjNTJhMmQ=
+    MTEwM2Q4MTU5ZWE0N2MxN2VhNTY4YWNlYTZkODdkYzZmNGZkMzZlOTk3MmM2
+    ZmM3ODE4ZjE4ZTU4ODhlNTdmZWQxMzYxYTJhOWRlODg3ZmM4NzVhZDk5ZWVh
+    NDI1ZDY5N2I1MmNkNjBiYzQ0MzdiYTY1ODQxYThhOWM5ZmRkZTQ=

data/lib/schema_tools/cleaner.rb

@@ -18,7 +18,7 @@ module SchemaTools
         schema = SchemaTools::Reader.read(obj_name)
         setters = []
         # gather allowed properties
-        schema[:properties].each{ |k,v| setters << k if !v['readonly'] }
+        schema[:properties].each{ |k,v| setters << k if !v['readOnly'] }
         setters += opts[:keep] if opts[:keep] && opts[:keep].is_a?(Array)
         # kick readonly
         params.delete_if { |k,v| !setters.include?("#{k}")  }

data/lib/schema_tools/klass_factory.rb

@@ -52,7 +52,7 @@ module SchemaTools
           include SchemaTools::Modules::Validations # +naming + transl + conversion
           has_schema_attrs schema['name'], reader: reader
           validate_with schema['name'], reader:reader
-          getter_names = schema['properties'].select{|name,prop| !prop['readonly'] }
+          getter_names = schema['properties'].select{|name,prop| !prop['readOnly'] }
                                              .keys.map { |name| name.to_sym}
           attr_accessor *getter_names
 

data/lib/schema_tools/modules/attributes.rb

@@ -40,7 +40,7 @@ module SchemaTools
           # make getter / setter methods
           self.schema[:properties].each do |key, prop|
             define_method(key) { schema_attrs[key] }
-            define_method("#{key}=") { |value| schema_attrs[key] = value } unless prop[:readonly]
+            define_method("#{key}=") { |value| schema_attrs[key] = value } unless prop['readOnly']
           end
         end
 

data/lib/schema_tools/modules/validations.rb

@@ -34,27 +34,28 @@ module SchemaTools
           schema = reader.read(schema, opts[:path])
           # create validation methods
           schema[:properties].each do |key, val|
-            validates_length_of key, validate_length_opts(val) if val['maxLength'] || val['minLength']
-            validates_presence_of key if val['required'] || val['required'] == 'true'
-            validates_numericality_of key, validate_number_opts(val) if val['type'] == 'number' || val['type'] == 'integer'
+            is_required =  schema['required'] && schema['required'].include?("#{key}")
+            validates_length_of key, validate_length_opts(val, is_required) if val['maxLength'] || val['minLength']
+            validates_presence_of key if is_required
+            validates_numericality_of key, validate_number_opts(val, is_required) if val['type'] == 'number' || val['type'] == 'integer'
             #TODO array minItems, max unique,  null, string
             # format: date-time, regex color style, email,uri,  ..
           end
         end
 
-        def validate_length_opts(attr)
+        def validate_length_opts(attr, is_required=false)
           opts = {}
           opts[:within] = attr['minLength']..attr['maxLength'] if attr['minLength'] && attr['maxLength']
           opts[:maximum] = attr['maxLength'] if attr['maxLength'] && !attr['minLength']
           opts[:minimum] = attr['minLength'] if attr['minLength'] && !attr['maxLength']
-          opts[:allow_blank] = true if !attr['required']
+          opts[:allow_blank] = true unless is_required
           opts
         end
 
         # @param [Hash<String>] attr property values
-        def validate_number_opts(attr)
+        def validate_number_opts(attr, is_required=false)
           opts = {}
-          opts[:allow_blank] = true
+          opts[:allow_blank] = true unless is_required
           # those vals should not be set both in one property
           opts[:greater_than_or_equal_to] = attr['minimum'] if attr['minimum'].present?
           opts[:less_than_or_equal_to] = attr['maximum'] if attr['maximum'].present?

data/lib/schema_tools/version.rb

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

data/spec/fixtures/schemata/address.json

@@ -2,18 +2,18 @@
   "title": "address",
   "name": "address",
   "description":"An address .. Example partially taken from SalesKing",
+  "required": ["city"],
   "properties":{
     "id":{
       "description":"Unique identifier - UUID",
       "identity":true,
-      "readonly":true,
+      "readOnly":true,
       "type":"string",
       "maxLength": 22,
       "minLength":22
     },
     "city":{
       "description": "City for the address. Must at least be present for an address.",
-      "required":true,
       "type":"string",
       "maxLength": 100
     },

data/spec/fixtures/schemata/basic_definitions.json

@@ -2,7 +2,7 @@
     "definitions": {
         "id": {
             "description": "some description",
-            "readonly": true,
+            "readOnly": true,
             "type": "integer"
         },
         "some_other_property": {

data/spec/fixtures/schemata/client.json

@@ -2,11 +2,12 @@
   "title": "client",
   "name": "client",
   "description": "A example client.",
+  "required": ["organisation"],
   "properties":{
     "id":{
       "description":"Unique identifier - UUID",
       "identity":true,
-      "readonly":true,
+      "readOnly":true,
       "type":"string",
       "maxLength": 22,
       "minLength":22
@@ -18,7 +19,6 @@
     },
     "organisation":{
       "description": "Name of a company. This or lastname must be present",
-      "required" : true,
       "type":"string",
       "maxLength": 100
     },
@@ -40,13 +40,13 @@
     "created_at":{
       "description": "Date the record was created in SK. Never changes afterwards.",
       "format":"date-time",
-      "readonly":true,
+      "readOnly":true,
       "type":"string"
     },
     "updated_at":{
       "description": "Last date when the record was edited.",
       "format":"date-time",
-      "readonly":true,
+      "readOnly":true,
       "type":"string"
     },
     "phone_mobile":{

data/spec/fixtures/schemata/contact.json

@@ -2,11 +2,12 @@
   "title": "Contact",
   "name": "contact",
   "description": "A simple contact",
+  "required": ["organisation"],
   "properties":{
     "id":{
       "description":"Unique identifier ",
       "identity":true,
-      "readonly":true,
+      "readOnly":true,
       "type":"number"
     },
     "contact_source":{
@@ -15,7 +16,6 @@
     },
     "organisation":{
       "description": "Name of a company. ",
-      "required" : true,
       "type":"string",
       "maxLength": 100
     },

data/spec/fixtures/schemata/nested_schemas/person.json

@@ -6,7 +6,7 @@
     "id":{
       "description":"Unique identifier ",
       "identity":true,
-      "readonly":true,
+      "readOnly":true,
       "type":"number"
     },
     "last_name":{

data/spec/fixtures/schemata/page.json

@@ -7,22 +7,22 @@
     "id": {
       "description": "The object identifier.",
       "identity": true,
-      "readonly": true,
+      "readOnly": true,
       "type": "integer"
     },
     "number": {
       "description": "Number of this page inside the document",
-      "readonly": true,
+      "readOnly": true,
       "type": "integer"
     },
     "related_object_id": {
       "description": "ID  of the PDF object the page belongs to.",
-      "readonly": true,
+      "readOnly": true,
       "type": "integer"
     },
     "related_object_type": {
       "description": "Type of the related object Pdf or Pdt (camelCased class name)",
-      "readonly": true,
+      "readOnly": true,
       "type": "string",
       "maxlength": 20
     },
@@ -32,19 +32,19 @@
     },
     "created_at": {
       "description": "Creation date.",
-      "readonly": true,
+      "readOnly": true,
       "type": "string",
       "format": "date-time"
     },
     "updated_at": {
       "description": "Update date.",
-      "readonly": true,
+      "readOnly": true,
       "type": "string",
       "format": "date-time"
     },
     "user_id": {
       "description": "User who created the object.",
-      "readonly": true,
+      "readOnly": true,
       "type": "integer"
     },
     "screenshot": {

data/spec/schema_tools/modules/attributes_spec.rb

@@ -28,7 +28,7 @@ describe SchemaTools::Modules::Attributes do
       subject.should respond_to('first_name=')
     end
 
-    it 'should not add setter for readonly properties' do
+    it 'should not add setter for readOnly properties' do
       subject.should_not respond_to('id=')
       subject.should_not respond_to('created_at=')
     end
@@ -144,7 +144,7 @@ describe SchemaTools::Modules::Attributes do
       subject.should respond_to('numbers=')
     end
 
-    it 'should not add setter for readonly properties' do
+    it 'should not add setter for readOnly properties' do
       subject.should_not respond_to('id=')
     end
   end

data/spec/test_helpers.rb

@@ -22,7 +22,7 @@ def schema_as_ruby_object
         },
         "id" => {
           "type"     => "number",
-          "readonly" => true
+          "readOnly" => true
         },
         "additionalProperties" => false
       }

metadata

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