maestrano-connector-rails 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33ca5ce6a87c49a85d92343cd1ca3fc95aa40f5a
-  data.tar.gz: 3f152361f671a50af5c3b6de00f70e5e5b4ecdc3
+  metadata.gz: dc59b725143370fc5d008c5ac038245a3e35616a
+  data.tar.gz: 589185264707571da796f97d3672223109136a8f
 SHA512:
-  metadata.gz: 5b4e1d85bb3002e08842c4bcd0465e8580c733cda97b4174de3bb3608b49a6a677293d5b4473bf01abb694eb19c6e733d6b091ec76df2d1e3c782b9aaea671c7
-  data.tar.gz: e1ad34efc0df915117050afbb547e1dbbcb6a8b178081518749c9bd7675b39f32d3de969cd34bf2e323c0498eace1f6b6c1048bbdc40757ec54934b600109dad
+  metadata.gz: dac38cc67856ecd00562faa4e09882af3b10c59a17a575b69724f375b0aedc4efa2cef0912b30d9423d67d9207824457b6883e38f3436d916401dde42e76dac3
+  data.tar.gz: a5a72a4b5a460d0401e0b060552451db1db5ef50c4871fee66a1bc9305e7e4352a0df8a83e08791bc639bf87fa57379d815ea5d37cd934a2059b9aa0e0a74c3e

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.2.3

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

@@ -18,7 +18,7 @@ module Maestrano::Connector::Rails::Concerns::ConnecHelper
     end
 
     def connec_version(organization)
-      @@connec_version = Rails.cache.fetch('connec_version', namespace: 'maestrano', expires_in: 1.day) do
+      @@connec_version = Rails.cache.fetch("connec_version_#{organization.tenant}", namespace: 'maestrano', expires_in: 1.day) do
         response = get_client(organization).class.get("#{Maestrano[organization.tenant].param('connec.host')}/version")
         response = JSON.parse(response.body)
         @@connec_version = response['ci_branch']
@@ -27,7 +27,7 @@ module Maestrano::Connector::Rails::Concerns::ConnecHelper
     end
 
     # Replace the ids arrays by the external id
-    # If a reference has no id for this oauth_provider and oauth_uid but has one for connec returns nil
+    # If a reference has no id for this oauth_provider and oauth_uid but has one for connec, returns nil
     def unfold_references(connec_entity, references, organization)
       unfolded_connec_entity = connec_entity.with_indifferent_access
       not_nil = true
@@ -85,6 +85,7 @@ module Maestrano::Connector::Rails::Concerns::ConnecHelper
 
       # Unfold the id
       if array_of_refs.empty? && field
+        return entity.delete(ref) if field.is_a?(String) # ~retro-compatibility to ease transition aroud Connec! idmaps rework. Should be removed eventually.
         id_hash = field.find { |id| id[:provider] == organization.oauth_provider && id[:realm] == organization.oauth_uid }
         if id_hash
           entity[ref] = id_hash['id']

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.2 ruby lib
+# stub: maestrano-connector-rails 1.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "1.2.2"
+  s.version = "1.2.3"
 
   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-05"
+  s.date = "2016-07-12"
   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"]
@@ -170,6 +170,7 @@ Gem::Specification.new do |s|
     "spec/dummy/public/422.html",
     "spec/dummy/public/500.html",
     "spec/dummy/public/favicon.ico",
+    "spec/dummy/tmp/cache/.keep",
     "spec/factories.rb",
     "spec/integration/connec_to_external_spec.rb",
     "spec/integration/external_to_connec_spec.rb",

data/release_notes.md

@@ -1,3 +1,15 @@
+## 1.2.2
+
+### Fixes
+* Fix PushToConnecWork to take an organization_id insteand of an organization object
+
+### Features
+* Add a version endpoint with the framework version
+
+### Improvments
+* Add rubocop in the framework for better code quality
+* Improve framework dependancies handling and update template accordingly
+
 ## 1.2.1
 
 ### Features

data/spec/models/connec_helper_spec.rb

@@ -17,12 +17,17 @@ describe Maestrano::Connector::Rails::ConnecHelper do
 
   describe 'connec_version' do
     let!(:organization) { create(:organization, tenant: 'default') }
+    let!(:organization2) { create(:organization, tenant: 'default2') }
     before {
-      allow(Maestrano::Connec::Client[organization.tenant]).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {ci_build_number: '111', ci_branch: '1.1', ci_commit: '111'}.to_json, {}))
+      allow(Maestrano::Connec::Client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {ci_build_number: '111', ci_branch: '1.1', ci_commit: '111'}.to_json, {}), ActionDispatch::Response.new(200, {}, {ci_build_number: '112', ci_branch: '1.2', ci_commit: '112'}.to_json, {}))
     }
 
     it 'returns the connec_version' do
+      expect(Maestrano::Connec::Client).to receive(:get).twice
       expect(subject.connec_version(organization)).to eql('1.1')
+      expect(subject.connec_version(organization2)).to eql('1.2')
+      expect(subject.connec_version(organization)).to eql('1.1')
+      expect(subject.connec_version(organization2)).to eql('1.2')
     end
 
   end
@@ -113,6 +118,26 @@ describe Maestrano::Connector::Rails::ConnecHelper do
         expect(subject.unfold_references(connec_hash, ['organization_id', 'lines/linked_transaction/id'], organization)).to eql(output_hash.merge(organization_id: nil).with_indifferent_access)
       end
     end
+
+    describe 'when reference field is a string instead of an array' do
+      let(:connec_hash) {
+        {
+          id: [subject.id_hash('123', organization), {'provider' => 'connec', 'id' => 'abcd'}],
+          organization_id: 'an unexpected string id',
+        }
+      }
+
+      let(:output_hash) {
+        {
+          __connec_id: 'abcd',
+          id: '123'
+        }
+      }
+
+      it 'let the string as it is' do
+        expect(subject.unfold_references(connec_hash, ['organization_id'], organization)).to eql(output_hash.with_indifferent_access)
+      end
+    end
   end
 
   describe 'fold_references' do

data/spec/spec_helper.rb

@@ -25,5 +25,6 @@ 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))
+    Rails.cache.clear
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -520,6 +520,7 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/tmp/cache/.keep
 - spec/factories.rb
 - spec/integration/connec_to_external_spec.rb
 - spec/integration/external_to_connec_spec.rb