capsule_crm 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 970a6f5219598a75460554b8447b1feb07714674
-  data.tar.gz: 483c4c0ec0f5fa7639f3c8788d91ce195c51bce5
+  metadata.gz: 9c9c330d4eeb07e7c78b092407c54bde1d851b7d
+  data.tar.gz: 745c544f60e55e8d7ce5aa9e8e3abdb79c80c0e2
 SHA512:
-  metadata.gz: 540692d5ab936b2e828feae94611b02875aee983d2d1e70ccc807ea679ccb9a544e85ab0ddea973fce8f48f2541790f7fc701943eb5f9d33c8e4d91c615df074
-  data.tar.gz: f7ef2803939afa2b25c5c43176c073cfc3c4412a16ef1347cb428ba15b88a67510bfbc142e85749a59edeab2ef700b138b15e564f45b145e20c692b50e235272
+  metadata.gz: c8643c862014d2c0fa7980d6f9c6cdc82279a4fa9e513b556012e1bb902f325a1b61fbeb107d1f92dd5b781c0ce7ab4d5592f55921337c1dd85b90676d78d3f0
+  data.tar.gz: ff1850b21048a9994f05b1678895b522089c24240329d436da85e852874986049b8d53217b7122612c14488a8c0105092d59e036c288e61b4f339fc1b6d17a79

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--format documentation

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+## 0.9.0
+
+### New Features
+
+- Custom field support (@srbaker, @clod81)
+- Add Organization#destroy (@danthompson)
+
+### Bug fixes
+
+- Fixed init_collection method for when a single (#27) (@clod81)

data/README.md

@@ -8,6 +8,8 @@ Version](https://badge.fury.io/rb/capsule_crm.png)](http://badge.fury.io/rb/caps
 Status](https://coveralls.io/repos/mattbeedle/capsule_crm/badge.png?branch=master)](https://coveralls.io/r/mattbeedle/capsule_crm)
 [![Dependency
 Status](https://gemnasium.com/mattbeedle/capsule_crm.png)](https://gemnasium.com/mattbeedle/capsule_crm)
+[![Stories in
+Ready](http://badge.waffle.io/mattbeedle/capsule_crm.png)](http://waffle.io/mattbeedle/capsule_crm)
 
 # CapsuleCRM
 

data/lib/capsule_crm/case.rb

@@ -6,6 +6,7 @@ module CapsuleCRM
     include ActiveModel::Conversion
     include ActiveModel::Validations
 
+    include CapsuleCRM::Collection
     include CapsuleCRM::Associations::HasMany
     include CapsuleCRM::Associations::BelongsTo
     include CapsuleCRM::Taggable
@@ -254,9 +255,5 @@ module CapsuleCRM
     def update_record
       CapsuleCRM::Connection.put("/api/kase/#{id}", to_capsule_json)
     end
-
-    def self.init_collection(results)
-      CapsuleCRM::ResultsProxy.new(results.map { |item| new item })
-    end
   end
-end
+end

data/lib/capsule_crm/collection.rb

@@ -0,0 +1,9 @@
+module CapsuleCRM::Collection
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def init_collection(*collection)
+      collection.flatten.compact.map { |item| new item }
+    end
+  end
+end

data/lib/capsule_crm/connection.rb

@@ -22,7 +22,7 @@ module CapsuleCRM
     end
 
     def self.put(path, params)
-      faraday.put(path, params) do |request|
+      faraday.put(path, params.to_json) do |request|
         request.headers.update default_request_headers
       end.success?
     end

data/lib/capsule_crm/custom_field.rb

@@ -6,34 +6,89 @@ module CapsuleCRM
     include ActiveModel::Conversion
     include ActiveModel::Validations
 
+    include CapsuleCRM::Associations
+    include CapsuleCRM::Collection
+
     attribute :id, Integer
+    attribute :label, String
     attribute :date, DateTime
     attribute :tag, String
     attribute :boolean, Boolean
     attribute :text, String
-    attribute :data_tag, String
+
+    validates :label, presence: true
+
+    belongs_to :party, class_name: 'CapsuleCRM::Party'
+
+    def self._for_party(party_id)
+      init_collection(
+        CapsuleCRM::Connection.
+          get("/api/party/#{party_id}/customfields")['customFields'].
+          fetch('customField', nil)
+      )
+    end
+
+    class << self
+      alias :_for_organization :_for_party
+      alias :_for_person :_for_party
+    end
+
+    def attributes=(attributes)
+      CapsuleCRM::HashHelper.underscore_keys!(attributes)
+      super(attributes)
+      self
+    end
 
     def self.create(attributes = {})
+      new(attributes).tap(&:save)
     end
 
     def self.create!(attribute = {})
+      new(attributes).tap(&:save)
     end
 
     def save
+      if valid?
+        update_record
+      else
+        false
+      end
     end
 
     def save!
+      if valid?
+        update_record
+      else
+        raise CapsuleCRM::Errors::RecordInvalid.new(self)
+      end
     end
 
     def destroy
     end
 
-    private
-
-    def create_record
+    def to_capsule_json
+      {
+        customFields: {
+          customField: [CapsuleCRM::HashHelper.camelize_keys(
+            {
+              id: id,
+              label: label,
+              date: date,
+              tag: tag,
+              boolean: boolean,
+              text: text,
+            }.delete_if { |key, value| value.blank? }
+          )]
+        }
+      }
     end
 
+    private
+
     def update_record
+      CapsuleCRM::Connection.post(
+        "/api/party/#{party.id}/customfields", to_capsule_json
+      )
     end
   end
-end
+end

data/lib/capsule_crm/history.rb

@@ -7,6 +7,7 @@ module CapsuleCRM
     include ActiveModel::Validations
 
     include CapsuleCRM::Associations
+    include CapsuleCRM::Collection
 
     attribute :id, Integer
     attribute :type, String
@@ -55,12 +56,6 @@ module CapsuleCRM
       )
     end
 
-    def self.init_collection(collection)
-      CapsuleCRM::ResultsProxy.new(
-        [collection].flatten.delete_if(&:blank?).map { |item| new(item) }
-      )
-    end
-
     # Public: Underscore all of the attributes keys and set the attributes of
     # this history item
     #
@@ -355,4 +350,4 @@ module CapsuleCRM
       CapsuleCRM::Connection.put("/api/history/#{id}", to_capsule_json)
     end
   end
-end
+end

data/lib/capsule_crm/milestone.rb

@@ -2,6 +2,8 @@ module CapsuleCRM
   class Milestone
     include Virtus
 
+    include CapsuleCRM::Collection
+
     attribute :id, Integer
     attribute :name, String
     attribute :description, String
@@ -22,13 +24,5 @@ module CapsuleCRM
     def self.find_by_name(name)
       all.select { |item| item.name == name }.first
     end
-
-    private
-
-    def self.init_collection(collection)
-      CapsuleCRM::ResultsProxy.new(
-        collection.map { |attributes| new attributes }
-      )
-    end
   end
-end
+end

data/lib/capsule_crm/opportunity.rb

@@ -6,8 +6,8 @@ module CapsuleCRM
     include ActiveModel::Conversion
     include ActiveModel::Validations
 
-    include CapsuleCRM::Associations::HasMany
-    include CapsuleCRM::Associations::BelongsTo
+    include CapsuleCRM::Associations
+    include CapsuleCRM::Collection
 
     attribute :id, Integer
     attribute :name, String
@@ -348,9 +348,5 @@ module CapsuleCRM
       CapsuleCRM::Connection.put("/api/opportunity/#{id}", attributes)
       self
     end
-
-    def self.init_collection(collection)
-      CapsuleCRM::ResultsProxy.new(collection.map { |item| new item })
-    end
   end
-end
+end

data/lib/capsule_crm/organization.rb

@@ -11,8 +11,9 @@ module CapsuleCRM
     include ActiveModel::Validations::Callbacks
 
     include CapsuleCRM::Associations::HasMany
-    include CapsuleCRM::Taggable
+    include CapsuleCRM::Collection
     include CapsuleCRM::Contactable
+    include CapsuleCRM::Taggable
 
     attribute :id,    Integer
     attribute :name,  String
@@ -21,6 +22,7 @@ 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
 
     # Public: Set the attributes of an organization
     #
@@ -227,12 +229,25 @@ module CapsuleCRM
     #
     # Returns a Hash
     def to_capsule_json
+      self.contacts = nil if self.contacts.blank?
       {
-        organisation: attributes.merge(contacts: contacts.to_capsule_json).
+        organisation: attributes.merge(self.contacts ? {contacts: (self.contacts.is_a?(Hash) ? self.contacts : self.contacts.to_capsule_json)} : {}).
         stringify_keys
       }.stringify_keys
     end
 
+    # Public: Delete the organization in capsule
+    #
+    # Examples
+    #
+    # organization.destroy
+    #
+    # Return the CapsuleCRM::Organization
+    def destroy
+      self.id = nil if CapsuleCRM::Connection.delete("/api/party/#{id}")
+      self
+    end
+
     private
 
     def create_record
@@ -242,17 +257,8 @@ module CapsuleCRM
     end
 
     def update_record
-      CapsuleCRM::Connection.put("/api/organisation/#{id}", attributes)
-    end
-
-    # Private: Build a ResultsProxy from a Array of CapsuleCRM::Organization
-    # attributes
-    #
-    # collection  - The Array of CapsuleCRM::Organization attributes hashes
-    #
-    # Returns a CapsuleCRM::ResultsProxy
-    def self.init_collection(collection)
-      CapsuleCRM::ResultsProxy.new(collection.map { |item| new item })
+      CapsuleCRM::Connection.put("/api/organisation/#{id}", to_capsule_json)
+      self
     end
   end
 end

data/lib/capsule_crm/person.rb

@@ -2,6 +2,7 @@ module CapsuleCRM
   class Person < CapsuleCRM::Party
     include Virtus
 
+    include CapsuleCRM::Collection
     include CapsuleCRM::Contactable
     include CapsuleCRM::Associations::BelongsTo
 
@@ -20,6 +21,8 @@ module CapsuleCRM
     belongs_to :organization, class_name: 'CapsuleCRM::Organization',
       foreign_key: :organisation_id
 
+    has_many :custom_fields, class_name: 'CapsuleCRM::CustomField', source: :person
+
     validates :first_name, presence: { if: :first_name_required? }
     validates :last_name, presence: { if: :last_name_required? }
 
@@ -243,10 +246,11 @@ module CapsuleCRM
     #
     # Returns a Hash
     def to_capsule_json
+      self.contacts = nil if self.contacts.blank?
       {
         person: CapsuleCRM::HashHelper.camelize_keys(
           attributes.dup.delete_if { |key, value| value.blank? }.
-          merge(contacts: contacts.to_capsule_json)
+          merge(self.contacts ? {contacts: (self.contacts.is_a?(Hash) ? self.contacts : self.contacts.to_capsule_json)} : {})
         )
       }.stringify_keys
     end
@@ -265,15 +269,6 @@ module CapsuleCRM
       self
     end
 
-    # Private: Build a ResultsProxy from a Array of CapsuleCRM::Person attributes
-    #
-    # collection  - The Array of CapsuleCRM::Person attributes hashes
-    #
-    # Returns a CapsuleCRM::ResultsProxy
-    def self.init_collection(collection)
-      CapsuleCRM::ResultsProxy.new(collection.map { |item| new item })
-    end
-
     # Private: Determines whether the person first name is required. Either the
     # first or the last name is always required
     #

data/lib/capsule_crm/taggable.rb

@@ -11,7 +11,7 @@ module CapsuleCRM
     def add_tag(tag_name)
       if id
         CapsuleCRM::Connection.post(
-          "/api/#{api_singular_name}/#{id}/#{URI.encode(tag_name)}"
+          "/api/#{api_singular_name}/#{id}/tag/#{URI.encode(tag_name)}"
         )
       end
     end
@@ -19,13 +19,15 @@ module CapsuleCRM
     def remove_tag(tag_name)
       if id
         CapsuleCRM::Connection.delete(
-          "/api/#{api_singular_name}/#{id}/#{URI.encode(tag_name)}"
+          "/api/#{api_singular_name}/#{id}/tag/#{URI.encode(tag_name)}"
         )
       end
     end
 
     def api_singular_name
-      self.class.to_s.demodulize.downcase.singularize
+      class_name = self.class.superclass.to_s unless self.class.superclass == Object
+      class_name ||= self.class.to_s
+      class_name.demodulize.downcase.singularize
     end
   end
 end

data/lib/capsule_crm/task.rb

@@ -7,6 +7,7 @@ module CapsuleCRM
     include ActiveModel::Validations
 
     include CapsuleCRM::Associations::BelongsTo
+    include CapsuleCRM::Collection
 
     attribute :id, Integer
     attribute :due_date, Date
@@ -147,10 +148,6 @@ module CapsuleCRM
       end
     end
 
-    def self.init_collection(collection)
-      CapsuleCRM::ResultsProxy.new(collection.map { |item| new item })
-    end
-
     def create_record
       self.attributes = CapsuleCRM::Connection.post(
         create_url, to_capsule_json
@@ -175,4 +172,4 @@ module CapsuleCRM
       self
     end
   end
-end
+end

data/lib/capsule_crm/version.rb

@@ -1,3 +1,3 @@
 module CapsuleCrm
-  VERSION = '0.8.0'
+  VERSION = '0.9.0'
 end

data/lib/capsule_crm.rb

@@ -4,6 +4,7 @@ require 'faraday_middleware'
 require 'virtus'
 require 'capsule_crm/capsule_jsonable'
 require 'capsule_crm/taggable'
+require 'capsule_crm/collection'
 require 'capsule_crm/associations'
 require 'capsule_crm/address'
 require 'capsule_crm/case'
@@ -26,6 +27,7 @@ require 'capsule_crm/errors/record_invalid'
 require 'capsule_crm/contacts'
 require 'capsule_crm/contactable'
 require 'capsule_crm/configuration'
+require 'capsule_crm/custom_field'
 require 'capsule_crm/opportunity'
 require 'capsule_crm/organization'
 require 'capsule_crm/participant'

data/spec/lib/capsule_crm/custom_field_spec.rb

@@ -0,0 +1,655 @@
+require 'spec_helper'
+
+describe CapsuleCRM::CustomField do
+  before { configure }
+
+  before do
+    stub_request(:get, /\/api\/users$/).
+      to_return(body: File.read('spec/support/all_users.json'))
+    stub_request(:get, /\/api\/opportunity\/milestones$/).
+      to_return(body: File.read('spec/support/milestones.json'))
+  end
+
+  it { should validate_presence_of(:label) }
+
+  describe '._for_party' do
+    let(:party) { Fabricate.build(:organization, id: 1) }
+
+    subject { CapsuleCRM::CustomField._for_party(party.id) }
+
+    context 'when there are some custom fields' do
+      before do
+        stub_request(:get, /\/api\/party\/#{party.id}\/customfields$/).
+          to_return(body: File.read('spec/support/all_customfields.json'))
+      end
+
+      it { should be_an(Array) }
+
+      it do
+        subject.all? { |item| item.is_a?(CapsuleCRM::CustomField) }.should be_true
+      end
+    end
+
+    context 'when there are no custom fields' do
+      before do
+        stub_request(:get, /\/api\/party\/#{party.id}\/customfields$/).
+          to_return(body: File.read('spec/support/no_customfields.json'))
+      end
+
+      it { should be_blank }
+    end
+  end
+
+  describe '.create' do
+    context 'when it belongs to a party' do
+      let(:organization) { Fabricate.build(:organization, id: 1) }
+      let(:location) { "https://sample.capsulecrm.com/api/party/#{organization.id}/customfields" }
+
+      subject do
+        CapsuleCRM::CustomField.create(
+          id: 100,
+          tag: 'The tag',
+          label: 'A field',
+          text: 'Some text',
+          date: Date.today,
+          boolean: true,
+          party: organization
+        )
+      end
+
+      before do
+        stub_request(:post, /\/api\/party\/#{organization.id}\/customfields$/).
+          to_return(headers: { 'Location' => location})
+      end
+
+      it { subject.id.should eql(100) }
+    end
+  end
+end
+
+
+
+
+#   describe '.create' do
+#     context 'when it belongs to a party' do
+#       let(:person) { Fabricate.build(:person, id: 1) }
+
+#       subject do
+#         CapsuleCRM::History.create(
+#           note: Faker::Lorem.paragraph, party: person
+#         )
+#       end
+
+#       let(:location) do
+#         "https://sample.capsulecrm.com/api/party/#{person.id}/history/101"
+#       end
+
+#       before do
+#         stub_request(:post, /\/api\/party\/#{person.id}\/history$/).
+#           to_return(headers: { 'Location' => location})
+#       end
+
+#       it { subject.id.should eql(101) }
+#     end
+
+
+
+####
+
+
+#   describe 'find' do
+#     before do
+#       stub_request(:get, /\/api\/history\/100$/).
+#         to_return(body: File.read('spec/support/history.json'))
+#       stub_request(:get, /\/api\/users$/).
+#         to_return(body: File.read('spec/support/all_users.json'))
+#     end
+
+#     subject { CapsuleCRM::History.find(100) }
+
+#     it { subject.type.should eql('Note') }
+
+#     it { subject.creator.should be_a(CapsuleCRM::User) }
+
+#     it { subject.entry_date.should_not be_blank }
+
+#     it { subject.subject.should_not be_blank }
+
+#     it { subject.note.should_not be_blank }
+
+#     it { subject.attachments.should be_a(Array) }
+
+#     it { subject.attachments.first.should be_a(CapsuleCRM::Attachment) }
+
+#     it { subject.attachments.first.filename.should eql('latin.doc') }
+
+#     it { subject.participants.should be_a(Array) }
+
+#     it { subject.participants.first.should be_a(CapsuleCRM::Participant) }
+
+#     it { subject.participants.first.name.should eql('Matt Beedle') }
+
+#     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
+
+#       it { subject.party_id.should_not be_blank }
+
+#       it { subject.party.should_not be_blank }
+#     end
+
+#     context 'when it belongs to a case' do
+#       before do
+#         stub_request(:get, /\/api\/kase\/5$/).
+#           to_return(body: File.read('spec/support/case.json'))
+#       end
+
+#       it { subject.case_id.should_not be_blank }
+
+#       it { subject.kase.should_not be_blank }
+#     end
+
+#     context 'when it belongs to an opportunity' do
+#       before do
+#         stub_request(:get, /\/api\/opportunity\/2$/).
+#           to_return(body: File.read('spec/support/opportunity.json'))
+#       end
+
+#       it { subject.opportunity_id.should_not be_blank }
+
+#       it { subject.opportunity.should_not be_blank }
+#     end
+#   end
+
+#   describe '#creator=' do
+#     let(:history) { CapsuleCRM::History.new }
+
+#     context 'when a String is supplied' do
+#       before do
+#         stub_request(:get, /\/api\/users$/).
+#           to_return(body: File.read('spec/support/all_users.json'))
+#       end
+
+#       context 'when the user exists' do
+#         before { history.creator = 'a.user' }
+
+#         it { history.creator.should be_a(CapsuleCRM::User) }
+#       end
+
+#       context 'when the user does not exist' do
+#         before { history.creator = 'asdfadsfdsaf' }
+
+#         it { history.creator.should be_blank }
+#       end
+#     end
+
+#     context 'when a CapsuleCRM::Person is supplied' do
+#       let(:user) { CapsuleCRM::User.new }
+
+#       before { history.creator = user }
+
+#       it { history.creator.should eql(user) }
+#     end
+#   end
+
+#   describe '.create' do
+#     context 'when it belongs to a party' do
+#       let(:person) { Fabricate.build(:person, id: 1) }
+
+#       subject do
+#         CapsuleCRM::History.create(
+#           note: Faker::Lorem.paragraph, party: person
+#         )
+#       end
+
+#       let(:location) do
+#         "https://sample.capsulecrm.com/api/party/#{person.id}/history/101"
+#       end
+
+#       before do
+#         stub_request(:post, /\/api\/party\/#{person.id}\/history$/).
+#           to_return(headers: { 'Location' => location})
+#       end
+
+#       it { subject.id.should eql(101) }
+#     end
+
+#     context 'when it belongs to a kase' do
+#       let(:kase) { Fabricate.build(:case, id: 2) }
+
+#       let(:location) do
+#         "https://sample.capsulecrm.com/api/kase/#{kase.id}/history/10"
+#       end
+
+#       subject do
+#         CapsuleCRM::History.create(note: Faker::Lorem.paragraph, kase: kase)
+#       end
+
+#       before do
+#         stub_request(:post, /\/api\/kase\/#{kase.id}\/history$/).
+#           to_return(headers: { 'Location' => location })
+#       end
+
+#       it { subject.id.should eql(10) }
+#     end
+
+#     context 'when it belongs to an opportunity' do
+#       let(:opportunity) { Fabricate.build(:opportunity, id: 1) }
+
+#       subject do
+#         CapsuleCRM::History.create(
+#           note: Faker::Lorem.paragraph, opportunity: opportunity
+#         )
+#       end
+
+#       let(:location) do
+#         [
+#           'https://sample.capsulecrm.com/api/opportunity/',
+#           opportunity.id, '/history/9'
+#         ].join
+#       end
+
+#       before do
+#         stub_request(:post, /\/api\/opportunity\/#{opportunity.id}\/history$/).
+#           to_return(headers: { 'Location' => location })
+#       end
+
+#       it { subject.id.should eql(9) }
+#     end
+
+#     context 'when it is invalid' do
+#       subject { CapsuleCRM::History.create }
+
+#       it { should_not be_valid }
+#     end
+#   end
+
+#   describe '.create!' do
+#     context 'when it belongs to a party' do
+#       let(:person) { Fabricate.build(:person, id: 1) }
+
+#       subject do
+#         CapsuleCRM::History.create!(
+#           note: Faker::Lorem.paragraph, party: person
+#         )
+#       end
+
+#       let(:location) do
+#         "https://sample.capsulecrm.com/api/party/#{person.id}/history/101"
+#       end
+
+#       before do
+#         stub_request(:post, /\/api\/party\/#{person.id}\/history$/).
+#           to_return(headers: { 'Location' => location})
+#       end
+
+#       it { subject.id.should eql(101) }
+#     end
+
+#     context 'when it belongs to a kase' do
+#       let(:kase) { Fabricate.build(:case, id: 2) }
+
+#       let(:location) do
+#         "https://sample.capsulecrm.com/api/kase/#{kase.id}/history/10"
+#       end
+
+#       subject do
+#         CapsuleCRM::History.create!(note: Faker::Lorem.paragraph, kase: kase)
+#       end
+
+#       before do
+#         stub_request(:post, /\/api\/kase\/#{kase.id}\/history$/).
+#           to_return(headers: { 'Location' => location })
+#       end
+
+#       it { subject.id.should eql(10) }
+#     end
+
+#     context 'when it belongs to an opportunity' do
+#       let(:opportunity) { Fabricate.build(:opportunity, id: 1) }
+
+#       subject do
+#         CapsuleCRM::History.create!(
+#           note: Faker::Lorem.paragraph, opportunity: opportunity
+#         )
+#       end
+
+#       let(:location) do
+#         [
+#           'https://sample.capsulecrm.com/api/opportunity/',
+#           opportunity.id, '/history/9'
+#         ].join
+#       end
+
+#       before do
+#         stub_request(:post, /\/api\/opportunity\/#{opportunity.id}\/history$/).
+#           to_return(headers: { 'Location' => location })
+#       end
+
+#       it { subject.id.should eql(9) }
+#     end
+
+#     context 'when it is invalid' do
+#       it do
+#         expect { CapsuleCRM::History.create! }.
+#           to raise_error(CapsuleCRM::Errors::RecordInvalid)
+#       end
+#     end
+#   end
+
+#   describe '#update_attributes' do
+#     context 'when the history is valid' do
+#       subject { Fabricate(:history, id: 2, party: Fabricate.build(:person)) }
+
+#       before do
+#         stub_request(:put, /api\/history\/2$/).to_return(status: 200)
+#         subject.update_attributes note: 'changed note text'
+#       end
+
+#       it { subject.note.should eql('changed note text') }
+
+#       it { should be_persisted }
+#     end
+
+#     context 'when the history is not valid' do
+#       subject do
+#         CapsuleCRM::History.new(id: 2)
+#       end
+
+#       before { subject.update_attributes subject: Faker::Lorem.sentence }
+
+#       it { subject.should_not be_valid }
+#     end
+#   end
+
+#   describe '#update_attributes!' do
+#     context 'when it is valid' do
+#       subject { Fabricate(:history, id: 3, party: Fabricate.build(:case)) }
+
+#       before do
+#         stub_request(:put, /api\/history\/3$/).to_return(status: 200)
+#         subject.update_attributes! note: 'some new note'
+#       end
+
+#       it { subject.note.should eql('some new note') }
+
+#       it { should be_persisted }
+#     end
+
+#     context 'when it is not valid' do
+#       subject { CapsuleCRM::History.new(id: 3) }
+
+#       it do
+#         expect { subject.update_attributes! subject: 'test' }.
+#           to raise_error(CapsuleCRM::Errors::RecordInvalid)
+#       end
+#     end
+#   end
+
+#   describe '#save' do
+#     context 'when it is a new record' do
+#       let(:history) { Fabricate.build(:history) }
+
+#       context 'when it belongs to a party' do
+#         let(:party) { Fabricate.build(:organization, id: 2) }
+
+#         let(:location) do
+#           "https://sample.capsulecrm.com/api/party/#{party.id}/history/101"
+#         end
+
+#         before do
+#           history.party = party
+#           stub_request(:post, /\/api\/party\/#{party.id}\/history$/).
+#             to_return(headers: { 'Location' => location })
+#           history.save
+#         end
+
+#         it { history.id.should eql(101) }
+
+#         it { history.should be_persisted }
+#       end
+
+#       context 'when it belongs to a kase' do
+#         let(:kase) { Fabricate.build(:case, id: 5) }
+
+#         let(:location) do
+#           "https://sample.capsulecrm.com/api/kase/#{kase.id}/history/10005"
+#         end
+
+#         before do
+#           history.kase = kase
+#           stub_request(:post, /\/api\/kase\/#{kase.id}\/history$/).
+#             to_return(headers: { 'Location' => location })
+#           history.save
+#         end
+
+#         it { history.id.should eql(10005) }
+
+#         it { history.should be_persisted }
+#       end
+
+#       context 'when it belongs to an opportunity' do
+#         let(:opportunity) { Fabricate.build(:opportunity, id: 3) }
+
+#         let(:location) do
+#           [
+#             'https://sample.capsulecrm.com/api/opportunity/',
+#             opportunity.id, '/history/101'
+#           ].join
+#         end
+
+#         before do
+#           history.opportunity = opportunity
+#           stub_request(
+#             :post, /\/api\/opportunity\/#{opportunity.id}\/history$/
+#           ).to_return(headers: { 'Location' => location })
+#           history.save
+#         end
+
+#         it { history.id.should eql(101) }
+
+#         it { history.should be_persisted }
+#       end
+#     end
+
+#     context 'when it is an existing record' do
+#       let(:history) do
+#         Fabricate.build(:history, party: Fabricate.build(:person), id: 10)
+#       end
+
+#       before do
+#         stub_request(:put, /\/api\/history\/#{history.id}$/).
+#           to_return(status: 200)
+#         history.save
+#       end
+
+#       it { history.should be_persisted }
+#     end
+#   end
+
+#   describe '#save!' do
+#     context 'when it is a new record' do
+#       context 'when it is invalid' do
+#         let(:history) { CapsuleCRM::History.new(id: 5) }
+
+#         it 'should raise an error' do
+#           expect { history.save! }.
+#             to raise_error(CapsuleCRM::Errors::RecordInvalid)
+#         end
+#       end
+
+#       let(:history) { Fabricate.build(:history) }
+
+#       context 'when it belongs to a party' do
+#         let(:party) { Fabricate.build(:organization, id: 2) }
+
+#         let(:location) do
+#           "https://sample.capsulecrm.com/api/party/#{party.id}/history/101"
+#         end
+
+#         before do
+#           history.party = party
+#           stub_request(:post, /\/api\/party\/#{party.id}\/history$/).
+#             to_return(headers: { 'Location' => location })
+#           history.save!
+#         end
+
+#         it { history.id.should eql(101) }
+
+#         it { history.should be_persisted }
+#       end
+
+#       context 'when it belongs to a kase' do
+#         let(:kase) { Fabricate.build(:case, id: 5) }
+
+#         let(:location) do
+#           "https://sample.capsulecrm.com/api/kase/#{kase.id}/history/10005"
+#         end
+
+#         before do
+#           history.kase = kase
+#           stub_request(:post, /\/api\/kase\/#{kase.id}\/history$/).
+#             to_return(headers: { 'Location' => location })
+#           history.save!
+#         end
+
+#         it { history.id.should eql(10005) }
+
+#         it { history.should be_persisted }
+#       end
+
+#       context 'when it belongs to an opportunity' do
+#         let(:opportunity) { Fabricate.build(:opportunity, id: 3) }
+
+#         let(:location) do
+#           [
+#             'https://sample.capsulecrm.com/api/opportunity/',
+#             opportunity.id, '/history/101'
+#           ].join
+#         end
+
+#         before do
+#           history.opportunity = opportunity
+#           stub_request(
+#             :post, /\/api\/opportunity\/#{opportunity.id}\/history$/
+#           ).to_return(headers: { 'Location' => location })
+#           history.save!
+#         end
+
+#         it { history.id.should eql(101) }
+
+#         it { history.should be_persisted }
+#       end
+#     end
+
+#     context 'when it is an existing record' do
+#       context 'when it is valid' do
+#         let(:history) do
+#           Fabricate.build(:history, party: Fabricate.build(:person), id: 10)
+#         end
+
+#         before do
+#           stub_request(:put, /\/api\/history\/#{history.id}$/).
+#             to_return(status: 200)
+#           history.save!
+#         end
+
+#         it { history.should be_persisted }
+#       end
+
+#       context 'when it is not valid' do
+#         let(:history) { CapsuleCRM::History.new(id: 1) }
+
+#         it 'should raise an error' do
+#           expect { history.save! }.
+#             to raise_error(CapsuleCRM::Errors::RecordInvalid)
+#         end
+#       end
+#     end
+#   end
+
+#   describe '#destroy' do
+#     let(:history) { Fabricate.build(:history, id: 19) }
+
+#     before do
+#       stub_request(:delete, /\/api\/history\/#{history.id}$/).
+#         to_return(status: 200)
+#       history.destroy
+#     end
+
+#     subject { history }
+
+#     it { should_not be_persisted }
+#   end
+
+#   describe '#new_record?' do
+#     context 'when the history item is a new record' do
+#       let(:history) { CapsuleCRM::History.new }
+
+#       subject { history.new_record? }
+
+#       it { should be_true }
+#     end
+
+#     context 'when the history item is not a new record' do
+#       let(:history) { CapsuleCRM::History.new(id: 1) }
+
+#       subject { history.new_record? }
+
+#       it { should be_false }
+#     end
+#   end
+
+#   describe '#persisted?' do
+#     context 'when the history item is persisted' do
+#       let(:history) { CapsuleCRM::History.new(id: 1) }
+
+#       subject { history.persisted? }
+
+#       it { should be_true }
+#     end
+
+#     context 'when the hitory item is not persisted' do
+#       let(:history) { CapsuleCRM::History.new }
+
+#       subject { history.persisted? }
+
+#       it { should be_false }
+#     end
+#   end
+
+#   describe '#to_capsule_json' do
+#     let(:creator) { CapsuleCRM::User.new(username: Faker::Name.name) }
+
+#     let(:history) do
+#       CapsuleCRM::History.new(
+#         type: 'Note', entry_date: Time.now, creator: creator,
+#         subject: Faker::Lorem.sentence, note: Faker::Lorem.paragraph,
+#         participants: [participant]
+#       )
+#     end
+
+#     let(:participant) do
+#       CapsuleCRM::Participant.new(
+#         name: Faker::Name.name, email_address: Faker::Internet.email,
+#         role: 'TO'
+#       )
+#     end
+
+#     subject { history.to_capsule_json }
+
+#     let(:participants_json) { subject[:historyItem]['participants'] }
+
+#     it { subject.keys.first.should eql(:historyItem) }
+
+#     it { subject[:historyItem]['entryDate'].should eql(history.entry_date) }
+
+#     it { subject[:historyItem]['creator'].should eql(creator.username) }
+
+#     it { subject[:historyItem]['note'].should eql(history.note) }
+
+#     it { subject[:historyItem].should have_key('note') }
+#   end
+# end

data/spec/lib/capsule_crm/organization_spec.rb

@@ -91,4 +91,18 @@ describe CapsuleCRM::Organization do
 
     it { email_json.should have_key('emailAddress') }
   end
+
+  describe '#destroy' do
+    let(:organization) { CapsuleCRM::Organization.new(id: 1) }
+
+    before do
+      stub_request(:delete, /\/api\/party\/#{organization.id}/).
+        to_return(status: 200)
+      organization.destroy
+    end
+
+    it { expect(organization.id).to be_blank }
+
+    it { expect(organization).to_not be_persisted }
+  end
 end

data/spec/lib/capsule_crm/person_spec.rb

@@ -32,7 +32,13 @@ describe CapsuleCRM::Person do
     end
 
     context 'when there is 1 person for the organization' do
-      pending
+      before do
+        stub_request(:get, /\/api\/party\/1\/people$/).
+          to_return(body: File.read('spec/support/single_user.json'))
+      end
+      subject { CapsuleCRM::Person._for_organization(1) }
+
+      it { should be_a(Array) }
     end
 
     context 'when there are no people for the organization' do

data/spec/lib/capsule_crm/taggable_spec.rb

@@ -7,6 +7,9 @@ class TaggableItem
   attribute :id
 end
 
+class SubclassedTaggableItem < TaggableItem
+end
+
 describe CapsuleCRM::Taggable do
   before { configure }
 
@@ -39,7 +42,7 @@ describe CapsuleCRM::Taggable do
 
       before do
         loc = 'https://sample.capsulecrm.com/api/party/1000/tag/A%20Test%20Tag'
-        stub_request(:post, /\/api\/taggableitem\/1\/A%20Test%20Tag$/).
+        stub_request(:post, /\/api\/taggableitem\/1\/tag\/A%20Test%20Tag$/).
           to_return(headers: { 'Location' =>  loc })
       end
 
@@ -66,7 +69,7 @@ describe CapsuleCRM::Taggable do
 
       before do
         loc = 'https://sample.capsulecrm.com/api/party/1000/tag/A%20Test%20Tag'
-        stub_request(:delete, /\/api\/taggableitem\/1\/A%20Test%20Tag$/).
+        stub_request(:delete, /\/api\/taggableitem\/1\/tag\/A%20Test%20Tag$/).
           to_return(headers: { 'Location' => loc })
       end
 
@@ -81,4 +84,14 @@ describe CapsuleCRM::Taggable do
       it { subject.should be_nil }
     end
   end
+
+  describe '#api_singular_name' do
+    it 'turns the class name into appropriate api name' do
+      TaggableItem.new.api_singular_name.should == 'taggableitem' 
+    end
+
+    it 'gives the superclass unless Object to work with Organization/Person subclassing of Party' do
+      SubclassedTaggableItem.new.api_singular_name.should == 'taggableitem'
+    end
+  end
 end

data/spec/support/all_customfields.json

@@ -0,0 +1,23 @@
+{
+  "customFields": {
+    "customField": [
+      {
+        "id": "1",
+        "tag": "Staff",
+        "label": "NI Number",
+        "text": "12345678"
+      },
+      {
+        "id": "1",
+        "tag": "Staff",
+        "label": "Start Date",
+        "date": "2011-03-13T00:00:00Z"
+      },
+      {
+        "id": "1",
+        "label": "Send newsletter",
+        "boolean": "true"
+      }
+    ]
+  }
+}

data/spec/support/no_customfields.json

@@ -0,0 +1,5 @@
+{
+  "customFields": {
+    "@size": "0"
+  }
+}

data/spec/support/single_user.json

@@ -0,0 +1,25 @@
+{
+  "parties":
+  {
+    "@size":"1",
+    "person":
+      {
+        "id":"100",
+        "contacts":
+        {
+          "email":
+          {
+            "id":"25101754",
+            "emailAddress":"aa@aa.com"
+          }
+        },
+        "pictureURL": "",
+        "createdOn":"2011-08-10T01:58:49Z",
+        "updatedOn":"2011-08-10T03:20:43Z",
+        "firstName":"aaa",
+        "lastName":"bbb",
+        "organisationId":"1",
+        "organisationName":"test"
+      }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsule_crm
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -244,6 +244,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -260,6 +261,7 @@ files:
 - lib/capsule_crm/attachment.rb
 - lib/capsule_crm/capsule_jsonable.rb
 - lib/capsule_crm/case.rb
+- lib/capsule_crm/collection.rb
 - lib/capsule_crm/configuration.rb
 - lib/capsule_crm/connection.rb
 - lib/capsule_crm/contactable.rb
@@ -298,6 +300,7 @@ files:
 - spec/lib/capsule_crm/contacts_spec.rb
 - spec/lib/capsule_crm/country_spec.rb
 - spec/lib/capsule_crm/currency_spec.rb
+- spec/lib/capsule_crm/custom_field_spec.rb
 - spec/lib/capsule_crm/email_spec.rb
 - spec/lib/capsule_crm/history_spec.rb
 - spec/lib/capsule_crm/milestone_spec.rb
@@ -311,6 +314,7 @@ files:
 - spec/lib/capsule_crm/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/all_cases.json
+- spec/support/all_customfields.json
 - spec/support/all_history.json
 - spec/support/all_opportunities.json
 - spec/support/all_parties.json
@@ -325,11 +329,13 @@ files:
 - spec/support/helpers.rb
 - spec/support/history.json
 - spec/support/milestones.json
+- spec/support/no_customfields.json
 - spec/support/no_history.json
 - spec/support/opportunity.json
 - spec/support/organisation.json
 - spec/support/person.json
 - spec/support/shared_examples/contactable.rb
+- spec/support/single_user.json
 - spec/support/task.json
 - spec/support/task_categories.json
 homepage: ''
@@ -370,6 +376,7 @@ test_files:
 - spec/lib/capsule_crm/contacts_spec.rb
 - spec/lib/capsule_crm/country_spec.rb
 - spec/lib/capsule_crm/currency_spec.rb
+- spec/lib/capsule_crm/custom_field_spec.rb
 - spec/lib/capsule_crm/email_spec.rb
 - spec/lib/capsule_crm/history_spec.rb
 - spec/lib/capsule_crm/milestone_spec.rb
@@ -383,6 +390,7 @@ test_files:
 - spec/lib/capsule_crm/user_spec.rb
 - spec/spec_helper.rb
 - spec/support/all_cases.json
+- spec/support/all_customfields.json
 - spec/support/all_history.json
 - spec/support/all_opportunities.json
 - spec/support/all_parties.json
@@ -397,10 +405,12 @@ test_files:
 - spec/support/helpers.rb
 - spec/support/history.json
 - spec/support/milestones.json
+- spec/support/no_customfields.json
 - spec/support/no_history.json
 - spec/support/opportunity.json
 - spec/support/organisation.json
 - spec/support/person.json
 - spec/support/shared_examples/contactable.rb
+- spec/support/single_user.json
 - spec/support/task.json
 - spec/support/task_categories.json