socialcast 1.3.14 → 1.3.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9de45230b2671da6dbe2c97752900207a128bb08
-  data.tar.gz: 2d24c42f2afbfba3c82cca8a3b592b7fe53f0cdc
+  metadata.gz: 773760fd92b5e744a225bcd6dfd00eeb1fa3dd0d
+  data.tar.gz: 80168ae8554b118c9452e388b0a1df35af2eaddf
 SHA512:
-  metadata.gz: c876a5f5b3e9865dfca6507d3b03e40cd0521af86418572dc0111f0f1037b3c4d75840dc490e793be901594a905cd65565be8abc026862fc29ada3e804215e63
-  data.tar.gz: ecfebccebe6e9180a68682d2dd52a7141960b0d05e3993e38c46a82f0bd67b9a4a94d7d4e34e2dfb5aa7f22e8c8000216d4d65aaff8de47f1082fcf9e09be3cf
+  metadata.gz: 533bc9e567674bc219a022c032cc15200bd1e843de464720d90292bd6a30e8128d5cca9e7f57ddbde6fd8aa8c4ebbd7b639111b5f793f27965098978498f1ad0
+  data.tar.gz: a1796b2299b36a11d591d607a096dde3756b29a7964f65deaec2bd43777eabc1cafc2fe4540a58c543b1c8e319e1ee51d7ce2c651b081cd2a417e4fa7c932517

data/lib/socialcast/command_line/provision_photo.rb

@@ -6,7 +6,8 @@ module Socialcast
       attr_accessor :sync_strategy
 
       def sync(strategy_klass = ApiSyncStrategy)
-        assert_ldap_connections_support_photo!
+        assert_no_unsupported_configurations
+
         sync_strategy = strategy_klass.new(self)
         process_options = {
           :http_config => http_config,
@@ -54,6 +55,16 @@ module Socialcast
         @default_profile_photo_id ||= Socialcast::CommandLine::Authenticate.current_user['community']['default_profile_photo_id']
       end
 
+      def configured?
+        unsupported_configurations.none?
+      end
+
+      def unsupported_configurations
+        @unsupported_configurations ||= @ldap_config['connections'].reject do |connection_name, _|
+          LDAPConnector.attribute_mappings_for(connection_name, @ldap_config).key? LDAPConnector::PROFILE_PHOTO_ATTRIBUTE
+        end.keys
+      end
+
       protected
 
       def each_photo_hash
@@ -64,13 +75,11 @@ module Socialcast
         end
       end
 
-      def assert_ldap_connections_support_photo!
-        @ldap_config['connections'].each do |connection_name, _|
-          unless LDAPConnector.attribute_mappings_for(connection_name, @ldap_config).key? LDAPConnector::PROFILE_PHOTO_ATTRIBUTE
-            message = "Cannot sync photos: #{connection_name} does not have a mapping for the profile photo field."
-            log(message)
-            raise Socialcast::CommandLine::Provisioner::ProvisionError, message
-          end
+      def assert_no_unsupported_configurations
+        unless configured?
+          message = "Cannot sync photos: #{unsupported_configurations.join(', ')} do not have a mapping for the profile photo field."
+          log(message)
+          raise Socialcast::CommandLine::Provisioner::ProvisionError, message
         end
       end
 
@@ -98,7 +107,7 @@ module Socialcast
 
         MAX_BATCH_SIZE = 50
 
-        def initialize(provisioner, options = {})
+        def initialize(provisioner)
           @provisioner = provisioner
         end
 

data/lib/socialcast/command_line/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module CommandLine
-    VERSION = "1.3.14"
+    VERSION = "1.3.15"
   end
 end

data/spec/fixtures/ldap_with_multiple_incomplete_connection_mappings.yml

@@ -0,0 +1,52 @@
+---
+# LDAP connections
+connections:
+  example_connection_1:
+    username: "cn=Directory Manager"
+    password: "test"
+    host: localhost
+    port: 1389
+    basedn: "dc=example,dc=com"
+    filter: "(mail=*)"
+    mappings:
+      email: mailCon
+      profile_photo: photoCon
+
+  example_connection_2:
+    username: "cn=Directory Manager"
+    password: "test"
+    host: localhost
+    port: 1389
+    basedn: "dc=example,dc=com"
+    filter: "(mail=*)"
+    mappings:
+      email: mailCon2
+      first_name: firstName
+
+# Map LDAP Group Memberships to Socialcast Permissions
+permission_mappings:
+  # configure LDAP field for group memberships (ex: memberof, isMemberOf, etc)
+  attribute_name: isMemberOf
+  account_types:
+    external: "cn=External,dc=example,dc=com"
+  roles:
+    tenant_admin: "cn=Admins,dc=example,dc=com"
+    sbi_admin: "cn=SbiAdmins,dc=example,dc=com"
+    reach_admin: "cn=ReachAdmins,dc=example,dc=com"
+    town_hall_admin: "cn=TownHallAdmins,dc=example,dc=com"
+
+
+# general script options
+options:
+  # cleanup the extracted ldap data file after run is complete
+  delete_users_file: false
+  # skip sending emails to newly activated users
+  skip_emails: true
+  # do not actually provision accounts
+  # useful during testing
+  test: true
+
+
+# http options for connecting to Socialcast servers
+http:
+  timeout: 660

data/spec/socialcast/command_line/provision_photo_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Socialcast::CommandLine::ProvisionPhoto do
   let!(:ldap_with_profile_photo_config) { YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'ldap_with_profile_photo.yml')) }
   let!(:ldap_multiple_connection_mapping_config) { YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'ldap_with_multiple_connection_mappings.yml')) }
+  let!(:ldap_multiple_incomplete_connection_mapping_config) { YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'ldap_with_multiple_incomplete_connection_mappings.yml')) }
   let(:default_profile_photo_id) { 3 }
   let(:another_profile_photo_id) { 4 }
 
@@ -20,7 +21,8 @@ describe Socialcast::CommandLine::ProvisionPhoto do
   describe '#sync' do
     context "with a single ldap connection" do
       let(:options) { {} }
-      subject(:sync_photos) { Socialcast::CommandLine::ProvisionPhoto.new(ldap_with_profile_photo_config, options).sync }
+      let(:provisioner) { Socialcast::CommandLine::ProvisionPhoto.new(ldap_with_profile_photo_config, options) }
+      subject(:sync_photos) { provisioner.sync }
       let(:user_search_resource) { double(:user_search_resource) }
       let(:user_submit_resource) { double(:user_submit_resource) }
       let(:data_fingerprint) { '5d41402abc4b2a76b9719d911017c592' }
@@ -110,7 +112,7 @@ describe Socialcast::CommandLine::ProvisionPhoto do
       end
     end
 
-    context "with multiple ldap connections" do
+    context "with multiple fully configured ldap connections" do
       let(:user_search_resource) { double(:user_search_resource) }
       let(:search_api_response) do
         {
@@ -136,8 +138,8 @@ describe Socialcast::CommandLine::ProvisionPhoto do
           ]
         }
       end
-
-      let(:sync_photos) { Socialcast::CommandLine::ProvisionPhoto.new(ldap_multiple_connection_mapping_config, {}).sync }
+      let(:provisioner) { Socialcast::CommandLine::ProvisionPhoto.new(ldap_multiple_connection_mapping_config, {}) }
+      let(:sync_photos) { provisioner.sync }
       let(:binary_photo_data) { "\x89PNGabc".force_encoding('binary') }
       before do
         Socialcast::CommandLine::ProvisionPhoto::ApiSyncStrategy.any_instance.stub(:batch_size).and_return(2)
@@ -175,6 +177,22 @@ describe Socialcast::CommandLine::ProvisionPhoto do
         sync_photos
       end
       it 'uses attributes from each connection' do end
+      it 'is considered fully configured' do
+        expect(provisioner.configured?).to be_true
+      end
+    end
+    context "with multiple incompletely configured ldap connections" do
+      let(:provisioner) { Socialcast::CommandLine::ProvisionPhoto.new(ldap_multiple_incomplete_connection_mapping_config, {}) }
+      let(:sync_photos) { provisioner.sync }
+      before do
+        expect { sync_photos }.to raise_error Socialcast::CommandLine::Provisioner::ProvisionError
+      end
+      it 'is not considered fully configured' do
+        expect(provisioner.configured?).to be_false
+      end
+      it 'provides a list of incomplete configurations' do
+        expect(provisioner.unsupported_configurations).to eq(['example_connection_2'])
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast
 version: !ruby/object:Gem::Version
-  version: 1.3.14
+  version: 1.3.15
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -241,6 +241,7 @@ files:
 - spec/fixtures/ldap_with_manager_attribute.yml
 - spec/fixtures/ldap_with_multiple_connection_mappings.yml
 - spec/fixtures/ldap_with_multiple_connection_permission_mappings.yml
+- spec/fixtures/ldap_with_multiple_incomplete_connection_mappings.yml
 - spec/fixtures/ldap_with_plugin_mapping.yml
 - spec/fixtures/ldap_with_profile_photo.yml
 - spec/fixtures/ldap_with_roles_without_account_type.yml
@@ -299,6 +300,7 @@ test_files:
 - spec/fixtures/ldap_with_manager_attribute.yml
 - spec/fixtures/ldap_with_multiple_connection_mappings.yml
 - spec/fixtures/ldap_with_multiple_connection_permission_mappings.yml
+- spec/fixtures/ldap_with_multiple_incomplete_connection_mappings.yml
 - spec/fixtures/ldap_with_plugin_mapping.yml
 - spec/fixtures/ldap_with_profile_photo.yml
 - spec/fixtures/ldap_with_roles_without_account_type.yml