mautic 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb4e903dff064ccd272c769b31a9692b0479cc93f86d6caa7586f73adb0190d6
-  data.tar.gz: a96abb5a2f455fb0026bfe56be46640f49d6fdcf89673f27fb59ebae8f66aa42
+  metadata.gz: 8369fa0948409afca63ba594d3c630729dd160bc27fd9808dbaa941fab2e6a6e
+  data.tar.gz: 0cbc398f5515825575367d69866f176659713af2835df403901ee7321bdd0d85
 SHA512:
-  metadata.gz: 49997f77ce24fa44c9a3ec96a785b31d0ae382ccd754e9c3c89b1adabf33869b31dc3fbc0aaf25f38b3d988192cafa6ccc7d617b7c90a53ae516a6f218b8fa38
-  data.tar.gz: ab3974fd38ba6ce83c8b489634bce1a637b18effdddbcb779b98e5531d865cf4bd6363c899b57927a9374a409b35cc0f27865cffca7086963954bbfad9aa9828
+  metadata.gz: 623bedbe8dce28df4d92147ba646ff88506e1e2ddb883903ac687cfba6927164579279011307fbe53587d6940cd94a71feb55a31ef0a4642a7140a1e86f80253
+  data.tar.gz: e33d151ab4d0b44b4c978c347f6b56b1b4407520d814d9c62a2f0db1b363dab893cea944727158eab115ef17d9c9a0dec754c80ef25aaaf85bcfa3be5a556320

data/app/models/mautic/contact.rb

@@ -1,6 +1,9 @@
 module Mautic
   class Contact < Model
 
+    around_create :ensure_stage, if: ->(contact) { contact.changes.has_key?(:stage_id) }
+    around_update :ensure_stage, if: ->(contact) { contact.changes.has_key?(:stage_id) }
+
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
 
@@ -41,11 +44,13 @@ module Mautic
 
       if source
         self.owner = source['owner'] || {}
+        self.stage = source['stage'] || {}
         tags = (source['tags'] || []).map { |t| Mautic::Tag.new(self, t) }.sort_by(&:name)
         self.attributes = {
           tags: Tag::Collection.new(self, *tags),
           doNotContact: source['doNotContact'] || [],
           owner: owner['id'],
+          stage_id: stage&.id,
         }
       end
     end
@@ -134,11 +139,47 @@ module Mautic
 
     # !endgroup
 
+    # @!group Stage
+
+    # @return [Mautic::Stage, nil]
+    def stage
+      @stage
+    end
+
+    # @param [Mautic:::Stage,Hash, nil] hash
+    def stage=(object_or_hash)
+      @stage = case object_or_hash
+               when Mautic::Stage
+                 object_or_hash
+               when Hash
+                 Mautic::Stage.new(connection, object_or_hash)
+               end
+      @table[:stage_id] = @stage&.id
+      @stage
+    end
+
+    # !endgroup
+
     private
 
     def clear_change
       super
       remove_instance_variable :@do_not_contact
     end
+
+    # Add or Remove contact in stage after contact save
+    def ensure_stage
+      stage_id_change = changes[:stage_id]
+      yield
+      if stage_id_change
+        self.stage = Mautic::Stage.in(connection).find(stage_id_change)
+        stage.add_contact!(id)
+        @table[:stage_id] = stage.id
+      else
+        stage.remove_contact!(id)
+        @table.delete(:stage_id)
+      end
+      clear_changes
+    end
   end
-end
+end

data/app/models/mautic/stage.rb

@@ -0,0 +1,22 @@
+module Mautic
+  class Stage < Model
+
+    # @see https://developer.mautic.org/#add-contact-to-a-stage
+    # @param [Integer] id of Mautic::Contact
+    def add_contact!(id)
+      json = @connection.request(:post, "api/stages/#{self.id}/contact/#{id}/add")
+      json["success"]
+    rescue RequestError => _e
+      false
+    end
+
+    # @see https://developer.mautic.org/#remove-contact-from-a-stage
+    # @param [Integer] id of Mautic::Contact
+    def remove_contact!(id)
+      json = @connection.request(:post, "api/stages/#{self.id}/contact/#{id}/remove")
+      json["success"]
+    rescue RequestError => _e
+      false
+    end
+  end
+end

data/lib/mautic/model.rb

@@ -2,6 +2,7 @@ module Mautic
   # Virtual model for Mautic endpoint
   #   @see https://developer.mautic.org/#endpoints
   class Model < OpenStruct
+    extend ActiveModel::Callbacks
 
     class MauticHash < Hash
 
@@ -37,6 +38,8 @@ module Mautic
 
     end
 
+    define_model_callbacks :create, :update, :save
+
     attr_reader :connection
     attr_accessor :errors
     attr_writer :changed
@@ -55,15 +58,19 @@ module Mautic
     end
 
     def save(force = false)
-      id.present? ? update(force) : create
+      run_callbacks :save do
+        id.present? ? update(force) : create
+      end
     end
 
     def update(force = false)
       return false unless changed?
 
       begin
-        json = @connection.request((force && :put || :patch), "api/#{endpoint}/#{id}/edit", body: to_mautic)
-        assign_attributes json[endpoint.singularize]
+        run_callbacks :create do
+          json = @connection.request((force && :put || :patch), "api/#{endpoint}/#{id}/edit", body: to_mautic)
+          assign_attributes json[endpoint.singularize]
+        end
         clear_changes
       rescue ValidationError => e
         self.errors = e.errors
@@ -82,8 +89,10 @@ module Mautic
 
     def create
       begin
-        json = @connection.request(:post, "api/#{endpoint}/#{id && "#{id}/"}new", body: to_mautic)
-        assign_attributes json[endpoint.singularize]
+        run_callbacks :create do
+          json = @connection.request(:post, "api/#{endpoint}/#{id && "#{id}/"}new", body: to_mautic)
+          assign_attributes json[endpoint.singularize]
+        end
         clear_changes
       rescue ValidationError => e
         self.errors = e.errors
@@ -124,14 +133,14 @@ module Mautic
     end
 
     def to_mautic(data = @table)
-      data.each_with_object({}) do |(key, val), mem|
-        mem[key] = if val.respond_to?(:to_mautic)
-                     val.to_mautic
-                   elsif val.is_a?(Array)
-                     val.join("|")
-                   else
-                     val
-                   end
+      data.transform_values do |val|
+        if val.respond_to?(:to_mautic)
+          val.to_mautic
+        elsif val.is_a?(Array)
+          val.join("|")
+        else
+          val
+        end
       end
     end
 

data/lib/mautic/version.rb

@@ -1,3 +1,3 @@
 module Mautic
-  VERSION = '2.5.0'
+  VERSION = '2.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mautic
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Lukáš Pokorný
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2021-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -176,6 +176,7 @@ files:
 - app/models/mautic/contact_field.rb
 - app/models/mautic/event.rb
 - app/models/mautic/form.rb
+- app/models/mautic/stage.rb
 - app/models/mautic/tag.rb
 - app/models/mautic/web_hook.rb
 - app/views/layouts/mautic/application.html.erb
@@ -204,7 +205,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -219,8 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.8
+signing_key: 
 specification_version: 4
 summary: Ruby on Rails Mautic integration
 test_files: