maestrano-connector-rails 2.0.2.pre.RC5 → 2.0.2.pre.RC6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06e3899a9fba9fa9e03d4e4fbb2255e200624ba4
-  data.tar.gz: 93cfdea7d3fb9035bce137b725d6b94045baa62f
+  metadata.gz: 44c8a03cd21fe3a99e6db9afaef6859ec8f7a7bf
+  data.tar.gz: fc34a1cec7f51613576f15631b0a1b2f99e3f0e7
 SHA512:
-  metadata.gz: 331992468a267ed7f31ca18f3cf3a5cbed9c8ded70621a180c5cc186c668a4011b9c3029af101312e7719e5964519119074a0a22818d6d087496a5dd413b5935
-  data.tar.gz: 9203094743d8549633008baf884c05ea60b476f1997cca322516c36e418e0536c666674659e5f08e00006e3a2088029da230393f2c9297132b4a0c68dfed191a
+  metadata.gz: 44d8478e4cd319ffa2dd858849b6382d8204f8047071139c817a0cfd0742e95cc4c29b4dba413228eae1eb3a881525924ee5c3b1ee408e6fc2629395c6229348
+  data.tar.gz: 9b77f64bce1e3f2b74b69e7653e36cd2a9aed844992cb6a019847fc657337f0fde563ed4bba96761cb5a241dfa2c0ce0017c55dd11890e8ceb2fc61ff0eaf97b

data/.rubocop_todo.yml

@@ -12,6 +12,10 @@ Lint/AssignmentInCondition:
   Exclude:
     - 'app/jobs/maestrano/connector/rails/push_to_connec_job.rb'
 
+# Offense count: 1
+Metrics/ClassLength:
+  Max: 160
+
 # Offense count: 23
 Metrics/AbcSize:
   Max: 70

data/Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
 gem 'rails', '~> 4.2'
 
-gem 'maestrano-rails', '~> 1.0.0'
+gem 'maestrano-rails', '~> 1.0.3'
 
 gem 'attr_encrypted', '~> 1.4.0'
 gem 'autoprefixer-rails'
@@ -22,7 +22,6 @@ gem 'slim'
 
 # Add dependencies to develop your gem here.
 group :development do
-  gem 'webmock', '~> 1.24.1'
   gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
   gem 'bundler'
   gem 'factory_girl_rails'
@@ -36,4 +35,5 @@ group :development do
   gem 'simplecov', '>= 0'
   gem 'sqlite3', platforms: :ruby
   gem 'timecop'
+  gem 'webmock', '~> 1.24.1'
 end

data/VERSION

@@ -1 +1 @@
-2.0.2.pre.RC5
+2.0.2.pre.RC6

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

@@ -422,84 +422,15 @@ module Maestrano::Connector::Rails::Concerns::Entity
   end
 
   def consolidate_and_map_connec_entities(connec_entities, external_entities, references, external_entity_name)
-    connec_entities.map { |entity|
-      # Entity has been created before date filtering limit
-      next nil if before_date_filtering_limit?(entity, false) && !@opts[:full_sync]
-
-      # 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)
-      entity = unfold_hash[:entity]
-      next nil unless entity # discard if at least one record reference is missing
-      connec_id = unfold_hash[:connec_id]
-      id_refs_only_connec_entity = unfold_hash[:id_refs_only_connec_entity]
-
-      if entity['id'].blank?
-        # Expecting find_or_create to be mostly a create
-        idmap = self.class.find_or_create_idmap(organization_id: @organization.id, name: self.class.object_name_from_connec_entity_hash(entity), external_entity: external_entity_name.downcase, connec_id: connec_id)
-        next map_connec_entity_with_idmap(entity, external_entity_name, idmap, id_refs_only_connec_entity)
-      end
-
-      # Expecting find_or_create to be mostly a find
-      idmap = self.class.find_or_create_idmap(external_id: entity['id'], organization_id: @organization.id, external_entity: external_entity_name.downcase, connec_id: connec_id)
-      idmap.update(name: self.class.object_name_from_connec_entity_hash(entity))
-
-      next nil if idmap.external_inactive || !idmap.to_external || (!@opts[:full_sync] && not_modified_since_last_push_to_external?(idmap, entity))
-
-      # Check for conflict with entities from external
-      solve_conflict(entity, external_entities, external_entity_name, idmap, id_refs_only_connec_entity)
-    }.compact
+    Maestrano::Connector::Rails::Services::DataConsolidator.new(@organization, self, @opts).consolidate_connec_entities(connec_entities, external_entities, references, external_entity_name)
   end
 
   def consolidate_and_map_external_entities(external_entities, connec_entity_name)
-    external_entities.map { |entity|
-      # Entity has been created before date filtering limit
-      next nil if before_date_filtering_limit?(entity) && !@opts[:full_sync]
-
-      entity_id = self.class.id_from_external_entity_hash(entity)
-      idmap = self.class.find_or_create_idmap(external_id: entity_id, organization_id: @organization.id, connec_entity: connec_entity_name.downcase)
-
-      # Not pushing entity to Connec!
-      next nil unless idmap.to_connec
-
-      # Not pushing to Connec! and flagging as inactive if inactive in external application
-      inactive = self.class.inactive_from_external_entity_hash?(entity)
-      idmap.update(external_inactive: inactive, name: self.class.object_name_from_external_entity_hash(entity))
-      next nil if inactive
-
-      # Entity has not been modified since its last push to connec!
-      next nil if !@opts[:full_sync] && not_modified_since_last_push_to_connec?(idmap, entity)
-
-      map_external_entity_with_idmap(entity, connec_entity_name, idmap)
-    }.compact
+    Maestrano::Connector::Rails::Services::DataConsolidator.new(@organization, self, @opts).consolidate_external_entities(external_entities, connec_entity_name)
   end
 
   def consolidate_and_map_singleton(connec_entities, external_entities)
-    return {connec_entities: [], external_entities: []} if external_entities.empty? && connec_entities.empty?
-
-    idmap = self.class.find_or_create_idmap(organization_id: @organization.id)
-    # No to_connec, to_external and inactive consideration here as we don't expect those workflow for singleton
-
-    keep_external = if external_entities.empty?
-                      false
-                    elsif connec_entities.empty?
-                      true
-                    elsif @opts.key?(:connec_preemption)
-                      !@opts[:connec_preemption]
-                    else
-                      !is_connec_more_recent?(connec_entities.first, external_entities.first)
-                    end
-
-    if keep_external
-      idmap.update(external_id: self.class.id_from_external_entity_hash(external_entities.first), name: self.class.object_name_from_external_entity_hash(external_entities.first))
-      return {connec_entities: [], external_entities: [{entity: map_to_connec(external_entities.first), idmap: idmap}]}
-    else
-      unfold_hash = Maestrano::Connector::Rails::ConnecHelper.unfold_references(connec_entities.first, self.class.references, @organization)
-      entity = unfold_hash[:entity]
-      idmap.update(name: self.class.object_name_from_connec_entity_hash(entity), connec_id: unfold_hash[:connec_id])
-      idmap.update(external_id: self.class.id_from_external_entity_hash(external_entities.first)) unless external_entities.empty?
-      return {connec_entities: [{entity: map_to_external(entity), idmap: idmap, id_refs_only_connec_entity: {}}], external_entities: []}
-    end
+    Maestrano::Connector::Rails::Services::DataConsolidator.new(@organization, self, @opts).consolidate_singleton(connec_entities, external_entities)
   end
 
   # ----------------------------------------------
@@ -548,59 +479,6 @@ module Maestrano::Connector::Rails::Concerns::Entity
       end
     end
 
-    def not_modified_since_last_push_to_connec?(idmap, entity)
-      not_modified = idmap.last_push_to_connec && idmap.last_push_to_connec > self.class.last_update_date_from_external_entity_hash(entity)
-      Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Discard #{Maestrano::Connector::Rails::External.external_name} #{self.class.external_entity_name} : #{entity}") if not_modified
-      not_modified
-    end
-
-    def not_modified_since_last_push_to_external?(idmap, entity)
-      not_modified = idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']
-      Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Discard Connec! #{self.class.connec_entity_name} : #{entity}") if not_modified
-      not_modified
-    end
-
-    def before_date_filtering_limit?(entity, external = true)
-      @organization.date_filtering_limit && @organization.date_filtering_limit > (external ? self.class.creation_date_from_external_entity_hash(entity) : entity['created_at'])
-    end
-
-    def is_connec_more_recent?(connec_entity, external_entity)
-      connec_entity['updated_at'] > self.class.last_update_date_from_external_entity_hash(external_entity)
-    end
-
-    # This methods try to find a external entity among all the external entities matching the connec (mapped) one (same id)
-    # If it does not find any, there is no conflict, and it returns the mapped connec entity
-    # If it finds one, the conflict is solved either with options or using the entities timestamps
-    #   If the connec entity is kept, it is returned mapped and the matching external entity is discarded (deleted from the array)
-    #   Else the method returns nil, meaning the connec entity is discarded
-    def solve_conflict(connec_entity, external_entities, external_entity_name, idmap, id_refs_only_connec_entity)
-      # Here the connec_entity['id'] is an external id (String) because the entity has been unfolded.
-      external_entity = external_entities.find { |entity| connec_entity['id'] == self.class.id_from_external_entity_hash(entity) }
-      # No conflict
-      return map_connec_entity_with_idmap(connec_entity, external_entity_name, idmap, id_refs_only_connec_entity) unless external_entity
-
-      # Conflict
-      # We keep the most recently updated entity
-      keep_connec = @opts.key?(:connec_preemption) ? @opts[:connec_preemption] : is_connec_more_recent?(connec_entity, external_entity)
-
-      if keep_connec
-        Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Conflict between #{Maestrano::Connector::Rails::External.external_name} #{external_entity_name} #{external_entity} and Connec! #{self.class.connec_entity_name} #{connec_entity}. Entity from Connec! kept")
-        external_entities.delete(external_entity)
-        map_connec_entity_with_idmap(connec_entity, external_entity_name, idmap, id_refs_only_connec_entity)
-      else
-        Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Conflict between #{Maestrano::Connector::Rails::External.external_name} #{external_entity_name} #{external_entity} and Connec! #{self.class.connec_entity_name} #{connec_entity}. Entity from external kept")
-        nil
-      end
-    end
-
-    def map_connec_entity_with_idmap(connec_entity, external_entity_name, idmap, id_refs_only_connec_entity)
-      {entity: map_to_external(connec_entity, idmap.last_push_to_external.nil?), idmap: idmap, id_refs_only_connec_entity: id_refs_only_connec_entity}
-    end
-
-    def map_external_entity_with_idmap(external_entity, connec_entity_name, idmap)
-      {entity: map_to_connec(external_entity, idmap.last_push_to_connec.nil?), idmap: idmap}
-    end
-
     def fetch_connec(uri)
       Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "Fetching data from connec entity=#{self.class.connec_entity_name}, url=#{uri}")
       response = @connec_client.get(uri)

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

@@ -60,14 +60,6 @@ module Maestrano::Connector::Rails::Concerns::SubEntityBase
     end
   end
 
-  def map_connec_entity_with_idmap(connec_entity, external_entity_name, idmap, id_refs_only_connec_entity)
-    {entity: map_to(external_entity_name, connec_entity, idmap.last_push_to_external.nil?), idmap: idmap, id_refs_only_connec_entity: id_refs_only_connec_entity}
-  end
-
-  def map_external_entity_with_idmap(external_entity, connec_entity_name, idmap)
-    {entity: map_to(connec_entity_name, external_entity, idmap.last_push_to_connec.nil?), idmap: idmap}
-  end
-
   # Maps the entity received from external after a creation or an update and complete the received ids with the connec ones
   def map_and_complete_hash_with_connec_ids(external_hash, external_entity_name, connec_hash)
     return nil if connec_hash.empty?

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

@@ -134,11 +134,11 @@ module Maestrano::Connector::Rails
     end
 
     def push_to_connec_enabled?(entity)
-      synchronized_entities.dig(EntityHelper.snake_name(entity), :can_push_to_connec) && entity&.class.can_write_connec?
+      synchronized_entities.dig(EntityHelper.snake_name(entity), :can_push_to_connec) && entity&.class&.can_write_connec?
     end
 
     def push_to_external_enabled?(entity)
-      synchronized_entities.dig(EntityHelper.snake_name(entity), :can_push_to_external) && entity&.class.can_write_external?
+      synchronized_entities.dig(EntityHelper.snake_name(entity), :can_push_to_external) && entity&.class&.can_write_external?
     end
 
     def set_instance_metadata

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

@@ -0,0 +1,157 @@
+module Maestrano::Connector::Rails::Services
+  class DataConsolidator
+    def initialize(organization, entity_self, options)
+      @is_a_subentity = entity_self.is_a?(Maestrano::Connector::Rails::Concerns::SubEntityBase)
+      @organization = organization
+      @current_entity = entity_self
+      @opts = options
+    end
+
+    def consolidate_singleton(connec_entities, external_entities)
+      return {connec_entities: [], external_entities: []} if external_entities.empty? && connec_entities.empty?
+
+      idmap = @current_entity.class.find_or_create_idmap(organization_id: @organization.id)
+      # No to_connec, to_external and inactive consideration here as we don't expect those workflow for singleton
+
+      external_id = @current_entity.class.id_from_external_entity_hash(external_entities.first) if external_entities.first
+      # A singleton will be either valid (updated/created) in the external app or in Connec!
+      # if keep_external is true we are keeping the external entity
+      keep_external = if external_entities.empty?
+                        false
+                      elsif connec_entities.empty?
+                        true
+                      elsif @opts.key?(:connec_preemption)
+                        !@opts[:connec_preemption]
+                      else
+                        !connec_more_recent?(connec_entities.first, external_entities.first)
+                      end
+
+      if keep_external
+        idmap.update(external_id: external_id, name: @current_entity.class.object_name_from_external_entity_hash(external_entities.first))
+        return {connec_entities: [], external_entities: [{entity: @current_entity.map_to_connec(external_entities.first), idmap: idmap}]}
+      else
+        unfold_hash = Maestrano::Connector::Rails::ConnecHelper.unfold_references(connec_entities.first, @current_entity.class.references, @organization)
+        entity = unfold_hash[:entity]
+        idmap.update(name: @current_entity.class.object_name_from_connec_entity_hash(entity), connec_id: unfold_hash[:connec_id])
+        idmap.update(external_id: @current_entity.class.id_from_external_entity_hash(external_entities.first)) unless external_entities.empty?
+        return {connec_entities: [{entity: @current_entity.map_to_external(entity), idmap: idmap, id_refs_only_connec_entity: {}}], external_entities: []}
+      end
+    end
+
+    def consolidate_connec_entities(connec_entities, external_entities, references, external_entity_name)
+      connec_entities.map do |entity|
+        # Entity has been created before date filtering limit
+        next if before_date_filtering_limit?(entity, false) && !@opts[:full_sync]
+
+        # 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)
+        entity = unfold_hash[:entity]
+        next unless entity # discard if at least one record reference is missing
+        connec_id = unfold_hash[:connec_id]
+        id_refs_only_connec_entity = unfold_hash[:id_refs_only_connec_entity]
+
+        if entity['id'].blank?
+          # Expecting find_or_create to be mostly a create
+          idmap = @current_entity.class.find_or_create_idmap(organization_id: @organization.id, name: @current_entity.class.object_name_from_connec_entity_hash(entity), external_entity: external_entity_name.downcase, connec_id: connec_id)
+          next map_connec_entity_with_idmap(entity, external_entity_name, idmap, id_refs_only_connec_entity)
+        end
+
+        # Expecting find_or_create to be mostly a find
+        idmap = @current_entity.class.find_or_create_idmap(external_id: entity['id'], organization_id: @organization.id, external_entity: external_entity_name.downcase, connec_id: connec_id)
+        idmap.update(name: @current_entity.class.object_name_from_connec_entity_hash(entity))
+
+        next if idmap.external_inactive || !idmap.to_external || (!@opts[:full_sync] && not_modified_since_last_push_to_external?(idmap, entity))
+
+        # Check for conflict with entities from external
+        solve_conflict(entity, external_entities, external_entity_name, idmap, id_refs_only_connec_entity)
+      end.compact
+    end
+
+    def consolidate_external_entities(external_entities, connec_entity_name)
+      external_entities.map do |entity|
+        # Entity has been created before date filtering limit
+        next if before_date_filtering_limit?(entity) && !@opts[:full_sync]
+
+        entity_id = @current_entity.class.id_from_external_entity_hash(entity)
+        idmap = @current_entity.class.find_or_create_idmap(external_id: entity_id, organization_id: @organization.id, connec_entity: connec_entity_name.downcase)
+
+        # Not pushing entity to Connec!
+        next unless idmap.to_connec
+
+        # Not pushing to Connec! and flagging as inactive if inactive in external application
+        inactive = @current_entity.class.inactive_from_external_entity_hash?(entity)
+        idmap.update(external_inactive: inactive, name: @current_entity.class.object_name_from_external_entity_hash(entity))
+        next if inactive
+
+        # Entity has not been modified since its last push to connec!
+        next if !@opts[:full_sync] && not_modified_since_last_push_to_connec?(idmap, entity)
+
+        map_external_entity_with_idmap(entity, connec_entity_name, idmap)
+      end.compact
+    end
+
+    def before_date_filtering_limit?(entity, external = true)
+      @organization.date_filtering_limit && @organization.date_filtering_limit > (external ? @current_entity.class.creation_date_from_external_entity_hash(entity) : entity['created_at'])
+    end
+
+    def not_modified_since_last_push_to_connec?(idmap, entity)
+      not_modified = idmap.last_push_to_connec && idmap.last_push_to_connec > @current_entity.class.last_update_date_from_external_entity_hash(entity)
+      Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Discard #{Maestrano::Connector::Rails::External.external_name} #{@current_entity.class.external_entity_name} : #{entity}") if not_modified
+      not_modified
+    end
+
+    def not_modified_since_last_push_to_external?(idmap, entity)
+      not_modified = idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at']
+      Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Discard Connec! #{@current_entity.class.connec_entity_name} : #{entity}") if not_modified
+      not_modified
+    end
+
+    def map_external_entity_with_idmap(external_entity, connec_entity_name, idmap)
+      entity = if @is_a_subentity
+                 @current_entity.map_to(connec_entity_name, external_entity, idmap.last_push_to_connec.nil?)
+               else
+                 @current_entity.map_to_connec(external_entity, idmap.last_push_to_connec.nil?)
+               end
+      {entity: entity, idmap: idmap}
+    end
+
+    def map_connec_entity_with_idmap(connec_entity, external_entity_name, idmap, id_refs_only_connec_entity)
+      entity = if @is_a_subentity
+                 @current_entity.map_to(external_entity_name, connec_entity, idmap.last_push_to_external.nil?)
+               else
+                 @current_entity.map_to_external(connec_entity, idmap.last_push_to_external.nil?)
+               end
+      {entity: entity, idmap: idmap, id_refs_only_connec_entity: id_refs_only_connec_entity}
+    end
+
+    # This methods try to find a external entity among all the external entities matching the connec (mapped) one (same id)
+    # If it does not find any, there is no conflict, and it returns the mapped connec entity
+    # If it finds one, the conflict is solved either with options or using the entities timestamps
+    #   If the connec entity is kept, it is returned mapped and the matching external entity is discarded (deleted from the array)
+    #   Else the method returns nil, meaning the connec entity is discarded
+    def solve_conflict(connec_entity, external_entities, external_entity_name, idmap, id_refs_only_connec_entity)
+      # Here the connec_entity['id'] is an external id (String) because the entity has been unfolded.
+      external_entity = external_entities.find { |entity| connec_entity['id'] == @current_entity.class.id_from_external_entity_hash(entity) }
+      # No conflict
+      return map_connec_entity_with_idmap(connec_entity, external_entity_name, idmap, id_refs_only_connec_entity) unless external_entity
+
+      # Conflict
+      # We keep the most recently updated entity
+      keep_connec = @opts.key?(:connec_preemption) ? @opts[:connec_preemption] : connec_more_recent?(connec_entity, external_entity)
+
+      if keep_connec
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Conflict between #{Maestrano::Connector::Rails::External.external_name} #{external_entity_name} #{external_entity} and Connec! #{@current_entity.class.connec_entity_name} #{connec_entity}. Entity from Connec! kept")
+        external_entities.delete(external_entity)
+        map_connec_entity_with_idmap(connec_entity, external_entity_name, idmap, id_refs_only_connec_entity)
+      else
+        Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Conflict between #{Maestrano::Connector::Rails::External.external_name} #{external_entity_name} #{external_entity} and Connec! #{@current_entity.class.connec_entity_name} #{connec_entity}. Entity from external kept")
+        nil
+      end
+    end
+
+    def connec_more_recent?(connec_entity, external_entity)
+      connec_entity['updated_at'] > @current_entity.class.last_update_date_from_external_entity_hash(external_entity)
+    end
+  end
+end

data/maestrano-connector-rails.gemspec

@@ -2,19 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: maestrano-connector-rails 2.0.2.pre.RC5 ruby lib
+# stub: maestrano-connector-rails 2.0.2.pre.RC6 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails".freeze
-  s.version = "2.0.2.pre.RC5"
+  s.version = "2.0.2.pre.RC6"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Maestrano".freeze]
-  s.date = "2017-02-03"
+  s.date = "2017-02-16"
   s.description = "Maestrano is the next generation marketplace for SME applications. See https://sme.maestrano.com for details.".freeze
   s.email = "developers@maestrano.com".freeze
-  s.executables = ["rails".freeze, "rake".freeze]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -64,12 +63,11 @@ Gem::Specification.new do |s|
     "app/models/maestrano/connector/rails/external.rb",
     "app/models/maestrano/connector/rails/id_map.rb",
     "app/models/maestrano/connector/rails/organization.rb",
+    "app/models/maestrano/connector/rails/services/data_consolidator.rb",
     "app/models/maestrano/connector/rails/sub_entity_base.rb",
     "app/models/maestrano/connector/rails/synchronization.rb",
     "app/models/maestrano/connector/rails/user.rb",
     "app/models/maestrano/connector/rails/user_organization_rel.rb",
-    "bin/rails",
-    "bin/rake",
     "config/routes.rb",
     "db/migrate/20151122162100_create_users.rb",
     "db/migrate/20151122162414_create_organizations.rb",
@@ -229,7 +227,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>.freeze, ["~> 4.2"])
-      s.add_runtime_dependency(%q<maestrano-rails>.freeze, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<maestrano-rails>.freeze, ["~> 1.0.3"])
       s.add_runtime_dependency(%q<attr_encrypted>.freeze, ["~> 1.4.0"])
       s.add_runtime_dependency(%q<autoprefixer-rails>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<bootstrap-sass>.freeze, [">= 0"])
@@ -242,7 +240,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sidekiq-unique-jobs>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<slim>.freeze, [">= 0"])
-      s.add_development_dependency(%q<webmock>.freeze, ["~> 1.24.1"])
       s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>.freeze, [">= 0"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_development_dependency(%q<factory_girl_rails>.freeze, [">= 0"])
@@ -256,9 +253,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
       s.add_development_dependency(%q<timecop>.freeze, [">= 0"])
+      s.add_development_dependency(%q<webmock>.freeze, ["~> 1.24.1"])
     else
       s.add_dependency(%q<rails>.freeze, ["~> 4.2"])
-      s.add_dependency(%q<maestrano-rails>.freeze, ["~> 1.0.0"])
+      s.add_dependency(%q<maestrano-rails>.freeze, ["~> 1.0.3"])
       s.add_dependency(%q<attr_encrypted>.freeze, ["~> 1.4.0"])
       s.add_dependency(%q<autoprefixer-rails>.freeze, [">= 0"])
       s.add_dependency(%q<bootstrap-sass>.freeze, [">= 0"])
@@ -271,7 +269,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sidekiq-unique-jobs>.freeze, [">= 0"])
       s.add_dependency(%q<sinatra>.freeze, [">= 0"])
       s.add_dependency(%q<slim>.freeze, [">= 0"])
-      s.add_dependency(%q<webmock>.freeze, ["~> 1.24.1"])
       s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>.freeze, [">= 0"])
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_dependency(%q<factory_girl_rails>.freeze, [">= 0"])
@@ -285,10 +282,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>.freeze, [">= 0"])
       s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
       s.add_dependency(%q<timecop>.freeze, [">= 0"])
+      s.add_dependency(%q<webmock>.freeze, ["~> 1.24.1"])
     end
   else
     s.add_dependency(%q<rails>.freeze, ["~> 4.2"])
-    s.add_dependency(%q<maestrano-rails>.freeze, ["~> 1.0.0"])
+    s.add_dependency(%q<maestrano-rails>.freeze, ["~> 1.0.3"])
     s.add_dependency(%q<attr_encrypted>.freeze, ["~> 1.4.0"])
     s.add_dependency(%q<autoprefixer-rails>.freeze, [">= 0"])
     s.add_dependency(%q<bootstrap-sass>.freeze, [">= 0"])
@@ -301,7 +299,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sidekiq-unique-jobs>.freeze, [">= 0"])
     s.add_dependency(%q<sinatra>.freeze, [">= 0"])
     s.add_dependency(%q<slim>.freeze, [">= 0"])
-    s.add_dependency(%q<webmock>.freeze, ["~> 1.24.1"])
     s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>.freeze, [">= 0"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
     s.add_dependency(%q<factory_girl_rails>.freeze, [">= 0"])
@@ -315,6 +312,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>.freeze, [">= 0"])
     s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
     s.add_dependency(%q<timecop>.freeze, [">= 0"])
+    s.add_dependency(%q<webmock>.freeze, ["~> 1.24.1"])
   end
 end
 

data/spec/models/complex_entity_spec.rb

@@ -166,7 +166,7 @@ describe Maestrano::Connector::Rails::ComplexEntity do
           let(:external_name) { 'sc_e1' }
           let(:connec_name) { 'connec1' }
           let(:modelled_external_entities) { {external_name => {connec_name => [entity]}} }
-          before {
+          before do
             allow(subject.class).to receive(:connec_entities_names).and_return(['connec1'])
             allow(subject.class).to receive(:external_entities_names).and_return(['sc_e1'])
             allow(Entities::SubEntities::ScE1).to receive(:external?).and_return(true)
@@ -175,7 +175,7 @@ describe Maestrano::Connector::Rails::ComplexEntity do
             allow(Entities::SubEntities::ScE1).to receive(:object_name_from_external_entity_hash).and_return(human_name)
             allow(Entities::SubEntities::ScE1).to receive(:last_update_date_from_external_entity_hash).and_return(date)
             allow_any_instance_of(Entities::SubEntities::ScE1).to receive(:map_to).and_return(mapped_entity)
-          }
+          end
 
           context 'when idmap exists' do
             let!(:idmap) { create(:idmap, organization: organization, connec_entity: connec_name.downcase, external_entity: external_name.downcase, external_id: id) }
@@ -199,9 +199,7 @@ describe Maestrano::Connector::Rails::ComplexEntity do
             end
 
             context 'when entity is inactive' do
-              before {
-                allow(Entities::SubEntities::ScE1).to receive(:inactive_from_external_entity_hash?).and_return(true)
-              }
+              before { allow(Entities::SubEntities::ScE1).to receive(:inactive_from_external_entity_hash?).and_return(true)}
 
               it 'discards the entity' do
                 expect(subject.consolidate_and_map_external_entities(modelled_external_entities)).to eql({external_name => {connec_name => []}})

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ RSpec.configure do |config|
     allow(Maestrano::Connector::Rails::External).to receive(:external_name).and_return('External app')
     allow(Maestrano::Connector::Rails::External).to receive(:get_client).and_return(Object.new)
     allow(Maestrano::Connector::Rails::External).to receive(:entities_list).and_return(%w(entity1 entity2))
-    stub_request(:get, "#{Maestrano['default'].param('api.host')}/api/v1/account/groups/").
+    stub_request(:get, %r(#{Maestrano['default'].param('api.host')}/api/v1/account/groups/[\w-]*)).
       to_return({status: 200, body: "{}", headers: {}})
     Rails.cache.clear
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2.pre.RC5
+  version: 2.0.2.pre.RC6
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: attr_encrypted
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +206,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.24.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.24.1
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
   requirement: !ruby/object:Gem::Requirement
@@ -402,12 +388,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.1
 description: Maestrano is the next generation marketplace for SME applications. See
   https://sme.maestrano.com for details.
 email: developers@maestrano.com
-executables:
-- rails
-- rake
+executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
@@ -457,12 +455,11 @@ files:
 - app/models/maestrano/connector/rails/external.rb
 - app/models/maestrano/connector/rails/id_map.rb
 - app/models/maestrano/connector/rails/organization.rb
+- app/models/maestrano/connector/rails/services/data_consolidator.rb
 - app/models/maestrano/connector/rails/sub_entity_base.rb
 - app/models/maestrano/connector/rails/synchronization.rb
 - app/models/maestrano/connector/rails/user.rb
 - app/models/maestrano/connector/rails/user_organization_rel.rb
-- bin/rails
-- bin/rake
 - config/routes.rb
 - db/migrate/20151122162100_create_users.rb
 - db/migrate/20151122162414_create_organizations.rb

data/bin/rails

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'rails' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("railties", "rails")

data/bin/rake

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'rake' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rake", "rake")