maestrano-connector-rails 1.2.1 → 1.2.2

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

@@ -1,7 +1,7 @@
 module Maestrano::Connector::Rails::Concerns::EntityBase
   extend ActiveSupport::Concern
 
-  def initialize(organization, connec_client, external_client, opts={})
+  def initialize(organization, connec_client, external_client, opts = {})
     @organization = organization
     @connec_client = connec_client
     @external_client = external_client
@@ -22,7 +22,7 @@ module Maestrano::Connector::Rails::Concerns::EntityBase
 
   # This method is called during the webhook workflow only. It should return the hash of arrays of filtered entities
   # The aim is to have the same filtering as with the Connec! filters on API calls in the webhooks
-  # input :  
+  # input :
   # For non complex entities [unmapped_external_entity1, unmapped_external_entity2]
   # For complex entities {
   #   external_entities_names[0]: [unmapped_external_entity1, unmapped_external_entity2],
@@ -31,4 +31,4 @@ module Maestrano::Connector::Rails::Concerns::EntityBase
   def filter_connec_entities(entities)
     entities
   end
-end
+end

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

@@ -14,7 +14,7 @@ module Maestrano::Connector::Rails::Concerns::External
     # If you add new entities, you need to generate
     # a migration to add them to existing organizations
     def entities_list
-      raise "Not implemented"
+      raise 'Not implemented'
     end
   end
-end
+end

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

@@ -3,27 +3,21 @@ module Maestrano::Connector::Rails::Concerns::SubEntityBase
 
   module ClassMethods
     def external?
-      raise "Not implemented"
+      raise 'Not implemented'
     end
 
     def entity_name
-      raise "Not implemented"
+      raise 'Not implemented'
     end
 
     def external_entity_name
-      if external?
-        entity_name
-      else
-        raise "Forbidden call: cannot call external_entity_name for a connec entity"
-      end
+      return entity_name if external?
+      raise 'Forbidden call: cannot call external_entity_name for a connec entity'
     end
 
     def connec_entity_name
-      if external?
-        raise "Forbidden call: cannot call connec_entity_name for an external entity"
-      else
-        entity_name
-      end
+      return entity_name unless external?
+      raise 'Forbidden call: cannot call connec_entity_name for an external entity'
     end
 
     def names_hash
@@ -49,7 +43,6 @@ module Maestrano::Connector::Rails::Concerns::SubEntityBase
     end
   end
 
-
   def map_to(name, entity)
     mapper = self.class.mapper_classes[name]
     raise "Impossible mapping from #{self.class.entity_name} to #{name}" unless mapper
@@ -57,7 +50,12 @@ module Maestrano::Connector::Rails::Concerns::SubEntityBase
     if self.class.external?
       mapped_entity = mapper.denormalize(entity).merge(id: self.class.id_from_external_entity_hash(entity))
       folded_entity = Maestrano::Connector::Rails::ConnecHelper.fold_references(mapped_entity, self.class.references[name] || [], @organization)
-      folded_entity.merge!(opts: (folded_entity[:opts] || {}).merge(matching_fields: self.class.connec_matching_fields)) if self.class.connec_matching_fields
+
+      if self.class.connec_matching_fields
+        folded_entity[:opts] ||= {}
+        folded_entity[:opts][:matching_fields] = self.class.connec_matching_fields
+      end
+
       folded_entity
     else
       connec_id = entity[:__connec_id]
@@ -73,4 +71,4 @@ module Maestrano::Connector::Rails::Concerns::SubEntityBase
   def map_external_entity_with_idmap(external_entity, connec_entity_name, idmap)
     {entity: map_to(connec_entity_name, external_entity), idmap: idmap}
   end
-end
+end

data/app/models/maestrano/connector/rails/connector_logger.rb

@@ -2,4 +2,4 @@ module Maestrano::Connector::Rails
   class ConnectorLogger
     include Maestrano::Connector::Rails::Concerns::ConnectorLogger
   end
-end
+end

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

@@ -2,4 +2,4 @@ module Maestrano::Connector::Rails
   class Entity < EntityBase
     include Maestrano::Connector::Rails::Concerns::Entity
   end
-end
+end

data/app/models/maestrano/connector/rails/external.rb

@@ -2,4 +2,4 @@ module Maestrano::Connector::Rails
   class External
     include Maestrano::Connector::Rails::Concerns::External
   end
-end
+end

data/app/models/maestrano/connector/rails/id_map.rb

@@ -1,6 +1,5 @@
 module Maestrano::Connector::Rails
   class IdMap < ActiveRecord::Base
-
     belongs_to :organization
   end
-end
+end

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

@@ -2,11 +2,11 @@ module Maestrano::Connector::Rails
   class Organization < ActiveRecord::Base
     # Enable Maestrano for this group
     maestrano_group_via :provider, :uid, :tenant do |group, maestrano|
-      group.name = (maestrano.name.blank? ? "Default Group name" : maestrano.name)
+      group.name = (maestrano.name.blank? ? 'Default Group name' : maestrano.name)
       group.tenant = 'default' # To be set from SSO parameter
-      #group.country_alpha2 = maestrano.country
-      #group.free_trial_end_at = maestrano.free_trial_end_at
-      #group.some_required_field = 'some-appropriate-default-value'
+      # group.country_alpha2 = maestrano.country
+      # group.free_trial_end_at = maestrano.free_trial_end_at
+      # group.some_required_field = 'some-appropriate-default-value'
     end
 
     def initialize
@@ -20,7 +20,7 @@ module Maestrano::Connector::Rails
     #===================================
     # Encryptions
     #===================================
-    attr_encrypted_options.merge!(:mode => :per_attribute_iv_and_salt)
+    attr_encrypted_options[:mode] = :per_attribute_iv_and_salt
     attr_encrypted :oauth_token, key: ::Settings.encryption_key1
     attr_encrypted :refresh_token, key: ::Settings.encryption_key2
 
@@ -45,17 +45,15 @@ module Maestrano::Connector::Rails
     serialize :synchronized_entities
 
     def add_member(user)
-      if self.tenant == user.tenant && !self.member?(user)
-        self.user_organization_rels.create(user:user)
-      end
+      user_organization_rels.create(user: user) if tenant == user.tenant && !member?(user)
     end
 
     def member?(user)
-      self.user_organization_rels.where(user_id:user.id).count > 0
+      user_organization_rels.where(user_id: user.id).count > 0
     end
 
     def remove_member(user)
-      self.user_organization_rels.where(user_id:user.id).delete_all
+      user_organization_rels.where(user_id: user.id).delete_all
     end
 
     def from_omniauth(auth)
@@ -64,20 +62,20 @@ module Maestrano::Connector::Rails
       self.oauth_token = auth.credentials.token
       self.refresh_token = auth.credentials.refresh_token
       self.instance_url = auth.credentials.instance_url
-      self.save!
+      save!
     end
 
     def last_three_synchronizations_failed?
-      arr = self.synchronizations.last(3).map(&:is_error?)
+      arr = synchronizations.last(3).map(&:error?)
       arr.count == 3 && arr.uniq == [true]
     end
 
     def last_successful_synchronization
-      self.synchronizations.where(status: 'SUCCESS', partial: false).order(updated_at: :desc).first
+      synchronizations.where(status: 'SUCCESS', partial: false).order(updated_at: :desc).first
     end
 
     def last_synchronization_date
       (last_successful_synchronization && last_successful_synchronization.updated_at) || date_filtering_limit
     end
   end
-end
+end

data/app/models/maestrano/connector/rails/sub_entity_base.rb

@@ -2,4 +2,4 @@ module Maestrano::Connector::Rails
   class SubEntityBase < Entity
     include Maestrano::Connector::Rails::Concerns::SubEntityBase
   end
-end
+end

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

@@ -3,6 +3,10 @@ module Maestrano::Connector::Rails
     # Keeping only 100 synchronizations per organization
     after_create :clean_synchronizations
 
+    RUNNING_STATUS = 'RUNNING'.freeze
+    ERROR_STATUS = 'ERROR'.freeze
+    SUCCESS_STATUS = 'SUCCESS'.freeze
+
     #===================================
     # Associations
     #===================================
@@ -10,39 +14,37 @@ module Maestrano::Connector::Rails
 
     validates :status, presence: true
 
-    def is_running?
-      self.status == 'RUNNING'
+    def running?
+      status == RUNNING_STATUS
     end
 
-    def is_error?
-      self.status == 'ERROR'
+    def error?
+      status == ERROR_STATUS
     end
 
-    def is_success?
-      self.status == 'SUCCESS'
+    def success?
+      status == SUCCESS_STATUS
     end
 
     def self.create_running(organization)
-      Synchronization.create(organization_id: organization.id, status: 'RUNNING')
+      Synchronization.create(organization_id: organization.id, status: RUNNING_STATUS)
     end
 
     def set_success
-      self.update_attributes(status: 'SUCCESS')
+      update_attributes(status: SUCCESS_STATUS)
     end
 
     def set_error(msg)
-      self.update_attributes(status: 'ERROR', message: msg)
+      update_attributes(status: ERROR_STATUS, message: msg)
     end
 
     def set_partial
-      self.update_attributes(partial: true)
+      update_attributes(partial: true)
     end
 
     def clean_synchronizations
-      count = self.organization.synchronizations.count
-      if count > 100
-        self.organization.synchronizations.order('id ASC').limit(count - 100).destroy_all
-      end
+      count = organization.synchronizations.count
+      organization.synchronizations.order('id ASC').limit(count - 100).destroy_all if count > 100
     end
   end
-end
+end

data/app/models/maestrano/connector/rails/user.rb

@@ -1,6 +1,5 @@
 module Maestrano::Connector::Rails
   class User < ActiveRecord::Base
-
     # Enable Maestrano for this user
     maestrano_user_via :provider, :uid, :tenant do |user, maestrano|
       user.uid = maestrano.uid
@@ -23,4 +22,4 @@ module Maestrano::Connector::Rails
     validates :email, presence: true
     validates :tenant, presence: true
   end
-end
+end

data/app/models/maestrano/connector/rails/user_organization_rel.rb

@@ -1,10 +1,9 @@
 module Maestrano::Connector::Rails
   class UserOrganizationRel < ActiveRecord::Base
-
     #===================================
     # Associations
     #===================================
     belongs_to :user
     belongs_to :organization
   end
-end
+end

data/config/routes.rb

@@ -1,8 +1,10 @@
 Maestrano::Connector::Rails::Engine.routes.draw do
   maestrano_routes
 
+  get 'version', to: 'version#index'
+
   namespace :maestrano do
-  	match 'signout', to: 'sessions#destroy', as: 'signout', via: [:get, :post]
+    match 'signout', to: 'sessions#destroy', as: 'signout', via: [:get, :post]
     post 'connec/notifications/:tenant' => 'connec#notifications'
 
     resources :synchronizations, only: [:show, :create] do
@@ -12,4 +14,4 @@ Maestrano::Connector::Rails::Engine.routes.draw do
     end
     resources :dependancies, only: [:index]
   end
-end
+end

data/lib/maestrano/connector/rails.rb

@@ -1,7 +1,22 @@
-require 'maestrano'
 require 'maestrano-rails'
+
+require 'haml-rails'
+require 'bootstrap-sass'
+require 'autoprefixer-rails'
+
 require 'hash_mapper'
 
+require 'config'
+require 'figaro'
+
+require 'attr_encrypted'
+
+require 'sidekiq'
+require 'sidekiq-cron'
+require 'sidekiq-unique-jobs'
+require 'sinatra'
+require 'slim'
+
 module Maestrano
   module Connector
     module Rails
@@ -10,4 +25,4 @@ module Maestrano
       end
     end
   end
-end
+end

data/lib/maestrano_connector_rails.rb

@@ -0,0 +1 @@
+require 'maestrano/connector/rails'

data/maestrano-connector-rails.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: maestrano-connector-rails 1.2.1 ruby lib
+# stub: maestrano-connector-rails 1.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "1.2.1"
+  s.version = "1.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Pierre Berard"]
-  s.date = "2016-07-04"
+  s.date = "2016-07-05"
   s.description = "Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details."
   s.email = "pierre.berard@maestrano.com"
   s.executables = ["rails"]
@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    ".rubocop.yml",
+    ".rubocop_todo.yml",
     ".ruby-version",
     "CODESHIP.md",
     "DEVELOPER.md",
@@ -37,6 +39,7 @@ Gem::Specification.new do |s|
     "app/controllers/maestrano/dependancies_controller.rb",
     "app/controllers/maestrano/sessions_controller.rb",
     "app/controllers/maestrano/synchronizations_controller.rb",
+    "app/controllers/version_controller.rb",
     "app/helpers/maestrano/connector/rails/session_helper.rb",
     "app/jobs/maestrano/connector/rails/all_synchronizations_job.rb",
     "app/jobs/maestrano/connector/rails/push_to_connec_job.rb",
@@ -103,8 +106,8 @@ Gem::Specification.new do |s|
     "lib/generators/connector/templates/synchronizations_controller.rb",
     "lib/generators/connector/templates/synchronizations_controller_spec.rb",
     "lib/generators/connector/templates/synchronizations_index.haml",
-    "lib/maestrano-connector-rails.rb",
     "lib/maestrano/connector/rails.rb",
+    "lib/maestrano_connector_rails.rb",
     "maestrano-connector-rails.gemspec",
     "maestrano.png",
     "release_notes.md",
@@ -113,6 +116,7 @@ Gem::Specification.new do |s|
     "spec/controllers/group_users_controller_spec.rb",
     "spec/controllers/groups_controller_spec.rb",
     "spec/controllers/synchronizations_controller_spec.rb",
+    "spec/controllers/version_controller_spec.rb",
     "spec/dummy/README.md",
     "spec/dummy/Rakefile",
     "spec/dummy/app/assets/images/.keep",
@@ -215,16 +219,20 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 4.0"])
+      s.add_runtime_dependency(%q<rails>, ["~> 4.2"])
       s.add_runtime_dependency(%q<maestrano-rails>, [">= 0"])
       s.add_runtime_dependency(%q<hash_mapper>, [">= 0"])
-      s.add_runtime_dependency(%q<sidekiq>, [">= 0"])
-      s.add_runtime_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
       s.add_runtime_dependency(%q<haml-rails>, [">= 0"])
       s.add_runtime_dependency(%q<bootstrap-sass>, [">= 0"])
       s.add_runtime_dependency(%q<autoprefixer-rails>, [">= 0"])
       s.add_runtime_dependency(%q<attr_encrypted>, ["~> 1.4.0"])
       s.add_runtime_dependency(%q<config>, [">= 0"])
+      s.add_runtime_dependency(%q<figaro>, [">= 0"])
+      s.add_runtime_dependency(%q<sidekiq>, [">= 0"])
+      s.add_runtime_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<sidekiq-cron>, [">= 0"])
+      s.add_runtime_dependency(%q<slim>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
@@ -234,18 +242,23 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<factory_girl_rails>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<shoulda-matchers>, [">= 0"])
+      s.add_development_dependency(%q<rubocop>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 4.0"])
+      s.add_dependency(%q<rails>, ["~> 4.2"])
       s.add_dependency(%q<maestrano-rails>, [">= 0"])
       s.add_dependency(%q<hash_mapper>, [">= 0"])
-      s.add_dependency(%q<sidekiq>, [">= 0"])
-      s.add_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
       s.add_dependency(%q<haml-rails>, [">= 0"])
       s.add_dependency(%q<bootstrap-sass>, [">= 0"])
       s.add_dependency(%q<autoprefixer-rails>, [">= 0"])
       s.add_dependency(%q<attr_encrypted>, ["~> 1.4.0"])
       s.add_dependency(%q<config>, [">= 0"])
+      s.add_dependency(%q<figaro>, [">= 0"])
+      s.add_dependency(%q<sidekiq>, [">= 0"])
+      s.add_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<sidekiq-cron>, [">= 0"])
+      s.add_dependency(%q<slim>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -255,19 +268,24 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<factory_girl_rails>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<shoulda-matchers>, [">= 0"])
+      s.add_dependency(%q<rubocop>, [">= 0"])
       s.add_dependency(%q<timecop>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 4.0"])
+    s.add_dependency(%q<rails>, ["~> 4.2"])
     s.add_dependency(%q<maestrano-rails>, [">= 0"])
     s.add_dependency(%q<hash_mapper>, [">= 0"])
-    s.add_dependency(%q<sidekiq>, [">= 0"])
-    s.add_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
     s.add_dependency(%q<haml-rails>, [">= 0"])
     s.add_dependency(%q<bootstrap-sass>, [">= 0"])
     s.add_dependency(%q<autoprefixer-rails>, [">= 0"])
     s.add_dependency(%q<attr_encrypted>, ["~> 1.4.0"])
     s.add_dependency(%q<config>, [">= 0"])
+    s.add_dependency(%q<figaro>, [">= 0"])
+    s.add_dependency(%q<sidekiq>, [">= 0"])
+    s.add_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<sidekiq-cron>, [">= 0"])
+    s.add_dependency(%q<slim>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
@@ -277,6 +295,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<factory_girl_rails>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<shoulda-matchers>, [">= 0"])
+    s.add_dependency(%q<rubocop>, [">= 0"])
     s.add_dependency(%q<timecop>, [">= 0"])
   end
 end