capsule_crm 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 895602f68388ac5ca0d367ee33568425ea6b9b94
-  data.tar.gz: 426048ab8c437b47607fe449af53455ee22a6c14
+  metadata.gz: 6cc2774ab10bd28336dd0d4586a9e580339da8fa
+  data.tar.gz: 993020dd12dc61dcf601e70b111279f7dbf0dd8b
 SHA512:
-  metadata.gz: 2c0c4236c700a3014c6ed84ed1122d4784047016dfc69b2f8431cac9b23bea80832f17858562e1adf86c0eaf8c3367e0fa21d365187197acce034c91c171400f
-  data.tar.gz: bab4f5d64be4d3bf1f75be0de9d98a1a294307b1fae5af38ee70bee1f26d2ba50c64e70508808d523713c61acb3b94e5e5cdff57c3949a745584aea8c18f4465
+  metadata.gz: e8ff0fcca56968b5f6bcf914c2041e758c2f28c3d16107b2a36f61be649ba35c9741c171619f2197d7ca229b746131a68d6e556e8b440b311413c8611c41b646
+  data.tar.gz: 002ed9d4cb89290cf6151e72439c84912f2752e7b6b4a455d4165aa024b01d4d75c0efbf2b08c5ca65bef995ae9e6bdca176a84bfb17fe8c237c8c1e05bc55fb

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.4.0
+
+- Fix bug with contacts, where contact details were being attached to parties as
+  an array of hashes
+- Added ActiveModel::Callbacks to persistence module so after_save methods may
+  be added
+- Used after_save method to save all embedded associations (custom fields)
+
 ## 1.3.0
 
 - Refactored associations to allow classes to reflect on themselves in order to

data/lib/capsule_crm/associations/has_many.rb

@@ -39,6 +39,22 @@ module CapsuleCRM
             new(association_name, self, options)
           self.associations[association_name] = association
 
+          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
+              end
+            end
+
+            class_eval do
+              after_save :"save_#{association_name}" if respond_to?(:after_save)
+              private :"save_#{association_name}"
+            end
+
+          end
+
           define_method association_name do
             instance_variable_get(:"@#{association_name}") ||
               instance_variable_set(:"@#{association_name}", association.proxy(self))

data/lib/capsule_crm/associations/has_many_proxy.rb

@@ -44,12 +44,6 @@ module CapsuleCRM
         { root => serializer.serialize_collection(target_klass, target) }
       end
 
-      private
-
-      def serializer
-        @serializer ||= ::CapsuleCRM::Serializer
-      end
-
       def save
         json = to_capsule_json(target_klass.serializable_options.collection_root)
         path = [
@@ -59,6 +53,12 @@ module CapsuleCRM
         ::CapsuleCRM::Connection.put(path, json)
       end
 
+      private
+
+      def serializer
+        @serializer ||= ::CapsuleCRM::Serializer
+      end
+
       def save!
         save
       end

data/lib/capsule_crm/associations.rb

@@ -28,10 +28,17 @@ module CapsuleCRM
         select_associations(:belongs_to)
       end
 
+      # Public: Get all the embedded has many associations defined on the class
+      def embedded_associations
+        has_many_associations.select do |name, association|
+          association.embedded
+        end
+      end
+
       def select_associations(macro)
         associations.select do |name, association|
           association.macro == macro &&
-            [self, self.parent].include?(association.defined_on)
+            [self, self.ancestors].flatten.include?(association.defined_on)
         end
       end
     end

data/lib/capsule_crm/contacts.rb

@@ -34,8 +34,7 @@ module CapsuleCRM
     #
     # Returns an Array of CapsuleCRM::Address objects
     def addresses=(addresses)
-      addresses = CapsuleCRM::Address.new(addresses) if addresses.is_a?(Hash)
-      @addresses = Array(addresses)
+      set_collection(CapsuleCRM::Address, addresses)
     end
 
     # Public: Gets the addresses for this contacts container
@@ -62,10 +61,10 @@ module CapsuleCRM
     #
     # Returns an Array of CapsuleCRM::Email objects
     def emails=(emails)
-      emails = CapsuleCRM::Email.new(emails) if emails.is_a?(Hash)
-      @emails = Array(emails)
+      set_collection(CapsuleCRM::Email, emails)
     end
 
+
     # Public: Gets the emails for this contacts container
     #
     # Examples
@@ -89,8 +88,7 @@ module CapsuleCRM
     #
     # Returns an Array of CapsuleCRM::Phone objects
     def phones=(phones)
-      phones = CapsuleCRM::Phone.new(phones) if phones.is_a?(Hash)
-      @phones = Array(phones)
+      set_collection(CapsuleCRM::Phone, phones)
     end
 
     # Public: Gets the phones for this contacts container
@@ -118,8 +116,7 @@ module CapsuleCRM
     #
     # Returns an Array of CapsuleCRM::Website objects
     def websites=(websites)
-      websites = CapsuleCRM::Website.new(websites) if websites.is_a?(Hash)
-      @websites = Array(websites)
+      set_collection(CapsuleCRM::Website, websites)
     end
 
     # Public: Gets the websites for this contacts container
@@ -148,5 +145,16 @@ module CapsuleCRM
         website:  websites.map(&:to_capsule_json)
       }.delete_if { |key, value| value.blank? }.stringify_keys
     end
+
+    private
+
+    def set_collection(klass, collection)
+      objects = [collection].compact.flatten.map do |item|
+        item.is_a?(Hash) ? klass.new(item) : item
+      end
+      instance_variable_set(
+        :"@#{klass.to_s.downcase.demodulize.pluralize}", objects
+      )
+    end
   end
 end

data/lib/capsule_crm/gettable.rb

@@ -3,8 +3,8 @@ module CapsuleCRM
     extend ActiveSupport::Concern
 
     module ClassMethods
-      def get(path)
-        CapsuleCRM::Connection.get(path)
+      def get(path, options = {})
+        CapsuleCRM::Connection.get(path, options)
       end
     end
   end

data/lib/capsule_crm/organization.rb

@@ -24,6 +24,7 @@ module CapsuleCRM
 
     persistable_config do |config|
       config.create = lambda { |org| "organisation" }
+      config.update = lambda { |org| "organisation" }
       config.destroy = lambda { |org| "party/#{org.id}" }
     end
 
@@ -33,6 +34,8 @@ module CapsuleCRM
 
     validates :name, presence: true
 
+    after_save :save_custom_fields
+
     has_many :people
 
     # Public: Get all people from Capsule. The list can be restricted

data/lib/capsule_crm/persistence/persistable.rb

@@ -6,6 +6,8 @@ module CapsuleCRM
       def self.included(base)
         base.send :include, CapsuleCRM::Persistence::Configuration
         base.extend CapsuleCRM::Persistence::Persistable::ClassMethods
+        base.extend ActiveModel::Callbacks
+        base.send :define_model_callbacks, :save
       end
 
       module ClassMethods
@@ -20,18 +22,14 @@ module CapsuleCRM
 
       def save
         if valid?
-          new_record? ? create_record : update_record
+          run_callbacks(:save) { new_record? ? create_record : update_record }
         else
           false
         end
       end
 
       def save!
-        if valid?
-          new_record? ? create_record : update_record
-        else
-          raise CapsuleCRM::Errors::RecordInvalid.new(self)
-        end
+        save || raise(CapsuleCRM::Errors::RecordInvalid.new(self))
       end
 
       def update_attributes(attributes = {})

data/lib/capsule_crm/person.rb

@@ -34,6 +34,8 @@ module CapsuleCRM
 
     belongs_to :organization, foreign_key: :organisation_id
 
+    after_save :save_custom_fields
+
     validates :id, numericality: { allow_blank: true }
     validates :first_name, presence: { if: :first_name_required? }
     validates :last_name, presence: { if: :last_name_required? }

data/lib/capsule_crm/serializer.rb

@@ -18,7 +18,7 @@ module CapsuleCRM
 
     def self.serialize_collection(klass, collection)
       collection = collection.map do |item|
-        options = klass.serializable_options
+        options = klass.serializable_options.dup
         options.include_root = false
         ::CapsuleCRM::Serializer.new(options).serialize(item)
       end

data/lib/capsule_crm/version.rb

@@ -1,3 +1,3 @@
 module CapsuleCrm
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/spec/lib/capsule_crm/contacts_spec.rb

@@ -25,6 +25,54 @@ describe CapsuleCRM::Contacts do
     )
   end
 
+  describe '#emails=' do
+    let(:contacts) { CapsuleCRM::Contacts.new }
+    before { contacts.emails = email_attributes }
+    subject { contacts.emails }
+
+    context 'when a hash is supplied' do
+      let(:email_attributes) do
+        { email_address: 'matt@gmail.com', type: 'Work' }
+      end
+
+      it 'should create an email from the attributes' do
+        expect(subject.first).to be_a(CapsuleCRM::Email)
+      end
+
+      it 'should be an array' do
+        expect(subject).to be_a(Array)
+      end
+    end
+
+    context 'when an array is supplied' do
+      context 'when the array contains hashes' do
+        let(:email_attributes) do
+          [{ email_address: Faker::Internet.email, type: 'Work' }]
+        end
+
+        it 'should create an email from the attributes' do
+          expect(subject.first).to be_a(CapsuleCRM::Email)
+        end
+
+        it 'should be an array' do
+          expect(subject).to be_a(Array)
+        end
+      end
+
+      context 'when the array contains emails' do
+        let(:email) do
+          CapsuleCRM::Email.
+            new(email_address: Faker::Internet.email, type: 'Work')
+        end
+        let(:email_attributes) { [email] }
+
+        it 'should set the emails from the supplied array' do
+          expect(subject).to eql(email_attributes)
+        end
+      end
+    end
+  end
+
   describe '#initialize' do
     context 'when addresses supplied' do
       subject { CapsuleCRM::Contacts.new(addresses: [address]) }

data/spec/lib/capsule_crm/custom_field_spec.rb

@@ -50,6 +50,8 @@ describe CapsuleCRM::CustomField do
     end
 
     it 'should have a root element of "customField"' do
+      p described_class.serializable_options
+      p subject
       expect(subject.keys.first).to eql('customField')
     end
   end

data/spec/lib/capsule_crm/person_spec.rb

@@ -36,6 +36,11 @@ describe CapsuleCRM::Person do
     end
   end
 
+  it 'should have embedded custom fields association' do
+    expect(described_class.embedded_associations.keys).
+      to include(:custom_fields)
+  end
+
   before do
     stub_request(:get, /\/api\/users$/).
       to_return(body: File.read('spec/support/all_users.json'))

data/spec/support/shared_examples/persistable.rb

@@ -1,4 +1,13 @@
 shared_examples 'persistable' do |location, id|
+  before do
+    stub_request(:get, /[0-9]*\/customfields/).
+      to_return(body: File.read('spec/support/no_customfields.json'))
+  end
+
+  it 'should add an after_save class method' do
+    expect(described_class).to respond_to(:after_save)
+  end
+
   describe '.create' do
     subject { described_class.create attributes }
     before do
@@ -17,7 +26,30 @@ shared_examples 'persistable' do |location, id|
       expect(subject.id).to eql(id)
     end
 
-    if described_class.attributes.map(&:name).include?(:track_id)
+    described_class.embedded_associations.each do |name, association|
+      context "when the #{described_class} has embedded #{name}" do
+        let(:collection_root) do
+          association.target_klass.serializable_options.collection_root
+        end
+        let(:plural) { association.target_klass.queryable_options.plural }
+        let(:singular) { described_class.queryable_options.singular }
+        before do
+          stub_request(:get, /[0-9]*\/#{plural}/).
+            to_return(body: File.read("spec/support/all_#{plural}.json"))
+          stub_request(:put, /[0-9]*\/#{plural}/).
+            to_return(body: File.read("spec/support/all_#{plural}.json"))
+        end
+        subject { described_class.create attributes }
+
+        it "should save the embedded #{name}" do
+          expect(WebMock).to have_requested(
+            :put, "https://1234:@company.capsulecrm.com/api/#{singular}/#{subject.id}/#{plural}"
+          )
+        end
+      end
+    end
+
+    if described_class.attribute_set.map(&:name).include?(:track_id)
       context "when the #{described_class} has a track" do
         let(:track) { CapsuleCRM::Track.new(id: Random.rand(1..10)) }
         subject do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capsule_crm
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Matt Beedle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel