maestrano-connector-rails 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f491d86e8ed4f633f60495e2ef8e6ee1ace82e33
-  data.tar.gz: e03029e37868143e5ab4fd702d186634c19124fb
+SHA256:
+  metadata.gz: fe9997e4a9fafbf461eb15e54a2dc5d0fd39eeb76452cb33949145b3bc7a8f88
+  data.tar.gz: 771eae938809e8aeb51b0d9250ebf560b565b02b1b5c28e6de5d173e810c1a2b
 SHA512:
-  metadata.gz: 39326123a05567be519a51ed368a99c4f68c31b8a335d66292237cbccc18962a5bdd5c8d3c0db6fa6977cb8f7abe838e985e8ce5ecb64aa63aacd5b5c8d4f8bf
-  data.tar.gz: 62bd51a19f67246467d223080f40f016a46f43e14c3db8036b630ef4ad2ca69dece8238ba260fd0f604d99ce7b3b5aa3b3ef89205165521fc9da891d004d4048
+  metadata.gz: c587dc91ddbf6f32455fcd0e2000dc91d5f5591a3490af4421ae964650705f7c1d78a4d74ed29a1d5f8be1d2e4a86c1fdea870493fcfb8ffadbdf4579d15bced
+  data.tar.gz: 87e3b05e86736f355859921020f5d4bf18140cf914d6896953614a5e83fb90b2ca5dc586d9f58ef55cfe395949ed0724ae40cf6da5575c93f0243cdd1ef62e08

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2018-01-12 09:49:01 +1100 using RuboCop version 0.52.1.
+# on 2018-03-12 13:56:34 +1100 using RuboCop version 0.53.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -12,12 +12,7 @@ Lint/AssignmentInCondition:
   Exclude:
     - 'app/jobs/maestrano/connector/rails/push_to_connec_job.rb'
 
-# Offense count: 1
-Lint/UriEscapeUnescape:
-  Exclude:
-    - 'app/models/maestrano/connector/rails/concerns/organization.rb'
-
-# Offense count: 29
+# Offense count: 28
 Metrics/AbcSize:
   Max: 69
 
@@ -62,13 +57,6 @@ Performance/FlatMap:
   Exclude:
     - 'app/models/maestrano/connector/rails/concerns/complex_entity.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect.
-Performance/HashEachMethods:
-  Exclude:
-    - 'app/resources/maestrano/api/base_resource.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Whitelist.
@@ -154,7 +142,7 @@ Style/RegexpLiteral:
   Exclude:
     - 'app/models/maestrano/connector/rails/concerns/entity.rb'
 
-# Offense count: 8
+# Offense count: 10
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
@@ -166,10 +154,3 @@ Style/RescueStandardError:
     - 'app/models/maestrano/connector/rails/concerns/entity.rb'
     - 'app/models/maestrano/connector/rails/concerns/organization.rb'
     - 'app/resources/maestrano/api/base_resource.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: ConvertCodeThatCanStartToReturnNil.
-Style/SafeNavigation:
-  Exclude:
-    - 'app/models/maestrano/connector/rails/concerns/entity.rb'

data/.ruby-version

@@ -1 +1 @@
-2.3.1@maestrano-connector-rails
+2.3

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 2.3.0
+
+* Send data to Connec! even if the push/pull parameters are disabled (Transac! integration)
+* Randomise cron jobs time to avoid connectors crowding
+* Fix duplicated Sidekiq UI configuration and time based attack 
+
+## 2.2.1
+
+* Fix a bug where the CreationMapper was used to map updates coming from external
+
+## 2.2.0
+
+* New applications workflow
+* JSON API / Pundit introduced to manage resources
+
+### Migration Guide
+* Add this Gems to the Gemfile
+* `jsonapi-resources`, `pundit`, `pundit-resources`
+
 ## 2.1.3
 
 ### Features

data/DEVELOPER.md

@@ -1,6 +1,7 @@
 ## Release gem
 
 Edit `lib/maestrano/connector/rails/version.rb` with the new version.
+Update CHANGELOG.md with the changes and the migration guide (if needed)
 
 ``` bash
 bundle exec rake release

data/Rakefile

@@ -8,7 +8,7 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 RuboCop::RakeTask.new

data/app/controllers/maestrano/connec_controller.rb

@@ -24,12 +24,12 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
             entity_instance.push_entities_to_external(mapped_entity[:connec_entities])
             entity_instance.after_sync(last_synchronization_date)
           rescue => e
-            Maestrano::Connector::Rails::ConnectorLogger.log('warn', organization, "error processing notification entity_name=\"#{entity_name}\", message=\"#{e.message}\", #{e.backtrace.join("\n")}")
+            Maestrano::Connector::Rails::ConnectorLogger.log('warn', organization, "error processing notification entity_name=\"#{entity_name}\", message=\"#{e.message}\", trace=\"#{e.backtrace}\"")
           end
         end
       end
     rescue => e
-      Maestrano::Connector::Rails::ConnectorLogger.log('warn', nil, "error processing notification #{e.message} - #{e.backtrace.join("\n")}")
+      Maestrano::Connector::Rails::ConnectorLogger.log('warn', nil, "error processing notification #{e.message} - #{e.backtrace}")
     end
 
     head 200, content_type: 'application/json'

data/app/jobs/maestrano/connector/rails/concerns/synchronization_job.rb

@@ -13,13 +13,23 @@ module Maestrano::Connector::Rails::Concerns::SynchronizationJob
     def find_job(organization_id)
       queue = Sidekiq::Queue.new(:default)
       queue.find do |job|
-        organization_id == job.item['args'][0]['arguments'].first
+        job_organization_id = begin
+          job.item['args'][0]['arguments'].first
+        rescue
+          false
+        end
+        organization_id == job_organization_id
       end
     end
 
     def find_running_job(organization_id)
       Sidekiq::Workers.new.find do |_, _, work|
-        work['queue'] == 'default' && work['payload']['args'][0]['arguments'].first == organization_id
+        job_organization_id = begin
+          work['payload']['args'][0]['arguments'].first
+        rescue
+          false
+        end
+        work['queue'] == 'default' && organization_id == job_organization_id
       end
     rescue
       nil
@@ -87,7 +97,7 @@ module Maestrano::Connector::Rails::Concerns::SynchronizationJob
       Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Finished synchronization, organization=#{organization.uid}, status=success")
       current_synchronization.mark_as_success
     rescue => e
-      Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Finished synchronization, organization=#{organization.uid}, status=error, message=#{e.message} backtrace=#{e.backtrace.join("\n\t")}")
+      Maestrano::Connector::Rails::ConnectorLogger.log('warn', organization, "Finished synchronization, organization=#{organization.uid}, status=error, message=\"#{e.message}\" backtrace=\"#{e.backtrace}\"")
       current_synchronization.mark_as_error(e.message)
     end
   end

data/app/jobs/maestrano/connector/rails/concerns/update_configuration_job.rb

@@ -0,0 +1,16 @@
+# Periodically fetch the developer platform configuration
+module Maestrano::Connector::Rails::Concerns::UpdateConfigurationJob
+  extend ActiveSupport::Concern
+
+  included do
+    queue_as :default
+  end
+
+  def perform
+    return if ENV['SKIP_CONFIGURATION']
+    Maestrano.reset!
+    Maestrano.auto_configure
+  rescue StandardError => e
+    Rails.logger.warn "Cannot load configuration #{e.message}"
+  end
+end

data/app/jobs/maestrano/connector/rails/update_configuration_job.rb

@@ -0,0 +1,5 @@
+module Maestrano::Connector::Rails
+  class UpdateConfigurationJob < ::ActiveJob::Base
+    include Maestrano::Connector::Rails::Concerns::UpdateConfigurationJob
+  end
+end

data/app/models/maestrano/connector/rails/concerns/entity.rb

@@ -388,7 +388,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
       else
         # Store External error
         Maestrano::Connector::Rails::ConnectorLogger.log('error', @organization, "Error while pushing to #{Maestrano::Connector::Rails::External.external_name}: #{e}")
-        Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "Error while pushing backtrace: #{e.backtrace.join("\n\t")}")
+        Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "Error while pushing backtrace: #{e.backtrace}")
         idmap.update(message: e.message.truncate(255))
       end
     end

data/app/models/maestrano/connector/rails/concerns/organization.rb

@@ -13,9 +13,6 @@ module Maestrano::Connector::Rails::Concerns::Organization
       # group.some_required_field = 'some-appropriate-default-value'
     end
 
-    # Callbacks
-    before_save :update_metadata
-
     #===================================
     # Encryptions
     #===================================
@@ -53,7 +50,19 @@ module Maestrano::Connector::Rails::Concerns::Organization
 
     self.synchronized_entities = {}
     Maestrano::Connector::Rails::External.entities_list.each do |entity|
-      synchronized_entities[entity.to_sym] = {can_push_to_connec: !pull_disabled, can_push_to_external: !push_disabled}
+      begin
+        # Transform entity name from entities_list to class name
+        # ex. :item => Entities::Item
+        clazz = "Entities::#{entity.to_s.titleize.tr(' ', '')}".constantize
+      rescue
+        clazz = nil
+      end
+
+      # Check if Entity or ComplexEntity and set entity_push_to_connec and entity_push_to_external
+      entity_push_to_connec = clazz && clazz < Maestrano::Connector::Rails::Entity ? clazz.can_write_connec? : true
+      entity_push_to_external = clazz && clazz < Maestrano::Connector::Rails::Entity ? clazz.can_write_external? : true
+
+      synchronized_entities[entity.to_sym] = {can_push_to_connec: !pull_disabled && entity_push_to_connec, can_push_to_external: !push_disabled && entity_push_to_external}
     end
   end
 
@@ -61,7 +70,9 @@ module Maestrano::Connector::Rails::Concerns::Organization
     result = {}
     synchronized_entities.each do |entity, hash|
       begin
-        clazz = "Entities::#{entity.to_s.titleize.split.join}".constantize
+        # Transform entity name from entities_list to class name
+        # ex. :item => Entities::Item
+        clazz = "Entities::#{entity.to_s.titleize.tr(' ', '')}".constantize
       rescue
         next
       end
@@ -138,7 +149,7 @@ module Maestrano::Connector::Rails::Concerns::Organization
         can_push_to_external = synchronized_entities[entity.to_sym]
         can_push_to_connec = synchronized_entities[entity.to_sym]
       end
-      synchronized_entities[entity.to_sym] = {can_push_to_connec: (can_push_to_connec || default) && !pull_disabled, can_push_to_external: (can_push_to_external || default) && !push_disabled}
+      synchronized_entities[entity.to_sym] = {can_push_to_connec: (can_push_to_connec || default), can_push_to_external: (can_push_to_external || default)}
     end
     save
   end
@@ -150,17 +161,4 @@ module Maestrano::Connector::Rails::Concerns::Organization
   def push_to_external_enabled?(entity)
     synchronized_entities.dig(Maestrano::Connector::Rails::EntityHelper.snake_name(entity), :can_push_to_external) && entity&.class&.can_write_external?
   end
-
-  def set_instance_metadata
-    auth = {username: Maestrano[tenant].param('api.id'), password: Maestrano[tenant].param('api.key')}
-    res = HTTParty.get(URI.encode("#{Maestrano[tenant].param('api.host')}/api/v1/account/groups/#{uid}"), basic_auth: auth)
-    response = JSON.parse(res.body)
-    self.push_disabled = response.dig('data', 'metadata', 'push_disabled')
-    self.pull_disabled = response.dig('data', 'metadata', 'pull_disabled')
-  end
-
-  def update_metadata
-    set_instance_metadata
-    enable_historical_data(true) if push_disabled
-  end
 end

data/app/models/maestrano/connector/rails/concerns/synchronization.rb

@@ -36,15 +36,15 @@ module Maestrano::Connector::Rails::Concerns::Synchronization
   end
 
   def mark_as_success
-    update_attributes(status: SUCCESS_STATUS)
+    update(status: SUCCESS_STATUS)
   end
 
   def mark_as_error(msg)
-    update_attributes(status: ERROR_STATUS, message: msg)
+    update(status: ERROR_STATUS, message: msg)
   end
 
   def mark_as_partial
-    update_attributes(partial: true)
+    update(partial: true)
   end
 
   def clean_synchronizations

data/lib/generators/connector/complex_entity_generator.rb

@@ -1,7 +1,7 @@
 module Connector
   module Generators
     class ComplexEntityGenerator < ::Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
+      source_root File.expand_path('templates', __dir__)
 
       def copy_example_files
         copy_file 'complex_entity_example/contact_and_lead.rb', 'app/models/entities/example_contact_and_lead.rb'

data/lib/generators/connector/install_generator.rb

@@ -2,7 +2,7 @@ require 'fileutils'
 
 module Connector
   class InstallGenerator < ::Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
     desc 'Creating a Maestrano Connector application'
 
     def maestrano_generator

data/lib/generators/connector/templates/home_controller.rb

@@ -5,6 +5,7 @@ class HomeController < ApplicationController
 
     # Update list of entities to synchronize
     current_organization.synchronized_entities.keys.each do |entity|
+      next unless params[entity.to_s]
       current_organization.synchronized_entities[entity][:can_push_to_connec] = params[entity.to_s]["to_connec"] == "1"
       current_organization.synchronized_entities[entity][:can_push_to_external] = params[entity.to_s]["to_external"] == "1"
     end

data/lib/generators/connector/templates/home_index.haml

@@ -64,9 +64,9 @@
                 - current_organization.displayable_synchronized_entities.each do |k, v|
                   .row.sync-entity
                     .col-md-1.link-step-action
-                      #{check_box("#{k}", "to_connec", {checked: (v[:can_push_to_connec] || v[:can_push_to_external]) && !current_organization.pull_disabled, onclick: "return !#{k}_to_external.checked;", disabled: current_organization.pull_disabled})}
+                      #{check_box("#{k}", "to_connec", {checked: (v[:can_push_to_connec] || v[:can_push_to_external]) && !current_organization.pull_disabled, onclick: "return !#{k}_to_external.checked;", disabled: current_organization.pull_disabled || !v[:can_push_to_connec]})}
                     .col-md-1.link-step-action
-                      #{check_box("#{k}", "to_external", {checked: v[:can_push_to_external] && !current_organization.push_disabled, onchange: "#{k}_to_connec.checked = #{!current_organization.pull_disabled};", disabled: current_organization.push_disabled})}
+                      #{check_box("#{k}", "to_external", {checked: v[:can_push_to_external] && !current_organization.push_disabled, onchange: "#{k}_to_connec.checked = #{!current_organization.pull_disabled};", disabled: current_organization.push_disabled || !v[:can_push_to_external]})}
                     %label.col-md-7{:for => "#{k}", style: 'padding-top: 5px;'}
                       .col-md-6
                         #{v[:external_name]}

data/lib/maestrano/connector/rails.rb

@@ -14,7 +14,6 @@ require 'attr_encrypted'
 require 'sidekiq'
 require 'sidekiq-cron'
 require 'sidekiq-unique-jobs'
-require 'sinatra'
 require 'slim'
 
 module Maestrano

data/lib/maestrano/connector/rails/version.rb

@@ -1,7 +1,7 @@
 module Maestrano
   module Connector
     module Rails
-      VERSION = '2.2.1'.freeze
+      VERSION = '2.3.0'.freeze
     end
   end
 end

data/maestrano-connector-rails.gemspec

@@ -40,7 +40,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('sidekiq', '~> 4.2.9')
   s.add_runtime_dependency('sidekiq-cron')
   s.add_runtime_dependency('sidekiq-unique-jobs')
-  s.add_runtime_dependency('sinatra')
   s.add_runtime_dependency('slim')
 
   s.add_development_dependency('bundler')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,20 +234,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
@@ -458,9 +444,11 @@ files:
 - app/helpers/maestrano/connector/rails/session_helper.rb
 - app/jobs/maestrano/connector/rails/all_synchronizations_job.rb
 - app/jobs/maestrano/connector/rails/concerns/synchronization_job.rb
+- app/jobs/maestrano/connector/rails/concerns/update_configuration_job.rb
 - app/jobs/maestrano/connector/rails/push_to_connec_job.rb
 - app/jobs/maestrano/connector/rails/push_to_connec_worker.rb
 - app/jobs/maestrano/connector/rails/synchronization_job.rb
+- app/jobs/maestrano/connector/rails/update_configuration_job.rb
 - app/models/maestrano/connector/rails/complex_entity.rb
 - app/models/maestrano/connector/rails/concerns/complex_entity.rb
 - app/models/maestrano/connector/rails/concerns/connec_helper.rb
@@ -575,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails framework to build connector with Maestrano