socialcast 1.3.3 → 1.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWUzYmYzN2M5OGQ4MWI4OWEzMzhjYmExOGJkZjdhZjljM2ExM2Q2OQ==
+    NmI1ZDYyYjY1YjFlNjY3NzYyOTQ3YjdkMGZlYjAzMWU0ZWVlZGJhNg==
   data.tar.gz: !binary |-
-    MmFiZGExOWY3ZWJiM2ZhNjRlMWRiMTcwMzQ2NWQ4MzNlOTc4NzI4Mw==
+    MDFhNzNhNGE4MTVmZjdhMGE0NGFiYTMyZjNjMzM4ZDBiNmM5NDUwOA==
 SHA512:
   metadata.gz: !binary |-
-    NWYzYTY4YjZkZmE2Yzg1NjRiZDZhYjA2NzdlMzg2ZTNjOTMzZWU5NDY5NjYw
-    ZWVmYWQ2OGE1NTc5ZTMzZjM0YjA1ZDRhMmMwYmU0NjIxZWI2ZmEzN2E5ZGQz
-    MjFiYWMwMjU5MDExZDYxYWQzYmYxNjhjODkzMmVmODE2YWM0MzE=
+    ODBiZmIxOWQ4NjUxYWY0M2E5MGZhZjZjODJhYWQ1NzYzMmRhOGQzZjg1OTdh
+    ODc1ZjRjZDViZTBhZDAzMWM5YTljZjI4ZmFhZmI5NTAzNzg3ZDljMWJjMWY2
+    OGYzYTczYjIzYmJiZTNlMDI5ZWVkNGJlZmY0ZDEzYTQzNzJjYjU=
   data.tar.gz: !binary |-
-    Y2QxNjdmMWJhMGYzYTk0MmFjNWI2MDIyODI2ZTIwOTE1YWQ5MWVkMTQ0ODM4
-    MTJmMjU3NDY2YTMxMTNiNzY4MTM1NDliOTlkMWFlYTYwM2ExMDI2ZmIwMGRk
-    NzIxMjI0N2YwNWQxMzU1MjQwNTVhZThkYzFlZjVhMzY0OTAyMWY=
+    OTc2M2U5YWFiYWY4MTVhZjI5NTllODAxYTEzZjc4ZjlhOWFiYTg0NDhjZWJk
+    Njg4OGRlNDJkMWI0NmE4NjE2NDc2ZjgxODIwZjFlYTJhMTEwMTQyNDYwM2Qz
+    ZGYzMmVhNTY1MDk5NmI5YzYzYjg0ZmFjMDAyOTk0ODQ1YmU0Y2Y=

data/lib/socialcast/command_line/ldap_connector.rb

@@ -78,7 +78,7 @@ module Socialcast
       end
 
       def attribute_mappings
-        @attribute_mappings ||= connection_config.fetch 'mappings', nil
+        @attribute_mappings ||= connection_config['mappings']
         @attribute_mappings ||= @config.fetch 'mappings', {}
       end
 
@@ -140,13 +140,12 @@ module Socialcast
       end
 
       def permission_mappings
-        @permission_mappings ||= connection_config.fetch 'permission_mappings', nil
+        @permission_mappings ||= connection_config['permission_mappings']
         @permission_mappings ||= @config.fetch 'permission_mappings', {}
       end
 
       def group_membership_mappings
-        @group_membership_mappings ||= connection_config.fetch 'group_membership_mappings', nil
-        @group_membership_mappings ||= @config.fetch 'group_membership_mappings', {}
+        permission_mappings['group_memberships']
       end
 
       def dereference_mail(entry, dn_field, mail_attribute)

data/lib/socialcast/command_line/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module CommandLine
-    VERSION = "1.3.3"
+    VERSION = "1.3.4"
   end
 end

data/spec/socialcast/command_line/ldap_connector_spec.rb

@@ -32,17 +32,17 @@ describe Socialcast::CommandLine::LDAPConnector do
         "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"
-      }
+      },
+      "group_memberships" => group_membership_mappings
     }
   end
-  let(:group_membership_mappings) { "" }
+  let(:group_membership_mappings) { nil }
 
   let(:ldap_config) do
     {
       "connections" => connections,
       "mappings" => mappings,
       "permission_mappings" => permission_mappings,
-      "group_membership_mappings" => group_membership_mappings
     }
   end
 
@@ -237,61 +237,6 @@ describe Socialcast::CommandLine::LDAPConnector do
         }))
       end
     end
-    context "with socialcast group ldap group membership mappings at the connection level" do
-      let(:group_membership_mappings) do
-        {
-          "filter" => "(objectClass=groupOfUniqueNames)",
-          "unique_identifier" => "gid"
-        }
-      end
-      let(:connector) { Socialcast::CommandLine::LDAPConnector.new('connection_1', ldap_config) }
-      let(:group_entry) do
-        create_entry(:dn => "cn=Sales,dc=example,dc=com", :groupId => "sales_group_id")
-      end
-      let(:user_entry) do
-        create_entry(:mail => 'user@example.com',
-          :givenName => 'first name',
-          :sn => 'last name',
-          :isMemberOf => ["cn=SFOffice,dc=example,dc=com", "cn=Sales,dc=example,dc=com"])
-      end
-      before do
-        connection.merge!({
-          "group_membership_mappings" => {
-            "filter" => "(groupId=*)",
-            "unique_identifier" => "groupId"
-          }
-        })
-        ldap_instance = double(Net::LDAP, :auth => nil)
-        Net::LDAP.should_receive(:new).once.and_return(ldap_instance)
-
-        ldap_instance.should_receive(:search).once.ordered.with(
-          :return_result => false,
-          :filter => "(mail=*)",
-          :base => "dc=example,dc=com",
-          :attributes => ['givenName', 'sn', 'mail', 'isMemberOf']).and_yield(user_entry)
-
-        ldap_instance.should_receive(:search).once.ordered.with(
-          :return_result => false,
-          :filter => "(groupId=*)",
-          :base => "dc=example,dc=com",
-          :attributes => ["groupId"]).and_yield(group_entry)
-      end
-      it "includes group memberships" do
-        expect do |blk|
-          connector.each_user_hash(&blk)
-        end.to yield_with_args(HashWithIndifferentAccess.new({
-          'first_name' => 'first name',
-          'last_name' => 'last name',
-          'contact_info' => {
-            'email' => 'user@example.com',
-          },
-          'custom_fields' => [],
-          'account_type' => 'member',
-          'roles' => [],
-          'groups' => ['sales_group_id']
-        }))
-      end
-    end
   end
 
   describe "#each_ldap_entry" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client