amorail 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0fe2be0f031e806dd9eac0da0ac09ee4a9b5d79
-  data.tar.gz: ae1153aee232f6d0b30190a68e0e2b2e9d15cdd7
+  metadata.gz: 151952934c801a5cce9b699869f1e46bd88f4e6a
+  data.tar.gz: 9ed39010c5f080bd68c07d35fc3434edba549b4d
 SHA512:
-  metadata.gz: 32b9fb3a98d3ac82dd40e9c7fd4f9aeb079d8f942a72f98428de7bf13712a1edea8d2b7562e16974d8ddadd4e80024e5119ca79d3e6cb6a7118535367922e312
-  data.tar.gz: 224079bf6eb4bb040a72386fd589b0f4aca5bb76df7a1c69ba9e6cd923e9064db53ab3c8d7be3f941f891df2bfb0932b0e56499ba64b9c7637977eafedf2558c
+  metadata.gz: a11232b9fbc2f0b93f87d90e14c8ac068dff7281e732727156229708e3cb8bb0f1406840922ad203f41cbd451bd0d926e75d46c1c37a3f2893ff20a65d100069
+  data.tar.gz: 0eba066877b078d2676e0c9896b5c36a6a9451cf5894c4cabe0b83377c2d65b528970e8bc5bfc2cdd7e2185d789136fb8db8ce0faa2034181b624bd03997dce8

data/lib/amorail/entities/company.rb

@@ -2,7 +2,7 @@ require 'amorail/entities/leadable'
 
 module Amorail
   # AmoCRM company entity
-  class AmoCompany < Amorail::AmoEntity
+  class Company < Amorail::Entity
     include Leadable
     amo_names 'company', 'contacts'
 

data/lib/amorail/entities/contact.rb

@@ -2,16 +2,21 @@ require 'amorail/entities/leadable'
 
 module Amorail
   # AmoCRM contact entity
-  class AmoContact < Amorail::AmoEntity
+  class Contact < Amorail::Entity
     include Leadable
     amo_names 'contacts'
 
-    amo_field :name, :company_name
+    amo_field :name, :company_name, :linked_company_id
 
     amo_property :email, enum: 'WORK'
     amo_property :phone, enum: 'MOB'
     amo_property :position
 
     validates :name, presence: true
+
+    def company
+      return if linked_company_id.nil?
+      @company ||= Amorail::Company.find(linked_company_id)
+    end
   end
 end

data/lib/amorail/entities/lead.rb

@@ -1,6 +1,6 @@
 module Amorail
   # AmoCRM lead entity
-  class AmoLead < Amorail::AmoEntity
+  class Lead < Amorail::Entity
     amo_names "leads"
 
     amo_field :name, :price, :status_id, :tags

data/lib/amorail/entities/leadable.rb

@@ -1,6 +1,14 @@
 module Amorail
   # Lead associations
   module Leadable
-    # TODO: !!!
+    def linked_leads_id
+      @linked_leads_id ||= []
+    end
+
+    def params
+      data = super
+      data[:linked_leads_id] = linked_leads_id unless linked_leads_id.empty?
+      data
+    end
   end
 end

data/lib/amorail/entities/task.rb

@@ -1,6 +1,6 @@
 module Amorail
   # AmoCRM task entity
-  class AmoTask < Amorail::AmoEntity
+  class Task < Amorail::Entity
     amo_names "tasks"
 
     amo_field :element_id, :element_type, :text,

data/lib/amorail/entity/finders.rb

@@ -1,5 +1,5 @@
 module Amorail # :nodoc: all
-  class AmoEntity
+  class Entity
     class << self
       def find(id)
         new.load_record(id)

data/lib/amorail/entity/params.rb

@@ -1,5 +1,5 @@
 module Amorail # :nodoc: all
-  class AmoEntity
+  class Entity
     def params
       data = {}
       self.class.attributes.each do |k, v|

data/lib/amorail/entity/persistance.rb

@@ -1,5 +1,5 @@
 module Amorail # :nodoc: all
-  class AmoEntity
+  class Entity
     class InvalidRecord < ::Amorail::Error; end
     class NotPersisted < ::Amorail::Error; end
 
@@ -38,6 +38,11 @@ module Amorail # :nodoc: all
       end
     end
 
+    def reload
+      fail NotPersisted if id.nil?
+      load_record(id)
+    end
+
     private
 
     def extract_data_add(response)

data/lib/amorail/entity.rb

@@ -2,7 +2,7 @@ require 'active_model'
 
 module Amorail
   # Core class for all Amo entities (company, contact, etc)
-  class AmoEntity
+  class Entity
     include ActiveModel::Model
     include ActiveModel::AttributeMethods
     include ActiveModel::Validations

data/lib/amorail/version.rb

@@ -1,4 +1,4 @@
 # Amorail version
 module Amorail
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/company_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Amorail::AmoCompany do
+describe Amorail::Company do
   before { mock_api }
 
   describe "validations" do
@@ -65,6 +65,8 @@ describe Amorail::AmoCompany do
       expect(prop).not_to be_nil
       expect(prop[:values].first[:value]).to eq 'hoohle.com'
     end
+
+    it_behaves_like 'leadable'
   end
 
   describe "#save" do

data/spec/contact_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Amorail::AmoContact do
+describe Amorail::Contact do
   before { mock_api }
 
   let(:contact) { described_class.new(name: "test") }
@@ -28,6 +28,7 @@ describe Amorail::AmoContact do
       described_class.new(
         name: 'Tester',
         company_name: 'Test inc',
+        linked_company_id: 123,
         phone: '12345678',
         email: 'test@mala.ru',
         position: 'CEO'
@@ -39,6 +40,7 @@ describe Amorail::AmoContact do
     specify { is_expected.to include(:last_modified) }
     specify { is_expected.to include(name: 'Tester') }
     specify { is_expected.to include(company_name: 'Test inc') }
+    specify { is_expected.to include(linked_company_id: 123) }
 
     it "contains email property" do
       prop = subject[:custom_fields].detect { |p| p[:id] == "1460591" }
@@ -61,6 +63,8 @@ describe Amorail::AmoContact do
       expect(prop).not_to be_nil
       expect(prop[:values].first[:value]).to eq 'CEO'
     end
+
+    it_behaves_like 'leadable'
   end
 
   describe ".find" do
@@ -83,7 +87,7 @@ describe Amorail::AmoContact do
 
     it "raise error" do
       expect { described_class.find!(102) }
-        .to raise_error(Amorail::AmoEntity::RecordNotFound)
+        .to raise_error(Amorail::Entity::RecordNotFound)
     end
   end
 

data/spec/entity_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Amorail::AmoEntity do
+describe Amorail::Entity do
   before { mock_api }
 
   let(:entity) { described_class.new }

data/spec/lead_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Amorail::AmoLead do
+describe Amorail::Lead do
   before { mock_api }
 
   describe "validations" do

data/spec/support/leadable_example.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+shared_examples 'leadable' do
+  let(:leadable) { described_class.new }
+  subject { leadable.params }
+
+  specify { is_expected.not_to include(:linked_leads_id) }
+
+  context 'with leads' do
+    before { leadable.linked_leads_id << 100 }
+    specify { is_expected.to include(:linked_leads_id) }
+    specify { expect(subject.fetch(:linked_leads_id)).to include(100) }
+  end
+end

data/spec/task_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Amorail::AmoTask do
+describe Amorail::Task do
   before { mock_api }
 
   describe "validations" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amorail
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - alekseenkoss
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -219,6 +219,7 @@ files:
 - spec/property_spec.rb
 - spec/spec_helper.rb
 - spec/support/entity_class_example.rb
+- spec/support/leadable_example.rb
 - spec/task_spec.rb
 homepage: ''
 licenses:
@@ -259,5 +260,6 @@ test_files:
 - spec/property_spec.rb
 - spec/spec_helper.rb
 - spec/support/entity_class_example.rb
+- spec/support/leadable_example.rb
 - spec/task_spec.rb
 has_rdoc: