maestrano-connector-rails 2.0.0.pre.RC12 → 2.0.0.pre.RC13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d95bff19220474be447576fb4048e63d48e1266
-  data.tar.gz: 75565ee7992093efd5a77fe20052f9dc17d1b953
+  metadata.gz: e8ec288f5438c26072eff030c169cb0229c658a4
+  data.tar.gz: af078ac257dada789c2982437e1bcfbf53eaa29c
 SHA512:
-  metadata.gz: 7b673778a40d4dfc9b0e002fc54360c9e729e052aeffc244aebff563672e40f545f0232530ad6848333833229e6d2d839131e76b36abb84867a2d8dc53e23e16
-  data.tar.gz: d9644a034bfed0f31440df9aa33315a8a493dcf7aa58898304b33693bc9bf13fd95f0a4cc14b8cc7ef82f14e625d1f952a0b9414993903ab318ec5a35a4f558d
+  metadata.gz: 8340555280cbda5f4924f5ec464519566e14245be8bb01d16ccf9256d87d9cd5f5641f42ab417bd9efc763a11fbc14f6c13c80bce498f698425ab6ca0c118d23
+  data.tar.gz: 7dea5dee0a116cda7f346fa14589acbfc6571fe3024f4ac98105e396223970bb4be6361fb14d802e708ade0aebb89b570bc083e8fc4c88f8251194756e0b09c2

data/Gemfile

@@ -22,10 +22,10 @@ gem 'slim'
 
 # Add dependencies to develop your gem here.
 group :development do
-  gem 'shoulda', '>= 0'
-  gem 'rdoc', '~> 3.12'
-  gem 'bundler', '~> 1.0'
-  gem 'jeweler', '~> 2.1.1'
+  gem 'shoulda'
+  gem 'rdoc'
+  gem 'bundler'
+  gem 'jeweler'
   gem 'simplecov', '>= 0'
   gem 'rspec-rails'
   gem 'factory_girl_rails'

data/VERSION

@@ -1 +1 @@
-2.0.0.pre.RC12
+2.0.0.pre.RC13

data/app/controllers/version_controller.rb

@@ -3,7 +3,7 @@ class VersionController < ApplicationController
     framework_version = Gem.loaded_specs['maestrano-connector-rails'].version.version
     respond_to do |format|
       format.html { render text: "framework_version=#{framework_version}\n" }
-      format.json { render json: {framework_version: framework_version, env: Rails.env} }
+      format.json { render json: {framework_version: framework_version, env: Rails.env, ruby_version: RUBY_VERSION, ruby_engine: RUBY_ENGINE} }
     end
   end
 end

data/bin/rails

@@ -1,12 +1,17 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rails' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/maestrano/connector/rails.rb', __FILE__)
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+require "rubygems"
+require "bundler/setup"
 
-require 'rails/all'
-require 'rails/engine/commands'
+load Gem.bin_path("railties", "rails")

data/bin/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/db/migrate/20161011005751_add_unique_index_on_organization_oauth_uid.rb

@@ -1,5 +1,16 @@
 class AddUniqueIndexOnOrganizationOauthUid < ActiveRecord::Migration
   def change
+    # Disconnect accounts linked several times
+    if ActiveRecord::Base.connection.class.to_s == 'ActiveRecord::ConnectionAdapters::Mysql2Adapter'
+      execute <<-SQL
+        UPDATE organizations AS o
+        INNER JOIN
+          (SELECT organizations.oauth_uid, min(organizations.id) minid FROM organizations GROUP BY oauth_uid) o1
+          ON o.oauth_uid = o1.oauth_uid AND o.id != o1.minid
+        SET o.oauth_uid = null, o.encrypted_oauth_token = null, encrypted_refresh_token= null, sync_enabled = false
+      SQL
+    end
+
     add_index :organizations, :oauth_uid, unique: true
   end
 end

data/lib/generators/connector/install_generator.rb

@@ -1,66 +1,65 @@
 module Connector
-  module Generators
-    class InstallGenerator < ::Rails::Generators::Base
-      source_root File.expand_path('../templates', __FILE__)
+  class InstallGenerator < ::Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    desc 'Creating a Maestrano Connector application'
 
-      def maestrano_generator
-        generate 'maestrano:initializer'
-      end
+    def maestrano_generator
+      generate 'maestrano:initializer'
+    end
 
-      def include_helpers
-        sentinel = 'class ApplicationController < ActionController::Base'
-        code_lines = [
-          'include Maestrano::Connector::Rails::SessionHelper'
-        ]
+    def include_helpers
+      sentinel = 'class ApplicationController < ActionController::Base'
+      code_lines = [
+        'include Maestrano::Connector::Rails::SessionHelper'
+      ]
 
-        in_root do
-          gsub_file 'app/controllers/application_controller.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
-            "#{match}\n  #{code_lines.join("\n  ")}\n"
-          end
+      in_root do
+        gsub_file 'app/controllers/application_controller.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+          "#{match}\n  #{code_lines.join("\n  ")}\n"
         end
       end
+    end
 
-      def copy_entity
-        copy_file 'entity.rb', 'app/models/maestrano/connector/rails/entity.rb'
-      end
+    def copy_entity
+      copy_file 'entity.rb', 'app/models/maestrano/connector/rails/entity.rb'
+    end
 
-      def copy_external
-        copy_file 'external.rb', 'app/models/maestrano/connector/rails/external.rb'
-      end
+    def copy_external
+      copy_file 'external.rb', 'app/models/maestrano/connector/rails/external.rb'
+    end
 
-      def copy_example_entity
-        copy_file 'example_entity.rb', 'app/models/entities/example_entitiy.rb'
-        copy_file 'example_entity_spec.rb', 'spec/models/entities/example_entitiy.rb'
-      end
+    def copy_example_entity
+      copy_file 'example_entity.rb', 'app/models/entities/example_entitiy.rb'
+      copy_file 'example_entity_spec.rb', 'spec/models/entities/example_entitiy.rb'
+    end
 
-      def copy_controllers_and_views
-        copy_file 'home_controller.rb', 'app/controllers/home_controller.rb'
-        copy_file 'home_controller_spec.rb', 'spec/controllers/home_controller_spec.rb'
-        copy_file 'home_index.haml', 'app/views/home/index.html.haml'
-        copy_file 'home.js', 'app/assets/javascripts/home.js'
+    def copy_controllers_and_views
+      copy_file 'home_controller.rb', 'app/controllers/home_controller.rb'
+      copy_file 'home_controller_spec.rb', 'spec/controllers/home_controller_spec.rb'
+      copy_file 'home_index.haml', 'app/views/home/index.html.haml'
+      copy_file 'home.js', 'app/assets/javascripts/home.js'
 
-        copy_file 'synchronizations_controller.rb', 'app/controllers/synchronizations_controller.rb'
-        copy_file 'synchronizations_controller_spec.rb', 'spec/controllers/synchronizations_controller_spec.rb'
-        copy_file 'synchronizations_index.haml', 'app/views/synchronizations/index.html.haml'
+      copy_file 'synchronizations_controller.rb', 'app/controllers/synchronizations_controller.rb'
+      copy_file 'synchronizations_controller_spec.rb', 'spec/controllers/synchronizations_controller_spec.rb'
+      copy_file 'synchronizations_index.haml', 'app/views/synchronizations/index.html.haml'
 
-        copy_file 'shared_entities_controller.rb', 'app/controllers/shared_entities_controller.rb'
-        copy_file 'shared_entities_controller_spec.rb', 'spec/controllers/shared_entities_controller_spec.rb'
-        copy_file 'shared_entities_index.haml', 'app/views/shared_entities/index.html.haml'
+      copy_file 'shared_entities_controller.rb', 'app/controllers/shared_entities_controller.rb'
+      copy_file 'shared_entities_controller_spec.rb', 'spec/controllers/shared_entities_controller_spec.rb'
+      copy_file 'shared_entities_index.haml', 'app/views/shared_entities/index.html.haml'
 
-        copy_file 'layouts.haml', 'app/views/layouts/application.html.haml'
-      end
+      copy_file 'layouts.haml', 'app/views/layouts/application.html.haml'
+    end
 
-      def copy_stylesheets
-        copy_file 'stylesheets/application.sass', 'app/assets/stylesheets/application.sass'
-        copy_file 'stylesheets/home.sass', 'app/assets/stylesheets/home.sass'
-        copy_file 'stylesheets/layout.sass', 'app/assets/stylesheets/layout.sass'
-        copy_file 'stylesheets/spacers.sass', 'app/assets/stylesheets/spacers.sass'
-        copy_file 'stylesheets/variables.sass', 'app/assets/stylesheets/variables.sass'
-      end
+    def copy_stylesheets
+      copy_file 'stylesheets/application.sass', 'app/assets/stylesheets/application.sass'
+      copy_file 'stylesheets/home.sass', 'app/assets/stylesheets/home.sass'
+      copy_file 'stylesheets/layout.sass', 'app/assets/stylesheets/layout.sass'
+      copy_file 'stylesheets/spacers.sass', 'app/assets/stylesheets/spacers.sass'
+      copy_file 'stylesheets/variables.sass', 'app/assets/stylesheets/variables.sass'
+    end
 
-      def copy_oauth_controller
-        copy_file 'oauth_controller.rb', 'app/controllers/oauth_controller.rb'
-      end
+    def copy_oauth_controller
+      copy_file 'oauth_controller.rb', 'app/controllers/oauth_controller.rb'
     end
   end
 end

data/maestrano-connector-rails.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: maestrano-connector-rails 2.0.0.pre.RC12 ruby lib
+# stub: maestrano-connector-rails 2.0.0.pre.RC13 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "2.0.0.pre.RC12"
+  s.version = "2.0.0.pre.RC13"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Maestrano"]
-  s.date = "2016-10-18"
+  s.date = "2016-11-07"
   s.description = "Maestrano is the next generation marketplace for SME applications. See https://sme.maestrano.com for details."
   s.email = "developers@maestrano.com"
-  s.executables = ["rails"]
+  s.executables = ["rails", "rake"]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
     "app/models/maestrano/connector/rails/user.rb",
     "app/models/maestrano/connector/rails/user_organization_rel.rb",
     "bin/rails",
+    "bin/rake",
     "config/routes.rb",
     "db/migrate/20151122162100_create_users.rb",
     "db/migrate/20151122162414_create_organizations.rb",
@@ -239,9 +240,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sidekiq-cron>, [">= 0"])
       s.add_runtime_dependency(%q<slim>, [">= 0"])
       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.1.1"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<factory_girl_rails>, [">= 0"])
@@ -267,9 +268,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sidekiq-cron>, [">= 0"])
       s.add_dependency(%q<slim>, [">= 0"])
       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.1.1"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<factory_girl_rails>, [">= 0"])
@@ -296,9 +297,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sidekiq-cron>, [">= 0"])
     s.add_dependency(%q<slim>, [">= 0"])
     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.1.1"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<factory_girl_rails>, [">= 0"])

data/spec/controllers/version_controller_spec.rb

@@ -11,7 +11,7 @@ describe VersionController, type: :controller do
 
     it 'returns a version hash' do
       subject
-      expect(JSON.parse(response.body)).to eql({"framework_version"=>"1.2", "env" => "test"})
+      expect(JSON.parse(response.body)).to eql('framework_version'=>'1.2', 'env' => 'test', 'ruby_version' => RUBY_VERSION, 'ruby_engine' => RUBY_ENGINE)
     end
   end
 end

data/spec/dummy/config/settings.yml

@@ -1,37 +1,2 @@
 encryption_key1: <%= ENV['encryption_key1'] %>
 encryption_key2: <%= ENV['encryption_key2'] %>
-
-# tenant config
-default:
-  environment: 'production'
-  x509_certificate: "-----BEGIN CERTIFICATE-----\nMIIDezCCAuSgAwIBAgIJAPFpcH2rW0pyMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD\nVQQGEwJBVTEMMAoGA1UECBMDTlNXMQ8wDQYDVQQHEwZTeWRuZXkxGjAYBgNVBAoT\nEU1hZXN0cmFubyBQdHkgTHRkMRYwFAYDVQQDEw1tYWVzdHJhbm8uY29tMSQwIgYJ\nKoZIhvcNAQkBFhVzdXBwb3J0QG1hZXN0cmFuby5jb20wHhcNMTQwMTA0MDUyNDEw\nWhcNMzMxMjMwMDUyNDEwWjCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEP\nMA0GA1UEBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQG\nA1UEAxMNbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVz\ndHJhbm8uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD3feNNn2xfEz5/\nQvkBIu2keh9NNhobpre8U4r1qC7h7OeInTldmxGL4cLHw4ZAqKbJVrlFWqNevM5V\nZBkDe4mjuVkK6rYK1ZK7eVk59BicRksVKRmdhXbANk/C5sESUsQv1wLZyrF5Iq8m\na9Oy4oYrIsEF2uHzCouTKM5n+O4DkwIDAQABo4HuMIHrMB0GA1UdDgQWBBSd/X0L\n/Pq+ZkHvItMtLnxMCAMdhjCBuwYDVR0jBIGzMIGwgBSd/X0L/Pq+ZkHvItMtLnxM\nCAMdhqGBjKSBiTCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEPMA0GA1UE\nBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQGA1UEAxMN\nbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVzdHJhbm8u\nY29tggkA8WlwfatbSnIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQDE\nhe/18oRh8EqIhOl0bPk6BG49AkjhZZezrRJkCFp4dZxaBjwZTddwo8O5KHwkFGdy\nyLiPV326dtvXoKa9RFJvoJiSTQLEn5mO1NzWYnBMLtrDWojOe6Ltvn3x0HVo/iHh\nJShjAn6ZYX43Tjl1YXDd1H9O+7/VgEWAQQ32v8p5lA==\n-----END CERTIFICATE-----"
-  x509_fingerprint: '2f:57:71:e4:40:19:57:37:a6:2c:f0:c5:82:52:2f:2e:41:b7:9d:7e'
-  api_id: 'connec_api_id'
-  api_key: 'connec_api_key'
-  sso_init_path: '/maestrano/auth/saml/init/default'
-  sso_consume_path: '/maestrano/auth/saml/consume/default'
-  api_host: 'https://maestrano.com'
-  connec_host: 'https://api-connec.maestrano.com'
-  webhook:
-    account:
-      groups_path: '/maestrano/account/groups/:id/default'
-      group_users_path: '/maestrano/account/groups/:group_id/users/:id/default'
-    connec:
-      notifications_path: '/maestrano/connec/notifications/default'
-
-maestrano-uat:
-  environment: 'uat'
-  x509_certificate: "-----BEGIN CERTIFICATE-----\nMIIDezCCAuSgAwIBAgIJAMzy+weDPp7qMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD\nVQQGEwJBVTEMMAoGA1UECBMDTlNXMQ8wDQYDVQQHEwZTeWRuZXkxGjAYBgNVBAoT\nEU1hZXN0cmFubyBQdHkgTHRkMRYwFAYDVQQDEw1tYWVzdHJhbm8uY29tMSQwIgYJ\nKoZIhvcNAQkBFhVzdXBwb3J0QG1hZXN0cmFuby5jb20wHhcNMTQwMTA0MDUyMzE0\nWhcNMzMxMjMwMDUyMzE0WjCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEP\nMA0GA1UEBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQG\nA1UEAxMNbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVz\ndHJhbm8uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+2uyQeAOc/iro\nhCyT33RkkWfTGeJ8E/mu9F5ORWoCZ/h2J+QDuzuc69Rf1LoO4wZVQ8LBeWOqMBYz\notYFUIPlPfIBXDNL/stHkpg28WLDpoJM+46WpTAgp89YKgwdAoYODHiUOcO/uXOO\n2i9Ekoa+kxbvBzDJf7uuR/io6GERXwIDAQABo4HuMIHrMB0GA1UdDgQWBBTGRDBT\nie5+fHkB0+SZ5g3WY/D2RTCBuwYDVR0jBIGzMIGwgBTGRDBTie5+fHkB0+SZ5g3W\nY/D2RaGBjKSBiTCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEPMA0GA1UE\nBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQGA1UEAxMN\nbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVzdHJhbm8u\nY29tggkAzPL7B4M+nuowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAw\nRxg3rZrML//xbsS3FFXguzXiiNQAvA4KrMWhGh3jVrtzAlN1/okFNy6zuN8gzdKD\nYw2n0c/u3cSpUutIVZOkwQuPCMC1hoP7Ilat6icVewNcHayLBxKgRxpBhr5Sc4av\n3HOW5Bi/eyC7IjeBTbTnpziApEC7uUsBou2rlKmTGw==\n-----END CERTIFICATE-----"
-  x509_fingerprint: '8a:1e:2e:76:c4:67:80:68:6c:81:18:f7:d3:29:5d:77:f8:79:54:2f'
-  api_id: 'maestrano_uat_connec_api_id'
-  api_key: 'maestrano_uat_connec_api_key'
-  sso_consume_path: '/maestrano/auth/saml/consume/maestrano-uat'
-  sso_init_path: '/maestrano/auth/saml/init/maestrano-uat'
-  api_host: 'https://uat.maestrano.io'
-  connec_host: 'https://api-connec-uat.maestrano.io'
-  webhook:
-    account:
-      groups_path: '/maestrano/account/groups/:id/maestrano-uat'
-      group_users_path: '/maestrano/account/groups/:group_id/users/:id/maestrano-uat'
-    connec:
-      notifications_path: '/maestrano/connec/notifications/maestrano-uat'

data/spec/dummy/db/schema.rb

@@ -38,7 +38,6 @@ ActiveRecord::Schema.define(version: 20161018155513) do
     t.string   "provider"
     t.string   "uid"
     t.string   "name"
-    t.string   "org_uid"
     t.string   "tenant"
     t.string   "oauth_provider"
     t.string   "oauth_uid"
@@ -51,12 +50,15 @@ ActiveRecord::Schema.define(version: 20161018155513) do
     t.datetime "updated_at",                                   null: false
     t.boolean  "sync_enabled",                 default: false
     t.datetime "date_filtering_limit"
+    t.boolean  "historical_data",              default: false
     t.string   "encrypted_oauth_token_iv"
     t.string   "encrypted_oauth_token_salt"
     t.string   "encrypted_refresh_token_iv"
     t.string   "encrypted_refresh_token_salt"
+    t.string   "org_uid"
   end
 
+  add_index "organizations", ["oauth_uid"], name: "index_organizations_on_oauth_uid", unique: true
   add_index "organizations", ["uid", "tenant"], name: "orga_uid_index"
 
   create_table "synchronizations", force: :cascade do |t|

data/template/maestrano_connector_template.rb

@@ -28,27 +28,30 @@ remove_file 'Gemfile'
 run 'touch Gemfile'
 
 add_source 'https://rubygems.org'
-
-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'
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  run 'echo "ruby \'2.3.1\', :engine => \'jruby\', :engine_version => \'9.1.5.0\'" | cat - Gemfile > temp && mv temp Gemfile'
 end
 
 gem 'rails', '~> 4.2'
 gem 'turbolinks', '~> 2.5'
 gem 'jquery-rails'
-gem 'puma', require: false
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :jruby]
 gem 'uglifier', '>= 1.3.0'
 
+gem 'puma', require: false
+gem 'sinatra', require: false
+gem 'sidekiq'
+gem 'sidekiq-cron'
+
 gem 'maestrano-connector-rails'
 
-group :production, :uat do
+gem_group :production, :uat do
   gem 'activerecord-jdbcmysql-adapter', platforms: :jruby
   gem 'mysql2', platforms: :ruby
   gem 'rails_12factor'
 end
 
-group :test, :develpment do
+gem_group :test, :development do
   gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
   gem 'sqlite3', platforms: :ruby
   gem 'rubocop'
@@ -101,7 +104,7 @@ after_bundle do
   copy_file 'settings/settings.yml', 'config/settings.yml'
 
   copy_file 'application-sample.yml', 'config/application-sample.yml'
-  copy_file 'application-sample.yml', 'config/application.yml'
+  copy_file 'application-sample.yml', 'config/application.yml', force: true
 
   application do
     <<-RUBY

data/template/settings/settings.yml

@@ -1,37 +1,2 @@
 encryption_key1: <%= ENV['encryption_key1'] %>
 encryption_key2: <%= ENV['encryption_key2'] %>
-
-# tenant config
-default:
-  environment: 'production'
-  x509_certificate: "-----BEGIN CERTIFICATE-----\nMIIDezCCAuSgAwIBAgIJAPFpcH2rW0pyMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD\nVQQGEwJBVTEMMAoGA1UECBMDTlNXMQ8wDQYDVQQHEwZTeWRuZXkxGjAYBgNVBAoT\nEU1hZXN0cmFubyBQdHkgTHRkMRYwFAYDVQQDEw1tYWVzdHJhbm8uY29tMSQwIgYJ\nKoZIhvcNAQkBFhVzdXBwb3J0QG1hZXN0cmFuby5jb20wHhcNMTQwMTA0MDUyNDEw\nWhcNMzMxMjMwMDUyNDEwWjCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEP\nMA0GA1UEBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQG\nA1UEAxMNbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVz\ndHJhbm8uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD3feNNn2xfEz5/\nQvkBIu2keh9NNhobpre8U4r1qC7h7OeInTldmxGL4cLHw4ZAqKbJVrlFWqNevM5V\nZBkDe4mjuVkK6rYK1ZK7eVk59BicRksVKRmdhXbANk/C5sESUsQv1wLZyrF5Iq8m\na9Oy4oYrIsEF2uHzCouTKM5n+O4DkwIDAQABo4HuMIHrMB0GA1UdDgQWBBSd/X0L\n/Pq+ZkHvItMtLnxMCAMdhjCBuwYDVR0jBIGzMIGwgBSd/X0L/Pq+ZkHvItMtLnxM\nCAMdhqGBjKSBiTCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEPMA0GA1UE\nBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQGA1UEAxMN\nbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVzdHJhbm8u\nY29tggkA8WlwfatbSnIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQDE\nhe/18oRh8EqIhOl0bPk6BG49AkjhZZezrRJkCFp4dZxaBjwZTddwo8O5KHwkFGdy\nyLiPV326dtvXoKa9RFJvoJiSTQLEn5mO1NzWYnBMLtrDWojOe6Ltvn3x0HVo/iHh\nJShjAn6ZYX43Tjl1YXDd1H9O+7/VgEWAQQ32v8p5lA==\n-----END CERTIFICATE-----"
-  x509_fingerprint: '2f:57:71:e4:40:19:57:37:a6:2c:f0:c5:82:52:2f:2e:41:b7:9d:7e'
-  api_id: 'connec_api_id'
-  api_key: 'connec_api_key'
-  sso_init_path: '/maestrano/auth/saml/init/default'
-  sso_consume_path: '/maestrano/auth/saml/consume/default'
-  api_host: 'https://maestrano.com'
-  connec_host: 'https://api-connec.maestrano.com'
-  webhook:
-    account:
-      groups_path: '/maestrano/account/groups/:id/default'
-      group_users_path: '/maestrano/account/groups/:group_id/users/:id/default'
-    connec:
-      notifications_path: '/maestrano/connec/notifications/default'
-
-maestrano-uat:
-  environment: 'uat'
-  x509_certificate: "-----BEGIN CERTIFICATE-----\nMIIDezCCAuSgAwIBAgIJAMzy+weDPp7qMA0GCSqGSIb3DQEBBQUAMIGGMQswCQYD\nVQQGEwJBVTEMMAoGA1UECBMDTlNXMQ8wDQYDVQQHEwZTeWRuZXkxGjAYBgNVBAoT\nEU1hZXN0cmFubyBQdHkgTHRkMRYwFAYDVQQDEw1tYWVzdHJhbm8uY29tMSQwIgYJ\nKoZIhvcNAQkBFhVzdXBwb3J0QG1hZXN0cmFuby5jb20wHhcNMTQwMTA0MDUyMzE0\nWhcNMzMxMjMwMDUyMzE0WjCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEP\nMA0GA1UEBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQG\nA1UEAxMNbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVz\ndHJhbm8uY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+2uyQeAOc/iro\nhCyT33RkkWfTGeJ8E/mu9F5ORWoCZ/h2J+QDuzuc69Rf1LoO4wZVQ8LBeWOqMBYz\notYFUIPlPfIBXDNL/stHkpg28WLDpoJM+46WpTAgp89YKgwdAoYODHiUOcO/uXOO\n2i9Ekoa+kxbvBzDJf7uuR/io6GERXwIDAQABo4HuMIHrMB0GA1UdDgQWBBTGRDBT\nie5+fHkB0+SZ5g3WY/D2RTCBuwYDVR0jBIGzMIGwgBTGRDBTie5+fHkB0+SZ5g3W\nY/D2RaGBjKSBiTCBhjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA05TVzEPMA0GA1UE\nBxMGU3lkbmV5MRowGAYDVQQKExFNYWVzdHJhbm8gUHR5IEx0ZDEWMBQGA1UEAxMN\nbWFlc3RyYW5vLmNvbTEkMCIGCSqGSIb3DQEJARYVc3VwcG9ydEBtYWVzdHJhbm8u\nY29tggkAzPL7B4M+nuowDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAw\nRxg3rZrML//xbsS3FFXguzXiiNQAvA4KrMWhGh3jVrtzAlN1/okFNy6zuN8gzdKD\nYw2n0c/u3cSpUutIVZOkwQuPCMC1hoP7Ilat6icVewNcHayLBxKgRxpBhr5Sc4av\n3HOW5Bi/eyC7IjeBTbTnpziApEC7uUsBou2rlKmTGw==\n-----END CERTIFICATE-----"
-  x509_fingerprint: '8a:1e:2e:76:c4:67:80:68:6c:81:18:f7:d3:29:5d:77:f8:79:54:2f'
-  api_id: 'maestrano_uat_connec_api_id'
-  api_key: 'maestrano_uat_connec_api_key'
-  sso_consume_path: '/maestrano/auth/saml/consume/maestrano-uat'
-  sso_init_path: '/maestrano/auth/saml/init/maestrano-uat'
-  api_host: 'https://uat.maestrano.io'
-  connec_host: 'https://api-connec-uat.maestrano.io'
-  webhook:
-    account:
-      groups_path: '/maestrano/account/groups/:id/maestrano-uat'
-      group_users_path: '/maestrano/account/groups/:group_id/users/:id/maestrano-uat'
-    connec:
-      notifications_path: '/maestrano/connec/notifications/maestrano-uat'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.RC12
+  version: 2.0.0.pre.RC13
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -224,44 +224,44 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -393,6 +393,7 @@ description: Maestrano is the next generation marketplace for SME applications.
 email: developers@maestrano.com
 executables:
 - rails
+- rake
 extensions: []
 extra_rdoc_files:
 - LICENSE
@@ -445,6 +446,7 @@ files:
 - app/models/maestrano/connector/rails/user.rb
 - app/models/maestrano/connector/rails/user_organization_rel.rb
 - bin/rails
+- bin/rake
 - config/routes.rb
 - db/migrate/20151122162100_create_users.rb
 - db/migrate/20151122162414_create_organizations.rb