maestrano-connector-rails 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f94f571529c54189a2416028f32c9eaf10f0f496
-  data.tar.gz: ec2a9b0396f561cb157aa909f758b66b07d50cd9
+  metadata.gz: 84ed969991a93b3632339f112511a4baa3848ae9
+  data.tar.gz: 133ac31a7b246b0d5f7f7aa096fdd859ab2b7e19
 SHA512:
-  metadata.gz: 580f8d9921831198e67a9102ddce992fbe6359b08f0346a32c35af69385ca4f51c6c35a34975b71e7744e74b24fa8d7a03cc4e48ab0e8d31464da2d729091c33
-  data.tar.gz: 46749aca76d739411ea64a4187a7fdfdbe2d1c795481306458c338bac8586628a6706cae51132e1c5538de1c6f490ffed6357f2a52057efacb0dd889b7444c50
+  metadata.gz: 14cbd5436d31186f909ce2c66b01b10e027a5b31fb6f932e2387eabb754aa349f170679d523af24327c79e659a4fad5333e4dd51bbf43a74c468ec0f938add90
+  data.tar.gz: 5befbf8603f56588e5501bc16594266d3a592ac775c27ebc3c39b4647ce26fb409e96b4fd7dbb384f26e00575c8628217cc79c9d52e6b0ed4d189416993497a4

data/VERSION

@@ -1 +1 @@
-0.2.18
+0.2.19

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

@@ -1,158 +1,5 @@
 module Maestrano::Connector::Rails
   class ComplexEntity
