query-interface-client 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fa79e05e41ffe7dbb942f8a1be9cd4f22fd3987
-  data.tar.gz: 0499bcd0f94c128e47e0494a6d9cf76ec7d56d33
+  metadata.gz: bd54e88c610df20cb66799bd6f6c319006c04ad4
+  data.tar.gz: a8343318ddf04e18209350f160c485618cc12eb3
 SHA512:
-  metadata.gz: 9258e75aa86fe482716fdaf521c4636ed57308a9d42c6d37d33e82eedf05bf775876a44d019833014f80232171e607575c9919f59bc972d4fefcdcd340760768
-  data.tar.gz: c01f0e4925fdd13eb7f6d05a5d99b73f531e2e576db44aa49e4b6739a6744135538c793a96db24724c2c0e098efc6ae1bd4d4fa9067a1bca648bdd5f0095af14
+  metadata.gz: 00ab57aee8ed655b64752287a6c088500a5f86a94b0a64f4573c4f4e41d27c157f6c7935af24ba66a750477964fb730c9898f5f0a3438cfaed70f8e357a0af17
+  data.tar.gz: 30a0e9f60fe92cf9d4ea08a313dd5ee4cbee714753cf47c823db40bf21116696f82c70c2dc168626f8e4a71981ee08f3f79b5479929d4204481c758ea47a290d

data/lib/query-interface-client/lazy_query.rb

@@ -16,7 +16,7 @@ module QueryInterface
       end
 
       def instantiate(data)
-        (self.result_model ? self.result_model.new(data) : self.model.new(data))
+        (self.result_model ? self.result_model.new_from_hash(data) : self.model.new_from_hash(data))
       end
 
       def instantiate_collection(parsed_data)
@@ -124,7 +124,11 @@ module QueryInterface
         if parsed_data[:data].is_a?(Array)
           self.instantiate_collection(parsed_data)
         else
-          self.instantiate(parsed_data[:data])
+          unless parsed_data[:data].empty?
+            self.instantiate(parsed_data[:data])
+          else
+            nil
+          end
         end
       end
 

data/lib/query-interface-client/model.rb

@@ -10,10 +10,10 @@ module QueryInterface
           raise "Unknown Type #{type}"
         end
         self.type = conversion
-        self.primary = options.delete(:primary) {false}
-        self.update = options.delete(:update) {true}
-        self.array = options.delete(:array) {false}
-        self.default = options.delete(:default) {nil}
+        self.primary = options.delete(:primary) { false }
+        self.update = options.delete(:update) { true }
+        self.array = options.delete(:array) { false }
+        self.default = options.delete(:default) { lambda { nil } }
       end
 
       def run_get_conversion(value)
@@ -82,41 +82,58 @@ module QueryInterface
 
         def new_collection(collection)
           collection[:data].map do |data|
-            self.new(data)
+            self.new_from_hash(data)
           end
         end
 
         def get(path, params={})
           data = self.get_raw(path: path, params: params)[:parsed_data][:data]
-          self.new(data)
+          self.new_from_hash(data)
+        end
+
+        def new_from_hash(data={})
+          instance = self.new
+          instance.assign_attributes(data)
+          instance
         end
       end
 
       module InstanceMethods
         def initialize(data={})
-          self.set_data(data)
+          self.properties.each do |name, property|
+            default = self.instance_exec(&property.default)
+            self.set_value(name, default)
+          end
+          self.assign_attributes(data, run_conversions: false)
         end
 
         def properties
           self.class.instance_variable_get(:@properties)
         end
 
-        def set_data(data)
+        def assign_attributes(data, options={})
+          self.errors.clear()
+          run_conversions = options.delete(:run_conversions) {true}
           data.each do |name, value|
             name = name.to_sym
             if self.properties.has_key?(name)
               property = self.properties[name]
-              self.set_value(name, property.run_set_conversion(value))
+              if run_conversions
+                begin
+                  converted = property.run_set_conversion(value)
+                rescue
+                  self.errors.add(name, "Type conversion failed")
+                  self.set_value(name, value)
+                else
+                  self.set_value(name, converted)
+                end
+              else
+                self.set_value(name, value)
+              end
             else
               self.additional_values[name] = value
             end
           end
-          # Initialize missing fields to whatever their default is
-          (self.properties.keys - data.keys.map(&:to_sym)).each do |name|
-            property = self.properties[name]
-            default = property.default
-            self.set_value(name, default.is_a?(Enumerable) ? default.dup : default)
-          end
         end
 
         def to_attributes(additional_data={})
@@ -129,13 +146,14 @@ module QueryInterface
         end
 
         def save(additional_data={})
+          return false unless (self.errors.empty? && self.valid?)
           if self.persisted? && self.dirty?
             result = self.put_raw(params: self.to_attributes(additional_data))
             return result[:response].success?
           elsif !self.persisted?
             result = self.class.post_raw(params: self.to_attributes(additional_data))
             if result[:response].success?
-              self.set_data(result[:parsed_data][:data])
+              self.assign_attributes(result[:parsed_data][:data])
               return true
             else
               return false
@@ -150,15 +168,6 @@ module QueryInterface
           self.save
         end
 
-        def assign_attributes(attributes)
-          attributes.each do |name, value|
-            method = "#{name}=".to_sym
-            if self.respond_to?(method)
-              self.send(method, value)
-            end
-          end
-        end
-
         def property_values
           self._property_values ||= {}
         end

data/lib/query-interface-client/version.rb

@@ -1,7 +1,7 @@
 module QueryInterface
   module Client
 
-    VERSION = '1.3.1'
+    VERSION = '1.3.2'
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query-interface-client
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Andreas Kopecky <andreas.kopecky@radarservices.com>
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rs_paginator