maestrano-connector-rails 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48d5cff94c3992312d69f4ae46493d883e9c752f
-  data.tar.gz: c9fb97913e6f032198ec72fc69bb2351aa220546
+  metadata.gz: 95e92f2381cc4ebc9478d3b71f683c6befeb10aa
+  data.tar.gz: 54d7c193e363d6c1897dde5232e995c6a782a0a3
 SHA512:
-  metadata.gz: 9635d73732f2d8e40e545049ddf45d752b2c725d2660fc03bbbda23fc158fbab0d4445b0721736a96f4596970e9f740fd98b7f3be2efb0bc4296f3a9c68bc40b
-  data.tar.gz: 94486ead1d56581183097dfb52f08498bf0fe093b5b220bfe91b83803007baf6a01a0b80d5d18b71cb5be9ccb075a916681e3f396be09f5adf1494be6e5117b0
+  metadata.gz: 4d274d460bb4c47ef71745754e91ead09874cdeca8f654f83c8e164bbf6fc3766a8a176e1c3fe917782dd410ae59ce43a254fe833c7039ee5f2312ab09e99d66
+  data.tar.gz: 55381a11bdf457004c6e82b6097edc9c4b3f1bc4f8326203e1018cc4628e67cf987f466cd0ed26de292f36c6177f8cc4b59f01d7f813cb3af460aa378238dd98

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.3.1@maestrano-connector-rails

data/CODESHIP.md

@@ -0,0 +1,11 @@
+# Setup
+```
+rvm install ruby-2.3.1
+gem install bundler
+bundle install
+```
+
+# Test commands
+```
+bundle exec rake
+```

data/Gemfile

@@ -1,9 +1,12 @@
 source "http://rubygems.org"
 
 # Add dependencies required to use your gem here.
+gem 'rails', '~> 4.0'
 gem 'maestrano-rails'
 gem 'hash_mapper'
 gem 'sidekiq'
+# The missing unique jobs for sidekiq
+gem 'sidekiq-unique-jobs'
 gem 'haml-rails'
 gem 'bootstrap-sass'
 gem 'autoprefixer-rails'
@@ -15,7 +18,7 @@ group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
-  gem "jeweler", "~> 2.0.1"
+  gem "jeweler", "~> 2.1.1"
   gem "simplecov", ">= 0"
   gem 'rspec-rails'
   gem 'factory_girl_rails'

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/app/jobs/maestrano/connector/rails/push_to_connec_worker.rb

@@ -0,0 +1,19 @@
+module Maestrano::Connector::Rails
+
+  # This class process the push to Connec, it use PushToConnecJob for retrocompatibility
+  # By using sidekiq-unique-jobs, it makes sure that 2 calls on the same entity, are processed in order
+  class PushToConnecWorker
+    include Sidekiq::Worker
+    sidekiq_options unique: :while_executing, unique_args: :unique_args
+
+    def self.unique_args(args)
+      organization = args[0]
+      entities_hash = args[1]
+      return[organization.id, entities_hash.keys.sort]
+    end
+
+    def perform(organization, entities_hash, opts={})
+      PushToConnecJob.new.perform(organization, entities_hash, opts)
+    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 1.2.0 ruby lib
+# stub: maestrano-connector-rails 1.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   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-01"
+  s.date = "2016-07-04"
   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"]
@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    ".ruby-version",
+    "CODESHIP.md",
     "DEVELOPER.md",
     "Gemfile",
     "LICENSE",
@@ -38,6 +40,7 @@ Gem::Specification.new do |s|
     "app/helpers/maestrano/connector/rails/session_helper.rb",
     "app/jobs/maestrano/connector/rails/all_synchronizations_job.rb",
     "app/jobs/maestrano/connector/rails/push_to_connec_job.rb",
+    "app/jobs/maestrano/connector/rails/push_to_connec_worker.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",
@@ -170,6 +173,7 @@ Gem::Specification.new do |s|
     "spec/integration/singleton_spec.rb",
     "spec/jobs/all_synchronizations_job_spec.rb",
     "spec/jobs/push_to_connec_job_spec.rb",
+    "spec/jobs/push_to_connec_worker_spec.rb",
     "spec/jobs/synchronization_job_spec.rb",
     "spec/models/complex_entity_spec.rb",
     "spec/models/connec_helper_spec.rb",
@@ -204,16 +208,18 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/maestrano/maestrano-connector-rails"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.6"
+  s.rubygems_version = "2.5.1"
   s.summary = "Rails framework to build connector with Maestrano"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, ["~> 4.0"])
       s.add_runtime_dependency(%q<maestrano-rails>, [">= 0"])
       s.add_runtime_dependency(%q<hash_mapper>, [">= 0"])
       s.add_runtime_dependency(%q<sidekiq>, [">= 0"])
+      s.add_runtime_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
       s.add_runtime_dependency(%q<haml-rails>, [">= 0"])
       s.add_runtime_dependency(%q<bootstrap-sass>, [">= 0"])
       s.add_runtime_dependency(%q<autoprefixer-rails>, [">= 0"])
@@ -222,7 +228,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.1.1"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<factory_girl_rails>, [">= 0"])
@@ -230,9 +236,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda-matchers>, [">= 0"])
       s.add_development_dependency(%q<timecop>, [">= 0"])
     else
+      s.add_dependency(%q<rails>, ["~> 4.0"])
       s.add_dependency(%q<maestrano-rails>, [">= 0"])
       s.add_dependency(%q<hash_mapper>, [">= 0"])
       s.add_dependency(%q<sidekiq>, [">= 0"])
+      s.add_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
       s.add_dependency(%q<haml-rails>, [">= 0"])
       s.add_dependency(%q<bootstrap-sass>, [">= 0"])
       s.add_dependency(%q<autoprefixer-rails>, [">= 0"])
@@ -241,7 +249,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+      s.add_dependency(%q<jeweler>, ["~> 2.1.1"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<factory_girl_rails>, [">= 0"])
@@ -250,9 +258,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<timecop>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rails>, ["~> 4.0"])
     s.add_dependency(%q<maestrano-rails>, [">= 0"])
     s.add_dependency(%q<hash_mapper>, [">= 0"])
     s.add_dependency(%q<sidekiq>, [">= 0"])
+    s.add_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
     s.add_dependency(%q<haml-rails>, [">= 0"])
     s.add_dependency(%q<bootstrap-sass>, [">= 0"])
     s.add_dependency(%q<autoprefixer-rails>, [">= 0"])
@@ -261,7 +271,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
+    s.add_dependency(%q<jeweler>, ["~> 2.1.1"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<factory_girl_rails>, [">= 0"])

data/release_notes.md

@@ -1,3 +1,25 @@
+## 1.2.0
+/!\ For this version to work, you'll need to add `< Maestrano::Connector::Rails::EntityBase` to your `entity.rb` class
+
+### Features
+* Custom synchronization process for first sync. (For this feature to work, you'll need to implement handling of additionnal options in your `get_external_entities` method. The connector will still work as before if you don't).
+* Administrations endpoints to get the synchronizations status, start a synchronization, toggle `sync_enabled` and get the connector dependancies (depenancies are declared in ConnecHelper. You'll need to overload the dependancies method if you have specific dependancies)
+
+### Improvments
+* Entity and ComplexEntity now inherits from EntityBase
+
+## 1.1.2
+/!\ This version need a migration (`bundle exec rake railties:install:migrations; bundle exec rake db:migrate`). It also requires the running of a manual script to encrypt existing oauth_keys
+You'll also need to change some methods as the framework is not sending the `last_synchronization` anymore but directly the `last_synchronization_date` (`get_external_entities`, `before_sync`, `after_sync`)
+
+### Features
+* Encryption of oauth keys (you'll need to add `gem 'attr_encrypted', '~> 1.4.0'` to your Gemfile)
+* No historical data option: only data created after the link to the connector will be sync. For this option to be available, you'll need to implement a `creation_date_from_external_entity_hash` method. It also requires a front end update (view, controller, js)
+
+### Fixes
+* Fix synchronization cleaning
+* Minor fixes
+
 ## 1.0.4
 
 ### Fixes

data/spec/jobs/push_to_connec_worker_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'sidekiq/testing'
+
+describe Maestrano::Connector::Rails::PushToConnecWorker do
+  describe 'class method' do
+    let(:organization) { create(:organization) }
+    subject { Maestrano::Connector::Rails::PushToConnecWorker }
+
+    Sidekiq::Testing.fake!
+    it 'perform_async add a new job' do
+      expect {
+        subject.perform_async(1, 2, 3)
+      }.to change(subject.jobs, :size).by(1)
+    end
+
+    describe 'unique_args' do
+      it do
+        entities_hash = {entity_2: [{'id': 'id2'}, {'id': 'id1'}], entity_1: [{'id': 'id4'}, {'id': nil}, {'id': 'id3'}, {'id': 'id3'}]}
+        expect(subject.unique_args([organization, entities_hash])).to eq([organization.id, [:entity_1, :entity_2]])
+      end
+    end
+  end
+
+
+end
+

data/template/maestrano-connector-template.rb

@@ -53,6 +53,8 @@ gem 'attr_encrypted', '~> 1.4.0'
 gem 'sinatra', :require => nil
 gem 'sidekiq'
 gem 'sidekiq-cron'
+# The missing unique jobs for sidekiq
+gem 'sidekiq-unique-jobs'
 gem 'slim'
 
 gem_group :production, :uat do

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: maestrano-rails
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sidekiq-unique-jobs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -273,6 +301,8 @@ extra_rdoc_files:
 - README.md
 files:
 - ".rspec"
+- ".ruby-version"
+- CODESHIP.md
 - DEVELOPER.md
 - Gemfile
 - LICENSE
@@ -290,6 +320,7 @@ files:
 - app/helpers/maestrano/connector/rails/session_helper.rb
 - app/jobs/maestrano/connector/rails/all_synchronizations_job.rb
 - app/jobs/maestrano/connector/rails/push_to_connec_job.rb
+- app/jobs/maestrano/connector/rails/push_to_connec_worker.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
@@ -422,6 +453,7 @@ files:
 - spec/integration/singleton_spec.rb
 - spec/jobs/all_synchronizations_job_spec.rb
 - spec/jobs/push_to_connec_job_spec.rb
+- spec/jobs/push_to_connec_worker_spec.rb
 - spec/jobs/synchronization_job_spec.rb
 - spec/models/complex_entity_spec.rb
 - spec/models/connec_helper_spec.rb
@@ -473,7 +505,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails framework to build connector with Maestrano