-
-    @@external_name = External.external_name
-
-    # -------------------------------------------------------------
-    #                   Complex specific methods
-    # Those methods needs to be implemented in each complex entity
-    # -------------------------------------------------------------
-    def connec_entities_names
-      raise "Not implemented"
-    end
-
-    def external_entities_names
-      raise "Not implemented"
-    end
-
-    # input :  {
-    #             connec_entities_names[0]: [unmapped_connec_entitiy1, unmapped_connec_entitiy2],
-    #             connec_entities_names[1]: [unmapped_connec_entitiy3, unmapped_connec_entitiy4]
-    #          }
-    # output : {
-    #             connec_entities_names[0]: {
-    #               external_entities_names[0]: [unmapped_connec_entitiy1, unmapped_connec_entitiy2]
-    #             },
-    #             connec_entities_names[1]: {
-    #               external_entities_names[0]: [unmapped_connec_entitiy3],
-    #               external_entities_names[1]: [unmapped_connec_entitiy4]
-    #             }
-    #          }
-    def connec_model_to_external_model(connec_hash_of_entities)
-      raise "Not implemented"
-    end
-
-    # input :  {
-    #             external_entities_names[0]: [unmapped_external_entity1}, unmapped_external_entity2],
-    #             external_entities_names[1]: [unmapped_external_entity3}, unmapped_external_entity4]
-    #          }
-    # output : {
-    #             external_entities_names[0]: {
-    #               connec_entities_names[0]: [unmapped_external_entity1],
-    #               connec_entities_names[1]: [unmapped_external_entity2]
-    #             },
-    #             external_entities_names[1]: {
-    #               connec_entities_names[0]: [unmapped_external_entity3, unmapped_external_entity4]
-    #             }
-    #           }
-    def external_model_to_connec_model(external_hash_of_entities)
-      raise "Not implemented"
-    end
-
-    # -------------------------------------------------------------
-    #          General methods
-    # -------------------------------------------------------------
-    def map_to_external_with_idmap(entity, organization, external_entity_name, sub_entity_instance)
-      idmap = sub_entity_instance.find_idmap({connec_id: entity['id'], external_entity: external_entity_name, organization_id: organization.id})
-
-      if idmap && ((!idmap.to_external) || idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at'])
-        ConnectorLogger.log('info', organization, "Discard Connec! #{sub_entity_instance.entity_name} : #{entity}")
-        nil
-      else
-        {entity: sub_entity_instance.map_to(external_entity_name, entity, organization), idmap: idmap || sub_entity_instance.create_idmap_from_connec_entity(entity, external_entity_name, organization)}
-      end
-    end
-
-    # -------------------------------------------------------------
-    #          Entity equivalent methods
-    # -------------------------------------------------------------
-    def get_connec_entities(client, last_synchronization, organization, opts={})
-      entities = ActiveSupport::HashWithIndifferentAccess.new
-
-      self.connec_entities_names.each do |connec_entity_name|
-        sub_entity_instance = "Entities::SubEntities::#{connec_entity_name.titleize.split.join}".constantize.new
-        entities[connec_entity_name] = sub_entity_instance.get_connec_entities(client, last_synchronization, organization, opts)
-      end
-      entities
-    end
-
-    def get_external_entities(client, last_synchronization, organization, opts={})
-      entities = ActiveSupport::HashWithIndifferentAccess.new
-
-      self.external_entities_names.each do |external_entity_name|
-        sub_entity_instance = "Entities::SubEntities::#{external_entity_name.titleize.split.join}".constantize.new
-        entities[external_entity_name] = sub_entity_instance.get_external_entities(client, last_synchronization, organization, opts)
-      end
-      entities
-    end
-
-    def consolidate_and_map_data(connec_entities, external_entities, organization, opts)
-      modeled_external_entities = external_model_to_connec_model(external_entities)
-      modeled_connec_entities = connec_model_to_external_model(connec_entities)
-
-      modeled_external_entities.each do |external_entity_name, entities_in_connec_model|
-        entities_in_connec_model.each do |connec_entity_name, entities|
-          sub_entity_instance = "Entities::SubEntities::#{external_entity_name.titleize.split.join}".constantize.new
-
-          entities.map!{|entity|
-            idmap = sub_entity_instance.find_idmap(external_id: sub_entity_instance.get_id_from_external_entity_hash(entity), connec_entity: connec_entity_name, organization_id: organization.id)
-
-            # No idmap: creating one, nothing else to do
-            unless idmap
-              next {entity: sub_entity_instance.map_to(connec_entity_name, entity, organization), idmap: sub_entity_instance.create_idmap_from_external_entity(entity, connec_entity_name, organization)}
-            end
-
-            # Not pushing entity to Connec!
-            next nil unless idmap.to_connec
-
-            # Entity has not been modified since its last push to connec!
-            next nil if Maestrano::Connector::Rails::Entity.not_modified_since_last_push_to_connec(idmap, entity, sub_entity_instance, organization)
-
-            # Check for conflict with entities from connec!
-            equivalent_connec_entities = modeled_connec_entities[connec_entity_name][external_entity_name] || []
-            Maestrano::Connector::Rails::Entity.solve_conflict(entity, sub_entity_instance, equivalent_connec_entities, connec_entity_name, idmap, organization, opts)
-          }.compact!
-        end
-      end
-
-      modeled_connec_entities.each do |connec_entity_name, entities_in_external_model|
-        entities_in_external_model.each do |external_entity_name, entities|
-          sub_entity_instance = "Entities::SubEntities::#{connec_entity_name.titleize.split.join}".constantize.new
-          entities.map!{|entity|
-            self.map_to_external_with_idmap(entity, organization, external_entity_name, sub_entity_instance)
-          }.compact!
-        end
-      end
-
-      return {connec_entities: modeled_connec_entities, external_entities: modeled_external_entities}
-    end
-
-    # input : {
-    #             external_entities_names[0]: {
-    #               connec_entities_names[0]: [mapped_external_entity1],
-    #               connec_entities_names[1]: [mapped_external_entity2]
-    #             },
-    #             external_entities_names[1]: {
-    #               connec_entities_names[0]: [mapped_external_entity3, mapped_external_entity4]
-    #             }
-    #          }
-    def push_entities_to_connec(connec_client, mapped_external_entities_with_idmaps, organization)
-      mapped_external_entities_with_idmaps.each do |external_entity_name, entities_in_connec_model|
-        sub_entity_instance = "Entities::SubEntities::#{external_entity_name.titleize.split.join}".constantize.new
-        entities_in_connec_model.each do |connec_entity_name, mapped_entities_with_idmaps|
-          sub_entity_instance.push_entities_to_connec_to(connec_client, mapped_entities_with_idmaps, connec_entity_name, organization)
-        end
-      end
-    end
-
-
-    def push_entities_to_external(external_client, mapped_connec_entities_with_idmaps, organization)
-      mapped_connec_entities_with_idmaps.each do |connec_entity_name, entities_in_external_model|
-        sub_entity_instance = "Entities::SubEntities::#{connec_entity_name.titleize.split.join}".constantize.new
-        entities_in_external_model.each do |external_entity_name, mapped_entities_with_idmaps|
-          sub_entity_instance.push_entities_to_external_to(external_client, mapped_entities_with_idmaps, external_entity_name, organization)
-        end
-      end
-    end
+    include Maestrano::Connector::Rails::Concerns::ComplexEntity
   end
 end

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

@@ -0,0 +1,157 @@
+module Maestrano::Connector::Rails::Concerns::ComplexEntity
+  extend ActiveSupport::Concern
+
+  @@external_name = Maestrano::Connector::Rails::External.external_name
+
+  # -------------------------------------------------------------
+  #                   Complex specific methods
+  # Those methods needs to be implemented in each complex entity
+  # -------------------------------------------------------------
+  def connec_entities_names
+    raise "Not implemented"
+  end
+
+  def external_entities_names
+    raise "Not implemented"
+  end
+
+  # input :  {
+  #             connec_entities_names[0]: [unmapped_connec_entitiy1, unmapped_connec_entitiy2],
+  #             connec_entities_names[1]: [unmapped_connec_entitiy3, unmapped_connec_entitiy4]
+  #          }
+  # output : {
+  #             connec_entities_names[0]: {
+  #               external_entities_names[0]: [unmapped_connec_entitiy1, unmapped_connec_entitiy2]
+  #             },
+  #             connec_entities_names[1]: {
+  #               external_entities_names[0]: [unmapped_connec_entitiy3],
+  #               external_entities_names[1]: [unmapped_connec_entitiy4]
+  #             }
+  #          }
+  def connec_model_to_external_model(connec_hash_of_entities)
+    raise "Not implemented"
+  end
+
+  # input :  {
+  #             external_entities_names[0]: [unmapped_external_entity1}, unmapped_external_entity2],
+  #             external_entities_names[1]: [unmapped_external_entity3}, unmapped_external_entity4]
+  #          }
+  # output : {
+  #             external_entities_names[0]: {
+  #               connec_entities_names[0]: [unmapped_external_entity1],
+  #               connec_entities_names[1]: [unmapped_external_entity2]
+  #             },
+  #             external_entities_names[1]: {
+  #               connec_entities_names[0]: [unmapped_external_entity3, unmapped_external_entity4]
+  #             }
+  #           }
+  def external_model_to_connec_model(external_hash_of_entities)
+    raise "Not implemented"
+  end
+
+  # -------------------------------------------------------------
+  #          General methods
+  # -------------------------------------------------------------
+  def map_to_external_with_idmap(entity, organization, external_entity_name, sub_entity_instance)
+    idmap = sub_entity_instance.find_idmap({connec_id: entity['id'], external_entity: external_entity_name, organization_id: organization.id})
+
+    if idmap && ((!idmap.to_external) || idmap.last_push_to_external && idmap.last_push_to_external > entity['updated_at'])
+      Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard Connec! #{sub_entity_instance.entity_name} : #{entity}")
+      nil
+    else
+      {entity: sub_entity_instance.map_to(external_entity_name, entity, organization), idmap: idmap || sub_entity_instance.create_idmap_from_connec_entity(entity, external_entity_name, organization)}
+    end
+  end
+
+  # -------------------------------------------------------------
+  #          Entity equivalent methods
+  # -------------------------------------------------------------
+  def get_connec_entities(client, last_synchronization, organization, opts={})
+    entities = ActiveSupport::HashWithIndifferentAccess.new
+
+    self.connec_entities_names.each do |connec_entity_name|
+      sub_entity_instance = "Entities::SubEntities::#{connec_entity_name.titleize.split.join}".constantize.new
+      entities[connec_entity_name] = sub_entity_instance.get_connec_entities(client, last_synchronization, organization, opts)
+    end
+    entities
+  end
+
+  def get_external_entities(client, last_synchronization, organization, opts={})
+    entities = ActiveSupport::HashWithIndifferentAccess.new
+
+    self.external_entities_names.each do |external_entity_name|
+      sub_entity_instance = "Entities::SubEntities::#{external_entity_name.titleize.split.join}".constantize.new
+      entities[external_entity_name] = sub_entity_instance.get_external_entities(client, last_synchronization, organization, opts)
+    end
+    entities
+  end
+
+  def consolidate_and_map_data(connec_entities, external_entities, organization, opts={})
+    modeled_external_entities = external_model_to_connec_model(external_entities)
+    modeled_connec_entities = connec_model_to_external_model(connec_entities)
+
+    modeled_external_entities.each do |external_entity_name, entities_in_connec_model|
+      entities_in_connec_model.each do |connec_entity_name, entities|
+        sub_entity_instance = "Entities::SubEntities::#{external_entity_name.titleize.split.join}".constantize.new
+
+        entities.map!{|entity|
+          idmap = sub_entity_instance.find_idmap(external_id: sub_entity_instance.get_id_from_external_entity_hash(entity), connec_entity: connec_entity_name, organization_id: organization.id)
+
+          # No idmap: creating one, nothing else to do
+          unless idmap
+            next {entity: sub_entity_instance.map_to(connec_entity_name, entity, organization), idmap: sub_entity_instance.create_idmap_from_external_entity(entity, connec_entity_name, organization)}
+          end
+
+          # Not pushing entity to Connec!
+          next nil unless idmap.to_connec
+
+          # Entity has not been modified since its last push to connec!
+          next nil if Maestrano::Connector::Rails::Entity.not_modified_since_last_push_to_connec(idmap, entity, sub_entity_instance, organization)
+
+          # Check for conflict with entities from connec!
+          equivalent_connec_entities = modeled_connec_entities[connec_entity_name][external_entity_name] || []
+          Maestrano::Connector::Rails::Entity.solve_conflict(entity, sub_entity_instance, equivalent_connec_entities, connec_entity_name, idmap, organization, opts)
+        }.compact!
+      end
+    end
+
+    modeled_connec_entities.each do |connec_entity_name, entities_in_external_model|
+      entities_in_external_model.each do |external_entity_name, entities|
+        sub_entity_instance = "Entities::SubEntities::#{connec_entity_name.titleize.split.join}".constantize.new
+        entities.map!{|entity|
+          self.map_to_external_with_idmap(entity, organization, external_entity_name, sub_entity_instance)
+        }.compact!
+      end
+    end
+
+    return {connec_entities: modeled_connec_entities, external_entities: modeled_external_entities}
+  end
+
+  # input : {
+  #             external_entities_names[0]: {
+  #               connec_entities_names[0]: [mapped_external_entity1],
+  #               connec_entities_names[1]: [mapped_external_entity2]
+  #             },
+  #             external_entities_names[1]: {
+  #               connec_entities_names[0]: [mapped_external_entity3, mapped_external_entity4]
+  #             }
+  #          }
+  def push_entities_to_connec(connec_client, mapped_external_entities_with_idmaps, organization)
+    mapped_external_entities_with_idmaps.each do |external_entity_name, entities_in_connec_model|
+      sub_entity_instance = "Entities::SubEntities::#{external_entity_name.titleize.split.join}".constantize.new
+      entities_in_connec_model.each do |connec_entity_name, mapped_entities_with_idmaps|
+        sub_entity_instance.push_entities_to_connec_to(connec_client, mapped_entities_with_idmaps, connec_entity_name, organization)
+      end
+    end
+  end
+
+
+  def push_entities_to_external(external_client, mapped_connec_entities_with_idmaps, organization)
+    mapped_connec_entities_with_idmaps.each do |connec_entity_name, entities_in_external_model|
+      sub_entity_instance = "Entities::SubEntities::#{connec_entity_name.titleize.split.join}".constantize.new
+      entities_in_external_model.each do |external_entity_name, mapped_entities_with_idmaps|
+        sub_entity_instance.push_entities_to_external_to(external_client, mapped_entities_with_idmaps, external_entity_name, organization)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Maestrano::Connector::Rails::Concerns::ConnectorLogger
+  extend ActiveSupport::Concern
+
+  module ClassMethods
+    def log(level, organization, msg)
+      Rails.logger.method(level).call("org: #{organization.uid} (#{organization.tenant}). Msg: #{msg}")
+    end
+  end
+end

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

@@ -332,7 +332,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
   module ClassMethods
     def not_modified_since_last_push_to_connec(idmap, entity, entity_instance, organization)
       result = idmap.last_push_to_connec && idmap.last_push_to_connec > entity_instance.get_last_update_date_from_external_entity_hash(entity)
-      Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard #{entity_instance.external_entity_name} : #{entity}") unless result
+      Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Discard #{entity_instance.external_entity_name} : #{entity}") if result
       result
     end
 

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

@@ -0,0 +1,71 @@
+module Maestrano::Connector::Rails::Concerns::SubEntityBase
+  extend ActiveSupport::Concern
+
+  def external?
+    raise "Not implemented"
+  end
+
+  def entity_name
+    raise "Not implemented"
+  end
+
+  def map_to(name, entity, organization)
+    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
+  end
+
+  def connec_entity_name
+    if external?
+      raise "Forbidden call: cannot call connec_entity_name for an external entity"
+    else
+      entity_name
+    end
+  end
+
+  def names_hash
+    if external?
+      {external_entity: entity_name.downcase}
+    else
+      {connec_entity: entity_name.downcase}
+    end
+  end
+
+  def create_idmap_from_external_entity(entity, connec_entity_name, organization)
+    if external?
+      h = names_hash.merge({
+        external_id: get_id_from_external_entity_hash(entity),
+        name: object_name_from_external_entity_hash(entity),
+        connec_entity: connec_entity_name.downcase,
+        organization_id: organization.id
+      })
+      Maestrano::Connector::Rails::IdMap.create(h)
+    else
+      raise 'Forbidden call: cannot call create_idmap_from_external_entity for a connec entity'
+    end
+  end
+
+  def create_idmap_from_connec_entity(entity, external_entity_name, organization)
+    if external?
+      raise 'Forbidden call: cannot call create_idmap_from_connec_entity for an external entity'
+    else
+      h = names_hash.merge({
+        connec_id: entity['id'],
+        name: object_name_from_connec_entity_hash(entity),
+        external_entity: external_entity_name.downcase,
+        organization_id: organization.id
+      })
+      Maestrano::Connector::Rails::IdMap.create(h)
+    end
+  end
+
+  def map_external_entity_with_idmap(external_entity, connec_entity_name, idmap, organization)
+    {entity: map_to(connec_entity_name, external_entity, organization), idmap: idmap}
+  end
+end

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

@@ -1,9 +1,5 @@
 module Maestrano::Connector::Rails
   class ConnectorLogger
-
-    def self.log(level, organization, msg)
-      Rails.logger.method(level).call("org: #{organization.uid} (#{organization.tenant}). Msg: #{msg}")
-    end
-
+    include Maestrano::Connector::Rails::Concerns::ConnectorLogger
   end
 end

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

@@ -1,72 +1,5 @@
 module Maestrano::Connector::Rails
   class SubEntityBase < Entity
-
-    def external?
-      raise "Not implemented"
-    end
-
-    def entity_name
-      raise "Not implemented"
-    end
-
-    def map_to(name, entity, organization)
-      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
-    end
-
-    def connec_entity_name
-      if external?
-        raise "Forbidden call: cannot call connec_entity_name for an external entity"
-      else
-        entity_name
-      end
-    end
-
-    def names_hash
-      if external?
-        {external_entity: entity_name.downcase}
-      else
-        {connec_entity: entity_name.downcase}
-      end
-    end
-
-    def create_idmap_from_external_entity(entity, connec_entity_name, organization)
-      if external?
-        h = names_hash.merge({
-          external_id: get_id_from_external_entity_hash(entity),
-          name: object_name_from_external_entity_hash(entity),
-          connec_entity: connec_entity_name.downcase,
-          organization_id: organization.id
-        })
-        Maestrano::Connector::Rails::IdMap.create(h)
-      else
-        raise 'Forbidden call: cannot call create_idmap_from_external_entity for a connec entity'
-      end
-    end
-
-    def create_idmap_from_connec_entity(entity, external_entity_name, organization)
-      if external?
-        raise 'Forbidden call: cannot call create_idmap_from_connec_entity for an external entity'
-      else
-        h = names_hash.merge({
-          connec_id: entity['id'],
-          name: object_name_from_connec_entity_hash(entity),
-          external_entity: external_entity_name.downcase,
-          organization_id: organization.id
-        })
-        Maestrano::Connector::Rails::IdMap.create(h)
-      end
-    end
-
-    def map_external_entity_with_idmap(external_entity, connec_entity_name, idmap, organization)
-      {entity: map_to(connec_entity_name, external_entity, organization), idmap: idmap}
-    end
+    include Maestrano::Connector::Rails::Concerns::SubEntityBase
   end
 end

data/lib/generators/connector/templates/entity.rb

@@ -21,13 +21,13 @@ class Maestrano::Connector::Rails::Entity
     # Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received data: Source=#{@@external_name}, Entity=#{self.external_entity_name}, Response=#{entities}")
   end
 
-  def create_entity_to_external(client, mapped_connec_entity, external_entity_name, organization)
+  def create_external_entity(client, mapped_connec_entity, external_entity_name, organization)
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending create #{external_entity_name}: #{mapped_connec_entity} to #{@@external_name}")
     # TODO
     # This method creates the entity in the external app and returns the external id
   end
 
-  def update_entity_to_external(client, mapped_connec_entity, external_id, external_entity_name)
+  def update_external_entity(client, mapped_connec_entity, external_id, external_entity_name, organization)
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Sending update #{external_entity_name} (id=#{external_id}): #{mapped_connec_entity} to #{@@external_name}")
     # TODO
     # This method updates the entity with the given id in the external app

data/lib/generators/connector/templates/home_controller_spec.rb

@@ -49,7 +49,7 @@ describe HomeController, :type => :controller do
 
     context 'when user is not admin' do
       before {
-        allow_any_instance_of(ApplicationHelper).to receive(:is_admin).and_return(false)
+        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(false)
       }
 
       it { expect(subject).to redirect_to back_path }
@@ -62,7 +62,7 @@ describe HomeController, :type => :controller do
 
     context 'when user is admin' do
       before {
-        allow_any_instance_of(ApplicationHelper).to receive(:is_admin).and_return(true)
+        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(true)
       }
 
       it { expect(subject).to redirect_to back_path }
@@ -95,7 +95,7 @@ describe HomeController, :type => :controller do
 
       context 'when user is not an admin' do
         before {
-          allow_any_instance_of(ApplicationHelper).to receive(:is_admin).and_return(false)
+          allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(false)
         }
         it { expect(subject).to redirect_to back_path }
 
@@ -106,7 +106,7 @@ describe HomeController, :type => :controller do
 
       context 'when user is admin' do
         before {
-          allow_any_instance_of(ApplicationHelper).to receive(:is_admin).and_return(true)
+          allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(true)
         }
         it { expect(subject).to redirect_to back_path }
 
@@ -121,21 +121,4 @@ describe HomeController, :type => :controller do
       end
     end
   end
-
-  describe 'redirect_to_external' do
-    subject { get :redirect_to_external }
-
-    context 'when organization has a redirect url' do
-      let(:organization) {  create(:organization, instance_url: 'url') }
-      before {
-        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_organization).and_return(organization)
-      }
-
-      it {expect(subject).to redirect_to('url')}
-    end
-
-    context 'otherwise' do
-      it {expect(subject).to redirect_to('https://login.salesforce.com')}
-    end
-  end
 end

data/lib/generators/connector/templates/layouts.haml

@@ -12,7 +12,7 @@
       .container-fluid
         .collapse.navbar-collapse#maestrano-navbar-collapse
           %ul.nav.navbar-nav
-            =image_tag "logos/default.png", class: 'external-logo'
+            =image_tag "logos/default.png", class: 'logo'
 
           %ul.nav.navbar-nav
             %li=link_to "Status", root_path

data/lib/generators/connector/templates/shared_entities_controller_spec.rb

@@ -11,7 +11,7 @@ describe SharedEntitiesController, :type => :controller do
       let(:idmap) { create(:idmap, organization: organization) }
       before {
         allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_organization).and_return(organization)
-        allow_any_instance_of(ApplicationHelper).to receive(:is_admin).and_return(true)
+        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(true)
       }
 
       it 'assigns the idmaps' do

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 0.2.18 ruby lib
+# stub: maestrano-connector-rails 0.2.19 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.2.18"
+  s.version = "0.2.19"
 
   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-03-08"
+  s.date = "2016-03-10"
   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"]
@@ -39,8 +39,11 @@ Gem::Specification.new do |s|
     "app/jobs/maestrano/connector/rails/push_to_connec_job.rb",
     "app/jobs/maestrano/connector/rails/synchronization_job.rb",
     "app/models/maestrano/connector/rails/complex_entity.rb",
