json_schema_tools 0.5.1 → 0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTVkNGZkMjUxMjk5YTQ0ZTg5NzFlMTg4OGU4MGJmMjQ3NWVkOGVhOQ==
+    MWMyMGVjNDg3M2IwYzhkMjU0N2Y3ZjY4OThjYTYxMTNkODY0MzYxZg==
   data.tar.gz: !binary |-
-    NTFlMjliNzNkMGZiYzFmOWRjYjM3ODQ3MTBiYzQ5YjQ4ODdjN2EwYg==
+    NjZjYjhiMmFhZmZhOWNjYjE5MzllZWE5ODllZjQzY2VjOGU1MTRlMQ==
 SHA512:
   metadata.gz: !binary |-
-    M2UyNTA5ZWQyMjcxYzQ2YTliNjgwZGQ2MWM1MmQ0NDUzNzY0ZDNiN2M2MTg3
-    MWE5YzZjN2VkMWI2MmVkNWE1ZGI4ZmU2OTc1YWY2ZTIwNDY0YTYwZDU0NzRh
-    ZTMzOTVhZjUyM2VkZmE0NmY2OWVjM2RhMGVkYzVlZjg4NWI5ZWI=
+    MDdkNTk5MWMzMmExMDAxZTU0ZTI4MWYyZmU1OGFkZjRlZTRiODhiNDljNzJk
+    YWMxMjA2OTljZWI1ODBiMjY4YjE5MDc3N2JkNGNlMTM1ZWM1YzVmOGRjMWRj
+    ZDE2NzIzZTM0NWNjZDk2MWFmNDBiYzFhYjE4Yjg3NWZjNmJkYWM=
   data.tar.gz: !binary |-
-    OWRhYzZiMzk1NjgzNmRkMWE1OWVjZTk4M2FhZTc3MzJkOTNlYzczOTU5OTNm
-    MjAyOTU0NWVlZmIzYzNjYzgzY2QwNjJmZGRlZGQxMGFjZmQ3MTIwY2IyOTA2
-    MjAyNzhjNzEyNTJmMTY5NzMzOTkzYzkzZTM1OWFiMTViYjUzNTM=
+    ZWI5YjZjZTU5MzUzZjliNTEwOTU2Nzc4YTRlMjlmNGMxMmYyNGJlODg1YzU4
+    OWU0ODJiYzc4MTBiODM5Yzk4MjYxNGIwODk0NDFkNDk3NzQ3YjYwNjFlOTE1
+    MTI1MjFlNGI3ZWNhMzQ5MzkzNTJhYjFhOWVhYmQxMzk5M2M2ODU=

data/lib/schema_tools/modules/attributes.rb

@@ -73,13 +73,15 @@ module SchemaTools
         #     c = Contact.from_hash( {'contact'=>{ "id=>"123456", "last_name"=>"Meier" }} )
         #     c.id #=>123456
         #
-        # @param [String|Hash{String=>Mixed}] json string or hash
-        def from_hash(hash)
+        # @param [Hash{String=>Mixed}] json string or hash
+        # @param [Object] obj if you want to update an existing objects
+        # attributes. e.g during an update
+        def from_hash(hash, obj=nil)
           # test if hash is nested and shift up
           if hash.length == 1 && hash["#{schema_name}"]
             hash = hash["#{schema_name}"]
           end
-          obj = new
+          obj ||= new
           hash.each do |key, val|
             next unless obj.respond_to?(key)
             # set values to raw schema attributes, even if there are no setters

data/lib/schema_tools/modules/validations.rb

@@ -16,20 +16,10 @@ module SchemaTools
       include ActiveModel::Conversion
       include ActiveModel::Validations
 
-      #included do
-      #  validate_with_schema :schema_name
-      #end
-      # Runs all the validations within the specified context. Returns true if no errors are found,
-      # false otherwise.
-      #
-      # If the argument is false (default is +nil+), the context is set to <tt>:create</tt> if
-      # <tt>new_record?</tt> is true, and to <tt>:update</tt> if it is not.
-      #
-      # Validations with no <tt>:on</tt> option will run no matter the context. Validations with
-      # some <tt>:on</tt> option will only run in the specified context.
-      def valid?(context = nil)
-        #context ||= (new_record? ? :create : :update)
-        output = super(context)
+      # Runs all the validations within the specified context.
+      # @return [Boolean] true if  no errors are found, false otherwise
+      def valid?
+        output = super
         errors.empty? && output
       end
 
@@ -42,15 +32,13 @@ module SchemaTools
         def validate_with(schema, opts={})
           reader = opts[:reader] || SchemaTools::Reader
           schema = reader.read(schema, opts[:path])
-          # make getter / setter
+          # 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'
+            validates_numericality_of key, validate_number_opts(val) if val['type'] == 'number' || val['type'] == 'integer'
             #TODO array minItems, max unique,  null, string
             # format: date-time, regex color style, email,uri,  ..
-            validates_numericality_of key, validate_number_opts(val) if val['type'] == 'number'
-            #end
           end
         end
 

data/lib/schema_tools/version.rb

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

data/spec/schema_tools/modules/attributes_spec.rb

@@ -111,7 +111,7 @@ describe SchemaTools::Modules::Attributes do
       hash = { created_at: "2014-12-06T04:30:26+01:00"}
       obj = TestClient.from_hash(hash)
       expect(obj.created_at.class).to eq Time
-      expect(obj.created_at.zone).to eq 'CET'
+      # expect(obj.created_at.zone).to eq 'CET' # fails on travis-ci .. strange
       expect(obj.created_at.year).to eq 2014
 
       hash = { created_at: "2014-12-04T10:39:50.000Z"}
@@ -120,6 +120,15 @@ describe SchemaTools::Modules::Attributes do
       expect(obj.created_at.hour).to eq 10
     end
 
+    it 'updates an object' do
+      obj = TestContact.from_hash( {first_name: 'Frieda'} )
+      expect(obj.first_name).to eq 'Frieda'
+      expect(obj.last_name).to eq nil
+
+      TestContact.from_hash({first_name: 'Paul', last_name: 'Hulk'}, obj)
+      expect(obj.first_name).to eq 'Paul'
+      expect(obj.last_name).to eq 'Hulk'
+    end
 
   end
 

metadata

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