mautic 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae603a459a430f1c56f626d53b5e124d8b8c8c7c
-  data.tar.gz: 2fe7b84ed8f84132d9de88d087f3c19be9289d14
+SHA256:
+  metadata.gz: 69e12653c1733475492f305f2fbb677898ac30997c8e145d9d83222890a5084b
+  data.tar.gz: 61448d97dd30a0b94b9f5898e64d37316176d4497f1a4bebf2da86d6b05fe830
 SHA512:
-  metadata.gz: f8e55980f0f3f508459e071848fdb177b90a084eb7931b6c0e34a9b9fddd57ebe34c3a08aae02a2a96d247ede0dd161610c7e565b9d316823653f4f7b6746058
-  data.tar.gz: 5505b22d15af7b959b536a1ec00e437051a4a49ac1281593bee90e3bc64cb52b9013886cd9981d5835574c07ad293d70895477649efdb105d454087e0600d78d
+  metadata.gz: e8a174aff3f060c0659a8ec1a2b04861ee9ddba6a246f50ae60f1e913dbcfed96263bb831d417aa143d2476933c3d3876421976270073ce56cc414543c5527af
+  data.tar.gz: acc8e875b58b23d8d0eba9a416fff6a3823218993162be99f2b55602c7a3d3f7d53a98818e30063703f747a1eb02f396daa4f23f452decaab5f4a8c57de2af5a

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

@@ -0,0 +1,118 @@
+module Mautic
+  module ConnectionsControllerConcern
+    extend ActiveSupport::Concern
+
+    included do
+
+      before_action :set_mautic_connection, only: [:show, :edit, :update, :destroy, :oauth2, :authorize]
+
+    end
+
+
+    # GET /mautic_connections
+    def index
+      @mautic_connections = Mautic::Connection.order(:url)
+      respond_to do |format|
+        format.html { render layout: !request.xhr? }
+        format.json { render json: @mautic_connections }
+      end
+    end
+
+    # GET /mautic_connections/1
+    def show
+      respond_to do |format|
+        format.html { render layout: !request.xhr? }
+      end
+    end
+
+    # GET /mautic_connections/new
+    def new
+      @mautic_connection = Mautic::Connection.new
+      respond_to do |format|
+        format.html { render layout: !request.xhr? }
+      end
+    end
+
+    # GET /mautic_connections/1/edit
+    def edit
+      respond_to do |format|
+        format.html { render layout: !request.xhr? }
+      end
+    end
+
+    # POST /mautic_connections
+    def create
+      @mautic_connection = Mautic::Connection.new(mautic_connection_params)
+
+      respond_to do |format|
+        if @mautic_connection.save
+          format.html { render(:edit, notice: t('mautic.text_mautic_connection_created')) }
+          format.js { head :no_content }
+          format.json { render json: @mautic_connection }
+        else
+          format.html { render :new }
+          format.js { head :unprocessable_entity }
+          format.json { render json: @mautic_connection.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    # PATCH/PUT /mautic_connections/1
+    def update
+      respond_to do |format|
+        if @mautic_connection.update(mautic_connection_params)
+          format.html { redirect_to({ action: :index }, notice: t('mautic.text_mautic_connection_updated')) }
+          format.js { head :no_content }
+          format.json { render json: @mautic_connection }
+        else
+          format.html { render :edit }
+          format.js { head :unprocessable_entity }
+          format.json { render json: @mautic_connection.errors, status: :unprocessable_entity }
+        end
+      end
+    end
+
+    # DELETE /mautic_connections/1
+    def destroy
+      @mautic_connection.destroy
+      respond_to do |format|
+        format.html { redirect_to action: "index", notice: t('mautic.text_mautic_connection_destroyed') }
+        format.js { render js: "document.getElementById('#{view_context.dom_id(@mautic_connection)}').remove()" }
+        format.json { render json: @mautic_connection }
+      end
+    end
+
+    # ==--==--==--==--
+
+    def authorize
+      redirect_to @mautic_connection.authorize
+    end
+
+    def oauth2
+      begin
+        response = @mautic_connection.get_code(params.require(:code))
+        @mautic_connection.update(token: response.token, refresh_token: response.refresh_token)
+        return render plain: t('mautic.text_mautic_authorize_successfully')
+      rescue OAuth2::Error => e
+        flash[:error] = e.message
+      end
+
+      render :show
+    end
+
+    private
+
+    # Use callbacks to share common setup or constraints between actions.
+    def set_mautic_connection
+      @mautic_connection = Mautic::Connection.find(params[:id])
+    rescue ActiveRecord::RecordNotFound => e
+      return render head: 404, plain: e.message
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def mautic_connection_params
+      params.require(:connection).permit(:url, :client_id, :secret, :type)
+    end
+
+  end
+end

data/app/controllers/mautic/connections_controller.rb

@@ -1,109 +1,5 @@
 module Mautic
   class ConnectionsController < ApplicationController
-    before_action :set_mautic_connection, only: [:show, :edit, :update, :destroy, :oauth2, :authorize]
-
-    # GET /mautic_connections
-    def index
-      @mautic_connections = Connection.order(:url)
-      respond_to do |format|
-        format.html { render layout: !request.xhr? }
-        format.json { render json: @mautic_connections }
-      end
-    end
-
-    # GET /mautic_connections/1
-    def show
-      respond_to do |format|
-        format.html { render layout: !request.xhr? }
-      end
-    end
-
-    # GET /mautic_connections/new
-    def new
-      @mautic_connection = Connection.new
-      respond_to do |format|
-        format.html { render layout: !request.xhr? }
-      end
-    end
-
-    # GET /mautic_connections/1/edit
-    def edit
-      respond_to do |format|
-        format.html { render layout: !request.xhr? }
-      end
-    end
-
-    # POST /mautic_connections
-    def create
-      @mautic_connection = Connection.new(mautic_connection_params)
-
-      respond_to do |format|
-        if @mautic_connection.save
-          format.html { redirect_to mautic.connection_path(@mautic_connection), notice: t('mautic.text_mautic_connection_created') }
-          format.js { head :no_content }
-          format.json { render json: @mautic_connection }
-        else
-          format.html { render :new }
-          format.js { head :unprocessable_entity }
-          format.json { render json: @mautic_connection.errors, status: :unprocessable_entity }
-        end
-      end
-    end
-
-    # PATCH/PUT /mautic_connections/1
-    def update
-      respond_to do |format|
-        if @mautic_connection.update(mautic_connection_params)
-          format.html { redirect_to mautic.connection_path(@mautic_connection), notice: t('mautic.text_mautic_connection_updated') }
-          format.js { head :no_content }
-          format.json { render json: @mautic_connection }
-        else
-          format.html { render :edit }
-          format.js { head :unprocessable_entity }
-          format.json { render json: @mautic_connection.errors, status: :unprocessable_entity }
-        end
-      end
-    end
-
-    # DELETE /mautic_connections/1
-    def destroy
-      @mautic_connection.destroy
-      respond_to do |format|
-        format.html { redirect_to :connections, notice: t('mautic.text_mautic_connection_destroyed') }
-        format.js { render js: "document.getElementById('#{view_context.dom_id(@mautic_connection)}').remove()" }
-        format.json { render json: @mautic_connection }
-      end
-    end
-
-    # ==--==--==--==--
-
-    def authorize
-      redirect_to @mautic_connection.authorize
-    end
-
-    def oauth2
-      begin
-        response = @mautic_connection.get_code(params.require(:code))
-        @mautic_connection.update(token: response.token, refresh_token: response.refresh_token)
-        return render plain: t('mautic.text_mautic_authorize_successfully')
-      rescue OAuth2::Error => e
-        flash[:error] = e.message
-      end
-
-      render :show
-    end
-
-    private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_mautic_connection
-      @mautic_connection = Connection.find(params[:id])
-    rescue ActiveRecord::RecordNotFound => e
-      return render head: 404, plain: e.message
-    end
-
-    # Only allow a trusted parameter "white list" through.
-    def mautic_connection_params
-      params.require(:connection).permit(:url, :client_id, :secret, :type)
-    end
+    include ::Mautic::ConnectionsControllerConcern
   end
 end

data/app/models/mautic/connection.rb

@@ -3,8 +3,8 @@ module Mautic
 
     self.table_name = 'mautic_connections'
 
-    validates :url, :client_id, :secret, presence: true
-    validates :url, format: URI::regexp(%w(http https))
+    validates :url, presence: true, format: URI::regexp(%w(http https))
+    validates :client_id, :secret, presence: true, unless: :new_record?
 
     alias_attribute :access_token, :token
 

data/lib/mautic/model.rb

@@ -62,7 +62,7 @@ module Mautic
 
     def create
       begin
-        json = @connection.request(:post, "api/#{endpoint}/#{id}/new", { body: to_h })
+        json = @connection.request(:post, "api/#{endpoint}/#{id && "#{id}/"}new", { body: to_h })
         self.attributes = json[endpoint.singularize]
         clear_changes
       rescue ValidationError => e

data/lib/mautic/version.rb

@@ -1,3 +1,3 @@
 module Mautic
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mautic
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-26 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -186,6 +186,7 @@ files:
 - app/assets/stylesheets/mautic/application.css
 - app/assets/stylesheets/mautic/mautic_connections.css
 - app/assets/stylesheets/scaffold.css
+- app/controllers/concerns/mautic/connections_controller_concern.rb
 - app/controllers/mautic/application_controller.rb
 - app/controllers/mautic/connections_controller.rb
 - app/helpers/mautic/application_helper.rb
@@ -234,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails Mautic integration