connectwise_sdk 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f97ff9137957a443af0184ff9f5be0864b3abd0f
-  data.tar.gz: 7348114bd346b8b314659b5006c3cd9117c61e73
+  metadata.gz: 546290353531e430d7605b8aa51830e260bdf854
+  data.tar.gz: f096307dc3cdba0adbba01d627b0cfdaa3d13a18
 SHA512:
-  metadata.gz: a4c762a2424ccfd108bfcd55ccfb09be095ad2b9ec6abdb384711c36062dc87a045dc74949bbc3a6d67dcb9c406d97100b11000a8314febdae797702ad239a12
-  data.tar.gz: e94651ab74d558d127b9de456fe3bf794bf4c1d3b32078008f9f291f7e6371c6dd2e40e0e74504df08a9e3fb045d8faa689d011bfbe4353563b97c0dcbc3bbc2
+  metadata.gz: 3f9f715f5715707d14842c54a0b5f05f5b5f7fdc070710903b463411b51b4c437001506cd3596e19dd4d61316575c6f8b08abe80d3b1bf16c5f27c4f9c33a915
+  data.tar.gz: 8b4943f39a85fc48a69700aedbc7839a76a4ee6227e3336470f33ec1becfe22eb68d223b3d57eccd8a9c48ae2953f1f05991d4b134b8186bc31a22aefcdd7cd1

data/README.md

@@ -1,6 +1,8 @@
 # ConnectwiseSdk
 
-An SDK allowing integration into Connectwise
+An SDK simplifying integration with the Connectwise API.
+
+The Connectwise (CW) XML Api can be a challenge to work with.  This Sdk aims to simplify this interaction with objects mirroring the CW objects, and applying the standard Ruby conventions to that naming.  While much of the heavy lifting is done by using Savon, there are a number of inconsistecies which this Sdk aims to smooth over.
 
 ## Installation
 
@@ -56,13 +58,18 @@ Note how `contact` is lower case, while `FirstName` and the other fields are cam
 
 ## Current progress and TODOs
 
-Currently only the `Member.where` method, and the low level `Connection.call` method are working.
+Currently the low level `Connection.call` method is working, as well as basic Member, Contact, Company, and Opportunity creation, and search.
+
+Remaining items include:
 
-1. Complete Contact class
-2. Company class
-3. Opportunity class
-4. Ticket class
-5. Remaining api
+1. Ticket class
+2. Support Notes for Opportunities (submitting them)
+2. Creating a Facade layer so that the connection object doesn't need to be passed to each object
+3. Supporting a late binding way of accessing internal objects (accessing the company object within an opportunity for example)
+4. Supporting an intuitive way of accessing lists of phone numbers, addresses, and email addresses, while still allowing simple access to the first one of each.
+5. Better support for the difference between a find (summary info only) and a get (full object). This should be hidden by the api
+6. A reload facitily to requery for the data.
+7. Remaining api
 
 ## Contributing
 
@@ -75,7 +82,7 @@ Currently only the `Member.where` method, and the low level `Connection.call` me
 ### Adding support for other Connectwise Classes
 
 There is a `Connectwise::Model` module that incorporates the core of what it is to be
-connectwise model. Every Model should include this class.
+connectwise model. Every Model should include this class.  See below for a description of it's capabilities.
 
 Then it's a matter of figuring out the following for each class:
 - What fields are returned from a find call
@@ -85,4 +92,23 @@ Then it's a matter of figuring out the following for each class:
 
 Some issues that need to be resolved:
 - How best to handle nested data structures (A contact has an email address list, a phone number list, etc.)
