quickbase_record 0.2.4 → 0.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTBiNzE5ZDE5ZmE1NjNiZGNkZDIyNzhkMmNjOTY5NTkxNzYzM2M0Zg==
+    ZmU2ODcwN2Y1NzUxMjBiZWUyYWYzNzYxMmFlMDE5MTVjNmNjZTQzMA==
   data.tar.gz: !binary |-
-    NzEyMDE4ZjdmOTNiN2M0YWZhZjYwMjAyZjMyZmRmNTBjM2MxYThkZg==
+    ZDZkZTVmZDUwMDM0YmNhNjIzYWE0ZjE3ODdlMDQwYTQ3OTJiMmE3Ng==
 SHA512:
   metadata.gz: !binary |-
-    MGY2MGU0YTNlNGZjNmU0OWFjNGE2MDJkYmVkZmY2ODFlYjI5NDhiZmMwNDk0
-    YzE1NmVmYmFkZDU3YWIwYjQyMzQ0OGZmZGY5MmQ4Mzk4Zjc0YTcyMzYxYzgy
-    YzJmZDg0ZmVhYWZiNjQ5MGZmZGNhMWJhNzUwZWE5YjVjZmQzMWE=
+    ZDg0MDdkYzc4YjMyMDk1NzJlZTY5NTkzYWExMzc1NWYxMmJiOGVhYWM0NWI3
+    ZDVkMjQ2YmRlODBkMTBlOTU4Y2ZiYzE2YjMwZmUzNTE3YWE3OTgyZTgyYWIx
+    ZmQwZmJkZWI4ZTFkZTYwN2MwNjU0N2IxNzIwNTZlZDIyYTE1ZDQ=
   data.tar.gz: !binary |-
-    YmUyZjJiM2M5YTU4N2NmNjI0ZDJhYTVkN2YwYzRiNzZjZTJiNDM3YWFlNmRk
-    YWY4MjNkMGFjMjMwMzU3MGRiNDQwNzkwZGNjMzc4YTFlMWU2NDA2MGY2NjJl
-    ZTQ0Zjc5OWQ3YTQ3ZWU0NDFmYmUzYjE2MGE0YWJjZWNiMGNlMjY=
+    NTVmNGZmYjliMTNlNGNjMDJmNjE0MmNjNDZjYzQxNWVjMTdhNDU4NGM2NDQ0
+    Y2JmNDA4NjQ5YzA4MWU2ZGVlNjc3ODE0ZTNmMzBhM2M5M2Y3MGM5OWZkN2U0
+    N2I5NTc4OTJmNDAxMDNiN2I3ODQ5ZjE2MTNhZGZhYmQ2MDA0ZTM=

data/.gitignore

@@ -12,6 +12,6 @@
 *.o
 *.a
 mkmf.log
-/spec/quickbase_record_config.rb
 /spec/config.yml
 .DS_Store
+*.gem

data/lib/quickbase_record/client.rb

@@ -14,7 +14,7 @@ module QuickbaseRecord
       password = QuickbaseRecord.configuration.password
       token = QuickbaseRecord.configuration.token
 
-      @qb_client ||= AdvantageQuickbase::API.new(realm, username, password, token)
+      @qb_client = AdvantageQuickbase::API.new(realm, username, password, token)
     end
   end
 end

data/lib/quickbase_record/field_mapping.rb

@@ -3,7 +3,30 @@ module QuickbaseRecord
     attr_accessor :fields
 
     def initialize(fields={})
+      # @fields = create_fields(fields)
       @fields = fields
     end
+
+    def create_fields(fields_hash)
+      converted_fields_hash = {}
+      fields_hash.each do |key, value|
+        converted_fields_hash[key] = Field.new(value)
+      end
+      return converted_fields_hash
+    end
+  end
+
+  class Field
+    attr_accessor :value
+
+    def initialize(value)
+      @value = format_value(value)
+    end
+
+    def format_value(value)
+      return value if value.is_a? Integer
+
+
+    end
   end
 end

data/lib/quickbase_record/model.rb

@@ -25,8 +25,6 @@ module QuickbaseRecord
     def initialize(attributes={})
       create_attr_accesssors
       assign_attributes(attributes) if attributes
-
-      super()
     end
 
     def persisted?
@@ -34,7 +32,7 @@ module QuickbaseRecord
     end
 
     def create_attr_accesssors
-      self.class.fields.each do |field_name, fid|
+      self.class.fields.each do |field_name, value|
         self.class.send(:attr_accessor, field_name)
       end
     end

data/lib/quickbase_record/queries.rb

@@ -32,11 +32,10 @@ module QuickbaseRecord
 
         return [] if query_response.first.nil?
 
-        build_array_of_new_objects(query_response)
+        build_collection(query_response)
       end
 
       def create(attributes={})
-        raise StandardErrror, "You cannot call #{self}.create() with an :id attribute" if attributes.include?(:id)
         object = new(attributes)
         object.save
         return object
@@ -48,7 +47,7 @@ module QuickbaseRecord
 
         return [] if query_response.first.nil?
 
-        build_array_of_new_objects(query_response)
+        build_collection(query_response)
       end
 
       def build_query(query_hash)
@@ -73,9 +72,7 @@ module QuickbaseRecord
         end.join("AND")
       end
 
-      private
-
-      def build_array_of_new_objects(query_response)
+      def build_collection(query_response)
         query_response.map do |response|
           converted_response = convert_quickbase_response(response)
           new(converted_response)
@@ -141,7 +138,7 @@ module QuickbaseRecord
         end
 
         if !match_found
-          raise ArgumentError, "Invalid arguments on #{self}.query() - no matching field name found. \nMake sure the field is part of your class configuration."
+          raise ArgumentError, "Invalid arguments on #{self}.where() - no matching field name found. \nMake sure the field is part of your class configuration."
         end
 
         return query_string
@@ -170,7 +167,7 @@ module QuickbaseRecord
     end
 
     def delete
-      return false if !self.id
+      return false unless self.id
       successful = qb_client.delete_record(self.class.dbid, self.id)
       return successful ? self.id : false
     end
@@ -178,12 +175,16 @@ module QuickbaseRecord
     def update_attributes(attributes={})
       return false if attributes.blank?
       self.assign_attributes(attributes)
-      self.save
+      updated_attributes = {}
+      attributes.each { |field_name, value| updated_attributes[self.class.convert_field_name_to_fid(field_name)] = value }
+      if self.id
+        qb_client.edit_record(self.class.dbid, self.id, updated_attributes)
+      else
+        self.id = qb_client.add_record(self.class.dbid, updated_attributes)
+      end
       return self
     end
 
-    private
-
     def has_file_attachment?(current_object)
       current_object.values.any? { |value| value.is_a? Hash }
     end

data/lib/quickbase_record/version.rb

@@ -1,3 +1,3 @@
 module QuickbaseRecord
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/fakes/student_fake.rb

@@ -2,12 +2,4 @@ require './lib/quickbase_record'
 
 class StudentFake
   include QuickbaseRecord::Model
-
-  define_fields ({
-    :dbid => 'bjzrx8ckw',
-    :id => 3,
-    :name => 6,
-    :grade => 7,
-    :email => 8
-  })
 end

data/spec/field_spec.rb

@@ -0,0 +1,14 @@
+# require 'quickbase_record/field_mapping'
+
+# RSpec.describe QuickbaseRecord::Field do
+#   describe '#value' do
+#     it "returns the value if an integer is passed" do
+#       expect(QuickbaseRecord::Field.new(123).value).to eq(123)
+#     end
+
+#     it "returns a formatted date if a hash with the key :date is passed" do
+#       value = {date: 123}
+#       expect(QuickbaseRecord::Field.new(value).to)
+#     end
+#   end
+# end

data/spec/model_spec.rb

@@ -13,6 +13,21 @@ RSpec.describe QuickbaseRecord::Model do
 
       expect(StudentFake.fields[:id]).to eq(3)
     end
+
+    # it "formats fields as dates given a hash value" do
+    #   StudentFake.define_fields ({
+    #     :dbid => 'bjzrx8ckw',
+    #     :date_created => {date: 1},
+    #     :id => 3,
+    #     :name => 6,
+    #     :grade => 7,
+    #     :email => 8
+    #   })
+
+    #   puts StudentFake.find(1).inspect
+
+    #   expect(StudentFake.find(1).date_created).to eq('1/1/2015')
+    # end
   end
 
   describe 'initialize' do

data/spec/queries_spec.rb

@@ -51,10 +51,6 @@ RSpec.describe QuickbaseRecord::Queries do
       expect(teacher.id).to be > 1
       teacher.delete
     end
-
-    it "throws an error if an :id argument is passed" do
-      expect { TeacherFake.create(id: 1, name: 'Professor Dumbledore') }.to raise_error
-    end
   end
 
   describe '.qid' do
@@ -127,7 +123,7 @@ RSpec.describe QuickbaseRecord::Queries do
   end
 
   describe '#update_attributes' do
-    it "assigns an objects attributes given a hash attributes and their values" do
+    it "assigns an objects attributes given a hash of attributes" do
       teacher = TeacherFake.new(name: 'teacher1', salary: 35000)
       teacher.update_attributes(name: 'teacher2', salary: 40000)
       expect(teacher.name).to eq('teacher2')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quickbase_record
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Cullen Jett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,9 +120,11 @@ files:
 - quickbase_record-0.2.1.gem
 - quickbase_record-0.2.2.gem
 - quickbase_record-0.2.3.gem
+- quickbase_record-0.2.4.gem
 - quickbase_record.gemspec
 - spec/fakes/student_fake.rb
 - spec/fakes/teacher_fake.rb
+- spec/field_spec.rb
 - spec/model_spec.rb
 - spec/queries_spec.rb
 - spec/quickbase_record_config.rb
@@ -153,6 +155,7 @@ summary: An ActiveRecord-style ORM for using Intuit QuickBase tables as models.
 test_files:
 - spec/fakes/student_fake.rb
 - spec/fakes/teacher_fake.rb
+- spec/field_spec.rb
 - spec/model_spec.rb
 - spec/queries_spec.rb
 - spec/quickbase_record_config.rb