maestrano-connector-rails 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6aacb721d865456e02851131b118f16891870268
-  data.tar.gz: ab5b6a2fa521f79c7e42d8028387504d0a6e5929
+  metadata.gz: f491d86e8ed4f633f60495e2ef8e6ee1ace82e33
+  data.tar.gz: e03029e37868143e5ab4fd702d186634c19124fb
 SHA512:
-  metadata.gz: 824bde6273b0f0bcecfd4a8b390c14851860cae5c5cc36ff133fbbbdd1b58105f8614244fc198dc0d1e28ba199790e2527399a3fa9764629aeac82957e135a65
-  data.tar.gz: 7f62f2ace833c722ee02fc37228393b054f119a6634cfdc8dbf263e9e5ec882b9f610d88c391a67222da19b8f12998c8b2df7d73123846ce907d61b4eedb8105
+  metadata.gz: 39326123a05567be519a51ed368a99c4f68c31b8a335d66292237cbccc18962a5bdd5c8d3c0db6fa6977cb8f7abe838e985e8ce5ecb64aa63aacd5b5c8d4f8bf
+  data.tar.gz: 62bd51a19f67246467d223080f40f016a46f43e14c3db8036b630ef4ad2ca69dece8238ba260fd0f604d99ce7b3b5aa3b3ef89205165521fc9da891d004d4048

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-09-19 10:17:44 +0100 using RuboCop version 0.49.1.
+# on 2018-01-12 09:49:01 +1100 using RuboCop version 0.52.1.
 # 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,7 +12,12 @@ Lint/AssignmentInCondition:
   Exclude:
     - 'app/jobs/maestrano/connector/rails/push_to_connec_job.rb'
 
-# Offense count: 28
+# Offense count: 1
+Lint/UriEscapeUnescape:
+  Exclude:
+    - 'app/models/maestrano/connector/rails/concerns/organization.rb'
+
+# Offense count: 29
 Metrics/AbcSize:
   Max: 69
 
@@ -39,6 +44,17 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 15
 
+# Offense count: 2
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/helpers/maestrano/connector/rails/session_helper.rb'
+
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnabledForFlattenWithoutParams.
@@ -46,6 +62,13 @@ 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.
@@ -54,8 +77,29 @@ Rails/DynamicFindBy:
   Exclude:
     - 'app/controllers/maestrano/api/api_controller.rb'
 
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/HasManyOrHasOneDependent:
+  Exclude:
+    - 'app/models/maestrano/connector/rails/concerns/organization.rb'
+    - 'app/models/maestrano/connector/rails/concerns/user.rb'
+
+# Offense count: 1
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/InverseOf:
+  Exclude:
+    - 'app/models/maestrano/connector/rails/concerns/user.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Rails/Presence:
+  Exclude:
+    - 'app/models/maestrano/connector/rails/concerns/organization.rb'
+
 # Offense count: 6
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Exclude:
@@ -63,7 +107,7 @@ Rails/TimeZone:
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
 # FunctionalMethods: let, let!, subject, watch
@@ -89,27 +133,43 @@ Style/DoubleNegation:
   Exclude:
     - 'app/controllers/maestrano/auth/saml_controller.rb'
 
-# Offense count: 56
+# Offense count: 64
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: when_needed, always
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: when_needed, always, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 2
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Style/PredicateName:
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/IfUnlessModifier:
   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.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
 # SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Exclude:
     - 'app/models/maestrano/connector/rails/concerns/entity.rb'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: implicit, explicit
+Style/RescueStandardError:
+  Exclude:
+    - 'app/controllers/maestrano/connec_controller.rb'
+    - 'app/jobs/maestrano/connector/rails/concerns/synchronization_job.rb'
+    - 'app/models/maestrano/connector/rails/concerns/connec_helper.rb'
+    - '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/app/models/maestrano/connector/rails/concerns/organization.rb

@@ -153,7 +153,7 @@ module Maestrano::Connector::Rails::Concerns::Organization
 
   def set_instance_metadata
     auth = {username: Maestrano[tenant].param('api.id'), password: Maestrano[tenant].param('api.key')}
-    res = HTTParty.get("#{Maestrano[tenant].param('api.host')}/api/v1/account/groups/#{uid}", basic_auth: auth)
+    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')

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

@@ -116,7 +116,7 @@ module Maestrano::Connector::Rails::Services
       entity = if @is_a_subentity
                  @current_entity.map_to(connec_entity_name, external_entity, idmap)
                else
-                 @current_entity.map_to_connec(external_entity, idmap.last_push_to_connec.nil?)
+                 @current_entity.map_to_connec(external_entity, (idmap.last_push_to_connec.nil? && idmap.connec_id.nil?))
                end
       {entity: entity, idmap: idmap}
     end
@@ -125,7 +125,7 @@ module Maestrano::Connector::Rails::Services
       entity = if @is_a_subentity
                  @current_entity.map_to(external_entity_name, connec_entity, idmap)
                else
-                 @current_entity.map_to_external(connec_entity.merge(idmap: idmap), idmap.last_push_to_external.nil?)
+                 @current_entity.map_to_external(connec_entity.merge(idmap: idmap), (idmap.last_push_to_external.nil? && idmap.external_id.nil?))
                end
       {entity: entity, idmap: idmap, id_refs_only_connec_entity: id_refs_only_connec_entity}
     end

data/lib/generators/connector/install_generator.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module Connector
   class InstallGenerator < ::Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
@@ -54,7 +56,7 @@ module Connector
 
       copy_file 'layouts.haml', 'app/views/layouts/application.html.haml'
 
-      mkdir_p 'app/controllers/maestrano/api'
+      FileUtils.mkdir_p 'app/controllers/maestrano/api'
       copy_file 'account_controller.rb', 'app/controllers/maestrano/api/account_controller.rb'
     end
 

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

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

data/maestrano-connector-rails.gemspec

@@ -48,9 +48,9 @@ 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.49.1')
+  s.add_development_dependency('rubocop', '~> 0.52')
   s.add_development_dependency('shoulda')
-  s.add_development_dependency('shoulda-matchers')
+  s.add_development_dependency('shoulda-matchers', '~> 3.1')
   s.add_development_dependency('simplecov', '>= 0')
   s.add_development_dependency('timecop')
   s.add_development_dependency('webmock')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2018-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -338,14 +338,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.52'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0.52'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -364,16 +364,16 @@ dependencies:
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -575,7 +575,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails framework to build connector with Maestrano