-- How best to handle nested objects (A company has a contact)
+- How best to handle nested objects.  These are handled for object creation, but accessing them should lazily load the object, making the query against CW only when necessary.
+- How best to handle the difference between find and get calls. With CW, a find returns a stub object returned by a get call.  For example, a find on a contact may return an email address, but the get call will return an array of connection objects, each with a different email address in it.  Currently these lists are ignored, but we'll need to deal with them eventually. The initial implementation can make the first email address in the list be returned from an email call, while emails will return the full list.
+
+### Connectwise::Model
+
+The connectwise model centralizes the common actions that are supported by each model object, and creates a small DSL for creating. These actions include support for `.where`, `.find`, `.save`, `.destroy`, and `.persisted?`.  In general the key to supporting these follows a common pattern:
+
+1. Place the api call using the correct model name ('XXXApi' for example, 'ContactApi' for a Contact object).
+2. Place the api call using the correct method name ('add_or_update_XXX' for example, 'add_or_update_contact' for a Contact object).
+3. Place the parameters inside the correct parent object (e.g. contact: {FirstName: 'first', LastName: 'Last'}}
+4. The where clause does a search converting thobject, and one that is generally inconsistent with the e hash parameters into a query string, and then removing the root element from the return hash.
+5. The find clause does a get using an id.
+6. The save calls use the 'add_or_update_XXX' actions, while the destroy calls use the 'delete_XXX' calls.
+7. Persistence is determined by the presence of an id.
+
+The main challenge is getting this to work is allowing enough hooks to customize the model name, plural form of the model name, and the specific api method names in the rare cases that require it.
+
+The final piece is translating the data returned by CW to the data in this API.  For the most part the conversion is straight forward, but part of the purpose of the high level api is to remove the inconsistencies as much as possible.
+
+So while getting a member's email is done with `.email_address`, a contact's email is retrieved with `.email`.  This should be consistent, or better yet, both should work in either case.

data/lib/connectwise/company.rb

@@ -1,5 +1,26 @@
+require 'securerandom'
+
 module Connectwise
   class Company
     include Model
+    plural :companies
+    attr_accessor :id, :status, :type, :market, :territory, :web_site, :fax_number, :phone_number, :company_name, :company_id
+
+    def self.transform(attrs)
+      attrs[:company_name] ||= attrs.delete(:name)
+      attrs
+    end
+
+    def initialize(connection, attrs)
+      super
+      @company_id ||= SecureRandom.hex(12)
+      @status ||= 'Active'
+    end
+
+    def to_cw_h
+      attrs = super
+      attrs['CompanyID'] = attrs.delete('CompanyId')
+      attrs
+    end
   end
 end

data/lib/connectwise/connection.rb

@@ -1,9 +1,4 @@
 module Connectwise
-  class ConnectionError < StandardError; end
-  class UnknownHostError < ConnectionError; end
-  class UnknownCompanyError < ConnectionError; end
-  class BadCredentialsError < ConnectionError; end
-
   class Connection
     attr_reader :host, :custom_api_mapping
     attr_accessor :log
@@ -12,6 +7,7 @@ module Connectwise
       @custom_api_mapping = custom_api_mapping
       @host = host
       @credentials = {CompanyId: company_name, IntegratorLoginId: integrator_login_id, IntegratorPassword: integrator_password}
+      HTTPI.adapter = :net_http
     end
 
     def call(api, action, message, options: {}, &err_handler)

data/lib/connectwise/contact.rb

@@ -3,54 +3,29 @@ module Connectwise
     include Model
     #TODO - email or email_address - Member uses email_address, while here it's email - normalize
     attr_accessor :id, :first_name, :last_name, :company_name, :phone, :email, :type, :relationship, :default_flag, :address_line1, :address_line2, :city, :state, :zip, :country,
-      :portal_security_level, :portal_security_caption, :disable_portal_login, :last_update
+      :portal_security_level, :portal_security_caption, :disable_portal_login, :last_update, :company_id
 
-    def self.where(connection, **attrs)
-      resp = connection.call :contact, :find_contacts, {conditions: attrs_to_query(attrs)}
-      Array(resp[:contact_find_result]).map {|attrs| p attrs; cw_find_to_model(connection, attrs) }
-    end
-
-    def save
-      #message = message.merge(CompanyId: company_id) if company_id
-      attrs = connection.call 'ContactApi', :add_or_update_contact, {contact: to_cw_h}
-      p attrs
-      self.class.cw_save_to_model(connection, attrs)
-    end
-
-    def destroy
-
-    end
-
-    def persisted?
-      !!@id
+    #TODO - add company accessor and make use of company rec id - either run another query to create it, or find a way to defer until company is asked for
+    def company=(company)
+      @company = company
     end
 
     private
-    def self.cw_find_to_model(conn, attrs)
-      id = attrs.delete(:contact_rec_id)
-      #TODO - make use of company rec id - either run another query to create it, or find a way to defer until company is asked for
-      company_id = attrs.delete(:company_rec_id)
-      self.new(conn, id: id, **attrs)
+    def self.find_transform(attrs)
+      attrs[:id] ||= attrs.delete(:contact_rec_id)
+      attrs
     end
 
-    def self.cw_save_to_model(conn, attrs)
-
+    def self.save_transform(attrs)
+      attrs[:id] ||= attrs.delete(:contact_rec_id)
+      attrs
     end
 
-    def create_contact(contact, company_id=nil, &err_handler)
-      message = {
-        FirstName: contact.first_name,
-        LastName: contact.last_name,
-        Email: contact.email,
-        Phone: contact.phone,
-      }
-      message = message.merge(CompanyId: company_id) if company_id
-      connection.call 'ContactApi', :add_or_update_contact, {contact: message}, &err_handler
+    def to_cw_h
+      h = super
+      h.delete(:company_id)
+      h = h.merge(CompanyId: @company.company_id) if @company
+      h
     end
-
-    def delete_contact(contact, &err_handler)
-      connection.call 'ContactApi', :delete_contact, {id: contact.id}, &err_handler
-    end
-
   end
 end

data/lib/connectwise/errors.rb

@@ -0,0 +1,7 @@
+module Connectwise
+  class ConnectionError < StandardError; end
+  class UnknownHostError < ConnectionError; end
+  class UnknownCompanyError < ConnectionError; end
+  class BadCredentialsError < ConnectionError; end
+  class RecordNotFound < StandardError; end
+end

data/lib/connectwise/member.rb

@@ -3,15 +3,9 @@ module Connectwise
     include Model
     attr_accessor :email_address, :first_name, :last_name, :id
 
-    def self.where(connection, **attrs)
-      resp = connection.call :member, :find_members, {conditions: attrs_to_query(attrs)}
-      Array(resp[:member_find_result]).map {|attrs| cw_to_model(connection, attrs) }
-    end
-
-    private
-    def self.cw_to_model(conn, attrs)
-      id = attrs.delete(:member_id)
-      self.new(conn, id: id, **attrs)
+    def self.find_transform(attrs)
+      attrs[:id] = attrs.delete(:member_id)
+      attrs
     end
   end
 end

data/lib/connectwise/model.rb

@@ -1,6 +1,26 @@
 module Connectwise
   module Model
     module ClassMethods
+      def where(connection, *args, **attrs)
+        conditions = attrs ? attrs_to_query(transform(attrs)) : args.join(' ')
+        resp = connection.call cw_api_name, "find_#{plural_class_name}".to_sym, {conditions: conditions}
+        resp ? Array(remove_root_node(resp)).map {|attrs| self.new(connection, find_transform(attrs)) } : []
+      end
+
+      def find(connection, id)
+        if (attrs = connection.call(cw_api_name, "get_#{cw_api_name}".to_sym, {id: id}))
+          self.new(connection, find_transform(attrs))
+        else
+          fail RecordNotFound
+        end
+      rescue ConnectionError
+        raise RecordNotFound
+      end
+
+      def plural(plural)
+        @plural_form = plural
+      end
+
       def attrs_to_query(attrs)
         attrs.map do |k,v|
           str = k.to_s
@@ -8,6 +28,40 @@ module Connectwise
           "#{str.camelize} like '#{v}'"
         end.join(' and ')
       end
+
+      def cw_api_name
+        base_class_name.downcase.to_sym
+      end
+
+      def plural_class_name
+        ending = base_class_name[/[aeiou]$/] ? 'es' : 's'
+        @plural_form ||= "#{base_class_name.downcase}#{ending}"
+      end
+
+      def find_transform(attrs)
+        attrs
+      end
+
+      def save_transform(attrs)
+        attrs
+      end
+
+      def transform(attrs)
+        attrs
+      end
+
+      def model_name(model_name = self.name)
+        @model_name ||= model_name
+      end
+
+      private
+      def base_class_name
+        model_name.split('::').last
+      end
+
+      def remove_root_node(resp)
+        resp.values.first
+      end
     end
 
     def self.included(klass)
@@ -16,13 +70,23 @@ module Connectwise
 
     def initialize(connection, **attributes)
       @connection = connection
-      attributes.each do |attr, value|
-        public_send "#{attr}=", value
+      self.class.transform(attributes).each do |attr, value|
+        public_send("#{attr}=", value) if respond_to?("#{attr}=")
       end
     end
 
+    def save
+      attrs = connection.call self.class.cw_api_name, "add_or_update_#{self.class.cw_api_name}".to_sym, {self.class.cw_api_name => to_cw_h}
+      self.class.new(connection, self.class.save_transform(attrs))
+    end
+
+    def destroy
+      connection.call self.class.cw_api_name, "delete_#{self.class.cw_api_name}".to_sym, {id: id}
+      self
+    end
+
     def persisted?
-      false
+      !!id
     end
 
     def to_h
@@ -37,6 +101,7 @@ module Connectwise
       instance_vars = instance_variables.map {|name| name.to_s.gsub(/@/, '').to_sym}
       public_methods.select{|method| instance_vars.include?(method) }
     end
+
     protected
     def connection
       @connection

data/lib/connectwise/opportunity.rb

@@ -1,5 +1,38 @@
 module Connectwise
   class Opportunity
     include Model
+    plural :opportunities
+
+    attr_accessor :id, :opportunity_name, :source, :rating, :stage_name, :type, :status, :closed, :won, :lost, :close_probablity, :expected_close_date, :primary_sales_rep, :secondary_sales_rep,
+      :marketing_campaign_name, :location, :business_unit, :age, :estimated_total, :recurring_total, :won_amount, :lost_amount, :open_amount, :margin, :product_amount, :service_amount
+
+    def company=(company)
+      @company = company
+    end
+
+    def contact=(contact)
+      @contact = contact
+    end
+
+    def company_id
+      @company
+    end
+
+    private
+
+    def to_cw_h
+      attrs = super
+      attrs.delete('CompanyId')
+      attrs.delete('ContactId')
+      attrs['Company'] = {'CompanyID' => @company.company_id} if @company
+      attrs['Contact'] = {'Id' => @contact.id} if @contact
+      attrs
+    end
+
+    def self.transform(attrs)
+      name = attrs.delete(:name) || attrs.delete(:opportunity_name)
+      attrs[:opportunity_name] = name if name
+      attrs
+    end
   end
 end

data/lib/connectwise/ticket.rb

@@ -1,5 +1,51 @@
 module Connectwise
   class Ticket
     include Model
+    model_name 'service_ticket'
+    attr_accessor :id, :summary, :problem_description, :status_name, :board, :site_name, :status, :resolution, :remote_internal_company_name, :priority, :source, :severity, :impact,
+
+    #TODO - The use of SrServiceRecid and TicketNumber instead of id - may want to configure these
+    # but this is so inconsistent for tickets that it may not be worth it unless other calls do the same thing
+    def self.find(connection, id)
+      if (attrs = connection.call(cw_api_name, "get_#{cw_api_name}".to_sym, {SrServiceRecid: id}))
+        self.new(connection, find_transform(attrs))
+      else
+        fail RecordNotFound
+      end
+    rescue ConnectionError
+      raise RecordNotFound
+    end
+
+    def status_name
+      @status_name ||= 'New'
+    end
+
+    def company=(company)
+      @company = company
+    end
+
+    def save
+      return false unless @company
+      attrs = {companyId: @company.company_id, 'serviceTicket' => to_cw_h}
+      attrs = connection.call self.class.cw_api_name, "add_or_update_#{self.class.cw_api_name}_via_company_id".to_sym, attrs
+      self.class.new(connection, self.class.save_transform(attrs))
+    end
+
+    def destroy
+      connection.call self.class.cw_api_name, "delete_#{self.class.cw_api_name}".to_sym, {SrServiceRecid: id}
+      self
+    end
+
+    private
+    def self.save_transform(attrs)
+      attrs[:id] = attrs.delete(:ticket_number)
+      attrs
+    end
+
+    def to_cw_h
+      attrs = super
+      attrs['TicketNumber'] = attrs[:id] || 0
+      attrs
+    end
   end
 end

data/lib/connectwise/version.rb

@@ -1,3 +1,3 @@
 module Connectwise
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/connectwise_sdk.rb

@@ -1,13 +1,11 @@
 require 'savon'
 require "connectwise/version"
 require 'connectwise/extensions'
+require 'connectwise/errors'
 require 'connectwise/connection'
 require 'connectwise/model'
 require 'connectwise/member'
-require 'connectwise/contact'
 require 'connectwise/company'
+require 'connectwise/contact'
 require 'connectwise/opportunity'
 require 'connectwise/ticket'
-
-module Connectwise
-end

data/spec/integration/opportunity_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'Opportunity' do
+  let(:credentials) { connectwise_credentials }
+  let(:conn) { Connectwise::Connection.new(credentials) }
+  let(:contact_attrs) { {first_name: 'Malcom', last_name: 'Reynolds'} }
+  let(:company_attrs) { {name: 'Blue Sun'} }
+
+  it 'creates a company and a contact and connects them' do
+    new_company = Connectwise::Company.new(conn, name: 'Blue Sun').save
+    new_contact = Connectwise::Contact.new(conn, contact_attrs)
+    new_contact.company = new_company
+    new_contact = new_contact.save
+    resp = Connectwise::Contact.find(conn, new_contact.id)
+    expect(resp.company_id).to eq new_company.company_id
+  end
+end

data/spec/lib/connectwise/company_spec.rb

@@ -1,35 +1,44 @@
 require 'spec_helper'
 
 describe Connectwise::Company do
+  let(:credentials) { connectwise_credentials }
+  let(:conn) { Connectwise::Connection.new(credentials) }
+  let(:company) { OpenStruct.new name: 'Blue Sun'}
+  subject {Connectwise::Company.new(conn, company.to_h)}
+
   it 'creates a company' do
-    expect(subject.create_company(company)[:id]).not_to be_empty
+    new_company = subject.save
+    expect(new_company.persisted?).to eq true
+    expect(new_company.id).not_to be_empty
+    expect(new_company.status).to eq 'Active'
   end
 
   it 'fails to create a company' do
-    company.id = nil
-    expect {subject.create_company(company)}.to raise_error Connectwise::ConnectionError
-  end
-
-  it 'fails to create company and throws error' do
-    company.id = nil
-    expect {subject.create_company(company) do |err|
-      fail ArgumentError
-    end}.to raise_error ArgumentError
+    subject.company_id = nil
+    expect {subject.save}.to raise_error Connectwise::ConnectionError
   end
 
   it 'deletes a company' do
-    new_company = subject.create_company(company)
-    expect(subject.delete_company(OpenStruct.new(id: new_company[:id]))).to be_nil
+    new_company = subject.save
+    instance = new_company.destroy
+    expect {Connectwise::Company.find(conn, new_company.id) }.to raise_error Connectwise::RecordNotFound
+    expect(instance).to eq new_company
   end
 
-  it 'finds a company' do
-    resp = subject.find_company(OpenStruct.new name: 'Blue Sun', id: '6417')
+  it 'finds a company with search' do
+    subject.save
+    resp = Connectwise::Company.where(conn, company_name: 'Blue Sun')
     expect(resp).not_to be_empty
   end
 
-  it 'creates a company and a contact and connects them' do
-    new_company = subject.create_company(company)
-    resp = subject.create_contact(contact, new_company[:company_id])
-    expect(resp[:company_id]).to eql new_company[:company_id]
+  it 'finds a company with id', focus:true do
+    new_company = subject.save
+    resp = Connectwise::Company.find(conn, new_company.id)
+    expect(resp).not_to be_nil
+    expect(resp.id).to eq new_company.id
+  end
+
+  it 'finds no company with in id' do
+    expect {Connectwise::Company.find(conn, 234234)}.to raise_error Connectwise::RecordNotFound
   end
 end

data/spec/lib/connectwise/contact_spec.rb

@@ -1,39 +1,54 @@
 require 'spec_helper'
 
-describe Connectwise::Contact do
-  let(:credentials) { connectwise_credentials }
-  let(:conn) { Connectwise::Connection.new(credentials) }
-  let(:contact) { OpenStruct.new first_name: 'Malcom', last_name: 'Reynolds' }
-  subject {Connectwise::Contact.new(conn, contact.to_h)}
-
-  it 'creates a contact' do
-    contact_id = contact.id
-    new_contact = subject.save
-    expect(new_contact.persisted?).to be_true
-    expect(new_contact.id).not_to be_empty
-    expect(contact_id).not_to eq new_contact.id
-  end
+module Connectwise
+  describe Contact do
+    let(:credentials) { connectwise_credentials }
+    let(:conn) { Connectwise::Connection.new(credentials) }
+    let(:contact) { OpenStruct.new first_name: 'Malcom', last_name: 'Reynolds' }
+    subject {Connectwise::Contact.new(conn, contact.to_h)}
 
-  it 'finds a contact' do
-    new_contact = subject.save
-    new_contact = contact
-    found_contacts = Connectwise::Contact.where(conn, first_name: new_contact.first_name, last_name: new_contact.last_name)
-    expect(found_contacts).not_to be_empty
-  end
+    before :each do
+      #conn.log = true
+    end
 
-  it 'finds no contact' do
-    new_contact = subject.save
-    found_contacts = Connectwise::Contact.where(conn, first_name: 'gobledy', last_name: 'gook')
-    expect(found_contacts).to be_empty
-  end
+    it 'creates a contact' do
+      new_contact = subject.save
+      expect(new_contact.persisted?).to eq true
+      expect(new_contact.id).not_to be_empty
+    end
+
+    it 'finds a contact' do
+      new_contact = subject.save
+      new_contact = contact
+      found_contacts = Connectwise::Contact.where(conn, first_name: new_contact.first_name, last_name: new_contact.last_name)
+      expect(found_contacts).not_to be_empty
+    end
+
+    it 'finds no contact' do
+      new_contact = subject.save
+      found_contacts = Connectwise::Contact.where(conn, first_name: 'gobledy', last_name: 'gook')
+      expect(found_contacts).to be_empty
+    end
+
+    it 'finds a contact with id' do
+      new_contact = subject.save
+      resp = Connectwise::Contact.find(conn, new_contact.id)
+      expect(resp).not_to be_nil
+      expect(resp.id).to eq new_contact.id
+    end
+
+    it 'finds no contact with in id' do
+      expect {Connectwise::Contact.find(conn, 234234)}.to raise_error Connectwise::RecordNotFound
+    end
 
