advantage_quickbase 0.7.2 → 0.8.0

data/lib/quickbase.rb

@@ -63,7 +63,7 @@ module AdvantageQuickbase
 
       if records.length > 0
         return records.first
-      else 
+      else
         return {}
       end
     end
@@ -144,9 +144,12 @@ module AdvantageQuickbase
       app_token
     end
 
-    def import_from_csv( db_id, data_array, columns )
+    def import_from_csv( db_id, import_data, columns=nil )
+      # If import_data contains hashes, use the keys as the import headers
+      columns ||= import_data[ 0 ].map{ |fid, value| fid }
       columns = normalize_list( columns )
-      xml = build_csv_xml( data_array, columns )
+
+      xml = build_csv_xml( import_data, columns )
 
       result = send_request( :importFromCSV, db_id, nil, xml )
       result.css('rid').map{ |xml_node| xml_node.text.to_i }
@@ -280,8 +283,7 @@ module AdvantageQuickbase
     def build_request_xml( tags )
       xml = '<qdbapi>'
       xml += tags.map{ |name, value| "<#{name}>#{value}</#{name}>" }.join()
-      xml += "<ticket>#{@ticket}</ticket>"
-      xml += "<apptoken>#{@app_token}</apptoken>"
+      xml += ticket_and_token
       xml += '</qdbapi>'
     end
 
@@ -302,8 +304,7 @@ module AdvantageQuickbase
       end
 
       xml += new_values.join()
-      xml += "<ticket>#{@ticket}</ticket>"
-      xml += "<apptoken>#{@app_token}</apptoken>"
+      xml += ticket_and_token
       xml += '</qdbapi>'
     end
 
@@ -319,16 +320,29 @@ module AdvantageQuickbase
     end
 
     def build_csv_xml( new_values, fields_to_import )
+      csv_data = []
+      new_values.each do |line|
+        if line.is_a?( Array )
+          csv_data << CSV.generate_line( line )
+        elsif line.is_a?( Hash )
+          csv_data << CSV.generate_line( line.map{ |k, v| v } )
+        end
+      end
+
       xml = '<qdbapi>'
       xml += "<records_csv><![CDATA[\n"
-      xml += new_values.map{ |line| CSV.generate_line(line) }.join()
+      xml += csv_data.join()
       xml += "]]></records_csv>"
       xml += "<clist>#{fields_to_import}</clist>"
-      xml += "<ticket>#{@ticket}</ticket>"
-      xml += "<apptoken>#{@app_token}</apptoken>"
+      xml += ticket_and_token
       xml += '</qdbapi>'
     end
 
+    def ticket_and_token
+      "<ticket>#{@ticket}</ticket>" +
+      "<apptoken>#{@app_token}</apptoken>"
+    end
+
     def parse_xml( xml )
       Nokogiri::HTML( xml )
     end

data/lib/user.rb

@@ -1,7 +1,7 @@
 module AdvantageQuickbase
   class API
     module User
-      def get_user_info(email)
+      def get_user_info( email )
         user = send_request( :GetUserInfo, "main", { :email => email })
         user = {
           :id => get_attr_value(user.css("user"), :id),
@@ -14,18 +14,23 @@ module AdvantageQuickbase
       end
 
       def get_user_role(db_id, user_id)
-        roles = []
         result = send_request(:GetUserRole, db_id, { :userid => user_id })
 
+        user = {
+          id: get_attr_value( result.css('user'), :id ),
+          name: get_tag_value( result, :name ),
+          roles: []
+        }
+
         result.css( 'role' ).each do |role|
-          roles << role = { 
-            :id => get_attr_value(role, :id), 
-            :name => get_tag_value(role, :name), 
-            :type => get_tag_value(role, :access )
+          user[ :roles ] << {
+            :id => get_attr_value( role, :id ),
+            :name => get_tag_value( role, :name ),
+            :type => get_tag_value( role, :access )
           }
         end
 
-        roles
+        user
       end
 
       def add_user_to_role(db_id, user_id, role_id)
@@ -44,7 +49,7 @@ module AdvantageQuickbase
         options = {
           :email => email,
           :roleid => role_id,
-          :first_name => first_name, 
+          :first_name => first_name,
           :last_name => last_name
         }
 
@@ -64,9 +69,9 @@ module AdvantageQuickbase
 
       def remove_access(db_id, email)
         user = self.get_user_info(email)
-        roles = get_user_role(db_id, user[:id])
+        user_roles = get_user_role(db_id, user[:id])
 
-        roles.each do |role|
+        user_roles[:roles].each do |role|
           self.remove_user_from_role(db_id, user[:id], role[:id])
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: advantage_quickbase
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri