quickbase_record 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmJhZmRmODRlODQ0NTI1OTUyMmQwZmZjZDM2MTg2ZjMxNWFiYmIzYw==
+    MTFlNzllN2NmODI1M2U5OWFlMTQyZTliOGQ3YTdhMDExMTA4OGM2Zg==
   data.tar.gz: !binary |-
-    NzY2M2ZmM2MwYmFhMDQ3MjFhMjZkODk4NWMzYzI3NzdjZDA4ODE0Nw==
+    YTA1NjViZjNjYWQyODZhYWY0YmVjNDU2OTc2YTVkODBkOTZjNWNkYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWEwYzAyZWE2N2VkOWZkNzRjNTYzNTk5MjNjNmY0OTIzMjI1OWE5ZjRmNWM4
-    MTIzOTM3MDI1ZGM3YTQxZDQ4N2U3MWVlNTFiOWQ2YTFjYjNmNjcxZmU3ODgz
-    NjA2MmZiZjcxMjlkN2Y3MDI5ODBmYTkzZGIwMDNlMzFmNDI5OTQ=
+    YzNkMDE4ZDdmZDllMjYxMDQ3N2ViNTYzM2ZmNDJjYjVkYzA2MTIxZDBlZjM2
+    NDM4NzIwZDk2OTVmNWYxMDRhZGFlNDUwNzI4Y2RhOTMyMDc4NzhkYWM5OGEy
+    NDUzZDA3YjlhMDc5MDgzMmVkNzVkMTFlNDRmZDQ4MDQyMDdjMzI=
   data.tar.gz: !binary |-
-    NTlmYmVmMzdhNjQ2YTFiYTMzOTlkODFkZDM0ZmEzYjM4OGI4YmU4M2Q2ZWU5
-    Nzk4NGMxODA4NWY4YzA2ZTI1NmNiYzQwNDNiZDk1Y2FjNTkzZTMwOTY0ZDEy
-    ODdiMzNjNDAzMDIwNWQ1ZTc5ZTE1MzliYjZlNmE1NDE2NzZjOGQ=
+    NDVlYzNlYjhkMjU0NmIwMzMzNGUyOWU2YjI1Y2YzNTQzYmU0NjM0YjA3OTY3
+    ZDM2Mzc5ZjBlMTYxNGE2ZTc4NTlkZWYyODY3ZjhlNGQzMjQwNzZlYjRkNjVk
+    ZDU0YTVmNzA1ZTczNmEwY2FmMjI3YzAzZTA4ODEyZTFiN2ZmMjY=

data/README.md

@@ -118,12 +118,21 @@ Database callbacks (i.e. `before_save :create_token!`) are not fully functional
       # {'8'.EX.'Socrates'}OR{'8'.EX.'Socrates'}
     ```
 
-    - To use a comparitor other than 'EX' pass the value as another hash with the key as the comparitor
+    - To use a comparator other than 'EX' pass the value as another hash with the key as the comparator
     ```
       Post.where(author: {XEX: 'Cullen Jett'})
       # {'8'.XEX.'Cullen Jett'}
     ```
 
+    - Combine arrays and hashes to build more complex queries
+    ```
+      Post.where(id: [{XEX: 123}, {OBF: 'today'}])
+      # "{'3'.XEX.'123'}OR{'3'.OAF.'today'}"
+
+      Post.where(id: {XEX: 123, OAF: 'today'})
+      # "{'3'.XEX.'123'}AND{'3'.OAF.'today'}"
+    ```
+
     - Also accepts a string in the standard QuickBase query format
       * Works with field names or FIDs
     ```
@@ -159,7 +168,7 @@ Database callbacks (i.e. `before_save :create_token!`) are not fully functional
     ```
 
   * **#update_attributes(attributes_hash)**
-    - ** IMPORTANT: Updates *and* saves the object with the new attributes**
+    - **IMPORTANT: Updates *and* saves the object with the new attributes**
     - Returns the object
     ```
       @post = Post.where(author: 'Cullen Jett').first
@@ -176,6 +185,9 @@ Database callbacks (i.e. `before_save :create_token!`) are not fully functional
       @post.save
     ```
 
+  * **.qb_client and #qb_client**
+    - Access the quickbase API client (advantage_quickbase gem) directly
+
 ## Testing
 Unfortunately you will not be able to run the test suite unless you have access to the QuickBase application used as the test database *or* you create your own QuickBase app to test against that mimics the test fakes. Eventually the test calls will be stubbed out so anyone can test it, but I've got stuff to do -- pull requests are welcome :)
 

data/lib/quickbase_record/queries.rb

@@ -75,30 +75,28 @@ module QuickbaseRecord
         end
       end
 
-      def join_with_and(fid, value, comparitor="EX")
-        "{'#{fid}'.#{comparitor}.'#{value}'}"
+      def join_with_and(fid, value, comparator="EX")
+        "{'#{fid}'.#{comparator}.'#{value}'}"
       end
 
-      def join_with_or(fid, array, comparitor="EX")
+      def join_with_or(fid, array, comparator="EX")
         array.map do |value|
           if value.is_a? Hash
             join_with_custom(fid, value)
           else
-            "{'#{fid}'.#{comparitor}.'#{value}'}"
+            "{'#{fid}'.#{comparator}.'#{value}'}"
           end
         end.join("OR")
       end
 
       def join_with_custom(fid, hash)
-        comparitor = hash.keys.first
-        value = hash.values.first
-
-        if value.is_a? Array
-          join_with_or(fid, value, comparitor)
-        else
-          "{'#{fid}'.#{comparitor}.'#{value}'}"
-        end
-
+        hash.map do |comparator, value|
+          if value.is_a? Array
+            join_with_or(fid, value, comparator)
+          else
+            "{'#{fid}'.#{comparator}.'#{value}'}"
+          end
+        end.join('AND')
       end
 
       def convert_field_name_to_fid(field_name)

data/lib/quickbase_record/version.rb

@@ -1,3 +1,3 @@
 module QuickbaseRecord
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/queries_spec.rb

@@ -159,21 +159,26 @@ RSpec.describe QuickbaseRecord::Queries do
       expect(TeacherFake.build_query(hash)).to eq("{'3'.EX.'1'}OR{'3'.EX.'2'}")
     end
 
-    it "accepts custom comparitors via a nested hash" do
+    it "accepts custom comparators via a nested hash" do
       hash = {id: {XEX: 1}}
       expect(TeacherFake.build_query(hash)).to eq("{'3'.XEX.'1'}")
     end
 
-    it "combines custom comparitors using arrays with OR" do
+    it "combines custom comparators using arrays with OR" do
       hash = {id: {XEX: [1, 2]}}
       expect(TeacherFake.build_query(hash)).to eq("{'3'.XEX.'1'}OR{'3'.XEX.'2'}")
     end
 
-    it "combines different comparitors with OR" do
-      hash = {id: [{XEX: '123'}, {OAF: 'today'}]}
+    it "combines different comparators with OR" do
+      hash = {id: [{XEX: 123}, {OAF: 'today'}]}
       expect(TeacherFake.build_query(hash)).to eq("{'3'.XEX.'123'}OR{'3'.OAF.'today'}")
     end
 
+    it "combines different comparators with AND" do
+      hash = {id: {XEX: 123, OAF: 'today'}}
+      expect(TeacherFake.build_query(hash)).to eq("{'3'.XEX.'123'}AND{'3'.OAF.'today'}")
+    end
+
     it "converts field names to FIDs" do
       hash = "{name.EX.'Cullen Jett'}"
       expect(TeacherFake.build_query(hash)).to eq("{6.EX.'Cullen Jett'}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quickbase_record
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Cullen Jett
@@ -118,6 +118,7 @@ files:
 - quickbase_record-0.1.0.gem
 - quickbase_record-0.2.0.gem
 - quickbase_record-0.2.1.gem
+- quickbase_record-0.2.2.gem
 - quickbase_record.gemspec
 - spec/fakes/student_fake.rb
 - spec/fakes/teacher_fake.rb