capsule_crm 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f08b4e0897c37f8539c3dc0fcde24c91c374d7f
-  data.tar.gz: 810a9aa84d4c3a2b8fd2fd855c68b65d9315dfc5
+  metadata.gz: fe0200eaa38f56d70ebe6aac7a0753b881cd57d5
+  data.tar.gz: 3fddf33fe50156ea8949b456dd072544e01d2b59
 SHA512:
-  metadata.gz: 6c2ded3a643e2d174a0bc0b03c0a238434734f8320f85855994af9374abc86cb1a9d59358bb949c70b7830fec342c5f89aa9540bd97b9b2188b55e77a15c9067
-  data.tar.gz: ba7401ac676e2ae7130929c30522b448374d37b6f2be8c5f9133e8590cae2170468680f77c1b21a24c2df2ba6b91de4ffa9f265938a9aa5c81440c053715696e
+  metadata.gz: 186db3ab34a48f0417c7a50e31b7f77952a12a39c7e1053c1889c9a0e83b3299308899d308d8357e4fcd6dafdb23b5092267a98f90df01ef9bf95f06398bfc90
+  data.tar.gz: 0def9e908692cad017f50a03c8d8d88abdc9362e79ae7f1f4c5fa3d2413e18ffc0a019ad9c6b621b2675dbb48e22e8a124116125274fa353b18c83fb2c11484e

data/lib/capsule_crm/organization.rb

@@ -20,7 +20,8 @@ module CapsuleCRM
     validates :name, presence: true
 
     has_many :people, class_name: 'CapsuleCRM::Person', source: :organization
-    has_many :custom_fields, class_name: 'CapsuleCRM::CustomField', source: :organization
+    has_many :custom_fields, class_name: 'CapsuleCRM::CustomField',
+      source: :organization
 
     # Public: Get all people from Capsule. The list can be restricted
     # and/or paginated with various query parameters sent through the options
@@ -44,10 +45,8 @@ module CapsuleCRM
     #
     # Returns a ResultsProxy of organisations
     def self.all(options = {})
-      init_collection(
-        CapsuleCRM::Connection.
-        get('/api/party', options)['parties']['organisation']
-      )
+      CapsuleCRM::Party.all(options).
+        delete_if { |item| !item.is_a?(CapsuleCRM::Organization) }
     end
 
     # Public: Get an organization by ID

data/lib/capsule_crm/party.rb

@@ -9,7 +9,9 @@ class CapsuleCRM::Party
   has_many :tasks, class_name: 'CapsuleCRM::Task', source: :party
 
   def self.all(options = {})
+    process_options(options)
     attributes = CapsuleCRM::Connection.get('/api/party', options)
+
     init_collection(attributes['parties'])
   end
 
@@ -25,6 +27,7 @@ class CapsuleCRM::Party
   def self.init_collection(collection)
     CapsuleCRM::ResultsProxy.new(
       collection.map do |key, value|
+        next unless %w(organisation person).include?(key)
         [collection[key]].flatten.map do |attrs|
           party_classes[key].constantize.new(attrs)
         end.flatten
@@ -33,9 +36,14 @@ class CapsuleCRM::Party
   end
 
   def self.party_classes
-    {
-      person:       'CapsuleCRM::Person',
-      organisation: 'CapsuleCRM::Organization'
-    }.stringify_keys
+    { person: 'CapsuleCRM::Person', organisation: 'CapsuleCRM::Organization' }.
+      stringify_keys
+  end
+
+  def self.process_options(options)
+    if options[:lastmodified] && options[:lastmodified].respond_to?(:strftime)
+      options[:lastmodified] = options[:lastmodified].
+        strftime("%Y%m%dT%H%M%SZ")
+    end
   end
 end

data/lib/capsule_crm/person.rb

@@ -54,10 +54,8 @@ module CapsuleCRM
     #
     # Returns a ResultsProxy of organisations
     def self.all(options = {})
-      init_collection(
-        CapsuleCRM::Connection.
-        get('/api/party', options)['parties']['person']
-      )
+      CapsuleCRM::Party.all(options).
+        delete_if { |item| !item.is_a?(CapsuleCRM::Person) }
     end
 
     # Public: Create a new person in capsulecrm

data/lib/capsule_crm/version.rb

@@ -1,3 +1,3 @@
 module CapsuleCrm
-  VERSION = '0.10.0'
+  VERSION = '0.10.2'
 end

data/spec/lib/capsule_crm/case_spec.rb

@@ -110,7 +110,7 @@ describe CapsuleCRM::Case do
 
       it { expect(subject).to be_persisted }
 
-      it do
+      it 'should add the trackId to the URI' do
         subject
         expect(WebMock).
           to have_requested(:post, "#{request_uri}?trackId=#{track.id}")

data/spec/lib/capsule_crm/organization_spec.rb

@@ -11,6 +11,36 @@ describe CapsuleCRM::Organization do
       to_return(body: File.read('spec/support/all_users.json'))
   end
 
+  describe '.all' do
+    context 'when some parties exist' do
+      before do
+        stub_request(:get, /\/api\/party$/).
+          to_return(body: File.read('spec/support/all_parties.json'))
+      end
+
+      subject { CapsuleCRM::Organization.all }
+
+      it { expect(subject).to be_a(Array) }
+
+      it { expect(subject.length).to eql(1) }
+
+      it { expect(subject.first).to be_a(CapsuleCRM::Organization) }
+    end
+
+    context 'when no parties exist' do
+      before do
+        stub_request(:get, /\/api\/party$/).
+          to_return(body: File.read('spec/support/no_parties.json'))
+      end
+
+      subject { CapsuleCRM::Organization.all }
+
+      it { expect(subject).to be_a(Array) }
+
+      it { expect(subject.length).to eql(0) }
+    end
+  end
+
   describe '#people' do
     let(:organization) { Fabricate.build(:organization, id: 1) }
 

data/spec/support/no_parties.json

@@ -0,0 +1,3 @@
+{
+  "parties": { "@size": "0" }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsule_crm
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -334,6 +334,7 @@ files:
 - spec/support/milestones.json
 - spec/support/no_customfields.json
 - spec/support/no_history.json
+- spec/support/no_parties.json
 - spec/support/opportunity.json
 - spec/support/organisation.json
 - spec/support/person.json
@@ -412,6 +413,7 @@ test_files:
 - spec/support/milestones.json
 - spec/support/no_customfields.json
 - spec/support/no_history.json
+- spec/support/no_parties.json
 - spec/support/opportunity.json
 - spec/support/organisation.json
 - spec/support/person.json