mautic 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4be984905747a5913cd7271d2f0f8b2475a22cf6
-  data.tar.gz: 14020973bd047ea58c470d3270f1b3000ded51f4
+  metadata.gz: d61af0eb918446c6edf125b168fd769dca21e6bf
+  data.tar.gz: 6e3707b229934a703d7065feaf6596c71e0a500c
 SHA512:
-  metadata.gz: 4f116539c9dc6a253e3373bf91c06bcc88600c120237bbb376769b1b3c2c6fb8711e6ed4dc9e828c53dbd2115bfd6166528b1c4726c2ded28dfde27d23b4713a
-  data.tar.gz: 65cf3ee03b29e4561ea9828f5f3ee1a6b78a0d71d7124642512e64af12315378bfd9369c705c9d1201334c9d231cdbc815dbd411f9d223c51304bfb5ee0e7b7b
+  metadata.gz: 0da6bcb99a484a7a4a2d2ecbb17a563a06f04687e44faf9f596f55bbad4e9dbe92029284f90ec6d60e1005cb117e6da8251e76afac1f5394ce92bc2d4f35a28e
+  data.tar.gz: 92d3a2903427d32d74a15fb523b60ffab5ef4563119ddf0405ec7d5c567102bb7947eeda4b7c1d77258c183280eb308eca512b88f2e482eec84a6ad515050d93

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

@@ -5,8 +5,8 @@ module Mautic
       def client
         @client ||= OAuth2::Client.new(client_id, secret, {
           site: url,
-          authorize_url: '/oauth/v2/authorize',
-          token_url: '/oauth/v2/token',
+          authorize_url: 'oauth/v2/authorize',
+          token_url: 'oauth/v2/token',
           raise_errors: false
         })
       end
@@ -46,4 +46,4 @@ module Mautic
 
     end
   end
-end
+end

data/lib/mautic/model.rb

@@ -15,6 +15,14 @@ module Mautic
 
     end
 
+    class Attribute < OpenStruct
+
+      def name
+        @alias
+      end
+
+    end
+
     class << self
 
       def endpoint
@@ -30,7 +38,7 @@ module Mautic
     def initialize(connection, hash=nil)
       @connection = connection
       @table = MauticHash.new
-      self.attributes = { created_at: hash['dateAdded']&.to_time, updated_at: hash['dateModified']&.to_time } if hash
+      self.attributes = { id: hash['id'], created_at: hash['dateAdded']&.to_time, updated_at: hash['dateModified']&.to_time } if hash
       assign_attributes(hash)
       clear_changes
     end
@@ -100,10 +108,24 @@ module Mautic
     end
 
     def assign_attributes(source = nil)
+      @mautic_attributes = []
       source ||= {}
       data = {}
+
       if (fields = source['fields'])
-        data.merge!(fields['all']) if fields['all']
+        if fields['all']
+          @mautic_attributes = fields['all'].collect do |key, value|
+            data[key] = value
+            Attribute.new(alias: key, value: value)
+          end
+        else
+          fields.each do |_group, pairs|
+            pairs.each do |key, attrs|
+              @mautic_attributes << (a = Attribute.new(attrs))
+              data[key] = a.value
+            end
+          end
+        end
       elsif source
         data = source
       end
@@ -111,4 +133,4 @@ module Mautic
     end
 
   end
-end
+end

data/lib/mautic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mautic
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -171,7 +171,6 @@ files:
 - app/helpers/mautic/application_helper.rb
 - app/jobs/mautic/application_job.rb
 - app/mailers/mautic/application_mailer.rb
-- app/models/application_record.rb
 - app/models/mautic/application_record.rb
 - app/models/mautic/connection.rb
 - app/models/mautic/connections/oauth2.rb

data/app/models/application_record.rb

@@ -1,3 +0,0 @@
-class ApplicationRecord < ActiveRecord::Base
-  self.abstract_class = true
-end