quickbase_record 0.2.7 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTBmZjI2MjYwMmQ0Nzk1M2QwN2QxM2ZkZmE1MmZiOTg2MDFhNDU3OQ==
+    YTI2YTdiYmM1M2ExYmMxYTg2MDIyMjFhOWJhZjE2M2E2NWYwYmNkOQ==
   data.tar.gz: !binary |-
-    ZTFlNjk2YWQ3MzdkYWI5NDY3MjYwZTYzNGI5YTAxYjFhMjg4MzRlOQ==
+    YWNiMDVmYzlhOTgyOTJmZTg2MTgxZDE1MDkyNTBiOWI0OTJiYTJjZQ==
 SHA512:
   metadata.gz: !binary |-
-    MzcxNGZjZDlmODAxMTc2ZDA5YWQ5OWY0ZjY2YTMyZjhmZmQ2NGI5YTYyZjRh
-    YWY1ZTc0ZGE2NTM5YjBkZmJlZWQyMzRlNDI3MDA5OWU2M2YyYjQwZjM3ZmQx
-    NmQ0MzNmZjJkNTM3M2NmZDFkY2U0NzQ2MjEyZjNkNzI5MDY1ZTU=
+    M2VhMzE1NjE2MmUxY2MzYTAzZmM3MmJlZDM5ZjQwOWM3NTA4MTUyNTkxN2Vl
+    MzNmNGMwZDY3NjE3YTQ1NTEyY2ZlZGMxMGRhM2NmZTQ5YTc2OGE5YjJhYTMz
+    M2Q0YTIyZGFmN2VjMzEyNjg5OWQxOTY3MjA5ZGMxYTQ4NDJiMzM=
   data.tar.gz: !binary |-
-    MDdmZWRjMjEyNjI1Y2E0MDVkM2MxYThkMzZkN2ExMGUzNGFkMjMwMTI3Mjlk
-    MWI5MGY5ZmVmNDQ2Yzg3ODA4ZDNjMGJmMjlkYzIwMTZjYzExZTNlNjBhNzJl
-    MmJmZjQxMjBlNzc0YjZjM2YxYmNlN2I2ZjBjOGJhYTY1NzU3ZTg=
+    NDFjYWRlZTcyZTgxODBjMTc4MGExYzkyMDRmYWFmNWNmZmE4Yzc4MTdhZmRj
+    MGQ5YmZmNjFjNGJmMWJkMTc3ZDZmYTczMmZhZjAzOTQ5ZjcwZjY4MGZhNzhl
+    NmMxYzZjNTUxY2M1YWFkZDFkZTRkN2Q2NmY5NWNkZjFhZTljODQ=

data/lib/quickbase_record/queries.rb

@@ -16,9 +16,10 @@ module QuickbaseRecord
         @clist ||= fields.reject{ |field_name| field_name == :dbid }.values.join('.')
       end
 
-      def find(id)
-        query_options = { query: build_query(id: id), clist: clist }
-        query_response = qb_client.do_query(dbid, query_options).first
+      def find(id, query_options = {})
+        query_options = build_query_options(query_options[:query_options])
+        query = { query: build_query(id: id), clist: clist }.merge(query_options)
+        query_response = qb_client.do_query(dbid, query).first
 
         return nil if query_response.nil?
 
@@ -27,23 +28,29 @@ module QuickbaseRecord
       end
 
       def where(query_hash)
-        query_options = { query: build_query(query_hash), clist: clist }
-        query_response = qb_client.do_query(dbid, query_options)
+        if !query_hash.is_a? String
+          options = build_query_options(query_hash.delete(:query_options))
+        else
+          options = {}
+        end
+
+        query = { query: build_query(query_hash), clist: clist }.merge(options)
+        query_response = qb_client.do_query(dbid, query)
 
         return [] if query_response.first.nil?
 
         build_collection(query_response)
       end
 
-      def create(attributes={})
+      def create(attributes = {})
         object = new(attributes)
         object.save
         return object
       end
 
       def qid(id)
-        query_options = { qid: id, clist: clist }
-        query_response = qb_client.do_query(dbid, query_options)
+        query = { qid: id, clist: clist }
+        query_response = qb_client.do_query(dbid, query)
 
         return [] if query_response.first.nil?
 
@@ -72,6 +79,22 @@ module QuickbaseRecord
         end.join("AND")
       end
 
+      def build_query_options(options)
+        return {} unless options
+
+        result = {}
+
+        options.each do |option_name, value|
+          if option_name.to_sym == :options
+            result[option_name] = value
+          else
+            result[option_name] = convert_field_name_to_fid(value)
+          end
+        end
+
+        return result
+      end
+
       def build_collection(query_response)
         query_response.map do |response|
           converted_response = convert_quickbase_response(response)
@@ -154,16 +177,11 @@ module QuickbaseRecord
 
       current_object.delete_if { |key, value| value.nil? }
 
-      # if has_file_attachment?(current_object)
-        if self.id
-          qb_client.edit_record(self.class.dbid, self.id, current_object)
-        else
-          self.id = qb_client.add_record(self.class.dbid, current_object)
-        end
-      # else
-      #   current_object[self.class.fields[:id]] = self.id if self.id
-      #   self.id = qb_client.import_from_csv(self.class.dbid, [current_object]).first
-      # end
+      if self.id
+        qb_client.edit_record(self.class.dbid, self.id, current_object)
+      else
+        self.id = qb_client.add_record(self.class.dbid, current_object)
+      end
 
       return self
     end
@@ -187,9 +205,5 @@ module QuickbaseRecord
       end
       return self
     end
-
-    def has_file_attachment?(current_object)
-      current_object.values.any? { |value| value.is_a? Hash }
-    end
   end
 end

data/lib/quickbase_record/version.rb

@@ -1,3 +1,3 @@
 module QuickbaseRecord
-  VERSION = "0.2.7"
+  VERSION = "0.3.0"
 end

data/spec/queries_spec.rb

@@ -16,6 +16,11 @@ RSpec.describe QuickbaseRecord::Queries do
       teacher = TeacherFake.find(999999)
       expect(teacher).to eq(nil)
     end
+
+    it "accepts query options" do
+      teacher = TeacherFake.find(1, query_options: {clist: 'id'})
+      expect(teacher.name).to be_nil
+    end
   end
 
   describe '.where' do
@@ -43,6 +48,11 @@ RSpec.describe QuickbaseRecord::Queries do
       teachers = TeacherFake.where(name: 'Not a real TeacherFake name...')
       expect(teachers).to eq([])
     end
+
+    it "accepts query options" do
+      teachers = TeacherFake.where(subject: ['Gym', 'Biology'], query_options: {slist: 'subject', options: 'sortorder-D'})
+      expect(teachers.first.subject).to eq('Gym')
+    end
   end
 
   describe '.create' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quickbase_record
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.0
 platform: ruby
 authors:
 - Cullen Jett