capsule_crm 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1285e326a851d39a7de50ac4877a021e3244ca17
-  data.tar.gz: 5f5668ee2771528bf0cd99a51b90c503dc91fd13
+  metadata.gz: 865ee033f500a769892f7e7483eeec3f4cd8b832
+  data.tar.gz: 2ede88b29d161c31525dc7fef8899c7cd2793240
 SHA512:
-  metadata.gz: 19272f32c360e946216faff6d1180f1eb130267b9818bab93cf5bdee54c4e4d4725d9844a18b5bdf604a4fcbee5a2965be291fd0aaab9cb1ddb8653373e72354
-  data.tar.gz: 51823fe7fe4fc47419f57c763f77db1c06bbbc6586e683c5fa336c253706671ad98d4c4840d66894eaeeca8c9f3846ebb3c07fa9356f7acf6929e2b9c5e5647e
+  metadata.gz: ed1b78da61e615596e3ab5be572ac9d90917a3d31ae672c709aaa954c363e03f9e7df543f2b6da8747a1eeef1a3b2d0544e0f853fd2704fbcdfb4434de139079
+  data.tar.gz: 3d73c58f3fcc18e162cf28ef0f9b096dd4b6d5844fa2f949341d7b93208737685f31052bca6a1e47e8e54f38ae120d21bd2bdbd22290d7da24ff129ce3bc113c

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.10.4
+
+- Use UTC when serializing times.
+    [#97](https://github.com/mattbeedle/capsule_crm/pull/97)
+- Upgraded to RSpec ~> 2.99.0 and fixed deprecations in preparation for RSpec
+  3 upgrade
+
 ## 1.10.3
 
 - Fix regression introduced in 1.10.1 where any records that do not respond

data/capsule_crm.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('guard-bundler')
   gem.add_development_dependency('guard-rspec')
   gem.add_development_dependency('rb-fsevent')
-  gem.add_development_dependency('rspec', '~> 2.14.0')
+  gem.add_development_dependency('rspec', '~> 2.99.0')
   gem.add_development_dependency('shoulda-matchers')
   gem.add_development_dependency('webmock')
 end

data/lib/capsule_crm/serializer.rb

@@ -84,7 +84,7 @@ module CapsuleCRM
         attrs.each do |key, value|
           attrs[key] = value.to_s(:db) if value.is_a?(Date)
           if value.is_a?(DateTime)
-            attrs[key] = value.strftime("%Y-%m-%dT%H:%M:%SZ")
+            attrs[key] = value.utc.strftime('%Y-%m-%dT%H:%M:%SZ')
           end
         end
         additional_methods.each do |method|

data/lib/capsule_crm/taggable.rb

@@ -3,9 +3,11 @@ module CapsuleCRM
     extend ActiveSupport::Concern
 
     def tags
-      CapsuleCRM::Connection.get(
+      tags = CapsuleCRM::Connection.get(
         "/api/#{api_singular_name}/#{id}/tag"
-      )['tags']['tag'].map { |item| CapsuleCRM::Tag.new(item) }
+      )['tags']['tag']
+      tags = [tags] if tags.is_a? Hash
+      tags.map { |item| CapsuleCRM::Tag.new(item) }
     end
 
     def add_tag(tag_name)

data/lib/capsule_crm/version.rb

@@ -1,3 +1,3 @@
 module CapsuleCrm
-  VERSION = '1.10.3'
+  VERSION = '1.10.4'
 end

data/spec/lib/capsule_crm/associations/has_many_association_spec.rb

@@ -5,7 +5,7 @@ class CapsuleCRM::SomeClass
 
   attribute :name
 
-  def self._for_mock(mock_id)
+  def self._for_double(mock_id)
     ['test']
   end
 end

data/spec/lib/capsule_crm/contacts_spec.rb

@@ -81,7 +81,7 @@ describe CapsuleCRM::Contacts do
 
       it do
         subject.addresses.
-          all? { |address| address.is_a?(CapsuleCRM::Address) }.should be_true
+          all? { |address| address.is_a?(CapsuleCRM::Address) }.should eql(true)
       end
     end
 
@@ -92,7 +92,7 @@ describe CapsuleCRM::Contacts do
 
       it do
         subject.emails.
-          all? { |email| email.is_a?(CapsuleCRM::Email) }.should be_true
+          all? { |email| email.is_a?(CapsuleCRM::Email) }.should eql(true)
       end
     end
 
@@ -103,7 +103,7 @@ describe CapsuleCRM::Contacts do
 
       it do
         subject.phones.
-          all? { |phone| phone.is_a?(CapsuleCRM::Phone) }.should be_true
+          all? { |phone| phone.is_a?(CapsuleCRM::Phone) }.should eql(true)
       end
     end
 
@@ -114,7 +114,7 @@ describe CapsuleCRM::Contacts do
 
       it do
         subject.websites.
-          all? { |website| website.is_a?(CapsuleCRM::Website) }.should be_true
+          all? { |website| website.is_a?(CapsuleCRM::Website) }.should eql(true)
       end
     end
   end

data/spec/lib/capsule_crm/custom_field_spec.rb

@@ -28,7 +28,7 @@ describe CapsuleCRM::CustomField do
       it { should be_an(Array) }
       it do
         subject.all? { |item| item.is_a?(CapsuleCRM::CustomField) }.
-          should be_true
+          should eql(true)
       end
     end
 

data/spec/lib/capsule_crm/history_spec.rb

@@ -69,7 +69,7 @@ describe CapsuleCRM::History do
       it { should be_a(Array) }
 
       it do
-        subject.all? { |item| item.is_a?(CapsuleCRM::History) }.should be_true
+        subject.all? { |item| item.is_a?(CapsuleCRM::History) }.should eql(true)
       end
     end
 
@@ -97,7 +97,7 @@ describe CapsuleCRM::History do
       it { should be_a(Array) }
 
       it do
-        subject.all? { |item| item.is_a?(CapsuleCRM::History) }.should be_true
+        subject.all? { |item| item.is_a?(CapsuleCRM::History) }.should eql(true)
       end
     end
 
@@ -125,7 +125,7 @@ describe CapsuleCRM::History do
       it { should be_a(Array) }
 
       it do
-        subject.all? { |item| item.is_a?(CapsuleCRM::History) }.should be_true
+        subject.all? { |item| item.is_a?(CapsuleCRM::History) }.should eql(true)
       end
     end
 
@@ -150,25 +150,63 @@ describe CapsuleCRM::History do
     end
     subject { CapsuleCRM::History.find(100) }
 
-    its(:type) { should eql('Note') }
-    its(:creator) { should be_a(CapsuleCRM::User) }
-    its(:entry_date) { should_not be_blank }
-    its(:subject) { should_not be_blank }
-    its(:note) { should_not be_blank }
-    its(:attachments) { should be_a(Array) }
-    it { expect(first_attachment).to be_a(CapsuleCRM::Attachment) }
-    it { expect(first_attachment.filename).to eql('latin.doc') }
-    its(:participants) { should be_a(Array) }
-    it { expect(first_participant).to be_a(CapsuleCRM::Participant) }
-    it { expect(first_participant.name).to eql('Matt Beedle') }
+    it 'type is note' do
+      expect(subject.type).to eql('Note')
+    end
+
+    it 'creator is a CapsuleCRM::User' do
+      expect(subject.creator).to be_a(CapsuleCRM::User)
+    end
+
+    it 'entry date is not blank' do
+      expect(subject.entry_date).not_to be_blank
+    end
+
+    it 'subject is not blank' do
+      expect(subject.subject).not_to be_blank
+    end
+
+    it 'note is not blank' do
+      expect(subject.note).not_to be_blank
+    end
+
+    it 'attachments is an array' do
+      expect(subject.attachments).to be_a(Array)
+    end
+
+    it 'attachments array contains CapsuleCRM::Attachment objects' do
+      expect(first_attachment).to be_a(CapsuleCRM::Attachment)
+    end
+
+    it 'has the correct attachment filename' do
+      expect(first_attachment.filename).to eql('latin.doc')
+    end
+
+    it 'has an array of participants' do
+      expect(subject.participants).to be_a(Array)
+    end
+
+    it 'has CapsuleCRM::Participant objects inside the participants array' do
+      expect(first_participant).to be_a(CapsuleCRM::Participant)
+    end
+
+    it 'has the correct participant names' do
+      expect(first_participant.name).to eql('Matt Beedle')
+    end
 
     context 'when it belongs to a party' do
       before do
         stub_request(:get, /\/api\/party\/1$/).
           to_return(body: File.read('spec/support/person.json'))
       end
-      its(:party_id) { should_not be_blank }
-      its(:party) { should_not be_blank }
+
+      it 'has a party_id' do
+        expect(subject.party_id).not_to be_blank
+      end
+
+      it 'has a party' do
+        expect(subject.party).not_to be_blank
+      end
     end
 
     context 'when it belongs to a case' do
@@ -177,8 +215,13 @@ describe CapsuleCRM::History do
           to_return(body: File.read('spec/support/case.json'))
       end
 
-      its(:case_id) { should_not be_blank }
-      its(:case) { should_not be_blank }
+      it 'has a case_id' do
+        expect(subject.case_id).not_to be_blank
+      end
+
+      it 'has a case' do
+        expect(subject.case).not_to be_blank
+      end
     end
 
     context 'when it belongs to an opportunity' do
@@ -187,8 +230,13 @@ describe CapsuleCRM::History do
           to_return(body: File.read('spec/support/opportunity.json'))
       end
 
-      its(:opportunity_id) { should_not be_blank }
-      its(:opportunity) { should_not be_blank }
+      it 'has an opportunity_id' do
+        expect(subject.opportunity_id).not_to be_blank
+      end
+
+      it 'has an opportunity' do
+        expect(subject.opportunity).not_to be_blank
+      end
     end
   end
 
@@ -205,13 +253,17 @@ describe CapsuleCRM::History do
       context 'when the user exists' do
         before { history.creator = 'a.user' }
 
-        its(:creator) { should be_a(CapsuleCRM::User) }
+        it 'has a creator' do
+          expect(subject.creator).to be_a(CapsuleCRM::User)
+        end
       end
 
       context 'when the user does not exist' do
         before { history.creator = 'asdfadsfdsaf' }
 
-        its(:creator) { should be_blank }
+        it 'has no creator' do
+          expect(subject.creator).to be_blank
+        end
       end
     end
 
@@ -219,7 +271,9 @@ describe CapsuleCRM::History do
       let(:user) { CapsuleCRM::User.new }
       before { history.creator = user }
 
-      its(:creator) { should eql(user) }
+      it 'has a creator' do
+        expect(subject.creator).to eql(user)
+      end
     end
   end
 
@@ -241,13 +295,21 @@ describe CapsuleCRM::History do
     let(:participants_json) { subject[:historyItem]['participants'] }
     subject { history.to_capsule_json }
 
-    it { expect(subject.keys.first).to eql('historyItem') }
-    it do
+    it 'has historyItem as the first key' do
+      expect(subject.keys.first).to eql('historyItem')
+    end
+
+    it 'has the correct history item entry date' do
       expect(subject['historyItem']['entryDate']).
-        to eql(history.entry_date.strftime("%Y-%m-%dT%H:%M:%SZ"))
+        to eql(history.entry_date.utc.strftime('%Y-%m-%dT%H:%M:%SZ'))
+    end
+
+    it 'has the correct history item creator' do
+      expect(subject['historyItem']['creator']).to eql(creator.username)
+    end
+
+    it 'has the correct history item note' do
+      expect(subject['historyItem']['note']).to eql(history.note)
     end
-    it { expect(subject['historyItem']['creator']).to eql(creator.username) }
-    it { expect(subject['historyItem']['note']).to eql(history.note) }
-    it { expect(subject['historyItem']).to have_key('note') }
   end
 end

data/spec/lib/capsule_crm/normalizer_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe CapsuleCRM::Normalizer do
   describe '#normalize' do
-    pending
+    skip
   end
 
   describe '#normalize_collection' do
-    pending
+    skip
   end
 end

data/spec/lib/capsule_crm/organization_spec.rb

@@ -87,7 +87,7 @@ describe CapsuleCRM::Organization do
     it { should be_a(Array) }
 
     it do
-      subject.all? { |item| item.is_a?(CapsuleCRM::Person) }.should be_true
+      subject.all? { |item| item.is_a?(CapsuleCRM::Person) }.should eql(true)
     end
   end
 

data/spec/lib/capsule_crm/person_spec.rb

@@ -155,13 +155,13 @@ describe CapsuleCRM::Person do
     subject { person.send(:first_name_required?) }
 
     context 'when there is no last name' do
-      it { should be_true }
+      it { should eql(true) }
     end
 
     context 'when there is a last name' do
       before { person.last_name = 'Beedle' }
 
-      it { should be_false }
+      it { should eql(false) }
     end
   end
 
@@ -171,13 +171,13 @@ describe CapsuleCRM::Person do
     subject { person.send(:last_name_required?) }
 
     context 'when there is no first name' do
-      it { should be_true }
+      it { should eql(true) }
     end
 
     context 'when there is a first name' do
       before { person.first_name = 'Matt' }
 
-      it { should be_false }
+      it { should eql(false) }
     end
   end
 

data/spec/lib/capsule_crm/serializer_spec.rb

@@ -8,6 +8,7 @@ class SerializableTest
   attribute :name
   attribute :description
   attribute :something, Date
+  attribute :a_timestamp, DateTime
 end
 
 class SerializableInverse
@@ -130,5 +131,16 @@ describe CapsuleCRM::Serializer do
           to eql(Date.today.to_s(:db))
       end
     end
+
+    context 'when there are datetimes' do
+      let(:time) { Time.now }
+
+      before { object.a_timestamp = time }
+
+      it 'uses the UTC time' do
+        expect(subject['serializabletest']['aTimestamp'])
+          .to eql(time.utc.strftime('%Y-%m-%dT%H:%M:%SZ'))
+      end
+    end
   end
 end

data/spec/lib/capsule_crm/taggable_spec.rb

@@ -28,12 +28,25 @@ describe CapsuleCRM::Taggable do
     it { subject.length.should eql(2) }
 
     it do
-      subject.all? { |item| item.is_a?(CapsuleCRM::Tag) }.should be_true
+      subject.all? { |item| item.is_a?(CapsuleCRM::Tag) }.should eql(true)
     end
 
     it { subject.first.name.should eql('Customer') }
 
     it { subject.last.name.should eql('VIP') }
+
+    context 'when taggable item has one tag' do
+      before do
+        stub_request(:get, /\/api\/taggableitem\/2\/tag$/).
+          to_return(body: File.read('spec/support/one_tag.json'))
+      end
+
+      let(:taggable_item) { TaggableItem.new(id: 2) }
+
+      subject { taggable_item.tags }
+
+      it { should be_a(Array) }
+    end
   end
 
   describe '#add_tag' do
@@ -48,7 +61,7 @@ describe CapsuleCRM::Taggable do
 
       subject { taggable_item.add_tag 'A Test Tag' }
 
-      it { subject.should be_true }
+      it { subject.should eql(true) }
     end
 
     context 'when the taggable item has no id' do
@@ -73,7 +86,7 @@ describe CapsuleCRM::Taggable do
           to_return(headers: { 'Location' => loc })
       end
 
-      it { subject.should be_true }
+      it { subject.should eql(true) }
     end
 
     context 'when the taggable item has no id' do

data/spec/support/one_tag.json

@@ -0,0 +1,7 @@
+{
+  "tags": {
+    "tag": {
+      "name": "Customer"
+    }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsule_crm
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -212,14 +212,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -401,6 +401,7 @@ files:
 - spec/support/no_tasks.json
 - spec/support/no_tracks.json
 - spec/support/no_users.json
+- spec/support/one_tag.json
 - spec/support/opportunity.json
 - spec/support/organisation.json
 - spec/support/person.json
@@ -514,6 +515,7 @@ test_files:
 - spec/support/no_tasks.json
 - spec/support/no_tracks.json
 - spec/support/no_users.json
+- spec/support/one_tag.json
 - spec/support/opportunity.json
 - spec/support/organisation.json
 - spec/support/person.json