maestrano-connector-rails 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36e8c6a37e11c68b3ccd1826bf62ad1c0125e6d8
-  data.tar.gz: 97c18f4676235c9e30582dcd9feddc47aad237f2
+  metadata.gz: f98ffd30f0c9e18fb5ad95d5a52849bba5e437d0
+  data.tar.gz: 9864988bffd82f6ce6d66aec534f5822b59c36db
 SHA512:
-  metadata.gz: a2ca112ca802402e496fc20ed0457b3cc0296bd18847b2617d61dd82621526d9929abd9f4654a5e45a5a0536b2b41cfc7d975ee320e3fc761205ed17f04a23fe
-  data.tar.gz: efdfbcbc6d52e7f84584b36af8078dc995370088766cbb9d026a28405851b01a6cb09a815f45357350982f60f63023e39b66af8bfcfb5a6ffd0a7709f5eaa79a
+  metadata.gz: 303ce74c7bd93ad0874971fd5faec32ffd2e65db3581a255725fde10a7db198471ef2f76ac6c340a14c8c08bc1276e59c640c86ca1385b3f5cccd492ec4dea8c
+  data.tar.gz: 9f369354a387999193b660096617465b41549acd6123e58ec4590cda4ade4ad7a10c74a552e061862bd5467fd92347c27fa84071d367ef8441b508de9bc06225

data/Gemfile

@@ -3,36 +3,36 @@ source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
 gem 'rails', '~> 4.2'
 
-gem 'maestrano-rails', '1.0.0'
+gem 'maestrano-rails', '~> 1.0.0'
 
-gem 'hash_mapper', '>= 0.2.2'
-gem 'haml-rails'
-gem 'bootstrap-sass'
-gem 'autoprefixer-rails'
 gem 'attr_encrypted', '~> 1.4.0'
+gem 'autoprefixer-rails'
+gem 'bootstrap-sass'
 gem 'config'
 gem 'figaro'
+gem 'haml-rails'
+gem 'hash_mapper', '>= 0.2.2'
 
 gem 'sidekiq'
 # The missing unique jobs for sidekiq
+gem 'sidekiq-cron'
 gem 'sidekiq-unique-jobs'
 gem 'sinatra', require: false
-gem 'sidekiq-cron'
 gem 'slim'
 
 # Add dependencies to develop your gem here.
 group :development do
-  gem 'shoulda'
-  gem 'rdoc'
+  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
   gem 'bundler'
+  gem 'factory_girl_rails'
+  gem 'github_changelog_generator'
   gem 'jeweler'
-  gem 'simplecov', '>= 0'
+  gem 'rdoc'
   gem 'rspec-rails'
-  gem 'factory_girl_rails'
-  gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
-  gem 'sqlite3', platforms: :ruby
-  gem 'shoulda-matchers'
   gem 'rubocop', '~> 0.43'
+  gem 'shoulda'
+  gem 'shoulda-matchers'
+  gem 'simplecov', '>= 0'
+  gem 'sqlite3', platforms: :ruby
   gem 'timecop'
-  gem 'github_changelog_generator'
 end

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/app/controllers/version_controller.rb

@@ -1,9 +1,12 @@
 class VersionController < ApplicationController
   def index
     framework_version = Gem.loaded_specs['maestrano-connector-rails'].version.version
+    branch = ENV['GIT_BRANCH']
+    commit = ENV['GIT_COMMIT_ID']
+
     respond_to do |format|
-      format.html { render text: "framework_version=#{framework_version}\n" }
-      format.json { render json: {framework_version: framework_version, env: Rails.env, ruby_version: RUBY_VERSION, ruby_engine: RUBY_ENGINE} }
+      format.html { render text: "framework_version=#{framework_version}\nci_branch=#{branch}\nci_commit=#{commit}\nenv=#{Rails}\nnv, ruby_version=#{RUBY_VERSION}\nruby_engine=#{RUBY_ENGINE}\n" }
+      format.json { render json: {framework_version: framework_version, ci_branch: branch, ci_commit: commit, env: Rails.env, ruby_version: RUBY_VERSION, ruby_engine: RUBY_ENGINE} }
     end
   end
 end

data/app/models/maestrano/connector/rails/organization.rb

@@ -114,5 +114,11 @@ module Maestrano::Connector::Rails
     def last_synchronization_date
       last_successful_synchronization&.updated_at || date_filtering_limit
     end
+
+    def reset_synchronized_entities
+      synchronized_entities.slice!(*External.entities_list.map(&:to_sym))
+      External.entities_list.each { |entity| synchronized_entities[entity.to_sym] ||= false }
+      save
+    end
   end
 end

data/lib/generators/connector/templates/stylesheets/variables.sass

@@ -16,6 +16,7 @@ $text-color:              #000
 
 $navbar-bg-color:         #aaa
 $navbar-text-color:       #fff
+$navbar-links:            #0066ff
 
 $navbar-link-hover:       #ffa
 

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 ruby lib
+# stub: maestrano-connector-rails 2.0.1 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "maestrano-connector-rails"
-  s.version = "2.0.0"
+  s.name = "maestrano-connector-rails".freeze
+  s.version = "2.0.1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Maestrano"]
-  s.date = "2016-11-25"
-  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", "rake"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Maestrano".freeze]
+  s.date = "2017-01-04"
+  s.description = "Maestrano is the next generation marketplace for SME applications. See https://sme.maestrano.com for details.".freeze
+  s.email = "developers@maestrano.com".freeze
+  s.executables = ["rails".freeze, "rake".freeze]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -217,99 +217,99 @@ Gem::Specification.new do |s|
     "template/sidekiq.yml",
     "template/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/maestrano/maestrano-connector-rails"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Rails framework to build connector with Maestrano"
+  s.homepage = "http://github.com/maestrano/maestrano-connector-rails".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.8".freeze
+  s.summary = "Rails framework to build connector with Maestrano".freeze
 
   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.2"])
-      s.add_runtime_dependency(%q<maestrano-rails>, ["= 1.0.0"])
-      s.add_runtime_dependency(%q<hash_mapper>, [">= 0.2.2"])
-      s.add_runtime_dependency(%q<haml-rails>, [">= 0"])
-      s.add_runtime_dependency(%q<bootstrap-sass>, [">= 0"])
-      s.add_runtime_dependency(%q<autoprefixer-rails>, [">= 0"])
-      s.add_runtime_dependency(%q<attr_encrypted>, ["~> 1.4.0"])
-      s.add_runtime_dependency(%q<config>, [">= 0"])
-      s.add_runtime_dependency(%q<figaro>, [">= 0"])
-      s.add_runtime_dependency(%q<sidekiq>, [">= 0"])
-      s.add_runtime_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      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>, [">= 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"])
-      s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<shoulda-matchers>, [">= 0"])
-      s.add_development_dependency(%q<rubocop>, ["~> 0.43"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<github_changelog_generator>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>.freeze, ["~> 4.2"])
+      s.add_runtime_dependency(%q<maestrano-rails>.freeze, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<attr_encrypted>.freeze, ["~> 1.4.0"])
+      s.add_runtime_dependency(%q<autoprefixer-rails>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<bootstrap-sass>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<config>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<figaro>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<haml-rails>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<hash_mapper>.freeze, [">= 0.2.2"])
+      s.add_runtime_dependency(%q<sidekiq>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<sidekiq-cron>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<sidekiq-unique-jobs>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<sinatra>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<slim>.freeze, [">= 0"])
+      s.add_development_dependency(%q<activerecord-jdbcsqlite3-adapter>.freeze, [">= 0"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<factory_girl_rails>.freeze, [">= 0"])
+      s.add_development_dependency(%q<github_changelog_generator>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec-rails>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rubocop>.freeze, ["~> 0.43"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_development_dependency(%q<shoulda-matchers>.freeze, [">= 0"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
+      s.add_development_dependency(%q<timecop>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 4.2"])
-      s.add_dependency(%q<maestrano-rails>, ["= 1.0.0"])
-      s.add_dependency(%q<hash_mapper>, [">= 0.2.2"])
-      s.add_dependency(%q<haml-rails>, [">= 0"])
-      s.add_dependency(%q<bootstrap-sass>, [">= 0"])
-      s.add_dependency(%q<autoprefixer-rails>, [">= 0"])
-      s.add_dependency(%q<attr_encrypted>, ["~> 1.4.0"])
-      s.add_dependency(%q<config>, [">= 0"])
-      s.add_dependency(%q<figaro>, [">= 0"])
-      s.add_dependency(%q<sidekiq>, [">= 0"])
-      s.add_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<sidekiq-cron>, [">= 0"])
-      s.add_dependency(%q<slim>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      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"])
-      s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<shoulda-matchers>, [">= 0"])
-      s.add_dependency(%q<rubocop>, ["~> 0.43"])
-      s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<github_changelog_generator>, [">= 0"])
+      s.add_dependency(%q<rails>.freeze, ["~> 4.2"])
+      s.add_dependency(%q<maestrano-rails>.freeze, ["~> 1.0.0"])
+      s.add_dependency(%q<attr_encrypted>.freeze, ["~> 1.4.0"])
+      s.add_dependency(%q<autoprefixer-rails>.freeze, [">= 0"])
+      s.add_dependency(%q<bootstrap-sass>.freeze, [">= 0"])
+      s.add_dependency(%q<config>.freeze, [">= 0"])
+      s.add_dependency(%q<figaro>.freeze, [">= 0"])
+      s.add_dependency(%q<haml-rails>.freeze, [">= 0"])
+      s.add_dependency(%q<hash_mapper>.freeze, [">= 0.2.2"])
+      s.add_dependency(%q<sidekiq>.freeze, [">= 0"])
+      s.add_dependency(%q<sidekiq-cron>.freeze, [">= 0"])
+      s.add_dependency(%q<sidekiq-unique-jobs>.freeze, [">= 0"])
+      s.add_dependency(%q<sinatra>.freeze, [">= 0"])
+      s.add_dependency(%q<slim>.freeze, [">= 0"])
+      s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>.freeze, [">= 0"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<factory_girl_rails>.freeze, [">= 0"])
+      s.add_dependency(%q<github_changelog_generator>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec-rails>.freeze, [">= 0"])
+      s.add_dependency(%q<rubocop>.freeze, ["~> 0.43"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+      s.add_dependency(%q<shoulda-matchers>.freeze, [">= 0"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+      s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+      s.add_dependency(%q<timecop>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 4.2"])
-    s.add_dependency(%q<maestrano-rails>, ["= 1.0.0"])
-    s.add_dependency(%q<hash_mapper>, [">= 0.2.2"])
-    s.add_dependency(%q<haml-rails>, [">= 0"])
-    s.add_dependency(%q<bootstrap-sass>, [">= 0"])
-    s.add_dependency(%q<autoprefixer-rails>, [">= 0"])
-    s.add_dependency(%q<attr_encrypted>, ["~> 1.4.0"])
-    s.add_dependency(%q<config>, [">= 0"])
-    s.add_dependency(%q<figaro>, [">= 0"])
-    s.add_dependency(%q<sidekiq>, [">= 0"])
-    s.add_dependency(%q<sidekiq-unique-jobs>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<sidekiq-cron>, [">= 0"])
-    s.add_dependency(%q<slim>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    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"])
-    s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<shoulda-matchers>, [">= 0"])
-    s.add_dependency(%q<rubocop>, ["~> 0.43"])
-    s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<github_changelog_generator>, [">= 0"])
+    s.add_dependency(%q<rails>.freeze, ["~> 4.2"])
+    s.add_dependency(%q<maestrano-rails>.freeze, ["~> 1.0.0"])
+    s.add_dependency(%q<attr_encrypted>.freeze, ["~> 1.4.0"])
+    s.add_dependency(%q<autoprefixer-rails>.freeze, [">= 0"])
+    s.add_dependency(%q<bootstrap-sass>.freeze, [">= 0"])
+    s.add_dependency(%q<config>.freeze, [">= 0"])
+    s.add_dependency(%q<figaro>.freeze, [">= 0"])
+    s.add_dependency(%q<haml-rails>.freeze, [">= 0"])
+    s.add_dependency(%q<hash_mapper>.freeze, [">= 0.2.2"])
+    s.add_dependency(%q<sidekiq>.freeze, [">= 0"])
+    s.add_dependency(%q<sidekiq-cron>.freeze, [">= 0"])
+    s.add_dependency(%q<sidekiq-unique-jobs>.freeze, [">= 0"])
+    s.add_dependency(%q<sinatra>.freeze, [">= 0"])
+    s.add_dependency(%q<slim>.freeze, [">= 0"])
+    s.add_dependency(%q<activerecord-jdbcsqlite3-adapter>.freeze, [">= 0"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<factory_girl_rails>.freeze, [">= 0"])
+    s.add_dependency(%q<github_changelog_generator>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec-rails>.freeze, [">= 0"])
+    s.add_dependency(%q<rubocop>.freeze, ["~> 0.43"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
+    s.add_dependency(%q<shoulda-matchers>.freeze, [">= 0"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
+    s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+    s.add_dependency(%q<timecop>.freeze, [">= 0"])
   end
 end
 

data/spec/controllers/synchronizations_controller_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Maestrano::SynchronizationsController, type: :controller do
+
   routes { Maestrano::Connector::Rails::Engine.routes }
 
   let(:uid) { 'cld-aaaa' }

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', 'ruby_version' => RUBY_VERSION, 'ruby_engine' => RUBY_ENGINE)
+      expect(JSON.parse(response.body)).to eql('framework_version'=>'1.2', 'ci_branch' => nil, 'ci_commit' => nil, 'env' => 'test', 'ruby_version' => RUBY_VERSION, 'ruby_engine' => RUBY_ENGINE)
     end
   end
 end

data/spec/dummy/config/initializers/maestrano.rb

@@ -1,135 +1,2 @@
-Maestrano.configure do |config|
-  
-  # ==> Environment configuration
-  # The environment to connect to.
-  # If set to 'production' then all Single Sign-On (SSO) and API requests
-  # will be made to maestrano.com
-  # If set to 'test' then requests will be made to api-sandbox.maestrano.io
-  # The api-sandbox allows you to easily test integration scenarios.
-  # More details on http://api-sandbox.maestrano.io
-  #
-  config.environment = 'test' # or 'production'
-  
-  # ==> Application host
-  # This is your application host (e.g: my-app.com) which is ultimately
-  # used to redirect users to the right SAML url during SSO handshake.
-  #
-  config.app.host = (config.environment == 'production' ? 'https://my-app.com' : 'http://localhost:3000')
-  
-  # ==> App ID & API key
-  # Your application App ID and API key which you can retrieve on http://maestrano.com
-  # via your cloud partner dashboard.
-  # For testing you can retrieve/generate an api.id and api.key from the API Sandbox directly 
-  # on http://api-sandbox.maestrano.io
-  #
-  config.api.id = (config.environment == 'production' ? 'prod_app_id' : 'sandbox_app_id')
-  config.api.key = (config.environment == 'production' ? 'prod_api_key' : 'sandbox_api_key')
-  
-  # ==> Single Sign-On activation
-  # Enable/Disable single sign-on. When troubleshooting authentication issues
-  # you might want to disable SSO temporarily
-  #
-  # config.sso.enabled = true
-  
-  # ==> Single Sign-On Identity Manager
-  # By default we consider that the domain managing user identification
-  # is the same as your application host (see above config.app.host parameter)
-  # If you have a dedicated domain managing user identification and therefore
-  # responsible for the single sign-on handshake (e.g: https://idp.my-app.com)
-  # then you can specify it below
-  #
-  # config.sso.idm = (config.environment == 'production' ? 'https://idp.my-app.com' : 'http://localhost:3000')
-  
-  # ==> SSO Initialization endpoint
-  # This is your application path to the SAML endpoint that allows users to
-  # initialize SSO authentication. Upon reaching this endpoint users your
-  # application will automatically create a SAML request and redirect the user
-  # to Maestrano. Maestrano will then authenticate and authorize the user. Upon
-  # authorization the user gets redirected to your application consumer endpoint
-  # (see below) for initial setup and/or login.
-  #
-  # The controller for this path is automatically
-  # generated when you run 'rake maestrano:install' and is available at
-  # <rails_root>/app/controllers/maestrano/auth/saml.rb
-  #
-  # config.sso.init_path = '/maestrano/auth/saml/init'
-  
-  # ==> SSO Consumer endpoint
-  # This is your application path to the SAML endpoint that allows users to
-  # finalize SSO authentication. During the 'consume' action your application
-  # sets users (and associated group) up and/or log them in.
-  #
-  # The controller for this path is automatically
-  # generated when you run 'rake maestrano:install' and is available at
-  # <rails_root>/app/controllers/maestrano/auth/saml.rb
-  #
-  # config.sso.consume_path = '/maestrano/auth/saml/consume'
-  
-  # ==> Single Logout activation
-  # Enable/Disable single logout. When troubleshooting authentication issues
-  # you might want to disable SLO temporarily.
-  # If set to false then Maestrano::SSO::Session#valid? - which should be
-  # used in a controller before filter to check user session - always return true
-  #
-  # config.sso.slo_enabled = true
-  
-  # ==> SSO User creation mode
-  # !IMPORTANT
-  # On Maestrano users can take several "instances" of your service. You can consider
-  # each "instance" as 1) a billing entity and 2) a collaboration group (this is
-  # equivalent to a 'customer account' in a commercial world). When users login to
-  # your application via single sign-on they actually login via a specific group which
-  # is then supposed to determine which data they have access to inside your application.
-  #
-  # E.g: John and Jack are part of group 1. They should see the same data when they login to
-  # your application (employee info, analytics, sales etc..). John is also part of group 2 
-  # but not Jack. Therefore only John should be able to see the data belonging to group 2.
-  #
-  # In most application this is done via collaboration/sharing/permission groups which is
-  # why a group is required to be created when a new user logs in via a new group (and 
-  # also for billing purpose - you charge a group, not a user directly). 
-  #
-  # == mode: 'real'
-  # In an ideal world a user should be able to belong to several groups in your application.
-  # In this case you would set the 'sso.creation_mode' to 'real' which means that the uid
-  # and email we pass to you are the actual user email and maestrano universal id.
-  #
-  # == mode: 'virtual'
-  # Now let's say that due to technical constraints your application cannot authorize a user
-  # to belong to several groups. Well next time John logs in via a different group there will
-  # be a problem: the user already exists (based on uid or email) and cannot be assigned 
-  # to a second group. To fix this you can set the 'sso.creation_mode' to 'virtual'. In this
-  # mode users get assigned a truly unique uid and email across groups. So next time John logs
-  # in a whole new user account can be created for him without any validation problem. In this
-  # mode the email we assign to him looks like "usr-sdf54.cld-45aa2@mail.maestrano.com". But don't
-  # worry we take care of forwarding any email you would send to this address
-  #
-  # config.sso.creation_mode = 'real' # or 'virtual'
-  
-  # ==> Account Webhooks
-  # Single sign on has been setup into your app and Maestrano users are now able
-  # to use your service. Great! Wait what happens when a business (group) decides to 
-  # stop using your service? Also what happens when a user gets removed from a business?
-  # Well the endpoints below are for Maestrano to be able to notify you of such
-  # events.
-  #
-  # Even if the routes look restful we issue only issue DELETE requests for the moment
-  # to notify you of any service cancellation (group deletion) or any user being
-  # removed from a group.
-  #
-  # The controllers for these hooks path are automatically generated when 
-  # you run 'rake maestrano:install' and is available under
-  # <rails_root>/app/controllers/maestrano/account/
-  #
-  # config.webhook.account.groups_path = '/maestrano/account/groups/:id',
-  # config.webhook.account.group_users_path = '/maestrano/account/groups/:group_id/users/:id',
-end
-
-# Example of multi-tenant configuration
-Maestrano['other-tenant'].configure do |config|
-  config.environment = 'test'
-  config.app.host = (config.environment == 'production' ? 'https://my-app.com' : 'http://localhost:3000')
-  
-  config.api.id = (config.environment == 'production' ? 'prod_app_id' : 'sandbox_app_id')
-  config.api.key = (config.environment == 'production' ? 'prod_api_key' : 'sandbox_api_key')
-end
+Maestrano.auto_configure unless Rails.env.test?
+Maestrano.configure { |config| config.environment = 'production' } if Rails.env.test?

data/spec/models/connec_helper_spec.rb

@@ -16,14 +16,14 @@ describe Maestrano::Connector::Rails::ConnecHelper do
   end
 
   describe 'connec_version' do
-    let!(:organization) { create(:organization, tenant: 'default') }
-    let!(:organization2) { create(:organization, tenant: 'default2') }
+    let!(:organization) { create(:organization, tenant: 'production') }
+    let!(:organization2) { create(:organization, tenant: 'uat') }
     before {
-      allow(Maestrano::Connec::Client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {ci_build_number: '111', ci_branch: 'v1.1', ci_commit: '111'}.to_json, {}), ActionDispatch::Response.new(200, {}, {ci_build_number: '112', ci_branch: 'v1.2', ci_commit: '112'}.to_json, {}))
+      allow(Maestrano::Connec::Client['production']).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {ci_build_number: '111', ci_branch: 'v1.1', ci_commit: '111'}.to_json, {}), ActionDispatch::Response.new(200, {}, {ci_build_number: '112', ci_branch: 'v1.2', ci_commit: '112'}.to_json, {}))
     }
 
     it 'returns the connec_version' do
-      expect(Maestrano::Connec::Client).to receive(:get).twice
+      expect(Maestrano::Connec::Client['production']).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')

data/spec/models/organization_spec.rb

@@ -207,7 +207,22 @@ describe Maestrano::Connector::Rails::Organization do
         it { expect(subject.last_synchronization_date).to eql(nil) }
       end
     end
-  end
 
+    describe '#reset_synchronized_entities' do
+      let(:organization) { create(:organization, synchronized_entities: {entity1: true, entity2: false, tomatoes: true}) }
+      subject { organization.reset_synchronized_entities }
+
+      it 'keeps only the known entities' do
+        subject
+        expect(organization.synchronized_entities).to eql(entity1: true, entity2: false)
+      end
+
+      it 'adds missing entities' do
+        organization.update_attributes(synchronized_entities: {entity1: true, tomatoes: true})
 
+        subject
+        expect(organization.synchronized_entities).to eql(entity1: true, entity2: false)
+      end
+    end
+  end
 end

data/template/application-sample.yml

@@ -6,7 +6,7 @@ SIDEKIQ_PASSWORD: password
 
 REDIS_URL: redis://localhost:6379/0/connector-myapp
 
-MNO_DEVPL_HOST: https://dev-platform.maestrano.io
+MNO_DEVPL_HOST: https://developer.maestrano.com
 MNO_DEVPL_API_PATH: /api/config/v1/marketplaces
 MNO_DEVPL_ENV_NAME: connector-myapp
 MNO_DEVPL_ENV_KEY:

data/template/maestrano.rb

@@ -1,2 +1,2 @@
 Maestrano.auto_configure unless Rails.env.test?
-Maestrano.configure { |config| config.environment = 'test' } if Rails.env.test?
+Maestrano.configure { |config| config.environment = 'production' } if Rails.env.test?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,32 +28,32 @@ dependencies:
   name: maestrano-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: hash_mapper
+  name: attr_encrypted
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
+  name: config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: attr_encrypted
+  name: figaro
   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: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: figaro
+  name: hash_mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq-unique-jobs
+  name: sidekiq-cron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: sidekiq-unique-jobs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sidekiq-cron
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: activerecord-jdbcsqlite3-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -277,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,7 +291,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -305,21 +305,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-jdbcsqlite3-adapter
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.43'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.43'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -347,21 +347,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -375,7 +375,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: github_changelog_generator
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -615,7 +615,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rails framework to build connector with Maestrano