amorail 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b18605e272eb7a0c72af69e2d017f54753ff715d474d79cc9071791a036cd6d
-  data.tar.gz: d77fee259b877786fd18a044aaa52aff432be6936834095b5d8ab2d857d0df11
+  metadata.gz: bbc85a53892ba746e91fb6b52a9d86dedfa4c2885bc550760797cea6b6c1077a
+  data.tar.gz: ef947d63cdb4556d3d37934bf7ff6a4298c529b3692ee2617b207737f460b9ad
 SHA512:
-  metadata.gz: ab1e1221b40f406909ed76f4b444b7f7f7805d8f04c1e386030563471172175149ff718438bb4ee97d9bee28f2a3d9b9a78733828f8ab2d7b62edca6f631f56e
-  data.tar.gz: 4034fbcc9fea9004e159e62ac910ce9bfbe301ea76013f7d62d05a26cae8df2084c2836a4e4c65707cc4451fc8380fc163c5afe580068bdb8c4a40f79f632ff3
+  metadata.gz: 92801120cb72d28e30df5d41ee23cf2f89681eec639f6837d75302204ab0b49d0b1bfffdd2ea544fad88a6e57939b2bfc8ddd1305c439ab4ff4c31b8206f998c
+  data.tar.gz: 532f646b965c0f92f7a4e6174932a97e1c0fb023fbfa4d4b2fea1d3d348361e3885ef671fbd0e165c00c274c136fe6d39dc628904e6487cd447375e576782db7

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## master (unreleased)
 
+## 0.7.1 (2021-09-25)
+
+### Features
+
+- Adds multiple option to property ([@lHydra][])
+
+See spec/support/my_contact.rb and spec/my_contact_spec.rb
+
 ## 0.7.0 (2021-07-16)
 
 ### Features

data/lib/amorail/entity/params.rb

@@ -23,8 +23,17 @@ module Amorail # :nodoc: all
       custom_fields = []
       self.class.properties.each do |k, v|
         prop_id = props.send(k).id
-        prop_val = { value: send(v.fetch(:method_name, k)) }.merge(v)
-        custom_fields << { id: prop_id, values: [prop_val] }
+        prop_values = send(v.fetch(:method_name, k))
+
+        if prop_values.is_a?(Array)
+          prop_val = prop_values.map do |value|
+            { value: value }.merge(v)
+          end
+        else
+          prop_val = [{ value: prop_values }.merge(v)]
+        end
+
+        custom_fields << { id: prop_id, values: prop_val }
       end
 
       custom_fields

data/lib/amorail/entity.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_model'
+require 'active_support/core_ext/array'
 
 module Amorail
   # Core class for all Amo entities (company, contact, etc)
@@ -34,7 +35,12 @@ module Amorail
 
       def amo_property(name, options = {})
         properties[name] = options
-        attr_accessor(options.fetch(:method_name, name))
+        var_name = options.fetch(:method_name, name)
+        define_method "#{var_name}=" do |value|
+          var_value = options[:multiple] ? Array.wrap(value) : Array.wrap(value).first
+          instance_variable_set("@#{var_name}", var_value)
+        end
+        attr_reader(var_name)
       end
 
       def attributes
@@ -93,7 +99,7 @@ module Amorail
         next if fname.nil?
 
         fname = "#{fname.downcase}="
-        fval = f.fetch('values').first.fetch('value')
+        fval = f.fetch('values').pluck('value')
         send(fname, fval) if respond_to?(fname)
       end
     end

data/lib/amorail/version.rb

@@ -2,5 +2,5 @@
 
 # Amorail version
 module Amorail
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

data/spec/contact_spec.rb

@@ -168,10 +168,12 @@ describe Amorail::Contact do
     it "update params" do
       contact.save!
       contact.name = "foo"
+      contact.phone = "123456789"
 
       contact_update_stub(Amorail.config.api_endpoint)
       expect(contact.save!).to be_truthy
       expect(contact.name).to eq "foo"
+      expect(contact.phone).to eq "123456789"
     end
 
     it "raise error if id is blank?" do

data/spec/fixtures/contacts/my_contact_find.json

@@ -27,6 +27,10 @@
               {
                 "value": "1111 111 111",
                 "enum": "3392086"
+              },
+              {
+                "value": "2222 222 222",
+                "enum": "3392086"
               }
             ]
           },

data/spec/my_contact_spec.rb

@@ -14,7 +14,7 @@ describe MyContact do
   end
 
   describe "#params" do
-    let(:company) do
+    let(:contact) do
       described_class.new(
         name: 'Test inc',
         phone: '12345678',
@@ -23,7 +23,7 @@ describe MyContact do
       )
     end
 
-    subject { company.params }
+    subject { contact.params }
 
     specify { is_expected.to include(:last_modified) }
     specify { is_expected.to include(name: 'Test inc') }
@@ -43,6 +43,7 @@ describe MyContact do
       expect(obj.id).to eq 11
       expect(obj.company_name).to eq "Foo Inc."
       expect(obj.email).to eq "foo@tb.com"
+      expect(obj.phone).to eq ["1111 111 111", "2222 222 222"]
       expect(obj.teachbase_id).to eq 1123
       expect(obj.params[:id]).to eq 11
     end

data/spec/support/my_contact.rb

@@ -2,4 +2,5 @@
 
 class MyContact < Amorail::Contact # :nodoc:
   amo_property :teachbase_id
+  amo_property :phone, enum: 'MOB', multiple: true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amorail
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - alekseenkoss
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Ruby API client for AmoCRM