-  it 'deletes a contact' do
-    new_contact = subject.save
-    found_contacts = Connectwise::Contact.where(conn, first_name: new_contact.first_name, last_name: new_contact.last_name)
-    current_count = found_contacts.count
-    deleted_contact = found_contacts.first.destroy
-    expect(deleted_contact).not_to be_nil
-    found_contacts = Connectwise::Contact.where(conn, first_name: new_contact.first_name, last_name: new_contact.last_name)
-    expect(current_count - found_contacts.count).to eq 1
+    it 'deletes a contact' do
+      new_contact = subject.save
+      found_contacts = Connectwise::Contact.where(conn, first_name: new_contact.first_name, last_name: new_contact.last_name)
+      current_count = found_contacts.count
+      deleted_contact = found_contacts.first.destroy
+      expect(deleted_contact).not_to be_nil
+      found_contacts = Connectwise::Contact.where(conn, first_name: new_contact.first_name, last_name: new_contact.last_name)
+      expect(current_count - found_contacts.count).to eq 1
+    end
   end
 end

data/spec/lib/connectwise/opportunity_spec.rb

@@ -1,17 +1,49 @@
 require 'spec_helper'
 
 describe Connectwise::Opportunity do
+  let(:credentials) { connectwise_credentials }
+  let(:conn) { Connectwise::Connection.new(credentials) }
+  let(:company_attrs) { {name: 'Blue Sun'} }
+  let(:contact_attrs) { {first_name: 'Malcom', last_name: 'Reynolds'} }
+  let(:opp_attrs) { {name: 'Something', source: 'EOP', primary_sales_rep: 'Admin1'} }
+  let(:full_op) {
+    new_company = Connectwise::Company.new(conn, company_attrs).save
+    new_contact = Connectwise::Contact.new(conn, contact_attrs.merge(company: new_company)).save
+    Connectwise::Opportunity.new(conn, opp_attrs.merge(company: new_company, contact: new_contact)).save
+  }
+  subject {Connectwise::Opportunity}
+
   it 'creates an opportunity' do
-    new_company = subject.create_company(company)
-    new_contact = subject.create_contact(contact, new_company[:company_id])
-    resp = subject.create_opportunity(lead, new_company[:company_id], new_contact[:id])
-    expect(resp[:id]).not_to be_empty
+    new_company = Connectwise::Company.new(conn, company_attrs).save
+    new_contact = Connectwise::Contact.new(conn, contact_attrs.merge(company: new_company)).save
+    resp = subject.new(conn, opp_attrs.merge(company: new_company, contact: new_contact)).save
+    expect(resp.persisted?).to eq true
+  end
+
+  it 'finds opportunities' do
+    new_opp = full_op
+    found_opps = Connectwise::Opportunity.where(conn, opp_attrs.delete_if {|k, v| k == :source})
+    expect(found_opps).not_to be_empty
+  end
+
+  it 'finds no opportunities' do
+    found_opps = Connectwise::Opportunity.where(conn, name: 'Non-existent name')
+    expect(found_opps).to be_empty
+  end
+
+  it 'gets an opportunity' do
+    new_opp = full_op
+    found_opp = Connectwise::Opportunity.find(conn, new_opp.id)
+    expect(found_opp.id).not_to be_nil
+  end
+
+  it 'fails to find an opportunity' do
+    expect { Connectwise::Opportunity.find(conn, 123123123) }.to raise_error Connectwise::RecordNotFound
   end
 
   it 'deletes an opportunity' do
-    new_company = subject.create_company(company)
-    new_contact = subject.create_contact(contact, new_company[:company_id])
-    new_opp = subject.create_opportunity(lead, new_company[:company_id], new_contact[:id])
-    expect(subject.delete_opportunity(OpenStruct.new(id: new_opp[:id]))).to be_nil
+    new_opp = full_op
+    new_opp.destroy
+    expect {Connectwise::Opportunity.find(conn, new_opp.id)}.to raise_error Connectwise::RecordNotFound
   end
 end

