query-interface-client 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd54e88c610df20cb66799bd6f6c319006c04ad4
-  data.tar.gz: a8343318ddf04e18209350f160c485618cc12eb3
+  metadata.gz: 487a8eca13eb1048c6da5ada59a3433fbf064e7c
+  data.tar.gz: bcdd0bb35c96fe7eaf6002633d24bb59ebf0172e
 SHA512:
-  metadata.gz: 00ab57aee8ed655b64752287a6c088500a5f86a94b0a64f4573c4f4e41d27c157f6c7935af24ba66a750477964fb730c9898f5f0a3438cfaed70f8e357a0af17
-  data.tar.gz: 30a0e9f60fe92cf9d4ea08a313dd5ee4cbee714753cf47c823db40bf21116696f82c70c2dc168626f8e4a71981ee08f3f79b5479929d4204481c758ea47a290d
+  metadata.gz: fa864ca9695e4285c62ec28c362840ae49dd107b8fdf738874d7ed1c2f7b64457e75ee79fd04e6b657d32b5cc06acfad40d2192f1d056ef1d0bf1988e97bc0a1
+  data.tar.gz: 37eaed9f0a9264490af219e931ceb8570dbcdf10ef6c262bdc94a398873f876bdaf7cc78cf595e17a0f38f7488b25170d04eaf56a0095ed855f901a55dbda9b6

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

@@ -28,7 +28,8 @@ module QueryInterface
       def run_set_conversion(value)
         if self.array
           value ||= []
-          value.map { |item| self.type.apply_set(item) }
+          value.map { |item| self.type.apply_set(item) unless item.blank? }
+            .compact
         else
           self.type.apply_set(value) unless value.nil?
         end
@@ -43,7 +44,7 @@ module QueryInterface
         base.include(ActiveModel::Validations::Callbacks)
         base.include(ActiveModel::Conversion)
         base.instance_variable_set(:@properties, {})
-        base.send(:attr_accessor, :_property_values, :_additional_values, :_property_changes)
+        base.send(:attr_accessor, :_property_values, :_additional_values, :_original_values, :_destroyed)
         base.extend(ClassMethods)
         base.include(InstanceMethods)
       end
@@ -58,12 +59,7 @@ module QueryInterface
 
           unless property.primary || !property.update
             define_method "#{name}=".to_sym do |value|
-              if self.get_value(name) != value
-                self.property_changes << name unless self.property_changes.include?(name)
-                self.set_value(name, value)
-              else
-                value
-              end
+              self.set_value(name, value)
             end
           end
 
@@ -94,6 +90,7 @@ module QueryInterface
         def new_from_hash(data={})
           instance = self.new
           instance.assign_attributes(data)
+          instance._original_values = instance._property_values.deep_dup
           instance
         end
       end
@@ -105,6 +102,7 @@ module QueryInterface
             self.set_value(name, default)
           end
           self.assign_attributes(data, run_conversions: false)
+          self._original_values = self._property_values.deep_dup
         end
 
         def properties
@@ -112,7 +110,6 @@ module QueryInterface
         end
 
         def assign_attributes(data, options={})
-          self.errors.clear()
           run_conversions = options.delete(:run_conversions) {true}
           data.each do |name, value|
             name = name.to_sym
@@ -122,8 +119,8 @@ module QueryInterface
                 begin
                   converted = property.run_set_conversion(value)
                 rescue
-                  self.errors.add(name, "Type conversion failed")
                   self.set_value(name, value)
+                  self.errors.add(name, "Type conversion failed")
                 else
                   self.set_value(name, converted)
                 end
@@ -147,20 +144,21 @@ module QueryInterface
 
         def save(additional_data={})
           return false unless (self.errors.empty? && self.valid?)
-          if self.persisted? && self.dirty?
+          return true if self.persisted? && !self.dirty?
+
+          if self.persisted?
             result = self.put_raw(params: self.to_attributes(additional_data))
-            return result[:response].success?
-          elsif !self.persisted?
+          else
             result = self.class.post_raw(params: self.to_attributes(additional_data))
             if result[:response].success?
               self.assign_attributes(result[:parsed_data][:data])
-              return true
-            else
-              return false
             end
-          else
-            return true
           end
+          assign_errors(result)
+          status = result[:response].success?
+          self._original_values = self._property_values.deep_dup if status
+
+          status
         end
 
         def update_attributes(attributes)
@@ -176,8 +174,18 @@ module QueryInterface
           self._additional_values ||= {}
         end
 
+        def destroyed?
+          self._destroyed ||= false
+        end
+
         def property_changes
-          self._property_changes ||= []
+          self.properties.map do |name, property|
+            if self.get_value(name) != self._original_values[name]
+              [name, {original: self._original_values[name], new: self.get_value(name)}]
+            else
+              next
+            end
+          end.compact.to_h
         end
 
         def dirty?
@@ -185,6 +193,7 @@ module QueryInterface
         end
 
         def set_value(name, value)
+          self.errors.delete(name)
           self.property_values[name] = value
         end
 
@@ -209,8 +218,18 @@ module QueryInterface
 
         def destroy
           result = self.delete_raw()[:parsed_data]
-          # TODO: handle errors and destroyed flag
+          assign_errors(result)
+          self._destroyed = !self.errors.any?
         end
+
+      private
+
+        def assign_errors(result)
+          (result[:errors] || {}).each do |name, values|
+            values.each { |value| self.errors.add(name, value) }
+          end
+        end
+
       end
     end
   end

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

@@ -41,7 +41,7 @@ module QueryInterface
         def member_path(path=nil, keys={})
           fragments = self.resource_path_fragments.map do |fragment|
             if fragment.is_a?(Symbol)
-              if keys.has_key?(fragment) 
+              if keys.has_key?(fragment)
                 keys[fragment]
               else
                 nil
@@ -67,7 +67,7 @@ module QueryInterface
             params[:_headers] = self.default_api.options[:headers]
           end
           result = self.default_api.request(params)
-          {parsed_data: result[:parsed_data], response: result[:response]}
+          {parsed_data: result[:parsed_data], response: result[:response], errors: result[:errors]}
         end
 
         [:get, :post, :put, :delete].each do |method|
@@ -75,7 +75,7 @@ module QueryInterface
             params = options.delete(:params) { {} }
             keys = options.delete(:keys) { {} }
             path = options.delete(:path)
-            self.raw_request(method, params, keys, path)            
+            self.raw_request(method, params, keys, path)
           end
         end
       end

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

@@ -41,11 +41,15 @@ module QueryInterface
     end
 
     register_type :integer do
-      set { |value| value.to_i }
+      set do |value|
+        value.blank? ? nil : value.to_i
+      end
     end
 
     register_type :float do
-      set { |value| value.to_f }
+      set do |value|
+        value.blank? ? nil : value.to_f
+      end
     end
 
     register_type :ip do
@@ -69,7 +73,13 @@ module QueryInterface
     end
 
     register_type :boolean do
-      set { |value| !!value }
+      set do |value|
+        if [true, 1, '1', 't', 'T', 'true', 'TRUE', 'on'].include?(value)
+          true
+        else
+          false
+        end
+      end
     end
 
     register_type :raw

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

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

data/spec/lib/lazy_query_spec.rb

@@ -227,7 +227,7 @@ describe QueryInterface::Client::LazyQuery do
       query = subject.new(model)
       expect(query).to receive(:copy).and_return(query)
       objects = (1..10).to_a
-      allow(model).to receive(:new).and_return(*objects)
+      allow(model).to receive(:new_from_hash).and_return(*objects)
       expect(query).to receive(:do_raw_query).and_return({parsed_data: {data: {objects: objects, total: 15}, errors: []}})
       result = query.paginate
       expect(query.transformations).to eq(self.transformations)
@@ -272,24 +272,6 @@ describe QueryInterface::Client::LazyQuery do
 
   end
 
-  context "parsing" do
-    let(:result_model) { double("result model") }
-    let(:data) { double("data") }
-
-    it "parses the data via result model if set" do
-      query = subject.new(model)
-      query.result_model = result_model
-      expect(result_model).to receive(:parse).with(data)
-      query.parse(data)
-    end
-
-    it "parses the data via model if no result model set" do
-      query = subject.new(model)
-      expect(model).to receive(:parse).with(data)
-      query.parse(data)
-    end
-  end
-
   context "to_json" do
     let(:transformations) {[]}
     let(:result) { double("result") }

metadata

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