maestrano-connector-rails 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d1c080124eae41d2304fbc38ade5171d63c4419
-  data.tar.gz: 86484e5085dcefb2073b866e68d649e7b5d96a37
+  metadata.gz: 84ef649458c5d6f7cb94919594504d9ed0981716
+  data.tar.gz: 14a1c66e8e45ba44ae57f44f09a43ed9244a62e2
 SHA512:
-  metadata.gz: 75fbb95833b0d50c7f93e5aa09094efe790acd9eb556c6d4827d3a422388805f5965454044f8e5f651e7523989f932d401364ee25d7683bfdac23d6eb57173e8
-  data.tar.gz: 65fca67e8b7f63f1da1212f35d7fd1d629ae9f37e05edf41d0748c65be01eb41c7042d3d76d200f7210c6ef61149bad630adc26f9956fa1dba0916cc5a270ab5
+  metadata.gz: 9848a1d637b3d1feecb61c861ccd7f46279025b125b0732b696483c842b141436de0854c2c3b843d05502536c91c408cb747f45b4d07f90b9052785ba86db917
+  data.tar.gz: 250e0cd7eb986ff3d2fab3a2061ab33f18b876549c1cdda78a8e523295fe49557bf165b26ead63d8fba06ae072d9fbe214ab110e208d7c9b184d35dfcfd014b0

data/VERSION

@@ -1 +1 @@
-0.3.11
+0.3.12

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

@@ -28,7 +28,7 @@ module Maestrano::Connector::Rails::Concerns::ComplexEntity
   #               external_entities_names[1]: [unmapped_connec_entitiy4]
   #             }
   #          }
-  def connec_model_to_external_model(connec_hash_of_entities)
+  def connec_model_to_external_model(connec_hash_of_entities, organization)
     raise "Not implemented"
   end
 
@@ -45,7 +45,7 @@ module Maestrano::Connector::Rails::Concerns::ComplexEntity
   #               connec_entities_names[0]: [unmapped_external_entity3, unmapped_external_entity4]
   #             }
   #           }
-  def external_model_to_connec_model(external_hash_of_entities)
+  def external_model_to_connec_model(external_hash_of_entities, organization)
     raise "Not implemented"
   end
 

data/lib/generators/connector/templates/complex_entity_example/contact_and_lead.rb

@@ -23,7 +23,7 @@
 #   #               external_entities_names[1]: [unmapped_connec_entitiy4]
 #   #             }
 #   #          }
-#   def connec_model_to_external_model(connec_hash_of_entities)
+#   def connec_model_to_external_model(connec_hash_of_entities, organization)
 #     people = connec_hash_of_entities['person']
 #     modeled_connec_entities = {'person' => { 'lead' => [], 'contact' => [] }}
 
@@ -50,7 +50,7 @@
 #   #               connec_entity_names[0]: [unmapped_external_entity3, unmapped_external_entity4]
 #   #             }
 #   #           }
-#   def external_model_to_connec_model(external_hash_of_entities)
+#   def external_model_to_connec_model(external_hash_of_entities, organization)
 #     return {'lead' => {'person' => external_hash_of_entities['lead']}, 'contact' => {'person' => external_hash_of_entities['contact']}}
 #   end
 # end

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

@@ -15,11 +15,11 @@ class Maestrano::Connector::Rails::Entity
   # Return an array of entities from the external app
   def get_external_entities(client, last_synchronization, organization, opts={})
     return [] unless self.class.can_read_external?
-    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Fetching #{Maestrano::Connector::Rails::External.external_name} #{self.external_entity_name.pluralize}")
+    Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Fetching #{Maestrano::Connector::Rails::External.external_name} #{self.class.external_entity_name.pluralize}")
     # TODO
     # This method should return only entities that have been updated since the last_synchronization
     # It should also implements an option to do a full synchronization when opts[:full_sync] == true or when there is no last_synchronization
-    # Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received data: Source=#{Maestrano::Connector::Rails::External.external_name}, Entity=#{self.external_entity_name}, Response=#{entities}")
+    # Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Received data: Source=#{Maestrano::Connector::Rails::External.external_name}, Entity=#{self.class.external_entity_name}, Response=#{entities}")
   end
 
   def create_external_entity(client, mapped_connec_entity, external_entity_name, organization)

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

@@ -66,7 +66,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 }
@@ -79,7 +79,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 }
@@ -107,17 +107,8 @@ describe HomeController, :type => :controller do
   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')}
+      it {expect(subject).to redirect_to('somewhere')}
     end
   end
 end

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.3.11 ruby lib
+# stub: maestrano-connector-rails 0.3.12 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.3.11"
+  s.version = "0.3.12"
 
   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-04-05"
+  s.date = "2016-04-08"
   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"]

data/spec/models/complex_entity_spec.rb

@@ -13,10 +13,10 @@ describe Maestrano::Connector::Rails::ComplexEntity do
       it { expect{ subject.class.external_entities_names }.to raise_error('Not implemented') }
     end
     describe 'connec_model_to_external_model' do
-      it { expect{ subject.connec_model_to_external_model({}) }.to raise_error('Not implemented') }
+      it { expect{ subject.connec_model_to_external_model({}, nil) }.to raise_error('Not implemented') }
     end
     describe 'external_model_to_connec_model' do
-      it { expect{ subject.external_model_to_connec_model({}) }.to raise_error('Not implemented') }
+      it { expect{ subject.external_model_to_connec_model({}, nil) }.to raise_error('Not implemented') }
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maestrano-rails