data/spec/lib/connectwise/ticket_spec.rb

@@ -1,16 +1,54 @@
 require 'spec_helper'
 
 describe Connectwise::Ticket do
+  let(:credentials) { connectwise_credentials }
+  let(:conn) { Connectwise::Connection.new(credentials) }
+  let(:company_attrs) { {name: 'Pandorica'} }
+  let(:ticket_attrs) { {summary: 'Help me', problem_description: 'I need the doctor!'} }
+  let(:company) { Connectwise::Company.new(conn, company_attrs) }
+  subject {Connectwise::Ticket.new(conn, ticket_attrs)}
+
   it 'creates a ticket' do
-    new_company = subject.create_company(company)
-    resp = subject.create_ticket(OpenStruct.new(subject: 'help', description: 'abcd go boom'), OpenStruct.new(id: new_company[:company_id]))
-    expect(resp[:ticket_number]).not_to be_nil
+    subject.company = company.save
+    new_ticket = subject.save
+    expect(new_ticket.persisted?).to eq true
   end
 
   it 'finds a service ticket' do
-    new_company = subject.create_company(company)
-    new_ticket = subject.create_ticket(OpenStruct.new(subject: 'help', description: 'abcd go boom'), OpenStruct.new(id: new_company[:company_id]))
-    resp = subject.find_ticket(OpenStruct.new(id: new_ticket[:ticket_number]), OpenStruct.new(name: 'Gobledygook ragnok ramastrodon'))
+    subject.company = company.save
+    new_ticket = subject.save
+    resp = Connectwise::Ticket.where(conn, summary: 'Help me')
     expect(resp).not_to be_empty
   end
+
+  it 'finds no ticket' do
+    subject.company = company.save
+    new_ticket = subject.save
+    found_tickets = Connectwise::Ticket.where(conn, summary: 'gobledy-gook')
+    expect(found_tickets).to be_empty
+  end
+
+  it 'finds a ticket with id' do
+    subject.company = company.save
+    new_ticket = subject.save
+    p new_ticket.id
+    resp = Connectwise::Ticket.find(conn, new_ticket.id)
+    expect(resp).not_to be_nil
+    expect(resp.id).to eq new_ticket.id
+  end
+
+  it 'finds no ticket with in id' do
+    expect {Connectwise::Ticket.find(conn, 234234)}.to raise_error Connectwise::RecordNotFound
+  end
+
+  it 'deletes a ticket' do
+    subject.company = company.save
+    new_ticket = subject.save
+    found_ticket = Connectwise::Ticket.find(conn, new_ticket.id)
+    expect(found_ticket).not_to be_nil
+    deleted_ticket = found_tickets.first.destroy
+    expect(deleted_ticket).not_to be_nil
+    found_ticket = Connectwise::ticket.find(conn, new_ticket.id)
+    expect(found_ticket).to be_nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: connectwise_sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Emery A. Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - lib/connectwise/connection.rb
 - lib/connectwise/connectwise.rb
 - lib/connectwise/contact.rb
+- lib/connectwise/errors.rb
 - lib/connectwise/extensions.rb
 - lib/connectwise/member.rb
 - lib/connectwise/model.rb
@@ -91,6 +92,7 @@ files:
 - lib/connectwise/version.rb
 - lib/connectwise_sdk.rb
 - spec/credentials.yml.sample
+- spec/integration/opportunity_spec.rb
 - spec/lib/connectwise/company_spec.rb
 - spec/lib/connectwise/connection_spec.rb
 - spec/lib/connectwise/contact_spec.rb
@@ -125,6 +127,7 @@ specification_version: 4
 summary: A Connectwise SDK for Ruby
 test_files:
 - spec/credentials.yml.sample
+- spec/integration/opportunity_spec.rb
 - spec/lib/connectwise/company_spec.rb
 - spec/lib/connectwise/connection_spec.rb
 - spec/lib/connectwise/contact_spec.rb