maestrano-connector-rails 2.0.2.pre.RC10 → 2.0.2.pre.RC11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65e017e72e894da3e1fadf4eda7d24580fe90176
-  data.tar.gz: 09168f2321092da1b57490468516225190cd9e64
+  metadata.gz: 4f6eccd1fce609864badd6c4b166a0ceaf7136a6
+  data.tar.gz: cef4d3385f5a31ee1c352b9d8f0ed91aa2238ef9
 SHA512:
-  metadata.gz: cb5e4891f48db210ddf0a2881fe3cffaabe1850b42eebfb0988f02f1ef49a13f93984ba4f59b7bed1c6a26a740bc08023e173c25dfa3f4f3661aa01514cc50db
-  data.tar.gz: baea5af0aca2aac129786700ea1abf1df7a2d1969821cd54f97185c22d3ad338ead03a75d6d13e57915bc11ab2f2d63a9115949decbce5b57b4d21a3c4364630
+  metadata.gz: 9bdc954bfcd99c4378ca1fa82207f0638736805d0f73696eafbdfee0d033cea632452522ac907860834a715be83421e1abb008b0d537d976625003a40c6db2d3
+  data.tar.gz: c470342c8026c2ad466cab90fab9ee52c87c23f352d0f5cd4439b972a139373ac8f21c2c30dbfdb7c7e3290bd5930ad428af9f5dcce92d4d9e44c31cf8aec40b

data/.rubocop.yml

@@ -4,6 +4,9 @@ inherit_from: .rubocop_todo.yml
 Rails:
   Enabled: true
 
+Rails/ApplicationRecord:
+  Enabled: false
+
 AllCops:
   TargetRubyVersion: 2.3
   Exclude:

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-07-29 13:29:13 +0100 using RuboCop version 0.42.0.
+# on 2017-06-06 10:23:17 +0100 using RuboCop version 0.45.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,34 +12,30 @@ Lint/AssignmentInCondition:
   Exclude:
     - 'app/jobs/maestrano/connector/rails/push_to_connec_job.rb'
 
+# Offense count: 28
+Metrics/AbcSize:
+  Max: 69
+
 # Offense count: 1
+# Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 160
+  Max: 110
 
-# Offense count: 23
-Metrics/AbcSize:
-  Max: 70
-
-# Offense count: 10
+# Offense count: 9
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 20
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 42
-
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 278
+  Max: 206
 
 # Offense count: 2
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 7
 
-# Offense count: 10
+# Offense count: 9
 Metrics/PerceivedComplexity:
   Max: 15
 
@@ -55,15 +51,9 @@ Performance/FlatMap:
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Exclude:
-    - 'app/jobs/maestrano/connector/rails/synchronization_job.rb'
     - 'app/models/maestrano/connector/rails/concerns/entity.rb'
 
 # Offense count: 1
-Style/AccessorMethodName:
-  Exclude:
-    - 'app/models/maestrano/connector/rails/synchronization.rb'
-
-# Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining
@@ -94,19 +84,19 @@ Style/DoubleNegation:
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: empty_lines, no_empty_lines
+# SupportedStyles: empty_lines, empty_lines_except_namespace, no_empty_lines
 Style/EmptyLinesAroundModuleBody:
   Exclude:
     - 'app/jobs/maestrano/connector/rails/push_to_connec_worker.rb'
 
-# Offense count: 38
+# Offense count: 52
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: when_needed, always
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 2
 # Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
 # NamePrefix: is_, has_, have_
 # NamePrefixBlacklist: is_, has_, have_
@@ -115,13 +105,6 @@ Style/PredicateName:
   Exclude:
     - 'spec/**/*'
     - 'app/helpers/maestrano/connector/rails/session_helper.rb'
-    - 'app/models/maestrano/connector/rails/concerns/entity.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Exclude:
-    - 'app/models/maestrano/connector/rails/organization.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -131,14 +114,6 @@ Style/RegexpLiteral:
   Exclude:
     - 'app/models/maestrano/connector/rails/concerns/entity.rb'
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiterals:
-  Exclude:
-    - 'app/controllers/maestrano/synchronizations_controller.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -146,9 +121,3 @@ Style/StringLiterals:
 Style/TrailingBlankLines:
   Exclude:
     - 'app/helpers/maestrano/connector/rails/session_helper.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/TrailingWhitespace:
-  Exclude:
-    - 'app/jobs/maestrano/connector/rails/synchronization_job.rb'

data/app/controllers/maestrano/connec_controller.rb

@@ -6,10 +6,9 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
         next Maestrano::Connector::Rails::ConnectorLogger.log('info', nil, "Received notification from Connec! for unknow entity: #{entity_name}") unless entity_class_hash
 
         entities.each do |entity|
