capsule_crm 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 935d3018b76a8144d83756b5aef8fc9efbe25878
-  data.tar.gz: d7565a3704e3884b189ef8491198e7a42fac703c
+  metadata.gz: 40b178add184629b0011c050d6c021eecb3061ed
+  data.tar.gz: 07a406a438880798916012ef6af98fe59786db58
 SHA512:
-  metadata.gz: 9678e359e403045ebbc4225639ecd8c6da8b1e136be2d5af2b0424a82405f391617c702d53ab91a0c303f913d8c5dea96064303a5e2ef2dbf37a2e65019715f9
-  data.tar.gz: b441b111feb03a3daac3f0439b815bdf6139b15403db004aa857c4cfd126d497bf26dbde1a293e310a4bfdeca86991b9ee4c0aadf8d0bd2373408a4e5d1efb4f
+  metadata.gz: d5e6e13677f95912036882050ad7e5babb5a662b813007ffe94ed293a10d5b0b54858aaa9459206d9065cce3fd2583263876bc48f30b26e221b1f149f7013bd8
+  data.tar.gz: 4966758a6dfc65e830d68e133341dd104861e7afce472ea43907ed27fd7c65c3c23e15ed73138cdbd9a8154ee6201966e51f4b1247a13da56fa02ef316f0a3ea

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.8.0
+
+- Custom fields may now be deleted.
+
 ## 1.7.0
 
 - Inspecting items only displays their attributes now. Much cleaner for working

data/lib/capsule_crm/associations/belongs_to_finder.rb

@@ -9,7 +9,7 @@ module CapsuleCRM
       end
 
       def call(id)
-        id ? find(id) : []
+        id ? find_by_parent_id(id) : []
       end
 
       private
@@ -18,6 +18,10 @@ module CapsuleCRM
         @inverse ||= association.inverse
       end
 
+      def embedded?
+        inverse.embedded
+      end
+
       def singular
         @singular ||= inverse.defined_on.queryable_options.singular
       end
@@ -26,8 +30,12 @@ module CapsuleCRM
         @plural ||= association.defined_on.queryable_options.plural
       end
 
-      def find(id)
-        normalizer.normalize_collection get(path(id)) if inverse
+      def find_by_parent_id(id)
+        normalizer.normalize_collection(get(path(id))).tap do |collection|
+          collection.each do |item|
+            item.send("#{association.foreign_key}=", id)
+          end if embedded?
+        end
       end
 
       def get(path_string)

data/lib/capsule_crm/associations/has_many.rb

@@ -41,10 +41,8 @@ module CapsuleCRM
 
           if options[:embedded]
             define_method "save_#{association_name}" do
-              unless self.send(association_name).blank?
-                # TODO why can't I chain this?
-                a = self.send(association_name)
-                a.save
+              unless send(association_name).empty?
+                send(association_name).save
               end
             end
 
@@ -52,7 +50,6 @@ module CapsuleCRM
               after_save :"save_#{association_name}" if respond_to?(:after_save)
               private :"save_#{association_name}"
             end
-
           end
 
           define_method association_name do

data/lib/capsule_crm/associations/has_many_association.rb

@@ -5,7 +5,7 @@ module CapsuleCRM
 
       # Public: Initialize a new CapsuleCRM::Associations::HasManyAssociation
       #
-      # association_name  - The Symbox association name
+      # association_name  - The Symbol association name
       # defined_on        - The String name of the class that this association
       # is defined on
       # options           - The Hash of association options

data/lib/capsule_crm/associations/has_many_proxy.rb

@@ -8,6 +8,7 @@ module CapsuleCRM
         @target_klass   = target_klass
         @source         = source
         @embedded       = embedded
+        self
       end
 
       def method_missing(name, *args, &block)
@@ -25,14 +26,14 @@ module CapsuleCRM
         record = build(attributes).tap do |r|
           record_not_saved(r) unless parent.persisted?
         end
-        embedded? ? save : record.save
+        record if embedded? ? save : record.save
       end
 
       def create!(attributes = {})
         record = build(attributes).tap do |r|
           record_not_saved(r) unless parent.persisted?
         end
-        embedded? ? save! : record.save!
+        record if embedded? ? save! : record.save!
       end
 
       def tap

data/lib/capsule_crm/custom_field.rb

@@ -12,7 +12,7 @@ module CapsuleCRM
     include CapsuleCRM::Serializable
 
     serializable_config do |config|
-      config.root = 'customField'
+      config.root            = 'customField'
       config.collection_root = 'customFields'
     end
 
@@ -30,13 +30,24 @@ module CapsuleCRM
     validates :id, numericality: { allow_blank: true }
     validates :label, presence: true
 
-    belongs_to :party
-    belongs_to :opportunity
-    belongs_to :case
+    belongs_to :party,       serialize: false
+    belongs_to :opportunity, serialize: false
+    belongs_to :case,        serialize: false
 
     class << self
       alias :_for_organization :_for_party
       alias :_for_person :_for_party
     end
+
+    def parent
+      party || opportunity || self.case
+    end
+
+    def destroy
+      self.date, self.tag, self.boolean, self.text = nil, nil, nil, nil
+      parent.custom_fields.save
+      parent.custom_fields.delete_if { |cf| cf.id == id }
+      true
+    end
   end
 end

data/lib/capsule_crm/organization.rb

@@ -63,5 +63,17 @@ module CapsuleCRM
       CapsuleCRM::Party.all(options).
         delete_if { |item| !item.is_a?(CapsuleCRM::Organization) }
     end
+
+    def self.first
+      raise NotImplementedError.new(
+        [
+          'Unfortunately the capsulecrm.com API returns people and',
+          'organizations in one response. There is no way to query directly',
+          'for people. This means that quite often the first item returned',
+          'will actually be a person and so CapsuleCRM::Organization.first is',
+          'not possible.'
+        ].join(' ')
+      )
+    end
   end
 end

data/lib/capsule_crm/person.rb

@@ -66,6 +66,18 @@ module CapsuleCRM
         delete_if { |item| !item.is_a?(CapsuleCRM::Person) }
     end
 
+    def self.first
+      raise NotImplementedError.new(
+        [
+          'Unfortunately the capsulecrm.com API returns people and',
+          'organizations in one response. There is no way to query directly',
+          'for people. This means that quite often the first item returned',
+          'will actually be an organization and so CapsuleCRM::Person.first is',
+          'not possible.'
+        ].join(' ')
+      )
+    end
+
     private
 
     # Private: Determines whether the person first name is required. Either the

data/lib/capsule_crm/querying/find_one.rb

@@ -9,6 +9,14 @@ module CapsuleCRM
             get("/api/#{queryable_options.singular}/#{id}")
         end
       end
+
+      def reload
+        self.attributes = self.class.find(id).attributes
+        associations.keys.each do |association_name|
+          instance_variable_set(:"@#{association_name}", nil)
+        end
+        self
+      end
     end
   end
 end

data/lib/capsule_crm/version.rb

@@ -1,3 +1,3 @@
 module CapsuleCrm
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end

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

@@ -10,12 +10,13 @@ describe CapsuleCRM::Associations::BelongsToFinder do
       )
     end
     let(:inverse) do
-      double('CapsuleCRM::Associations::HasManyAssociation')
+      double('CapsuleCRM::Associations::HasManyAssociation', embedded: false)
     end
     let(:normalizer) do
       double('CapsuleCRM::Normalizer', normalize_collection: [])
     end
     let(:finder) { described_class.new(association) }
+
     before do
       finder.singular = 'person'
       finder.plural = 'customfields'

data/spec/lib/capsule_crm/custom_field_spec.rb

@@ -27,7 +27,8 @@ describe CapsuleCRM::CustomField do
 
       it { should be_an(Array) }
       it do
-        subject.all? { |item| item.is_a?(CapsuleCRM::CustomField) }.should be_true
+        subject.all? { |item| item.is_a?(CapsuleCRM::CustomField) }.
+          should be_true
       end
     end
 
@@ -53,4 +54,40 @@ describe CapsuleCRM::CustomField do
       expect(subject.keys.first).to eql('customField')
     end
   end
+
+  describe '#destroy' do
+    let(:custom_field) { Fabricate.build(:custom_field, party: person) }
+    let(:person) { Fabricate.build(:person, id: Random.rand(1..10)) }
+
+    def stub_requests
+      stub_request(
+        :get,
+        [
+          'https://1234:@company.capsulecrm.com/api/party/',
+          person.id,
+          '/customfields'
+        ].join
+      ).to_return(body: File.read('spec/support/no_customfields.json'))
+      # note, this test still passes although completely different data is being
+      # returned from this stub. The data returned should overwrite the
+      # association data
+      stub_request(
+        :put, [
+          'https://1234:@company.capsulecrm.com/api/party/',
+          person.id,
+          '/customfields'
+        ].join
+      ).to_return(body: File.read('spec/support/put_customfields.json'))
+    end
+
+    before do
+      stub_requests
+      person.custom_fields << custom_field
+      custom_field.destroy
+    end
+
+    it 'should remove the custom field from the parent association' do
+      expect(person.custom_fields).not_to include(custom_field)
+    end
+  end
 end

data/spec/lib/capsule_crm/organization_spec.rb

@@ -48,6 +48,14 @@ describe CapsuleCRM::Organization do
     end
   end
 
+  describe '.first' do
+    subject { described_class }
+
+    it 'should raise a NotImplementedError' do
+      expect { subject.first }.to raise_error(NotImplementedError)
+    end
+  end
+
   describe '#custom_fields' do
     before do
       stub_request(:get, /\/api\/party\/#{organization.id}\/customfields/).

data/spec/lib/capsule_crm/person_spec.rb

@@ -68,6 +68,14 @@ describe CapsuleCRM::Person do
     end
   end
 
+  describe '.first' do
+    subject { described_class }
+
+    it 'should raise a NotImplementedError' do
+      expect { subject.first }.to raise_error(NotImplementedError)
+    end
+  end
+
   describe '#tasks' do
     let(:person) { Fabricate.build(:person, id: 1) }
 

data/spec/support/put_customfields.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capsule_crm
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Matt Beedle
@@ -388,6 +388,7 @@ files:
 - spec/support/opportunity.json
 - spec/support/organisation.json
 - spec/support/person.json
+- spec/support/put_customfields.json
 - spec/support/shared_examples/capsule_json.rb
 - spec/support/shared_examples/contactable.rb
 - spec/support/shared_examples/deletable.rb
@@ -499,6 +500,7 @@ test_files:
 - spec/support/opportunity.json
 - spec/support/organisation.json
 - spec/support/person.json
+- spec/support/put_customfields.json
 - spec/support/shared_examples/capsule_json.rb
 - spec/support/shared_examples/contactable.rb
 - spec/support/shared_examples/deletable.rb