mautic 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c77ac23dffbdf501bf3193b5da058a6664aa887a
-  data.tar.gz: 5e70349a9999dae0f43725e6b2b0028eec68f858
+  metadata.gz: ae603a459a430f1c56f626d53b5e124d8b8c8c7c
+  data.tar.gz: 2fe7b84ed8f84132d9de88d087f3c19be9289d14
 SHA512:
-  metadata.gz: 403f7b5fefaffc8efd92088b916342051750d234a011d7f57e6bba1fa5a37d500f04cb2467146170e06ed34c6535e2bfad6cd93b7f6ef00641d17be7c0d4c2dc
-  data.tar.gz: 91744d8458f445803d0b43021183e1cd9339c739bce7b7382e13edfd906270f96b3dc4dd01499486db02a1b9e571d623900de5e1483d9c01364be2b3d1b227a5
+  metadata.gz: f8e55980f0f3f508459e071848fdb177b90a084eb7931b6c0e34a9b9fddd57ebe34c3a08aae02a2a96d247ede0dd161610c7e565b9d316823653f4f7b6746058
+  data.tar.gz: 5505b22d15af7b959b536a1ec00e437051a4a49ac1281593bee90e3bc64cb52b9013886cd9981d5835574c07ad293d70895477649efdb105d454087e0600d78d

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 = '0.1.4'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mautic
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Lukáš Pokorný
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,7 +191,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
@@ -235,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby on Rails Mautic integration

data/app/models/application_record.rb

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