maestrano-connector-rails 1.2.1 → 1.2.2

data/release_notes.md

@@ -1,3 +1,8 @@
+## 1.2.1
+
+### Features
+* Add PushToConnecWorker that give the possibilty to do jobs sequentially for a given organization and entity
+
 ## 1.2.0
 /!\ For this version to work, you'll need to add `< Maestrano::Connector::Rails::EntityBase` to your `entity.rb` class
 

data/spec/controllers/version_controller_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe VersionController, type: :controller do
+  routes { Maestrano::Connector::Rails::Engine.routes }
+
+  describe 'index' do
+    subject { get :index, format: :json }
+    before {
+      allow(Gem).to receive(:loaded_specs).and_return({'maestrano-connector-rails' => Gem::Specification.new('maestrano-connector-rails', '1.2')})
+    }
+
+    it 'returns a version hash' do
+      subject
+      expect(JSON.parse(response.body)).to eql({"framework_version"=>"1.2"})
+    end
+  end
+end

data/spec/dummy/config/application.rb

@@ -3,7 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "maestrano-connector-rails"
+require "maestrano_connector_rails"
 
 module Dummy
   class Application < Rails::Application

data/spec/jobs/push_to_connec_worker_spec.rb

@@ -2,25 +2,36 @@ require 'spec_helper'
 require 'sidekiq/testing'
 
 describe Maestrano::Connector::Rails::PushToConnecWorker do
-  describe 'class method' do
+  describe 'class methods' do
     let(:organization) { create(:organization) }
     subject { Maestrano::Connector::Rails::PushToConnecWorker }
 
     Sidekiq::Testing.fake!
     it 'perform_async add a new job' do
+      expect_any_instance_of(Maestrano::Connector::Rails::PushToConnecJob).to receive(:perform)
       expect {
-        subject.perform_async(1, 2, 3)
+        subject.perform_async(organization.id, 2, 3)
       }.to change(subject.jobs, :size).by(1)
+
+      expect {
+        subject.drain
+      }.to change(subject.jobs, :size).by(-1)
+    end
+
+    it 'raise an error if the organization can t be found' do
+      subject.perform_async(-1, 2, 3)
+      expect {
+        subject.drain
+      }.to raise_error(ActiveRecord::RecordNotFound)
     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]])
+        expect(subject.unique_args([organization.id, entities_hash])).to eq([organization.id, [:entity_1, :entity_2]])
       end
     end
   end
-
-
 end
 

data/spec/models/synchronization_spec.rb

@@ -26,19 +26,19 @@ describe Maestrano::Connector::Rails::Synchronization do
   end
 
   describe 'instance methods' do
-    describe 'is_success?' do
-      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'SUCCESS').is_success?).to be(true) }
-      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'ERROR').is_success?).to be(false) }
+    describe 'success?' do
+      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'SUCCESS').success?).to be(true) }
+      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'ERROR').success?).to be(false) }
     end
 
-    describe 'is_error?' do
-      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'ERROR').is_error?).to be(true) }
-      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'RUNNING').is_error?).to be(false) }
+    describe 'error?' do
+      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'ERROR').error?).to be(true) }
+      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'RUNNING').error?).to be(false) }
     end
 
-    describe 'is_running?' do
-      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'RUNNING').is_running?).to be(true) }
-      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'ERROR').is_running?).to be(false) }
+    describe 'running?' do
+      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'RUNNING').running?).to be(true) }
+      it { expect(Maestrano::Connector::Rails::Synchronization.new(status: 'ERROR').running?).to be(false) }
     end
 
     describe 'set_success' do

data/spec/models/user_organization_rel_spec.rb

@@ -11,4 +11,4 @@ describe Maestrano::Connector::Rails::UserOrganizationRel do
   #Associations
   it { should belong_to(:user) }
   it { should belong_to(:organization) }
-end
+end

data/template/maestrano-connector-template.rb

@@ -33,29 +33,14 @@ if yes?("Use JRuby? [y/n]")
   run 'echo "ruby \'2.2.3\', :engine => \'jruby\', :engine_version => \'9.0.5.0\'" | cat - Gemfile > temp && mv temp Gemfile'
 end
 
-gem 'haml-rails'
-gem 'bootstrap-sass'
-gem 'autoprefixer-rails'
-
-gem 'rails', '4.2.4'
-gem 'turbolinks'
+gem 'rails', '~> 4.2.6'
+gem 'turbolinks', '~> 2.5'
 gem 'jquery-rails'
 gem 'puma'
-gem 'figaro'
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :jruby]
 gem 'uglifier', '>= 1.3.0'
 
 gem 'maestrano-connector-rails'
-gem 'config'
-gem 'attr_encrypted', '~> 1.4.0'
-
-# Background jobs
-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
   gem 'activerecord-jdbcpostgresql-adapter', :platforms => :jruby

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: maestrano-rails
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq-unique-jobs
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bootstrap-sass
+  name: attr_encrypted
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
+  name: figaro
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,21 +137,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: attr_encrypted
+  name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: config
+  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: sinatra
+  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: sidekiq-cron
+  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: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -276,6 +332,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -301,6 +371,8 @@ extra_rdoc_files:
 - README.md
 files:
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
 - CODESHIP.md
 - DEVELOPER.md
@@ -317,6 +389,7 @@ files:
 - app/controllers/maestrano/dependancies_controller.rb
 - app/controllers/maestrano/sessions_controller.rb
 - app/controllers/maestrano/synchronizations_controller.rb
+- app/controllers/version_controller.rb
 - 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
@@ -383,8 +456,8 @@ files:
 - 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
+- lib/maestrano_connector_rails.rb
 - maestrano-connector-rails.gemspec
 - maestrano.png
 - release_notes.md
@@ -393,6 +466,7 @@ files:
 - spec/controllers/group_users_controller_spec.rb
 - spec/controllers/groups_controller_spec.rb
 - spec/controllers/synchronizations_controller_spec.rb
+- spec/controllers/version_controller_spec.rb
 - spec/dummy/README.md
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep

data/lib/maestrano-connector-rails.rb

@@ -1 +0,0 @@
-require 'maestrano/connector/rails'