redmine_mautic 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3852f03c34594e8549aeb4d71e886b845c22aca60d0d9fa79adb6d0d02eaface
-  data.tar.gz: aefa6c39bd0ca90036058a42dcf97d90cf73634dfcc5d543fcb6b2d55e552e8b
+  metadata.gz: f03aa6aef359c64217d96e938311793fc734fe048e83d0d0669daecda1867295
+  data.tar.gz: 7472f5ccea813c12b67e75a894be33bc896b0179c318b4a2bfd10bfc55cc26f6
 SHA512:
-  metadata.gz: c687a3f34c6e288e4c8832f7be4845b5ab0c94a5e694fe7f05144304c12410cfca3bb6d890093df6e7a4f234b40a446ed65b803cb5f4d1233dcaaa7d02916c13
-  data.tar.gz: 7a955cf33285beeb0f75314a375fef00612810fbd5382e6dccec0a1a2ccaefa0910c1733fa70e244f9374cd0ce0db3b072bd6c8c300871311c6c1fe55ac42762
+  metadata.gz: 99715fcda967dd979068989469a2107fcb9c86ae1abe990e9b8cb11fde47fcd6cbb66daf043236347047cf638621acc77f091653fc4c758635b8ecd7a090c69b
+  data.tar.gz: 9e4c5f13bcf397594535a14502ae5ce1cfe4143716e40acc65195af4cccc59ca9c79564bc6b42e71d90491f510e14edf675e980b9e8a90e085e1e97fc5bdab3c

data/app/views/redmine_mautic/_form.html.erb

@@ -13,7 +13,7 @@
   <% unless form.object.new_record? %>
     <p class="field">
       <label>Callback url</label>
-      <%= Setting.protocol %>://<%= Setting.host_name %>/mautic/connections/<%= (form.object.id || Mautic::Connection.last.id.next) %>/oauth2
+      <%= @mautic_connection.send :callback_url, controller %>
       <em class="info">Now generate pair of tokens with this callback url</em>
     </p>
     <p class="field settings">

data/app/views/redmine_mautic/index.html.erb

@@ -23,9 +23,9 @@
             <%= link_to l(:button_edit), edit_redmine_mautic_path(mautic_connection), class: 'icon icon-edit' %>
             <%= link_to l(:button_delete), redmine_mautic_path(mautic_connection), method: :delete, data: { confirm: l(:text_are_you_sure), rmeote: true }, class: 'icon icon-del' %>
             <% if mautic_connection.refresh_token.blank? %>
-              <%= link_to('Authorize', mautic.authorize_connection_path(mautic_connection), class: 'icon icon-server-authentication', target: '_blank') %>
+              <%= link_to('Authorize', authorize_redmine_mautic_path(mautic_connection), class: 'icon icon-server-authentication', target: '_blank') %>
             <% else %>
-              <%= link_to('re-Authorize', mautic.authorize_connection_path(mautic_connection), class: 'icon icon-reload', target: '_blank') %>
+              <%= link_to('re-Authorize', authorize_redmine_mautic_path(mautic_connection), class: 'icon icon-reload', target: '_blank') %>
             <% end %>
             </td>
         </tr>

data/config/routes.rb

@@ -15,8 +15,12 @@ Rails.application.routes.draw do
   # end
 
   rys_feature 'redmine_mautic' do
-    mount Mautic::Engine => '/mautic'
-    resources :redmine_mautic
+    resources :redmine_mautic do
+      member do
+        get :authorize
+        get :oauth2
+      end
+    end
   end
 
   # get '/redmine_mautic', to: 'redmine_mautic#index'

data/gems.rb

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-source 'https://gems.easysoftware.com'
 
 # Possible directories for dummy application
 possible_app_dirs = [
@@ -19,11 +18,11 @@ possible_app_dirs.each do |dir|
   %w[Gemfile gems.rb].each do |gems_rb|
     gems_rb = File.expand_path(File.join(dir, gems_rb))
 
-    next unless File.exist?(gems_rb)
-
-    eval_gemfile(gems_rb)
-    gems_rb_found = true
-    break
+    if File.exist?(gems_rb)
+      eval_gemfile(gems_rb)
+      gems_rb_found = true
+      break
+    end
   end
 end
 
@@ -42,7 +41,8 @@ end
 # Dummy application may already include this gem
 # You cannot specify the same gem twice
 current_gem_spec = Bundler.load_gemspec(gemspec_file)
-@dependencies.delete_if {|d| d.name == current_gem_spec.name }
+@dependencies.delete_if { |d| d.name == current_gem_spec.name }
 
 # Load current gem and its dependencies
-gemspec
+gemspec
+gem "rys", github: "easysoftware/rys", branch: "devel"

data/lib/redmine_mautic/version.rb

@@ -1,3 +1,3 @@
 module RedmineMautic
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_mautic
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redmine_extensions
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.9
 description: https://github.com/luk4s/mautic-rails
 email:
 - luk4s.pokorny@gmail.com
@@ -83,11 +89,11 @@ files:
 - spec/requests/redmine_mautic_spec.rb
 - spec/spec_helper.rb
 - spec/support/support.rb
-- test/dummy
 homepage: https://github.com/luk4s
 licenses:
 - GPL-2.0-or-later
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -103,12 +109,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Integration mautic rails gem with Redmine
 test_files:
-- test/dummy
 - spec/spec_helper.rb
 - spec/features/feature_spec.rb
 - spec/models/model_spec.rb

data/test/dummy

@@ -1 +0,0 @@
-test/Users/lukas/_projects/easy/dummy