maestrano-connector-rails 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95e92f2381cc4ebc9478d3b71f683c6befeb10aa
-  data.tar.gz: 54d7c193e363d6c1897dde5232e995c6a782a0a3
+  metadata.gz: 33ca5ce6a87c49a85d92343cd1ca3fc95aa40f5a
+  data.tar.gz: 3f152361f671a50af5c3b6de00f70e5e5b4ecdc3
 SHA512:
-  metadata.gz: 4d274d460bb4c47ef71745754e91ead09874cdeca8f654f83c8e164bbf6fc3766a8a176e1c3fe917782dd410ae59ce43a254fe833c7039ee5f2312ab09e99d66
-  data.tar.gz: 55381a11bdf457004c6e82b6097edc9c4b3f1bc4f8326203e1018cc4628e67cf987f466cd0ed26de292f36c6177f8cc4b59f01d7f813cb3af460aa378238dd98
+  metadata.gz: 5b4e1d85bb3002e08842c4bcd0465e8580c733cda97b4174de3bb3608b49a6a677293d5b4473bf01abb694eb19c6e733d6b091ec76df2d1e3c782b9aaea671c7
+  data.tar.gz: e1ad34efc0df915117050afbb547e1dbbcb6a8b178081518749c9bd7675b39f32d3de969cd34bf2e323c0498eace1f6b6c1048bbdc40757ec54934b600109dad

data/.rubocop.yml

@@ -0,0 +1,41 @@
+# require: rubocop-rspec
+inherit_from: .rubocop_todo.yml
+
+Rails:
+  Enabled: true
+
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+    - 'maestrano-connector-rails.gemspec'
+    - 'db/schema.rb'
+    - 'db/migrate/*'
+    - 'bin/*'
+    - 'spec/**/*'
+    - 'template/**/*'
+    - 'lib/generators/connector/**/*'
+
+# Enabled disabled Cops
+Style/CollectionMethods:
+  Enabled: true
+
+Metrics/LineLength:
+  Max: 320
+
+Style/IndentationConsistency:
+  EnforcedStyle: rails
+
+# Missing top-level class documentation comment
+Style/Documentation:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Space inside braces => only for blocks (not for literal)
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+# RSpec/FilePath:
+#   Exclude:
+    # - 'spec/routing/**/*_routing_spec.rb'

data/.rubocop_todo.yml

@@ -0,0 +1,180 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-07-05 12:03:48 +0100 using RuboCop version 0.41.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
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'app/jobs/maestrano/connector/rails/push_to_connec_job.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'app/jobs/maestrano/connector/rails/synchronization_job.rb'
+
+# Offense count: 14
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'app/jobs/maestrano/connector/rails/all_synchronizations_job.rb'
+    - 'app/models/maestrano/connector/rails/concerns/complex_entity.rb'
+    - 'app/models/maestrano/connector/rails/concerns/entity.rb'
+    - 'app/models/maestrano/connector/rails/concerns/external.rb'
+
+# Offense count: 21
+Metrics/AbcSize:
+  Max: 70
+
+# Offense count: 9
+Metrics/CyclomaticComplexity:
+  Max: 14
+
+# Offense count: 40
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 311
+
+# Offense count: 16
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 42
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 249
+
+# Offense count: 2
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 7
+
+# Offense count: 10
+Metrics/PerceivedComplexity:
+  Max: 15
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnabledForFlattenWithoutParams.
+Performance/FlatMap:
+  Exclude:
+    - 'app/models/maestrano/connector/rails/concerns/complex_entity.rb'
+
+# Offense count: 6
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# 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
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'app/models/maestrano/connector/rails/concerns/entity.rb'
+
+# Offense count: 2
+Style/ClassVars:
+  Exclude:
+    - 'app/models/maestrano/connector/rails/concerns/connec_helper.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredMethods.
+Style/CollectionMethods:
+  Exclude:
+    - 'app/models/maestrano/connector/rails/concerns/complex_entity.rb'
+
+# Offense count: 1
+Style/DoubleNegation:
+  Exclude:
+    - 'app/controllers/maestrano/auth/saml_controller.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
+Style/EmptyLinesAroundModuleBody:
+  Exclude:
+    - 'app/jobs/maestrano/connector/rails/push_to_connec_worker.rb'
+
+# Offense count: 38
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: when_needed, always
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 3
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+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.
+# Configuration parameters: AllowMultipleReturnValues.
+Style/RedundantReturn:
+  Exclude:
+    - 'app/jobs/maestrano/connector/rails/push_to_connec_worker.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.
+# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
+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.
+# SupportedStyles: final_newline, final_blank_line
+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/.ruby-version

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

data/CODESHIP.md

@@ -7,5 +7,7 @@ bundle install
 
 # Test commands
 ```
-bundle exec rake
+bundle exec rake app:db:test:prepare
+bundle exec rspec
+bundle exec rubocop
 ```

data/Gemfile

@@ -1,28 +1,34 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Add dependencies required to use your gem here.
-gem 'rails', '~> 4.0'
+gem 'rails', '~> 4.2'
 gem 'maestrano-rails'
 gem 'hash_mapper'
-gem 'sidekiq'
-# The missing unique jobs for sidekiq
-gem 'sidekiq-unique-jobs'
 gem 'haml-rails'
 gem 'bootstrap-sass'
 gem 'autoprefixer-rails'
 gem 'attr_encrypted', '~> 1.4.0'
 gem 'config'
+gem 'figaro'
+
+gem 'sidekiq'
+# The missing unique jobs for sidekiq
+gem 'sidekiq-unique-jobs'
+gem 'sinatra', require: nil
+gem 'sidekiq-cron'
+gem 'slim'
 
 # Add dependencies to develop your gem here.
 group :development do
-  gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.1.1"
-  gem "simplecov", ">= 0"
+  gem 'shoulda', '>= 0'
+  gem 'rdoc', '~> 3.12'
+  gem 'bundler', '~> 1.0'
+  gem 'jeweler', '~> 2.1.1'
+  gem 'simplecov', '>= 0'
   gem 'rspec-rails'
   gem 'factory_girl_rails'
   gem 'sqlite3'
   gem 'shoulda-matchers'
+  gem 'rubocop'
   gem 'timecop'
 end

data/Rakefile

@@ -6,7 +6,7 @@ begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
+  $stderr.puts 'Run `bundle install` to install missing gems'
   exit e.status_code
 end
 require 'rake'
@@ -14,24 +14,24 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
-  gem.name = "maestrano-connector-rails"
-  gem.homepage = "http://github.com/maestrano/maestrano-connector-rails"
-  gem.license = "MIT"
-  gem.summary = "Rails framework to build connector with Maestrano"
-  gem.description = "Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details."
-  gem.email = "pierre.berard@maestrano.com"
-  gem.authors = ["Pierre Berard"]
+  gem.name = 'maestrano-connector-rails'
+  gem.homepage = 'http://github.com/maestrano/maestrano-connector-rails'
+  gem.license = 'MIT'
+  gem.summary = 'Rails framework to build connector with Maestrano'
+  gem.description = 'Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details.'
+  gem.email = 'pierre.berard@maestrano.com'
+  gem.authors = ['Pierre Berard']
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+desc 'Run all specs in spec directory (excluding plugin specs)'
+RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
 
-task :default => :spec
+task default: :spec

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/app/controllers/maestrano/account/group_users_controller.rb

@@ -1,20 +1,18 @@
 class Maestrano::Account::GroupUsersController < Maestrano::Rails::WebHookController
-
-  # DELETE /maestrano/account/groups/cld-1/users/usr-1
   # DELETE /maestrano/account/groups/cld-1/users/usr-1/tenant
   # Remove a user from a group
   def destroy
     # Set the right uid based on Maestrano.param('sso.creation_mode')
-    user_uid = Maestrano.mask_user(params[:id], params[:group_id]) 
+    user_uid = Maestrano.mask_user(params[:id], params[:group_id])
     group_uid = params[:group_id]
-    
+
     # Get the entities
     user = Maestrano::Connector::Rails::User.find_by_uid_and_tenant(user_uid, params[:tenant] || 'default')
     organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(group_uid, params[:tenant] || 'default')
-    
+
     # Remove the user from the organization
     organization.remove_member(user)
-    
+
     render json: {success: true}
   end
-end
+end

data/app/controllers/maestrano/account/groups_controller.rb

@@ -1,22 +1,20 @@
 class Maestrano::Account::GroupsController < Maestrano::Rails::WebHookController
-  
-  # DELETE /maestrano/account/groups/cld-1
   # DELETE /maestrano/account/groups/cld-1/tenant
   # Delete an entire group
   def destroy
     # id
     org_uid = params[:id]
-    
+
     # Get entity
     organization = Maestrano::Connector::Rails::Organization.find_by_uid_and_tenant(org_uid, params[:tenant] || 'default')
-    
+
     # Delete all relations
     organization.user_organization_rels.delete_all
-    
+
     # Delete the organization
     organization.destroy
-    
+
     # Respond
     render json: {success: true}
   end
-end
+end

data/app/controllers/maestrano/application_controller.rb

@@ -4,4 +4,4 @@ module Maestrano
 
     protect_from_forgery with: :exception
   end
-end
+end

data/app/controllers/maestrano/auth/saml_controller.rb

@@ -1,5 +1,4 @@
 class Maestrano::Auth::SamlController < Maestrano::Rails::SamlBaseController
-
   def init
     session[:settings] = !!params[:settings]
     super
@@ -14,9 +13,7 @@ class Maestrano::Auth::SamlController < Maestrano::Rails::SamlBaseController
     user = Maestrano::Connector::Rails::User.find_or_create_for_maestrano(user_auth_hash, params[:tenant])
     organization = Maestrano::Connector::Rails::Organization.find_or_create_for_maestrano(group_auth_hash, params[:tenant])
     if user && organization
-      unless organization.member?(user)
-        organization.add_member(user)
-      end
+      organization.add_member(user) unless organization.member?(user)
 
       session[:tenant] = params[:tenant]
       session[:uid] = user.uid
@@ -27,12 +24,10 @@ class Maestrano::Auth::SamlController < Maestrano::Rails::SamlBaseController
     if session[:settings]
       session.delete(:settings)
       redirect_to main_app.root_path
+    elsif current_organization && current_organization.oauth_uid && current_organization.sync_enabled
+      redirect_to main_app.home_redirect_to_external_path
     else
-      if current_organization && current_organization.oauth_uid && current_organization.sync_enabled
-        redirect_to main_app.home_redirect_to_external_path
-      else
-        redirect_to main_app.root_path
-      end
+      redirect_to main_app.root_path
     end
   end
-end
+end

data/app/controllers/maestrano/connec_controller.rb

@@ -1,11 +1,9 @@
 class Maestrano::ConnecController < Maestrano::Rails::WebHookController
-
   def notifications
     Rails.logger.debug "Received notification from Connec!: #{params}"
 
     begin
       params.except(:tenant, :controller, :action, :connec).each do |entity_name, entities|
-
         entity_class_hash = find_entity_class(entity_name)
         next Rails.logger.info "Received notification from Connec! for unknow entity: #{entity_name}" unless entity_class_hash
 
@@ -14,7 +12,6 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
           next Rails.logger.warn "Received notification from Connec! for unknown group or group without oauth: #{entity['group_id']} (tenant: #{params[:tenant]})" unless organization && organization.oauth_uid
           next unless organization.sync_enabled && organization.synchronized_entities[entity_class_hash[:name].to_sym]
 
-
           Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received entity from Connec! webhook: Entity=#{entity_name}, Data=#{entity}")
           connec_client = Maestrano::Connector::Rails::ConnecHelper.get_client(organization)
           external_client = Maestrano::Connector::Rails::External.get_client(organization)
@@ -22,11 +19,14 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
 
           entity_instance = entity_class_hash[:class].new(organization, connec_client, external_client, {})
           entity_instance.before_sync(last_synchronization_date)
-          
+
           # Build expected input for consolidate_and_map_data
           if entity_class_hash[:is_complex]
-            filtered_entities = entity_instance.filter_connec_entities(Maestrano::Connector::Rails::ComplexEntity.build_hash_with_entities(entity_instance.class.connec_entities_names, entity_name, lambda{|name| name.parameterize('_').pluralize}, [entity]))
-            mapped_entity = entity_instance.consolidate_and_map_data(filtered_entities, Maestrano::Connector::Rails::ComplexEntity.build_empty_hash(entity_instance.class.external_entities_names))
+            connec_hash_of_entities = Maestrano::Connector::Rails::ComplexEntity.build_hash_with_entities(entity_instance.class.connec_entities_names, entity_name, ->(name) { name.parameterize('_').pluralize }, [entity])
+            filtered_entities = entity_instance.filter_connec_entities(connec_hash_of_entities)
+
+            empty_external_hash = Maestrano::Connector::Rails::ComplexEntity.build_empty_hash(entity_instance.class.external_entities_names)
+            mapped_entity = entity_instance.consolidate_and_map_data(filtered_entities, empty_external_hash)
           else
             filtered_entities = entity_instance.filter_connec_entities([entity])
             mapped_entity = entity_instance.consolidate_and_map_data(filtered_entities, [])
@@ -40,18 +40,19 @@ class Maestrano::ConnecController < Maestrano::Rails::WebHookController
       Rails.logger.warn("error processing notification #{e.message} - #{e.backtrace.join("\n")}")
     end
 
-    head 200, content_type: "application/json"
+    head 200, content_type: 'application/json'
   end
 
-
   private
+
     def find_entity_class(entity_name)
       Maestrano::Connector::Rails::External.entities_list.each do |entity_name_from_list|
         clazz = "Entities::#{entity_name_from_list.singularize.titleize.split.join}".constantize
         if clazz.methods.include?('connec_entities_names'.to_sym)
-          return {class: clazz, is_complex: true, name: entity_name_from_list} if clazz.connec_entities_names.map{|n| n.parameterize('_').pluralize}.include?(entity_name)
-        elsif clazz.methods.include?('connec_entity_name'.to_sym)
-          return {class: clazz, is_complex: false, name: entity_name_from_list} if clazz.normalized_connec_entity_name == entity_name
+          formatted_entities_names = clazz.connec_entities_names.map { |n| n.parameterize('_').pluralize }
+          return {class: clazz, is_complex: true, name: entity_name_from_list} if formatted_entities_names.include?(entity_name)
+        elsif clazz.methods.include?('connec_entity_name'.to_sym) && clazz.normalized_connec_entity_name == entity_name
+          return {class: clazz, is_complex: false, name: entity_name_from_list}
         end
       end
       nil