mautic 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69e12653c1733475492f305f2fbb677898ac30997c8e145d9d83222890a5084b
-  data.tar.gz: 61448d97dd30a0b94b9f5898e64d37316176d4497f1a4bebf2da86d6b05fe830
+  metadata.gz: 5fe0c00bf9adc2bb52aebcec2b270740492e49d6e8a3627635b1c5612e82b04a
+  data.tar.gz: 40ada8b3e84aa4ee9bb3ced6392fe47c912cd3ccf32bd7c97ff0f08454f2d2ef
 SHA512:
-  metadata.gz: e8a174aff3f060c0659a8ec1a2b04861ee9ddba6a246f50ae60f1e913dbcfed96263bb831d417aa143d2476933c3d3876421976270073ce56cc414543c5527af
-  data.tar.gz: acc8e875b58b23d8d0eba9a416fff6a3823218993162be99f2b55602c7a3d3f7d53a98818e30063703f747a1eb02f396daa4f23f452decaab5f4a8c57de2af5a
+  metadata.gz: 46d1ac327fee620c46227d3b8e41e16d2b66edcd5d228bdf7a414caca606e107cae91cd2c503fead21e37028b497136f3df19135f9d588d5175a73900e560c8f
+  data.tar.gz: a7eb6c40d61fa28df4907c022af430df7ec3d24c5ccbce5e284dda73f822991251737c3fbadf6ffc51e4505f2324defc2d726582b8f7c5bcc2c918fddf872bbd

data/README.md

@@ -86,6 +86,7 @@ add to `config/initializers/mautic.rb`:
 Mautic.configure do |config|
   # This is for oauth handshake token url. I need to know where your app listen
   config.base_url = "https://my-rails-app.com"
+  # OR it can be Proc 
   # *optional* This is your default mautic URL - used in form helper 
   config.mautic_url = "https://mautic.my.app"
 end

data/app/models/mautic/connection.rb

@@ -46,6 +46,14 @@ module Mautic
 
     private
 
+    def callback_url
+      if (conf = Mautic.config.base_url).is_a?(Proc)
+        conf = conf.call(self)
+      end
+
+      URI.parse(conf)
+    end
+
     def parse_response(response)
       case response.status
       when 400

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

@@ -38,8 +38,7 @@ module Mautic
       private
 
       def callback_url
-        # return Mautic.config.oauth2_callback_url if Mautic.config.oauth2_callback_url
-        uri = URI.parse(Mautic.config.base_url)
+        uri = super
         uri.path = Mautic::Engine.routes.url_helpers.oauth2_connection_path(self)
         uri.to_s
       end

data/lib/mautic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mautic
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-21 00:00:00.000000000 Z
+date: 2018-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails