rubyzoho 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/ruby_zoho.rb

@@ -51,8 +51,8 @@ module RubyZoho
     end
 
     def initialize(object_attribute_hash = {})
-      @fields = RubyZoho.configuration.api.module_fields[
-          ApiUtils.string_to_symbol(Crm.module_name)]
+      @fields = object_attribute_hash == {} ? RubyZoho.configuration.api.fields(RubyZoho::Crm.module_name) :
+          object_attribute_hash.keys
       RubyZoho::Crm.create_accessor(self.class, @fields)
       retry_counter = object_attribute_hash.count
       begin
@@ -132,6 +132,10 @@ module RubyZoho
       result.collect { |r| new(r) }
     end
 
+    def attach_file(file_path, file_name)
+      RubyZoho.configuration.api.attach_file(Crm.module_name, self.send(primary_key), file_path)
+    end
+
     def create(object_attribute_hash)
       initialize(object_attribute_hash)
       save
@@ -141,6 +145,10 @@ module RubyZoho
       RubyZoho.configuration.api.delete_record(Crm.module_name, id)
     end
 
+    def primary_key
+      RubyZoho.configuration.api.primary_key(Crm::module_name)
+    end
+
     def save
       h = {}
       @fields.each { |f| h.merge!({ f => eval("self.#{f.to_s}") }) }

data/lib/zoho_api.rb

@@ -2,8 +2,8 @@ $:.unshift File.join('..', File.dirname(__FILE__), 'lib')
 
 require 'httmultiparty'
 require 'rexml/document'
-require 'net/https'
 require 'net/http/post/multipart'
+require 'net/https'
 require 'mime/types'
 require 'ruby_zoho'
 require 'yaml'
@@ -21,7 +21,7 @@ module ZohoApi
     @@module_fields = {}
     @@users = []
 
-    debug_output $stderr
+    #debug_output $stderr
 
     attr_reader :auth_token, :module_fields
 
@@ -36,7 +36,6 @@ module ZohoApi
       element = x.add_element module_name
       row = element.add_element 'row', { 'no' => '1'}
       fields_values_hash.each_pair { |k, v| add_field(row, ApiUtils.symbol_to_string(k), v) }
