maestrano-connector-rails 1.3.4 → 1.3.5

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 ENV['RAILS_ENV'] ||= 'test'
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
 require 'factory_girl_rails'
 require 'shoulda/matchers'
@@ -17,7 +17,7 @@ RSpec.configure do |config|
   config.mock_with :rspec
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
-  config.order = "random"
+  config.order = 'random'
   config.include FactoryGirl::Syntax::Methods
   config.include Maestrano::Connector::Rails::Engine.routes.url_helpers
 

data/template/factories.rb

@@ -1,8 +1,7 @@
 FactoryGirl.define do
-
   factory :organization, class: Maestrano::Connector::Rails::Organization do
-    name "My company"
-    tenant "default"
+    name 'My company'
+    tenant 'default'
     sequence(:uid) { |n| "cld-11#{n}" }
     oauth_uid 'sfuiy765'
     oauth_provider 'this_app'
@@ -12,7 +11,7 @@ FactoryGirl.define do
     connec_entity 'person'
     external_id '4567ada66'
     external_entity 'contact'
-    last_push_to_external 2.day.ago
+    last_push_to_external 2.days.ago
     last_push_to_connec 1.day.ago
     association :organization
   end
@@ -22,4 +21,4 @@ FactoryGirl.define do
     status 'SUCCESS'
     partial false
   end
-end
+end

data/template/maestrano.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
 %w(default maestrano-uat).each do |tenant|
   Maestrano[tenant].configure do |config|
-
     # ==> Environment configuration
     # The environment to connect to.
     # If set to 'production' then all Single Sign-On (SSO) and API requests
@@ -140,7 +140,7 @@
     #
     # == Subscriptions
     # This is the list of entities (organizations,people,invoices etc.) for which you want to be
-    # notified upon creation/update in Connec!™
+    # notified upon creation/update in Connec!
     config.webhook.connec.subscriptions = {
       accounts: false,
       company: false,
@@ -171,4 +171,4 @@
       work_locations: false
     }
   end
-end
+end

data/template/{maestrano-connector-template.rb → maestrano_connector_template.rb}

@@ -1,14 +1,14 @@
 def current_directory
   @current_directory ||=
-      if __FILE__ =~ %r{\Ahttps?://}
-        tempdir = Dir.mktmpdir("maestrano-connector-rails-")
-        at_exit { FileUtils.remove_entry(tempdir) }
-        git :clone => "--quiet https://github.com/maestrano/maestrano-connector-rails/ #{tempdir}"
-
-        "#{tempdir}/template"
-      else
-        File.expand_path(File.dirname(__FILE__))
-      end
+    if __FILE__ =~ %r{\Ahttps?://}
+      tempdir = Dir.mktmpdir('maestrano-connector-rails-')
+      at_exit { FileUtils.remove_entry(tempdir) }
+      git clone: "--quiet https://github.com/maestrano/maestrano-connector-rails/ #{tempdir}"
+
+      "#{tempdir}/template"
+    else
+      File.expand_path(File.dirname(__FILE__))
+    end
 end
 
 # def current_directory
@@ -29,7 +29,7 @@ run 'touch Gemfile'
 
 add_source 'https://rubygems.org'
 
-if yes?("Use JRuby? [y/n]")
+if yes?('Use JRuby? [y/n]')
   run 'echo "ruby \'2.2.3\', :engine => \'jruby\', :engine_version => \'9.0.5.0\'" | cat - Gemfile > temp && mv temp Gemfile'
 end
 
@@ -43,14 +43,15 @@ gem 'uglifier', '>= 1.3.0'
 gem 'maestrano-connector-rails'
 
 gem_group :production, :uat do
-  gem 'activerecord-jdbcpostgresql-adapter', :platforms => :jruby
-  gem 'pg', :platforms => :ruby
+  gem 'activerecord-jdbcpostgresql-adapter', platforms: :jruby
+  gem 'pg', platforms: :ruby
   gem 'rails_12factor'
 end
 
 gem_group :test, :develpment do
-  gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
-  gem 'sqlite3', :platforms => :ruby
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
+  gem 'sqlite3', platforms: :ruby
+  gem 'rubocop'
 end
 
 gem_group :test do
@@ -63,7 +64,7 @@ end
 
 remove_file '.gitignore'
 copy_file 'gitignore', '.gitignore'
-
+copy_file 'rubocop.yml', '.rubocop.yml'
 
 #
 # Cleanup
@@ -100,15 +101,16 @@ after_bundle do
   end
   copy_file 'settings/settings.yml', 'config/settings.yml'
 
-  copy_file 'application.yml.sample', 'config/application.yml.sample'
+  copy_file 'application-sample.yml', 'config/application-sample.yml'
 
-  application do <<-RUBY
-    config.generators do |g|
-      g.test_framework :rspec, fixture: false
-      g.view_specs false
-      g.helper_specs false
-    end
-  RUBY
+  application do
+    <<-RUBY
+      config.generators do |g|
+        g.test_framework :rspec, fixture: false
+        g.view_specs false
+        g.helper_specs false
+      end
+    RUBY
   end
 
   run 'bundle exec rails g connector:install'
@@ -121,6 +123,6 @@ after_bundle do
 
   # Init repo and commit
   git :init
-  git add: "."
+  git add: '.'
   git commit: "-a -m 'Initial commit'"
-end
+end

data/template/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
   mount Maestrano::Connector::Rails::Engine, at: '/'
+  mount Sidekiq::Web => '/sidekiq'
 
   root 'home#index'
   get 'home/index' => 'home#index'
@@ -10,11 +11,4 @@ Rails.application.routes.draw do
 
   get 'synchronizations/index' => 'synchronizations#index'
   get 'shared_entities/index' => 'shared_entities#index'
-
-  # Sidekiq Admin
-  require 'sidekiq/web'
-  Sidekiq::Web.use Rack::Auth::Basic do |username, password|
-    username == ENV['SIDEKIQ_USERNAME'] && password == ENV['SIDEKIQ_PASSWORD']
-  end
-  mount Sidekiq::Web => '/sidekiq'
-end
+end

data/template/rubocop.yml

@@ -0,0 +1,55 @@
+Rails:
+  Enabled: true
+
+AllCops:
+  TargetRubyVersion: 2.3
+  Exclude:
+    - 'db/schema.rb'
+    - 'db/migrate/*'
+    - 'db/seeds.rb'
+    - 'bin/*'
+    - 'Gemfile'
+    - 'Rakefile'
+    - 'config.ru'
+    - 'spec/**/*'
+    - 'config/**/*'
+    - 'app/helpers/application_helper.rb'
+    - 'app/controllers/application_controller.rb'
+
+# 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
+
+# Checks for unused block arguments
+Lint/UnusedBlockArgument:
+  Enabled: false
+
+# Checks for unused method arguments.
+Lint/UnusedMethodArgument:
+  Enabled: false
+
+Metrics/AbcSize:
+  # The ABC size is a calculated magnitude, so this number can be a Fixnum or
+  # a Float.
+  Max: 27
+
+# RSpec/FilePath:
+#   Exclude:
+    # - 'spec/routing/**/*_routing_spec.rb'

data/template/sidekiq.rb

@@ -1 +1,9 @@
+# frozen_string_literal: true
+require 'sidekiq/web'
+
 Sidekiq::Cron::Job.create(name: 'AllSynchronizationsJob runs every hour', cron: '0 * * * *', class: 'Maestrano::Connector::Rails::AllSynchronizationsJob')
+
+# Sidekiq Admin
+Sidekiq::Web.use Rack::Auth::Basic do |username, password|
+  username == ENV['SIDEKIQ_USERNAME'] && password == ENV['SIDEKIQ_PASSWORD']
+end

data/template/spec_helper.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require 'simplecov'
 SimpleCov.start
 
 ENV['RAILS_ENV'] ||= 'test'
 
-require File.expand_path("../../config/environment", __FILE__)
+require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
 require 'factory_girl_rails'
 require 'shoulda/matchers'
@@ -17,6 +18,6 @@ RSpec.configure do |config|
   config.mock_with :rspec
   config.use_transactional_fixtures = true
   config.infer_base_class_for_anonymous_controllers = false
-  config.order = "random"
+  config.order = 'random'
   config.include FactoryGirl::Syntax::Methods
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -407,6 +407,7 @@ files:
 - app/models/maestrano/connector/rails/connector_logger.rb
 - app/models/maestrano/connector/rails/entity.rb
 - app/models/maestrano/connector/rails/entity_base.rb
+- app/models/maestrano/connector/rails/exceptions/entity_not_found_error.rb
 - app/models/maestrano/connector/rails/external.rb
 - app/models/maestrano/connector/rails/id_map.rb
 - app/models/maestrano/connector/rails/organization.rb
@@ -472,11 +473,8 @@ files:
 - spec/dummy/app/assets/images/.keep
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/admin_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/concerns/.keep
-- spec/dummy/app/controllers/home_controller.rb
-- spec/dummy/app/controllers/oauth_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
@@ -548,13 +546,14 @@ files:
 - spec/routing/connec_routing_spec.rb
 - spec/spec_helper.rb
 - template/Procfile
-- template/application.yml.sample
+- template/application-sample.yml
 - template/database.yml
 - template/factories.rb
 - template/gitignore
-- template/maestrano-connector-template.rb
 - template/maestrano.rb
+- template/maestrano_connector_template.rb
 - template/routes.rb
+- template/rubocop.yml
 - template/settings/development.yml
 - template/settings/production.yml
 - template/settings/settings.yml

data/spec/dummy/app/controllers/admin_controller.rb

@@ -1,48 +0,0 @@
-# TODO
-# This controller is given as an example of a possible admin implementation
-# The admin functions should be restricted to admin users
-# Admin funcitons :
-#  * Link account to external application
-#  * Disconnect account from external application
-#  * Launch a manual syncrhonization for all entities or a sub-part of them
-#  * Chose which entities are synchronized by the connector
-#  * Access a list of the organization's idmaps
-class AdminController < ApplicationController
-
-  def index
-    if is_admin
-      @organization = current_organization
-      @idmaps = Maestrano::Connector::Rails::IdMap.where(organization_id: @organization.id).order(:connec_entity)
-    end
-  end
-
-  def update
-    organization = Maestrano::Connector::Rails::Organization.find_by_id(params[:id])
-
-    if organization && is_admin?(current_user, organization)
-      organization.synchronized_entities.keys.each do |entity|
-        if !!params["#{entity}"]
-          organization.synchronized_entities[entity] = true
-        else
-          organization.synchronized_entities[entity] = false
-        end
-      end
-      organization.save
-    end
-
-    redirect_to admin_index_path
-  end
-
-  def synchronize
-    if is_admin
-      Maestrano::Connector::Rails::SynchronizationJob.perform_later(current_organization, params['opts'] || {})
-    end
-
-    redirect_to root_path
-  end
-
-  private
-    def is_admin
-      current_user && current_organization && is_admin?(current_user, current_organization)
-    end
-end

data/spec/dummy/app/controllers/home_controller.rb

@@ -1,17 +0,0 @@
-# TODO
-# This controller is given as an example of a possible home
-# Admin funcitons :
-# * Display generic information about the connector (mostly for not connected users)
-# * Link the connector to a Maestrano organization
-# * Acces the last synchronization and a synchronization history (with their status)
-class HomeController < ApplicationController
-  def index
-    if current_user
-      @organization = current_organization
-
-      if @organization
-        @synchronizations = Maestrano::Connector::Rails::Synchronization.where(organization_id: @organization.id).order(updated_at: :desc).limit(40)
-      end
-    end
-  end
-end

data/spec/dummy/app/controllers/oauth_controller.rb

@@ -1,45 +0,0 @@
-class OauthController < ApplicationController
-
-  # TODO
-  # Routes for this controller are not provided by the gem and
-  # should be set according to your needs
-
-  def request_omniauth
-    org_uid = params[:org_uid]
-    organization = Maestrano::Connector::Rails::Organization.find_by_uid(org_uid)
-
-    if organization && is_admin?(current_user, organization)
-      # TODO
-      # Perform oauth request here. The oauth process should be able to
-      # remember the organization, either by a param in the request or using
-      # a session
-    else
-      redirect_to root_url
-    end
-  end
-
-  def create_omniauth
-    org_uid = '' # TODO
-    organization = Maestrano::Connector::Rails::Organization.find_by_uid(org_uid)
-
-    if organization && is_admin?(current_user, organization)
-      # TODO
-      # Update organization with oauth params
-    end
-
-    redirect_to root_url
-  end
-
-  def destroy_omniauth
-    organization = Maestrano::Connector::Rails::Organization.find(params[:organization_id])
-
-    if organization && is_admin?(current_user, organization)
-      organization.oauth_uid = nil
-      organization.oauth_token = nil
-      organization.refresh_token = nil
-      organization.save
-    end
-
-    redirect_to root_url
-  end
-end