-          organization = Maestrano::Connector::Rails::Organization.find_by(uid: entity[:group_id], tenant: params[:tenant])
-
           begin
-            next unless valid_organization?(organization, entity_class_hash)
+            organization = find_valid_organization(entity[:group_id], params[:tenant], entity_class_hash)
+            next if organization.blank?
             Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Processing entity from Connec! webhook, entity_name=\"#{entity_name}\", data=\"#{entity}\"")
 
             connec_client = Maestrano::Connector::Rails::ConnecHelper.get_client(organization)
@@ -38,23 +37,25 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
 
   private
 
-    def valid_organization?(organization, entity_class_hash)
+    def find_valid_organization(uid, tenant, entity_class_hash)
+      organization = Maestrano::Connector::Rails::Organization.find_by(uid: uid, tenant: tenant)
+
       if organization.nil?
-        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received notification from Connec! for an unknown organization, organization_uid=\"#{entity[:group_id]}\", tenant=\"#{params[:tenant]}\"")
-        return false
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received notification from Connec! for an unknown organization, organization_uid=\"#{uid}\", tenant=\"#{tenant}\"")
+        return nil
       end
 
       if organization.oauth_uid.blank?
-        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received notification from Connec! for an organization not linked, organization_uid=\"#{entity[:group_id]}\", tenant=\"#{params[:tenant]}\"")
-        return false
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received notification from Connec! for an organization not linked, organization_uid=\"#{uid}\", tenant=\"#{tenant}\"")
+        return nil
       end
 
       unless organization.sync_enabled && organization.synchronized_entities[entity_class_hash[:name].to_sym][:can_push_to_external]
-        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Skipping notification from Connec! webhook, entity_name=\"#{entity_name}\"")
-        return false
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Skipping notification from Connec! webhook, entity_name=\"#{entity_class_hash[:name]}\"")
+        return nil
       end
 
-      true
+      organization
     end
 
     def find_entity_class(entity_name)

data/app/controllers/maestrano/synchronizations_controller.rb

@@ -19,7 +19,7 @@ class Maestrano::SynchronizationsController < Maestrano::Rails::WebHookControlle
 
     status = organization_status(organization)
 
-    unless status == 'RUNNING' || status == 'ENQUEUED'
+    unless %w[RUNNING ENQUEUED].include?(status)
       Maestrano::Connector::Rails::SynchronizationJob.perform_later(organization.id, opts.with_indifferent_access)
       status = 'ENQUEUED'
     end

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

@@ -48,8 +48,9 @@ module Maestrano::Connector::Rails::Concerns::Organization
   module ClassMethods
   end
 
-  def initialize
-    super
+  def initialize(attributes = nil, options = {})
+    super(attributes, options)
+
     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}

data/app/models/maestrano/connector/rails/services/data_consolidator.rb

@@ -46,8 +46,13 @@ module Maestrano::Connector::Rails::Services
         # Unfold the id arrays
         # From that point on, the connec_entity contains only string of external ids
         unfold_hash = Maestrano::Connector::Rails::ConnecHelper.unfold_references(entity, references, @organization)
+        unfolded_entity = entity
         entity = unfold_hash[:entity]
-        next unless entity # discard if at least one record reference is missing
+
+        unless entity # discard if at least one record reference is missing
+          Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Record discarded - missing external reference in #{unfolded_entity}")
+          next
+        end
         connec_id = unfold_hash[:connec_id]
         id_refs_only_connec_entity = unfold_hash[:id_refs_only_connec_entity]
 

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

@@ -1,7 +1,7 @@
 module Maestrano
   module Connector
     module Rails
-      VERSION = '2.0.2.pre.RC10'.freeze
+      VERSION = '2.0.2.pre.RC11'.freeze
     end
   end
 end

data/maestrano-connector-rails.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('bootstrap-sass')
   s.add_runtime_dependency('config')
   s.add_runtime_dependency('figaro')
-  s.add_runtime_dependency('jquery-rails')
+  s.add_runtime_dependency('jquery-rails', '>= 1.4.0')
   s.add_runtime_dependency('haml-rails')
   s.add_runtime_dependency('hash_mapper', '>= 0.2.2')
 
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('github_changelog_generator')
   s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec-rails')
-  s.add_development_dependency('rubocop', '~> 0.43')
+  s.add_development_dependency('rubocop', '~> 0.49.1')
   s.add_development_dependency('shoulda')
   s.add_development_dependency('shoulda-matchers')
   s.add_development_dependency('simplecov', '>= 0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2.pre.RC10
+  version: 2.0.2.pre.RC11
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: 0.49.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: 0.49.1
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -511,7 +511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rails framework to build connector with Maestrano