maestrano-connector-rails 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ee22c8ca44f84ce0e4a717c80892f1765af5987
-  data.tar.gz: 65e99c4163462829142e439f8323e8e2cd6f6306
+  metadata.gz: a68bf394fe0506af2d7ebf7f26fd3d03c05f3fb6
+  data.tar.gz: cf4b53e1b341757e263e0c12b68192fcbe187344
 SHA512:
-  metadata.gz: 5a480181d0599bc16c945364ff6949c684eaa431f89b1c5af2f41f7f8999f451ab48a470abe680a1d854f57284fa6831bd73b3ecaf0b503a2053b34674f3a4b9
-  data.tar.gz: 00ec463ca23d1994baaf7873ce4a26c8c3cc76c72809e5a1b06cba7ca54899f67ed5dcc92c97f019ac4fbf6363d42862edf770c579245fb42ce30ae488fbdcc5
+  metadata.gz: a3feb1c40cef5102c1d68ff42b988b07fe604b2b9a2f70c4a5c1a6563310915003211ada51a2e063c2219f3796be7b5fd0dae664b24217b55255733793253264
+  data.tar.gz: 6e0cc236c7a0e449a39611225ac8f2bf490f81556691ed5d7c26f52dab454dd7edc58fdd1aeb01206d6686d563db3b6c24189712bb0b265ca92093221da62e8d

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

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

@@ -176,6 +176,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
     uri = "/#{self.class.normalized_connec_entity_name}?#{query_params.to_query}"
     response_hash = fetch_connec(uri, 0)
     entities = response_hash["#{self.class.normalized_connec_entity_name}"]
+    entities = [entities] if self.class.singleton?
 
     # Fetch subsequent pages
     while response_hash['pagination'] && response_hash['pagination']['next']

data/maestrano-connector-rails.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: maestrano-connector-rails 1.0.0 ruby lib
+# stub: maestrano-connector-rails 1.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/release_notes.md

@@ -43,6 +43,7 @@ A major refactoring as lead to some breaking changes:
 `not_modified_since_last_push_to_connec?`
 `is_external_more_recent?`
 `solve_conflict`
+* Organization.uid is now enforced as an uniq attributes
 
 * The following methods have been removed
 `map_to_external_with_idmap`

data/spec/integration/singleton_spec.rb

@@ -53,7 +53,7 @@ describe 'singleton workflow' do
   let(:company_base) {
     {
       "name" => "My awesome company",
-      "updated_at" => connec_updated
+      "updated_at" => connec_updated.iso8601
     }
   }
 
@@ -61,7 +61,7 @@ describe 'singleton workflow' do
     {
       'id' => ext_comp_id,
       'name' => 'My not so awesome store',
-      'updated_at' => ext_updated
+      'updated_at' => ext_updated.iso8601
     }
   }
 
@@ -99,7 +99,7 @@ describe 'singleton workflow' do
   describe 'when no idmap' do
 
     describe 'when received both' do
-      let(:company) { [company_base.merge('id' => [{'id' => 'some connec id', 'provider' => 'connec', 'realm' => organization.uid}])] }
+      let(:company) { company_base.merge('id' => [{'id' => 'some connec id', 'provider' => 'connec', 'realm' => organization.uid}]) }
       let(:ext_company) { [ext_company_base] }
 
       context 'when connec most recent' do
@@ -127,6 +127,11 @@ describe 'singleton workflow' do
           }
         }
 
+        it 'handles the get correctly' do
+          expect_any_instance_of(Entities::SingletonIntegration).to receive(:consolidate_and_map_data).with([company], ext_company).and_return({connec_entities: [], external_entities: []})
+          subject
+        end
+
         it 'handles the idmap correctly' do
           expect{
             subject
@@ -182,7 +187,7 @@ describe 'singleton workflow' do
 
   describe 'when idmap exists' do
     describe 'when received both' do
-      let(:company) { [company_base.merge('id' => [{'id' => ext_comp_id, 'provider' => provider, 'realm' => oauth_uid}, {'id' => 'connec-id', 'provider' => 'connec', 'realm' => 'some-realm'}])] }
+      let(:company) { company_base.merge('id' => [{'id' => ext_comp_id, 'provider' => provider, 'realm' => oauth_uid}, {'id' => 'connec-id', 'provider' => 'connec', 'realm' => 'some-realm'}]) }
       let(:ext_company) { [ext_company_base] }
       let!(:idmap) { Entities::SingletonIntegration.create_idmap(organization_id: organization.id, external_id: ext_comp_id) }
 
@@ -241,7 +246,7 @@ describe 'singleton workflow' do
   end
 
   describe 'when received only connec one' do
-    let(:company) { [company_base.merge('id' => [{'id' => ext_comp_id, 'provider' => provider, 'realm' => oauth_uid}, {'id' => 'connec-id', 'provider' => 'connec', 'realm' => 'some-realm'}])] }
+    let(:company) { company_base.merge('id' => [{'id' => ext_comp_id, 'provider' => provider, 'realm' => oauth_uid}, {'id' => 'connec-id', 'provider' => 'connec', 'realm' => 'some-realm'}]) }
     let(:ext_company) { [] }
     let!(:idmap) { Entities::SingletonIntegration.create_idmap(organization_id: organization.id, external_id: ext_comp_id) }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Pierre Berard