maestrano-connector-rails 2.0.2.pre.RC2 → 2.0.2.pre.RC3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe9b69ee7aafe9ac46d755de03dc7781929f6e36
-  data.tar.gz: 4f52bc12c68ac6c471490d6958856da416f15fdb
+  metadata.gz: aa8b3f59cffa5ade47c728b287171f1c7bdd0c42
+  data.tar.gz: bcc4269dd6c0068d84845dbd1ff833ff42a3fa4e
 SHA512:
-  metadata.gz: 55ede4aed50e33f8cdab471d6a62e69cc41f80a9539f09de072671aeb81d82862e1b426ab387fcbc9384a32a0fc42394a401882d2e68a0b629d76bd146b76fd9
-  data.tar.gz: ec8a3be889554f9e7bea0b6afd244d176d14a5db35acca1bbd17d5c8612ba7cd729e7e8e972ec0929bf07397e36b460c91fa237c4b7fbf55cdc424e554297d50
+  metadata.gz: 812328467071809832e1a8369ca246f5b9d5ebf7a14a3ba467246d498443ba879621b8112ffb881438b9104414d2471d07da426e8cc1fad6bddcd2918e2506a1
+  data.tar.gz: 0d490ec05cf1109659b6b7ced8a714ff9b89116bca771d328f8c428b4970d4cabf7416029485b2d13b82daf975c929076dcd6f8ba5ee150744266cae7d47e634

data/Gemfile

@@ -22,6 +22,7 @@ gem 'slim'
 
 # Add dependencies to develop your gem here.
 group :development do
+  gem 'webmock', '~> 1.24.1'
   gem 'activerecord-jdbcsqlite3-adapter', platforms: :jruby
   gem 'bundler'
   gem 'factory_girl_rails'

data/VERSION

@@ -1 +1 @@
-2.0.2.pre.RC2
+2.0.2.pre.RC3

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

@@ -14,8 +14,9 @@ module Maestrano::Connector::Rails
     def initialize
       super
       self.synchronized_entities = {}
+      self.set_instance_metadata
       External.entities_list.each do |entity|
-        self.synchronized_entities[entity.to_sym] = {can_push_to_connec: true, can_push_to_external: true}
+        self.synchronized_entities[entity.to_sym] = {can_push_to_connec: !self.pull_disabled, can_push_to_external: !self.push_disabled}
       end
     end
 
@@ -141,9 +142,10 @@ module Maestrano::Connector::Rails
     def set_instance_metadata
       auth = {username: Maestrano[tenant].param('api.id'), password: Maestrano[tenant].param('api.key')}
       res = HTTParty.get("#{Maestrano[tenant].param('api.host')}/api/v1/account/groups/#{uid}", basic_auth: auth)
+      response = JSON.parse(res.body)
 
-      self.push_disabled = res.dig('data', 'metadata', 'push_disabled')
-      self.pull_disabled = res.dig('data', 'metadata', 'pull_disabled')
+      self.push_disabled = response.dig('data', 'metadata', 'push_disabled')
+      self.pull_disabled = response.dig('data', 'metadata', 'pull_disabled')
 
       self.save
     end

data/db/migrate/20170202033323_update_organization_metadata.rb

@@ -1,15 +1,18 @@
 class UpdateOrganizationMetadata < ActiveRecord::Migration
   def change
-  	add_column :organizations, :push_disabled, :boolean
-  	add_column :organizations, :pull_disabled, :boolean
-  	# Migration to update the way we handle synchronized_entities for data sharing.
-	  # Before : synchronized_entities = {company: true}
-	  # After: synchronized_entities = {company: {can_push_to_connec: true, can_push_to_external: true}}
+    add_column :organizations, :push_disabled, :boolean
+    add_column :organizations, :pull_disabled, :boolean
+    change_column :organizations, :synchronized_entities, :text
 
-	  #We also add metadata from MnoHub
+    # Migration to update the way we handle synchronized_entities for data sharing.
+    # Before : synchronized_entities = {company: true}
+    # After: synchronized_entities = {company: {can_push_to_connec: true, can_push_to_external: true}}
+
+    #We also add metadata from MnoHub
     Maestrano::Connector::Rails::Organization.all.each do |o|
       o.set_instance_metadata
       o.reset_synchronized_entities
+      o.enable_historical_data(true) if o.push_disabled
     end
   end
 end

data/maestrano-connector-rails.gemspec

@@ -2,11 +2,11 @@
 # 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.2.pre.RC2 ruby lib
+# stub: maestrano-connector-rails 2.0.2.pre.RC3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails".freeze
-  s.version = "2.0.2.pre.RC2"
+  s.version = "2.0.2.pre.RC3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -242,6 +242,7 @@ Gem::Specification.new do |s|
       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<webmock>.freeze, ["~> 1.24.1"])
       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"])
@@ -270,6 +271,7 @@ Gem::Specification.new do |s|
       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<webmock>.freeze, ["~> 1.24.1"])
       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"])
@@ -299,6 +301,7 @@ Gem::Specification.new do |s|
     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<webmock>.freeze, ["~> 1.24.1"])
     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"])

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require 'shoulda/matchers'
 require 'simplecov'
 require 'timecop'
 require 'maestrano_connector_rails/factories.rb'
+require 'webmock/rspec'
 SimpleCov.start
 
 Rails.backtrace_cleaner.remove_silencers!
@@ -26,6 +27,8 @@ 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))
+    stub_request(:get, "#{Maestrano['default'].param('api.host')}/api/v1/account/groups/").
+      to_return({status: 200, body: "{}", headers: {}})
     Rails.cache.clear
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.2.pre.RC2
+  version: 2.0.2.pre.RC3
 platform: ruby
 authors:
 - Maestrano
@@ -206,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.24.1
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbcsqlite3-adapter
   requirement: !ruby/object:Gem::Requirement