mautic 2.2.2 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89cef64a0de1e7e4e5e9646ec53c483d95d8bf533918ed2560118c0f3d7652b8
-  data.tar.gz: a0a34b7c04bb6ccc11ce78290190655103b1d7ad7f6f919fcd4e5fb30f5fbcbb
+  metadata.gz: 50cf7b5fa5dcc376ddb8a7e50a37c521d00ffcab8cef1b17b2e1bac598eb70aa
+  data.tar.gz: 6a6f4890c25207a24ac1eaa0b30834e8059fec5c0f14e0392e7e902016882688
 SHA512:
-  metadata.gz: b666c92dbfeeb6bd73c4a29007c064c7c29bd8dbf6f9af26d4b24885a6abd7decfcb22535e93009dac190c54f0631c55ea0d2c6c28164ad7ff835355905cd12c
-  data.tar.gz: '08a8ac1556b51dc267e84bcb20ceb2b556fe879053b0c2abe961439d9858a1106bb78cd43fa670fdd9c08dd6e3dc02b20159f8d134ae1a6cde832eb22c0b9bcd'
+  metadata.gz: 37cd5dae4578a9bffa5f16a9ac4341b7f9c22bf1e1f0bdbd86aab0e7ac76932d5e1106c2c33f50214f8ec9e0f51102cb68d1c718d952c42cdbaf38e24c8b6b2e
+  data.tar.gz: ee5be0217d9e2797778ab93ff29b9bc39a23e8c0bc92bbd7aa2df59ae46008a5eb60624d4743001ef4d2e1cbda15ddd7eb24c9c2a44b495d177ff8ea53235f7e

data/app/controllers/concerns/mautic/receive_web_hooks.rb

@@ -8,7 +8,7 @@ module Mautic
 
     protected
 
-    # params path need +:mautic_id+
+    # @note params path need +:mautic_connection_id+ . => Its Mautic::Connection ID
     def webhook
       @webhook ||= Mautic::Connection.receive_webhook params
     end

data/app/models/mautic/connection.rb

@@ -10,7 +10,7 @@ module Mautic
 
     # @param [ActionController::Parameters] params
     def self.receive_webhook(params)
-      WebHook.new(find(params.require(:mautic_id)), params)
+      WebHook.new(find(params.require(:mautic_connection_id)), params)
     end
 
     def client
@@ -67,6 +67,8 @@ module Mautic
       case response.status
       when 400
         raise Mautic::ValidationError.new(response)
+      when 401
+        json = try_to_refresh_and_parse(response)
       when 404
         raise Mautic::RecordNotFound.new(response)
       when 200, 201
@@ -74,10 +76,7 @@ module Mautic
         Array(json['errors']).each do |error|
           case error['code'].to_i
           when 401
-            raise Mautic::TokenExpiredError.new(response) if @try_to_refresh
-            @try_to_refresh = true
-            refresh!
-            json = request(*@last_request)
+            json = try_to_refresh_and_parse(response)
           when 404
             raise Mautic::RecordNotFound.new(response)
           else
@@ -91,5 +90,14 @@ module Mautic
       json
     end
 
+    private
+
+    def try_to_refresh_and_parse(response)
+      raise Mautic::TokenExpiredError.new(response) if @try_to_refresh
+      @try_to_refresh = true
+      refresh!
+      request(*@last_request)
+    end
+
   end
 end

data/app/models/mautic/contact.rb

@@ -14,9 +14,13 @@ module Mautic
     def assign_attributes(source = nil)
       super
       self.attributes = {
-        tags: (source['tags'] || []).collect{|t| Mautic::Tag.new(@connection, t)}
+        tags: (source['tags'] || []).collect { |t| Mautic::Tag.new(@connection, t) }.sort_by(&:name)
       } if source
     end
 
+    def events
+      @proxy_events ||= Proxy.new(connection, "contacts/#{id}/events", klass: "Mautic::Event")
+    end
+
   end
 end

data/app/models/mautic/event.rb

@@ -0,0 +1,23 @@
+module Mautic
+  class Event < Model
+
+    def initialize(connection, hash = nil)
+      hash["id"] ||= hash["eventId"]
+      hash["dateAdded"] ||= hash["timestamp"]&.to_time
+      super
+    end
+
+    def event_label
+      eventLabel
+    end
+
+    def label
+      event_label.is_a?(Hash) && event_label["label"] || event_label.to_s
+    end
+
+    def source_url
+      event_label.is_a?(Hash) ? "#{connection.url}#{event_label["href"]}" : nil
+    end
+
+  end
+end

data/app/models/mautic/web_hook.rb

@@ -12,7 +12,7 @@ module Mautic
 
     def form_submissions
       @forms ||= Array.wrap(@params.require("mautic.form_on_submit")).collect do |data|
-        p = data.permit(submission: [:id, form: {}, lead: {}]).to_h
+        p = data.permit(submission: [:id, form: {}, lead: {}, results: {}]).to_h
         ::Mautic::Submissions::Form.new(@connection, p["submission"]) if p["submission"]
       end.compact
     end

data/app/views/mautic/connections/edit.html.erb

@@ -1,3 +1,4 @@
 <h1>Editing Mautic Connection</h1>
 
 <%= render 'form', mautic_connection: @mautic_connection %>
+callback_url: <%= @mautic_connection.send :callback_url %>

data/config/routes.rb

@@ -5,6 +5,6 @@ Mautic::Engine.routes.draw do
       get :oauth2
 
     end
-    # post "webhook/:mautic_id", action: "webhook", on: :collection
+    # post "webhook/:mautic_connection_id", action: "webhook", on: :collection
   end
 end

data/lib/mautic/proxy.rb

@@ -2,15 +2,23 @@ module Mautic
   class Proxy
 
     def initialize(connection, endpoint, options = nil)
+      @options = options || {}
       @connection = connection
-      klass = "Mautic::#{endpoint.classify}"
+      klass = @options.delete(:klass) || "Mautic::#{endpoint.classify}"
       @target = klass.safe_constantize || Mautic.const_set(endpoint.classify, Class.new(Mautic::Model))
       @endpoint = endpoint
-      @options = options || {}
     end
 
     def new(attributes = {})
-      @target.new(@connection, attributes)
+      build_instance attributes
+    end
+
+    def data_name
+      @endpoint.split("/").last
+    end
+
+    def build_instance(data)
+      @target.new(@connection, data)
     end
 
     def all(options = {}, &block)
@@ -31,17 +39,18 @@ module Mautic
         end
       else
         results = where(options)
-        results.each{|i| yield i } if block_given?
+        results.each { |i| yield i } if block_given?
       end
       results
     end
 
     def where(params = {})
-      q =  params.reverse_merge(@options[:default_params] || {})
-      json = @connection.request(:get, "api/#{@endpoint}", {params: q })
+      q = params.reverse_merge(@options[:default_params] || {})
+      json = @connection.request(:get, "api/#{@endpoint}", { params: q })
+      @count = json["total"].to_i
       @last_response = json
-      json[@endpoint].collect do |id, attributes|
-        @target.new(@connection, attributes || id)
+      json[data_name].collect do |id, attributes|
+        build_instance attributes || id
       end
     end
 
@@ -52,9 +61,15 @@ module Mautic
     def find(id)
       json = @connection.request(:get, "api/#{@endpoint}/#{id}")
       @last_response = json
-      @target.new(@connection, json[@endpoint.singularize])
+      build_instance json[data_name.singularize]
     end
 
+    def count
+      return @count if defined? @count
+
+      json = @connection.request(:get, "api/#{@endpoint}", { limit: 1 })
+      @count = json["total"].to_i
+    end
 
   end
 end

data/lib/mautic/submissions/form.rb

@@ -3,26 +3,32 @@ module Mautic
     class Form
       attr_reader :id
 
+      # @param [Mautic::Connection] connection
+      # @param [Hash] data
       def initialize(connection, data)
         @connection = connection
         @raw = data
-        @id = data["id"]
+        @id = data["id"].to_i
       end
 
+      # @return [Integer]
       def form_id
-        @raw["form"]["id"]
+        @form_id ||= @raw["form"]["id"].to_i
       end
 
+      # @return [Integer]
       def contact_id
-        @raw["lead"]["id"]
+        @contact_id ||= @raw["lead"]["id"]
       end
 
+      # @return [Mautic::Form]
       def form
         @form ||= @connection.forms.new(@raw["form"].merge("fields" => @raw["results"]))
       end
 
+      # @return [Mautic::Contact]
       def contact
-        @connection.contacts.new(@raw["lead"])
+        @contact ||= @connection.contacts.new(@raw["lead"])
       end
     end
   end

data/lib/mautic/version.rb

@@ -1,3 +1,3 @@
 module Mautic
-  VERSION = '2.2.2'
+  VERSION = '2.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mautic
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.1
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ files:
 - app/models/mautic/connection.rb
 - app/models/mautic/connections/oauth2.rb
 - app/models/mautic/contact.rb
+- app/models/mautic/event.rb
 - app/models/mautic/form.rb
 - app/models/mautic/tag.rb
 - app/models/mautic/web_hook.rb
@@ -220,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails Mautic integration