mautic 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 395ca0792f8a56986bc97cc6a267deb9c24cdb44
-  data.tar.gz: 15c8e1583f8ea06db7683400978c8bf064b54e77
+  metadata.gz: 4be984905747a5913cd7271d2f0f8b2475a22cf6
+  data.tar.gz: 14020973bd047ea58c470d3270f1b3000ded51f4
 SHA512:
-  metadata.gz: bfff68b112c2edb739a49d4d549d1165f91d728b412c4a4e24219387e23ba65b7ec4f3ddc6892ddb3206b494e85f99b1b31d3b3238bc262cdf12859d7ca337d5
-  data.tar.gz: 5ec16c2043356e0118c0b509a8358b8902b750645e30092b3fa50f92c21aa24de986b1ca17c91b6232a5a5ae1848ff57cb691712c7c1ab5a1d11f9c2e7181c42
+  metadata.gz: 4f116539c9dc6a253e3373bf91c06bcc88600c120237bbb376769b1b3c2c6fb8711e6ed4dc9e828c53dbd2115bfd6166528b1c4726c2ded28dfde27d23b4713a
+  data.tar.gz: 65cf3ee03b29e4561ea9828f5f3ee1a6b78a0d71d7124642512e64af12315378bfd9369c705c9d1201334c9d231cdbc815dbd411f9d223c51304bfb5ee0e7b7b

data/README.md

@@ -5,6 +5,13 @@ RoR helper / wrapper for Mautic API and forms
 ### Gem provides API connection to your Mautic(s)
   1. Create mautic connection
   2. Authorize it
+      
+      In mautic you need add API oauth2 login.
+      For URI callback allow:
+      ```
+      http://localhost:3000/mautic/connections/:ID/oauth2
+      ```
+      ID = is your Mautic::Connection ID
   
    Find connection which you want to use:
   ```ruby

data/app/models/mautic/connection.rb

@@ -39,9 +39,40 @@ module Mautic
     end
 
     def request(type, path, params = {})
-      raise NotImplementedError
+      @last_request = [type, path, params]
+      response = raise NotImplementedError
+      parse_response(response)
     end
 
+    private
+
+    def parse_response(response)
+      case response.status
+      when 400
+        raise Mautic::ValidationError.new(response)
+      when 404
+        raise Mautic::RecordNotFound.new(response)
+      when 200, 201
+        json = JSON.parse(response.body) rescue {}
+        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)
+          when 404
+            raise Mautic::RecordNotFound.new(response)
+          else
+            raise Mautic::RequestError.new(response)
+          end
+        end
+      else
+        raise Mautic::RequestError.new(response)
+      end
+
+      json
+    end
 
   end
 end

data/app/models/mautic/connections/oauth2.rb

@@ -30,21 +30,9 @@ module Mautic
       end
 
       def request(type, path, params = {})
-        json = JSON.parse connection.request(type, path, params).body
-        Array(json['errors']).each do |error|
-          case error['code']
-          when 400
-            # Validation error
-          when 401
-            raise Mautic::TokenExpiredError.new(error['message']) if @try_to_refresh
-            @try_to_refresh = true
-            refresh!
-            json = request(type, path, params)
-          else
-            raise Mautic::AuthorizeError.new("#{error['code']} - #{error['message']}")
-          end
-        end
-        json
+        @last_request = [type, path, params]
+        response = connection.request(type, path, params)
+        parse_response(response)
       end
 
       private

data/app/models/mautic/contact.rb

@@ -1,6 +1,8 @@
 module Mautic
   class Contact < Model
 
+    alias_attribute :first_name, :firstname
+    alias_attribute :last_name, :lastname
     def self.in(connection)
       Proxy.new(connection, endpoint, default_params: { search: '!is:anonymous' })
     end

data/lib/mautic.rb

@@ -8,14 +8,46 @@ module Mautic
   autoload :Proxy, 'mautic/proxy'
   autoload :Model, 'mautic/model'
 
-  class TokenExpiredError < StandardError
+  class RequestError < StandardError
+
+    attr_reader :response, :errors
+
+    def initialize(response, message = nil)
+      @errors ||= []
+      @response = response
+      json_body = JSON.parse(response.body) rescue {}
+      message ||= Array(json_body['errors']).collect do |error|
+        msg = error['code'].to_s
+        msg << " (#{error['type']}):" if error['type']
+        msg << " #{error['message']}"
+        @errors << error['message']
+        msg
+      end.join(', ')
+
+      super(message)
+    end
+
   end
 
-  class ValidationError < StandardError
+  class TokenExpiredError < RequestError
+  end
+
+  class ValidationError < RequestError
+
+    def initialize(response, message = nil)
+      @response = response
+      json_body = JSON.parse(response.body) rescue {}
+      @errors = Array(json_body['errors']).inject({}) { |mem, var| mem.merge!(var['details']); mem }
+      message ||= @errors.collect { |field, msg| "#{field}: #{msg.join(', ')}" }.join('; ')
+      super(response, message)
+    end
+
+  end
 
+  class AuthorizeError < RequestError
   end
 
-  class AuthorizeError < StandardError
+  class RecordNotFound < RequestError
   end
 
   configure do |config|

data/lib/mautic/model.rb

@@ -32,6 +32,7 @@ module Mautic
       @table = MauticHash.new
       self.attributes = { created_at: hash['dateAdded']&.to_time, updated_at: hash['dateModified']&.to_time } if hash
       assign_attributes(hash)
+      clear_changes
     end
 
     def save(force = false)
@@ -40,29 +41,37 @@ module Mautic
 
     def update(force = false)
       return false if changes.blank?
-      json = @connection.request((force && :put || :patch), "api/#{endpoint}/#{id}/edit", { body: to_h })
-      if json['errors']
-        self.errors = json['errors']
-      else
+      begin
+        json = @connection.request((force && :put || :patch), "api/#{endpoint}/#{id}/edit", { body: to_h })
         self.attributes = json[endpoint.singularize]
+        clear_changes
+      rescue ValidationError => e
+        self.errors = e.errors
       end
-      json['errors'].blank?
+
+      self.errors.blank?
     end
 
     def create
-      json = @connection.request(:post, "api/#{endpoint}/#{id}/new", { body: to_h })
-      if json['errors']
-        self.errors = json['errors']
-      else
+      begin
+        json = @connection.request(:post, "api/#{endpoint}/#{id}/new", { body: to_h })
         self.attributes = json[endpoint.singularize]
+        clear_changes
+      rescue ValidationError => e
+        self.errors = e.errors
       end
-      json['errors'].blank?
+
+      self.errors.blank?
     end
 
     def destroy
-      json = @connection.request(:delete, "api/#{endpoint}/#{id}/delete")
-      self.errors = json['errors'] if json['errors']
-      json['errors'].blank?
+      begin
+        @connection.request(:delete, "api/#{endpoint}/#{id}/delete")
+        true
+      rescue RequestError => e
+        self.errors = e.errors
+        false
+      end
     end
 
     def changes
@@ -73,20 +82,23 @@ module Mautic
       @table.to_h
     end
 
-    private
-
-    def endpoint
-      self.class.endpoint
-    end
-
     def attributes=(hash)
       hash.each_pair do |k, v|
         k = k.to_sym
         @table[k] = v
       end
+    end
+
+    private
+
+    def clear_changes
       @table.instance_variable_set(:@changes, nil)
     end
 
+    def endpoint
+      self.class.endpoint
+    end
+
     def assign_attributes(source = nil)
       source ||= {}
       data = {}

data/lib/mautic/version.rb

@@ -1,3 +1,3 @@
 module Mautic
-  VERSION = '1.0.1'
+  VERSION = '1.0.3'
 end

data/spec/rails_helper.rb

@@ -1,4 +1,7 @@
 ENV['RAILS_ENV'] ||= 'test'
+require 'simplecov'
+SimpleCov.start
+
 require File.expand_path("../dummy/config/environment.rb", __FILE__)
 # Prevent database truncation if the environment is production
 abort('The Rails environment is running in production mode!') if Rails.env.production?

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ require 'factory_bot_rails'
 require 'database_cleaner'
 require 'faker'
 require 'webmock/rspec'
+require 'pry-rails'
 # require 'capybara/rspec'
 
 ActiveRecord::Migration.maintain_test_schema!
@@ -34,10 +35,6 @@ RSpec.configure do |config|
   end
 
   config.include FactoryBot::Syntax::Methods
-  # DatabaseCleaner.clean_with(
-  #   :truncation,
-  #   except: %w(ar_internal_metadata)
-  # )
 
   config.before(:suite) do
     DatabaseCleaner.clean_with(:truncation, except: %w(ar_internal_metadata))
@@ -47,10 +44,6 @@ RSpec.configure do |config|
     DatabaseCleaner.strategy = :transaction
   end
 
-  config.before(:each, js: true) do
-    DatabaseCleaner.strategy = :truncation
-  end
-
   config.before(:each) do
     DatabaseCleaner.start
   end
@@ -65,21 +58,4 @@ RSpec.configure do |config|
 
   config.filter_rails_from_backtrace!
 
-  # config.before(:each) do |ex|
-  #   meta = ex.metadata
-  #   unless meta[:null]
-  #     case meta[:logged]
-  #     when :admin
-  #       logged(Symphonia::User, FactoryBot.create(:admin_user))
-  #     when true
-  #       logged(Symphonia::User, FactoryBot.create(:user))
-  #     end
-  #   end
-  # end
-
-end
-
-
-def logged(model, user)
-  allow(model).to receive(:current).and_return(user)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mautic
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails Mautic integration