+    "app/models/maestrano/connector/rails/concerns/complex_entity.rb",
+    "app/models/maestrano/connector/rails/concerns/connector_logger.rb",
     "app/models/maestrano/connector/rails/concerns/entity.rb",
     "app/models/maestrano/connector/rails/concerns/external.rb",
+    "app/models/maestrano/connector/rails/concerns/sub_entity_base.rb",
     "app/models/maestrano/connector/rails/connector_logger.rb",
     "app/models/maestrano/connector/rails/entity.rb",
     "app/models/maestrano/connector/rails/external.rb",
@@ -86,8 +89,8 @@ Gem::Specification.new do |s|
     "lib/generators/connector/templates/stylesheets/layout.sass",
     "lib/generators/connector/templates/stylesheets/spacers.sass",
     "lib/generators/connector/templates/stylesheets/variables.sass",
-    "lib/generators/connector/templates/sychronizations_controller_spec.rb",
     "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",

data/template/maestrano-connector-template.rb

@@ -3,7 +3,7 @@ def current_directory
       if __FILE__ =~ %r{\Ahttps?://}
         tempdir = Dir.mktmpdir("maestrano-connector-rails-")
         at_exit { FileUtils.remove_entry(tempdir) }
-        git :clone => "--quiet https://github.com/berardpi/maestrano-connector-rails/tree/include-frontend #{tempdir}"
+        git :clone => "--quiet https://github.com/maestrano/maestrano-connector-rails/ #{tempdir}"
 
         "#{tempdir}/template"
       else
@@ -30,7 +30,7 @@ run 'touch Gemfile'
 add_source 'https://rubygems.org'
 
 if yes?("Use JRuby? [y/n]")
-  run 'echo "ruby \'2.2.2\', :engine => \'jruby\', :engine_version => \'9.0.4.0\'" | cat - Gemfile > temp && mv temp Gemfile'
+  run 'echo "ruby \'2.2.3\', :engine => \'jruby\', :engine_version => \'9.0.5.0\'" | cat - Gemfile > temp && mv temp Gemfile'
   gem_group :production do
     gem 'activerecord-jdbcpostgresql-adapter'
   end
@@ -41,12 +41,17 @@ else
   gem 'sqlite3'
 end
 
+gem 'haml-rails'
+gem 'bootstrap-sass'
+gem 'autoprefixer-rails'
+
 gem 'rails', '4.2.4'
 gem 'turbolinks'
 gem 'jquery-rails'
 gem 'puma'
 gem 'figaro'
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :jruby]
+gem 'uglifier', '>= 1.3.0'
 
 gem 'maestrano-connector-rails'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maestrano-rails
@@ -249,8 +249,11 @@ files:
 - app/jobs/maestrano/connector/rails/push_to_connec_job.rb
 - app/jobs/maestrano/connector/rails/synchronization_job.rb
 - app/models/maestrano/connector/rails/complex_entity.rb
+- app/models/maestrano/connector/rails/concerns/complex_entity.rb
+- app/models/maestrano/connector/rails/concerns/connector_logger.rb
 - app/models/maestrano/connector/rails/concerns/entity.rb
 - app/models/maestrano/connector/rails/concerns/external.rb
+- app/models/maestrano/connector/rails/concerns/sub_entity_base.rb
 - app/models/maestrano/connector/rails/connector_logger.rb
 - app/models/maestrano/connector/rails/entity.rb
 - app/models/maestrano/connector/rails/external.rb
@@ -296,8 +299,8 @@ files:
 - lib/generators/connector/templates/stylesheets/layout.sass
 - lib/generators/connector/templates/stylesheets/spacers.sass
 - lib/generators/connector/templates/stylesheets/variables.sass
-- lib/generators/connector/templates/sychronizations_controller_spec.rb
 - 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