quickbase_record 0.0.2 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzM0NTFiNWIyM2QyZmIxYTU0YTI4MTg1MDNhZGY4YTBmNWYwOGMwNQ==
+    ODYyYTFkNjQ2ZWJlY2MyYmM4ZTIzMjMxZGIwZGQ0NmIxYmM2ZTk3OA==
   data.tar.gz: !binary |-
-    ZjUxZWU5NzU1MzAwNTZjNDRhZDI0ZjZjOWI4YjJiNTk2NzZlYTUwMg==
+    ODM0YjlmNmM0ZWY2ODZlODhkZGYwNjRjYjAyZDlkOWNkZDZmYjU5Yw==
 SHA512:
   metadata.gz: !binary |-
-    ZmUwZTY5MDYzZmNjZjA2YjZiOGIzOGZhMmFmOTBkZTUzNTZiNzA0YjgxOWNk
-    M2QxNzY0Y2MzMzVkMjdlYjdjZWU5MGJjMjhlMDI2MzA2NTljZTRkZjgwNWFk
-    YzhjMmRkOWQzNjIzZDRjMGU5NTdjNjhhYjIzYWMzYjQ5NDNhMzQ=
+    ZWM1MTQ2OGQ0ZjIyMDFjM2U1MjhjNmEzZDBhZWZmZWM1M2VjMGQyMjgxZDFl
+    ZjI1M2FjNjZjODFmNDU3Yjg1ZTNkN2Y1ZWM5Yzc2ODlhOWQ0NjQ2ZTYyNGUw
+    OTRhYTA0ZTY1MjVhMTIxYWQ1MTQxMzUyMWNiMjUyMWYzYjdjN2E=
   data.tar.gz: !binary |-
-    MGZiMTk2NTRlNWMzNGJjYzEyNzc1ZWU3YzFkZDA1ZDFhZmU0ZDlkMjcxY2Mw
-    Mjc2YTNhZDBiYmM1NTdkNDc4ZmRkZjBiNDY4YmY4MWZmYjZiZDkwM2M1NjYw
-    YmJhYzZjNGQ2MWU2ZmQzNDJlZDIzMzgwOGUwOGI0MWZmYjY0MjE=
+    ZDBkNjQzZmM0ZWViZTUwNjY0MWIzMDQ3MDgzOWFlYzViMDM2ZWU3NTgwZTI2
+    OWNmNDcxYmZmNmI3YmU3MTE3ODZmNDI2OTM4NDk1MTU3MDZkYWQ4ODMxNTk2
+    NTY0Y2JhMWFkN2U2NDAwODg2ZjdmYzFiNTNiNzU0NTFjMTUxMzQ=

data/lib/quickbase_record/client.rb

@@ -2,12 +2,19 @@ module QuickbaseRecord
   module Client
     include ActiveSupport::Concern
 
+    module ClassMethods
+      def qb_client
+        self.new.qb_client
+      end
+    end
+
     def qb_client
       realm = QuickbaseRecord.configuration.realm
       username = QuickbaseRecord.configuration.username
       password = QuickbaseRecord.configuration.password
+      token = QuickbaseRecord.configuration.token
 
-      @qb_client ||= AdvantageQuickbase::API.new(realm, username, password)
+      @qb_client ||= AdvantageQuickbase::API.new(realm, username, password, token)
     end
   end
 end

data/lib/quickbase_record/configuration.rb

@@ -1,11 +1,12 @@
 module QuickbaseRecord
   class Configuration
-    attr_accessor :realm, :username, :password
+    attr_accessor :realm, :username, :password, :token
 
     def initialize
       @realm = ''
       @username = ''
       @password = ''
+      @token = ''
     end
   end
 end

data/lib/quickbase_record/queries.rb

@@ -19,8 +19,10 @@ module QuickbaseRecord
       def find(id)
         query_options = { query: build_query(id: id), clist: clist }
         query_response = qb_client.do_query(dbid, query_options).first
-        converted_response = convert_quickbase_response(query_response)
 
+        return false if query_response.nil?
+
+        converted_response = convert_quickbase_response(query_response)
         new(converted_response)
       end
 
@@ -28,12 +30,9 @@ module QuickbaseRecord
         query_options = { query: build_query(query_hash), clist: clist }
         query_response = qb_client.do_query(dbid, query_options)
 
-        array_of_new_objects = query_response.map do |response|
-          converted_response = convert_quickbase_response(response)
-          new(converted_response)
-        end
+        return false if query_response.first.nil?
 
-        return array_of_new_objects
+        build_array_of_new_objects(query_response)
       end
 
       def create(attributes={})
@@ -43,28 +42,11 @@ module QuickbaseRecord
         return object
       end
 
-      def query(query_string)
-        query_options = { query: build_query(query_string), clist: clist }
-        query_response = qb_client.do_query(dbid, query_options)
-
-        array_of_new_objects = query_response.map do |response|
-          converted_response = convert_quickbase_response(response)
-          new(converted_response)
-        end
-
-        return array_of_new_objects
-      end
-
       def qid(id)
         query_options = { qid: id, clist: clist }
         query_response = qb_client.do_query(dbid, query_options)
 
-        array_of_new_objects = query_response.map do |response|
-          converted_response = convert_quickbase_response(response)
-          new(converted_response)
-        end
-
-        return array_of_new_objects
+        build_array_of_new_objects(query_response)
       end
 
       def build_query(query_hash)
@@ -84,6 +66,13 @@ module QuickbaseRecord
 
       private
 
+      def build_array_of_new_objects(query_response)
+        query_response.map do |response|
+          converted_response = convert_quickbase_response(response)
+          new(converted_response)
+        end
+      end
+
       def join_with_and(fid, value, comparitor="EX")
         "{'#{fid}'.#{comparitor}.'#{value}'}"
       end
@@ -122,17 +111,14 @@ module QuickbaseRecord
           result[field_name] = value
         end
 
-        result
+        return result
       end
 
       def convert_query_string(query_string)
         match_found = false
-
         uses_field_name = query_string.match(/\{'?(.*)'?\..*\.'?.*'?\}/)[1].to_i == 0
 
-        if !uses_field_name
-          return query_string
-        end
+        return query_string unless uses_field_name
 
         fields.each do |field_name, fid|
           field_name = field_name.to_s
@@ -147,7 +133,7 @@ module QuickbaseRecord
           raise ArgumentError, "Invalid arguments on #{self}.query() - no matching field name found. \nMake sure the field is part of your class configuration."
         end
 
-        query_string
+        return query_string
       end
     end
 
@@ -159,17 +145,17 @@ module QuickbaseRecord
         current_object[self.class.fields[:id]] = self.id if self.id
       end
       self.id = qb_client.import_from_csv(self.class.dbid, [current_object]).first
+      return self
     end
 
     def delete
       return false if !self.id
-
       successful = qb_client.delete_record(self.class.dbid, self.id)
-
       return successful ? self.id : false
     end
 
     def update_attributes(attributes={})
+      return false if attributes.blank?
       self.assign_attributes(attributes)
       self.save
       return self

data/lib/quickbase_record/version.rb

@@ -1,3 +1,3 @@
 module QuickbaseRecord
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/spec/queries_spec.rb

@@ -11,6 +11,11 @@ RSpec.describe QuickbaseRecord::Queries do
       teacher = TeacherFake.find(1)
       expect(teacher).to be_a TeacherFake
     end
+
+    it "returns false if no QuickBase records are found" do
+      teacher = TeacherFake.find(999999)
+      expect(teacher).to be false
+    end
   end
 
   describe '.where' do
@@ -23,6 +28,21 @@ RSpec.describe QuickbaseRecord::Queries do
       teachers = TeacherFake.where(id: 1)
       expect(teachers.first).to be_a TeacherFake
     end
+
+    it "accepts a string in QuickBase query format" do
+      teachers = TeacherFake.where("{'3'.EX.'1'}")
+      expect(teachers.first.id).to eq('1')
+    end
+
+    it "accepts a string in QuickBase query format using field names" do
+      teachers = TeacherFake.where("{'id'.EX.'1'}")
+      expect(teachers.first.id).to eq('1')
+    end
+
+    it "returns false if no QuickBase records are found" do
+      teachers = TeacherFake.where(name: 'Not a real TeacherFake name...')
+      expect(teachers).to be false
+    end
   end
 
   describe '.create' do
@@ -37,23 +57,6 @@ RSpec.describe QuickbaseRecord::Queries do
     end
   end
 
-  describe '.query' do
-    it "returns an array of objects" do
-      teachers = TeacherFake.query("{id.EX.'1'}")
-      expect(teachers).to be_a Array
-    end
-
-    it "returns an object of the Teacher class" do
-      teachers = TeacherFake.query("{id.EX.'1'}")
-      expect(teachers.first).to be_a TeacherFake
-    end
-
-    it "accepts FIDs instead of field names" do
-      teachers = TeacherFake.query("{'3'.EX.'1'}")
-      expect(teachers.first.id).to eq('1')
-    end
-  end
-
   describe '.qid' do
     it "returns an array of objects" do
       teachers = TeacherFake.qid(1)
@@ -67,18 +70,22 @@ RSpec.describe QuickbaseRecord::Queries do
   end
 
   describe '#save' do
-    it "creates a new record for an object without an ID and sets it's new ID" do
+    it "creates a new record in QuickBase for an object without an ID and sets it's new ID" do
       cullen = TeacherFake.new(name: 'Cullen Jett', salary: '1,000,000.00')
-      new_id = cullen.save
-      expect(new_id).to be_truthy
-      expect(cullen.id).to eq(new_id)
+      cullen.save
+      expect(cullen.id).to be_truthy
+    end
+
+    it "returns the object on successful save" do
+      cullen = TeacherFake.where(name: 'Cullen Jett').first
+      expect(cullen.save).to be_a TeacherFake
     end
 
     it "edits an object that has an existing ID" do
       cullen = TeacherFake.where(name: 'Cullen Jett').first
       cullen.subject = 'Ruby on Rails'
       cullen.name = "THE #{cullen.name}"
-      expect(cullen.save).to be_truthy
+      expect(cullen.save.id).to be_truthy
       cullen.delete
     end
   end
@@ -117,6 +124,7 @@ RSpec.describe QuickbaseRecord::Queries do
       teacher.update_attributes(name: 'teacher2', salary: 40000)
       expect(teacher.name).to eq('teacher2')
       expect(teacher.salary).to eq(40000)
+      teacher.delete
     end
 
     it "saves the object" do
@@ -125,6 +133,12 @@ RSpec.describe QuickbaseRecord::Queries do
       expect(teacher.id).to be_truthy
       teacher.delete
     end
+
+    it "returns false if no attributes are passed" do
+      teacher = TeacherFake.new()
+      teacher.update_attributes()
+      expect(teacher.update_attributes()).to be false
+    end
   end
 
   # This is sort of a private method, but it seems pretty important so I'm keeping these tests.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickbase_record
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Cullen Jett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,6 +129,7 @@ files:
 - lib/quickbase_record/model.rb
 - lib/quickbase_record/queries.rb
 - lib/quickbase_record/version.rb
+- quickbase_record-0.0.2.gem
 - quickbase_record.gemspec
 - spec/fakes/student_fake.rb
 - spec/fakes/teacher_fake.rb