connectwise_sdk 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68ac46ac359aa92559aba1978421b651cef0c689
-  data.tar.gz: 2e271efa19715d2a236f0e052b8ec8e94d0c7417
+  metadata.gz: d6d2d523b28059cb548e7681f1f2ec0765121470
+  data.tar.gz: 2994bc44e356d9f7a00dad0d04e83354763b4ca8
 SHA512:
-  metadata.gz: 43098e427e3c46cbbd2a9fbc50517566f1542f5a55056b9c3626921fb5a2495dc6494326ef3608f80c926fc9694f91b3543864bab49ba77b543ac53725db92f8
-  data.tar.gz: 9c1465885322b7696f70da26ad0ec1074dc31f99982a19d4755ae0839428593b0ffe0f70b39493f1d7ea87f50388cf8fcc90814c1d3428cae106bc4e79a6ace8
+  metadata.gz: 060aca0059fe895b85139c1d8dc33a04e6eb49c0fa88f518c2e522b0291edcc942f961f4fbb872d8ac1c5ef68c3e920dbec747d9c498ef2f23551c076f698464
+  data.tar.gz: ae995236a9f669b16fc048e98d8499a4c010184ea4fec23dd2da00b470b26ea6b530048af553028279f567102e2706d369d7492892fcb0d776248012abef6b52

data/lib/connectwise/company.rb

@@ -6,15 +6,26 @@ module Connectwise
     plural :companies
     attr_accessor :id, :status, :type, :market, :territory, :web_site, :fax_number, :phone_number, :company_name, :company_id
 
+    def self.where_transform(attrs)
+      attrs[:company_name] ||= attrs.delete(:name) if attrs[:name]
+      attrs
+    end
+
     def self.transform(attrs)
       attrs[:company_name] ||= attrs.delete(:name)
+      attrs[:status] ||= 'Active'
+      attrs[:company_id] ||= SecureRandom.hex(12)
       attrs
     end
 
-    def initialize(connection, attrs)
-      super
-      @company_id ||= SecureRandom.hex(12)
-      @status ||= 'Active'
+    def self.find_transform(attrs)
+      attrs[:id] ||= attrs.delete(:company_rec_id)
+      attrs
+    end
+
+    def self.save_transform(attrs)
+      attrs[:id] ||= attrs.delete(:company_rec_id)
+      attrs
     end
 
     def to_cw_h

data/lib/connectwise/model.rb

@@ -2,11 +2,9 @@ module Connectwise
   module Model
     module ClassMethods
       def where(connection, *args, **attrs)
-        conditions = attrs.empty? ? args.join(' ') : attrs_to_query(transform(attrs))
+        conditions = attrs.empty? ? args.join(' ') : attrs_to_query(where_transform(attrs))
         resp = connection.call cw_api_name, "find_#{plural_class_name}".to_sym, {conditions: conditions}
-        resp = resp.nil? ? [] : remove_root_node(resp)
-        resp = resp.respond_to?(:to_ary) ? resp : [resp]
-        resp.map {|attrs| self.new(connection, find_transform(attrs)) }
+        normalize_find_response(resp).map {|attrs| self.new(connection, find_transform(attrs)) }
       end
 
       def find(connection, id)
@@ -40,6 +38,10 @@ module Connectwise
         @plural_form ||= "#{base_class_name.downcase}#{ending}"
       end
 
+      def where_transform(attrs)
+        attrs
+      end
+
       def find_transform(attrs)
         attrs
       end
@@ -64,6 +66,11 @@ module Connectwise
       def remove_root_node(resp)
         resp.values.first
       end
+
+      def normalize_find_response(resp)
+        resp = resp.nil? ? [] : remove_root_node(resp)
+        resp.respond_to?(:to_ary) ? resp : [resp]
+      end
     end
 
     def self.included(klass)

data/lib/connectwise/opportunity.rb

@@ -34,5 +34,11 @@ module Connectwise
       attrs[:opportunity_name] = name if name
       attrs
     end
+
+    def self.where_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

@@ -7,7 +7,7 @@ module Connectwise
     #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}))
+      if (attrs = connection.call(cw_api_name, "get_#{cw_api_name}".to_sym, {ticketNumber: id}))
         self.new(connection, find_transform(attrs))
       else
         fail RecordNotFound
@@ -32,11 +32,16 @@ module Connectwise
     end
 
     def destroy
-      connection.call self.class.cw_api_name, "delete_#{self.class.cw_api_name}".to_sym, {SrServiceRecid: id}
+      connection.call self.class.cw_api_name, "delete_#{self.class.cw_api_name}".to_sym, {ticketNumber: id}
       self
     end
 
     private
+    def self.find_transform(attrs)
+      attrs[:id] = attrs.delete(:ticket_number)
+      attrs
+    end
+
     def self.save_transform(attrs)
       attrs[:id] = attrs.delete(:ticket_number)
       attrs

data/lib/connectwise/version.rb

@@ -1,3 +1,3 @@
 module Connectwise
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/lib/connectwise/company_spec.rb

@@ -25,13 +25,20 @@ describe Connectwise::Company do
     expect(instance).to eq new_company
   end
 
+  it 'deletes a company based on where data' do
+    new_company = subject.save
+    company = Connectwise::Company.where(conn, company_id: new_company.company_id)
+    instance = company.first.destroy
+    expect {Connectwise::Company.find(conn, instance.id) }.to raise_error Connectwise::RecordNotFound
+  end
+
   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 'finds a company with id', focus:true do
+  it 'finds a company with id' do
     new_company = subject.save
     resp = Connectwise::Company.find(conn, new_company.id)
     expect(resp).not_to be_nil

data/spec/lib/connectwise/ticket_spec.rb

@@ -31,7 +31,6 @@ describe Connectwise::Ticket do
   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
@@ -46,9 +45,8 @@ describe Connectwise::Ticket do
     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
+    deleted_ticket = found_ticket.destroy
     expect(deleted_ticket).not_to be_nil
-    found_ticket = Connectwise::ticket.find(conn, new_ticket.id)
-    expect(found_ticket).to be_nil
+    expect {Connectwise::Ticket.find(conn, new_ticket.id)}.to raise_error Connectwise::RecordNotFound
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: connectwise_sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Emery A. Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler