apiql 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da237b810c30af8f312652d463e5a4ba2ee980653052a74e0533ee46cba32ebd
-  data.tar.gz: 110df82b41b3cd9a670ce414c40fa61d8e872fc9067d25e2949f030fa746ded2
+  metadata.gz: b31f3704ac2a7144b1d492f13cddc83b3c722cd5db52ecee24efa8889cdc4fc7
+  data.tar.gz: f2c5ebc7381cd7b2fd2f9cb886e674f8c68fc193071ba98a1edeb4c19b570a20
 SHA512:
-  metadata.gz: 01a25bbf772de28b18c1bc8d16e4e4bcddcb2feadbbe8a2218a8a6d526745a47ea71f12de7f383da317de68e880d01e25258aaf899a7b4c34b31a147ede70a85
-  data.tar.gz: 2b5a81697b13a95e2030d101d4c126af165c5422f4dffee8bc867098f37e0521f934d26adffc8bac8f20068c3a345b8584accacedd01847a38fcda8a86a537eb
+  metadata.gz: 92e64b9e2d197e22cb01eb14a97448551d49e89c03af894646d993abed04b8fd08c558216f82a2f7a00cd2e19bced08bac1cf3642e3b9fc7fb792ab6ed8186dc
+  data.tar.gz: 16460fa4e99dbd0ab42ca676f7f95a758b9d5ef83f63e07a8fe4483a5dc818145b8e873a6f2a9ecbdc10abf182ba9e7b9d64e0a0250290ed5cd98cdb828909a1

data/apiql.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'apiql'
-  spec.version       = '0.3.4'
+  spec.version       = '0.3.5'
   spec.authors       = ['Dmitry Silchenko']
   spec.email         = ['dmitry@desofto.com']
 

data/lib/apiql.rb

@@ -247,14 +247,7 @@ class APIQL
       if names.count > 1
         o = nil
         names.each do |field|
-          if o.present?
-            if o.respond_to? field
-              o = o.public_send(field, *params)
-            else
-              o = nil
-              break
-            end
-          else
+          if o.nil?
             return unless field.to_sym.in? self.class.apiql_attributes
 
             if respond_to? field
@@ -263,7 +256,14 @@ class APIQL
               o = object.public_send(field, *params)
             end
 
-            break unless o.present?
+            break if o.nil?
+          else
+            if o.respond_to? field
+              o = o.public_send(field, *params)
+            else
+              o = nil
+              break
+            end
           end
         end
 
@@ -320,16 +320,16 @@ class APIQL
       o = nil
 
       field.split('.').each do |name|
-        if o.present?
+        if o.nil?
+          o = object[name.to_sym]
+          break if o.nil?
+        else
           if o.respond_to? name
             o = o.public_send(name)
           else
             o = nil
             break
           end
-        else
-          o = object[name.to_sym]
-          break unless o.present?
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apiql
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Dmitry Silchenko