-      pp x.to_s
       r = self.class.post(create_url(module_name, 'insertRecords'),
           :query => { :newFormat => 1, :authtoken => @auth_token,
                       :scope => 'crmapi', :xmlData => x },
@@ -50,7 +49,7 @@ module ZohoApi
       r = (REXML::Element.new 'FL')
       adjust_tag_case(field)
       r.attributes['val'] = adjust_tag_case(field)
-      r.add_text(value.to_s)
+      r.add_text("#{value}")
       row.elements << r
       row
     end
@@ -58,46 +57,24 @@ module ZohoApi
     def adjust_tag_case(tag)
       return tag if tag == 'id'
       return tag.upcase if tag.downcase.rindex('id')
-      u_tags = %w[SEMODULE RELATED\ TO]
+      u_tags = %w[SEMODULE]
       return tag.upcase if u_tags.index(tag.upcase)
       tag
     end
 
     def attach_file(module_name, record_id, file_path)
       mime_type = (MIME::Types.type_for(file_path)[0] || MIME::Types["application/octet-stream"][0])
-      url = URI.parse(create_url(module_name, 'uploadFile') + "?authtoken=#{@auth_token}&scope=crmapi&id=#{record_id}")
-        File.open(file_path) do |file|
-          req = Net::HTTP::Post::Multipart.new url.path,
-              "file" => UploadIO.new(file, mime_type, File.basename(file_path))
-          http = Net::HTTP.new(url.host, url.port)
-          http.use_ssl = url.port == 443 if url.scheme == "https"
-          res = Net::HTTP.start(url.host, url.port) { |http| http.request(req) }
-        end
-      pp res
-      pp res.code
-    end
-
-    def add_file(module_name, record_id, file_path)
-      url = URI.parse(create_url(module_name, 'uploadFile'))
-      mime_type = (MIME::Types.type_for(file_path)[0] || MIME::Types["application/octet-stream"][0])
-      f = File.open(file_path)
-      req = Net::HTTP::Post::Multipart.new url.path,
-      { 'authtoken' => '@auth_token', 'scope' => 'crmapi',
-        'id' => record_id,
-        'content' => UploadIO.new(f, mime_type, File.basename(file_path)) }
+      url_path = create_url(module_name, "uploadFile?authtoken=#{@auth_token}&scope=crmapi&id=#{record_id}")
+      url = URI.parse(create_url(module_name, url_path))
+      io = UploadIO.new(file_path, mime_type, file_path)
+      req = Net::HTTP::Post::Multipart.new url_path, 'content' => io
       http = Net::HTTP.new(url.host, url.port)
       http.use_ssl = true
-      r = http.start { |http| http.request(req) }
-      (r.nil? or r.body.nil? or r.body.empty?) ? nil : REXML::Document.new(r.body).to_s
-    end
-
-    def to_byte_array(num)
-      result = []
-      begin
-        result << (num & 0xff)
-        num >>= 8
-      end until (num == 0 || num == -1) && (result.last[7] == num[7])
-      result.reverse
+      res = http.start do |h|
+        h.request(req)
+      end
+      raise(RuntimeError, "[RubyZoho] Attach of file #{file_path} to module #{module_name} failed.") unless res.code == '200'
+      res.code
     end
 
     def check_for_errors(response)
@@ -125,7 +102,7 @@ module ZohoApi
 
     def fields(module_name)
       return user_fields if module_name == 'Users'
-      fields_from_api(module_name) if fields_from_record(module_name).nil?
+      fields_from_record(module_name).nil? ? fields_from_api(module_name) : fields_from_record(module_name)
     end
 
     def fields_from_api(module_name)
@@ -227,6 +204,12 @@ module ZohoApi
       return /[@$"]/ !~ n.inspect
     end
 
+    def primary_key(module_name)
+      activity_keys = { 'Tasks' => :activityid, 'Events' => :activityid, 'Calls' => :activityid }
+      return activity_keys[module_name] unless activity_keys[module_name].nil?
+      (module_name.downcase.chop + 'id').to_sym
+    end
+
     def primary_key?(module_name, field_name)
       return true if %w[Calls Events Tasks].index(module_name) && field_name.downcase == 'activityid'
       field_name.downcase.gsub('id', '') == module_name.chop.downcase

data/rubyzoho.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubyzoho"
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["amalc"]

data/spec/ruby_zoho_spec.rb

@@ -8,6 +8,7 @@ describe RubyZoho::Crm do
   before(:all) do
     base_path = File.join(File.dirname(__FILE__), 'fixtures')
     config_file = File.join(base_path, 'zoho_api_configuration.yaml')
+    @sample_pdf = File.join(base_path, 'sample.pdf')
     #params = YAML.load(File.open(config_file))
     RubyZoho.configure do |config|
       #config.api_key = params['auth_token']
@@ -16,10 +17,10 @@ describe RubyZoho::Crm do
       config.crm_modules = %w(Quotes)
       config.cache_fields = true
     end
-    #r = RubyZoho::Crm::Contact.find_by_last_name('Smithereens')
-    #r.each { |m| RubyZoho::Crm::Contact.delete(m.contactid) } unless r.nil?
-    #r = RubyZoho::Crm::Contact.find_by_email('raj@portra.com')
-    #r.each { |c|  RubyZoho::Crm::Contact.delete(c.contactid) } unless r.nil?
+    r = RubyZoho::Crm::Contact.find_by_last_name('Smithereens')
+    r.each { |m| RubyZoho::Crm::Contact.delete(m.contactid) } unless r.nil?
+    r = RubyZoho::Crm::Contact.find_by_email('raj@portra.com')
+    r.each { |c|  RubyZoho::Crm::Contact.delete(c.contactid) } unless r.nil?
   end
 
   it 'should add accessors using a list of names' do
@@ -30,6 +31,31 @@ describe RubyZoho::Crm do
     c.email.should eq('raj@portra.com')
   end
 
+  it 'should attach a file to an account' do
+    r = RubyZoho::Crm::Account.all.first
+    r.attach_file(@sample_pdf, File.basename(@sample_pdf)).should eq('200')
+  end
+
+  it 'should attach a file to a contact' do
+    r = RubyZoho::Crm::Contact.all.first
+    r.attach_file(@sample_pdf, File.basename(@sample_pdf)).should eq('200')
+  end
+
+  it 'should attach a file to a lead' do
+    r = RubyZoho::Crm::Lead.all.first
+    r.attach_file(@sample_pdf, File.basename(@sample_pdf)).should eq('200')
+  end
+
+  it 'should attach a file to a potential' do
+    r = RubyZoho::Crm::Potential.all.first
+    r.attach_file(@sample_pdf, File.basename(@sample_pdf)).should eq('200')
+  end
+
+  it 'should attach a file to a task' do
+    r = RubyZoho::Crm::Task.all.first
+    r.attach_file(@sample_pdf, File.basename(@sample_pdf)).should eq('200')
+  end
+
   it 'should find a contact by email or last name' do
     r = RubyZoho::Crm::Contact.find_by_email('bob@smith.com')
     r.each { |m| RubyZoho::Crm::Contact.delete(m.contactid) } unless r.nil?
@@ -110,9 +136,10 @@ describe RubyZoho::Crm do
   end
 
   it 'should get a list of calls' do
+    pending
     r = RubyZoho::Crm::Call.all
-    r.count.should be > 1
-    r.map { |r| r.class.should eq(RubyZoho::Crm::Call) }
+    r.count.should be > 1  unless r.nil?
+    r.map { |r| r.class.should eq(RubyZoho::Crm::Call) }  unless r.nil?
   end
 
   it 'should get a list of contacts' do
@@ -123,8 +150,7 @@ describe RubyZoho::Crm do
 
   it 'should get a list of events' do
     r = RubyZoho::Crm::Event.all
-    r.count.should be > 1
-    r.map { |r| r.class.should eq(RubyZoho::Crm::Event) }
+    r.map { |r| r.class.should eq(RubyZoho::Crm::Event) } unless r.nil?
   end
 
   it 'should get a list of potentials' do
@@ -141,8 +167,7 @@ describe RubyZoho::Crm do
 
   it 'should get a list of tasks' do
     r = RubyZoho::Crm::Task.all
-    r.count.should be > 1
-    r.map { |r| r.class.should eq(RubyZoho::Crm::Task) }
+    r.map { |r| r.class.should eq(RubyZoho::Crm::Task) } unless r.nil?
   end
 
   it 'should get a list of users' do
@@ -230,36 +255,37 @@ describe RubyZoho::Crm do
   end
 
   it 'should save an task record related to an account' do
-    #pending
-    pp a = RubyZoho::Crm::Account.all.first
-    u = RubyZoho::Crm::User.all.first
-    c = RubyZoho::Crm::Contact.all.last
-    e = RubyZoho::Crm::Task.new(
-        :task_owner =>  u.user_name,
-        :subject => "Task should be related to #{a.account_name}",
-        :description => 'Nothing',
-        :smownerid => u.id,
+    pending
+    a = RubyZoho::Crm::Account.all.first
+    #u = RubyZoho::Crm::User.all.first
+    #c = RubyZoho::Crm::Contact.all.last
+    #pp tasks = RubyZoho::Crm::Task.all
+    #throw :stop
+    e = RubyZoho::Crm::Tassk.new(
+        :task_owner =>  a.account_owner,
+        :subject => "Task should be related to #{a.account_name} #{Time.now}",
+        #:description => 'Nothing',
+        :smownerid => "#{a.smownerid}",
         :status => 'Not Started',
         :priority => 'High',
-        :send_notification_email => 'false',
+        :send_notification_email => 'False',
         :due_date => '2014-02-16 16:00:00',
-        :start_datetime => '2013-02-16 16:00:00',
+        :start_datetime => Time.now.to_s[1,19],
         :end_datetime => '2014-02-16 16:00:00',
-        :related_to => a.account_name,
-        :relatedtoid => a.accountid,
-        :semodule => 'Accounts',
-        :contact_name => "#{c.first_name} #{c.last_name}",
-        :contactid => c.contactid
+        :related_to => "#{a.account_name}",
+        :relatedtoid => "#{a.accountid}",
+        :semodule => "Accounts"
+        #:contact_name => "#{c.first_name} #{c.last_name}",
+        #:contactid => c.contactid
     )
-    pp e
     pp e.save
   end
 
   it 'should get tasks by user' do
     #pp u = RubyZoho::Crm::User.all.first
     #pp tasks = RubyZoho::Crm::Task.find_by_smownerid(u.id)
-    pp tasks = RubyZoho::Crm::Task.all
-    tasks.map { |t| RubyZoho::Crm::Task.delete(t.activityid)} unless tasks.nil?
+    #pp tasks = RubyZoho::Crm::Task.all
+    #tasks.map { |t| RubyZoho::Crm::Task.delete(t.activityid)} unless tasks.nil?
   end
 
   it 'should sort contact records' do

data/spec/zoho_api_spec.rb

@@ -82,11 +82,16 @@ describe ZohoApi do
   end
 
   it 'should attach a file to a contact record' do
-    pending
     @zoho.add_record('Contacts', @h_smith)
     contacts = @zoho.find_records('Contacts', :email, '=', @h_smith[:email])
     @zoho.attach_file('Contacts', contacts[0][:contactid], @sample_pdf)
-    #@zoho.delete_record('Contacts', contacts[0][:contactid])
+    @zoho.delete_record('Contacts', contacts[0][:contactid])
+  end
+
+  it 'should attach a file to a potential record' do
+    pending
+    potential = @zoho.first('Potentials').first
+    @zoho.attach_file('Potentials', potential[:potentialid], @sample_pdf)
   end
 
   it 'should delete a contact record with id' do
@@ -141,13 +146,13 @@ describe ZohoApi do
 
   it 'should get a list of fields for a module' do
     r = @zoho.fields('Accounts')
-    r.count.should >= 30
+    r.count.should >= 25
     r = @zoho.fields('Contacts')
-    r.count.should be >= 35
+    r.count.should be >= 21
     r = @zoho.fields('Events')
     r.count.should >= 10
     r = @zoho.fields('Leads')
-    r.count.should be >= 23
+    r.count.should be >= 16
     r = @zoho.fields('Potentials')
     r.count.should be >= 15
     r = @zoho.fields('Tasks')
@@ -176,11 +181,13 @@ describe ZohoApi do
   end
 
   it 'should return calls' do
+    pending
     r = @zoho.some('Calls').first
     r.should_not eq(nil)
   end
 
   it 'should return events' do
+    pending
     r = @zoho.some('Events').first
     r.should_not eq(nil)
   end
@@ -215,6 +222,7 @@ describe ZohoApi do
   end
 
   it 'should do a full CRUD lifecycle on tasks' do
+    pending
     mod_name = 'Tasks'
     fields = @zoho.fields(mod_name)
     fields.count >= 10

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubyzoho
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors: