socialcast 1.2.1.RC1 → 1.2.2

data/.gitignore

@@ -22,3 +22,4 @@ pkg
 Gemfile.lock
 pkg/*
 
+users.xml.gz

data/lib/socialcast/cli.rb

@@ -135,12 +135,28 @@ module Socialcast
 
       permission_mappings = config.fetch 'permission_mappings', {}
       membership_attribute = permission_mappings.fetch 'attribute_name', 'memberof'
-      attributes = mappings.values
+      attributes = mappings.values.map do |mapping_value|
+        mapping_value = begin
+          mapping_value.camelize.constantize
+        rescue NameError
+          mapping_value
+        end
+        case mapping_value
+        when Hash
+          dup_mapping_value = mapping_value.dup
+          dup_mapping_value.delete("value")
+          dup_mapping_value.values
+        when String
+          mapping_value
+        when Class, Module
+          fail "Please add the attributes method to #{mapping_value}" unless mapping_value.respond_to?(:attributes)
+          mapping_value.attributes
+        end
+      end.flatten
       attributes << membership_attribute
-
       user_identifier_list = %w{email unique_identifier employee_number}
       user_whitelist = Set.new
-			count = 0
+      count = 0
       output_file = File.join Dir.pwd, options[:output]
       Zlib::GzipWriter.open(output_file) do |gz|
         xml = Builder::XmlMarkup.new(:target => gz, :indent => 1)

data/lib/socialcast/message.rb

@@ -1,5 +1,7 @@
 require 'active_resource'
 
+ActiveResource::Base.include_root_in_json = true
+
 module Socialcast
   class Message < ActiveResource::Base
     headers['Accept'] = 'application/json'

data/lib/socialcast/net_ldap_ext.rb

@@ -6,15 +6,16 @@ class Net::LDAP::Entry
   # abstracts away ldap multivalue attributes
   def grab(attribute)
     attribute = begin
-      attribute.classify.constantize
+      attribute.camelize.constantize
     rescue NameError
       attribute
     end
 
     case attribute
     when Hash
-      value = attribute.delete("value")
-      value % Hash[attribute.map {|k,v| [k, grab(v)]}].symbolize_keys
+      dup_attribute = attribute.dup
+      value = dup_attribute.delete("value")
+      value % Hash[dup_attribute.map {|k,v| [k, grab(v)]}].symbolize_keys
     when String
       Array.wrap(self[attribute]).compact.first
     when Class, Module

data/lib/socialcast/version.rb

@@ -1,3 +1,3 @@
 module Socialcast
-  VERSION = "1.2.1.RC1"
+  VERSION = "1.2.2"
 end

data/socialcast.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{publish messages to your stream from a command line interface}
 
   s.rubyforge_project = "socialcast"
-  
+
   s.add_runtime_dependency 'rest-client', '>= 1.4.0'
   s.add_runtime_dependency 'json', '>= 1.4.6'
   s.add_runtime_dependency 'thor', '>= 0.14.6'

data/spec/cli_spec.rb

@@ -7,8 +7,7 @@ describe Socialcast::CLI do
       before do
         Socialcast.stub(:credentials).and_return(YAML.load_file(File.join(File.dirname(__FILE__), 'fixtures', 'credentials.yml')))
         stub_request(:post, "https://ryan%40socialcast.com:foo@test.staging.socialcast.com/api/messages.json").
-                 with(:body => /message\_type\"\:null/).
-                 with(:body => /testing/).
+                 with(:body => { "message" => { "body" => "testing", "url" => nil, "message_type" => nil, "attachment_ids" => [], "group_id" => nil }}).
                  with(:headers => {'Accept' => 'application/json'}).
                  to_return(:status => 200, :body => "", :headers => {})
 
@@ -175,14 +174,16 @@ describe Socialcast::CLI do
         @result = ''
         Zlib::GzipWriter.stub(:open).and_yield(@result)
         Socialcast.stub(:credentials).and_return(YAML.load_file(File.join(File.dirname(__FILE__), 'fixtures', 'credentials.yml')))
-        Socialcast::CLI.any_instance.should_receive(:load_configuration).with('/my/path/to/ldap.yml').and_return(YAML.load_file(File.join(File.dirname(__FILE__), 'fixtures', 'ldap_without_permission_mappings.yml')))
+        Socialcast::CLI.any_instance.should_receive(:load_configuration).with('/my/path/to/ldap.yml').and_return(YAML.load_file(File.join(File.dirname(__FILE__), 'fixtures', 'ldap_with_plugin_mapping.yml')))
         File.should_receive(:exists?).with('/my/path/to/ldap.yml').and_return(true)
         File.stub(:open).with(/users.xml.gz/, anything).and_yield(@result)
         RestClient::Resource.any_instance.stub(:post)
 
         Socialcast::CLI.start ['provision', '-c', '/my/path/to/ldap.yml', '--plugins', [File.join(File.dirname(__FILE__), 'fixtures', 'fake_attribute_map')]]
       end
-      it 'successfully processes' do end # see expectations
+      it 'successfully processes' do
+        @result.should =~ %r{rybn@exbmple.com}
+      end # see expectations
     end
     context 'with ldap.yml configuration excluding permission_mappings' do
       before do

data/spec/fixtures/fake_attribute_map.rb

@@ -1,5 +1,8 @@
 module Socialcast
   class FakeAttributeMap
+    def self.attributes
+      %w{mail}
+    end
     def self.run(entry)
       return "#{entry[:mail].first.gsub(/a/,'b')}"
     end

data/spec/fixtures/ldap_with_plugin_mapping.yml

@@ -0,0 +1,53 @@
+---
+# LDAP connections
+connections:
+  example_connection_1:
+    username: "cn=Directory Manager"
+    password: "test"
+    host: localhost
+    port: 1389
+    basedn: "dc=example,dc=com"
+    filter: "(mail=*)"
+
+
+# LDAP attribute mappings
+mappings:
+  first_name: socialcast/fake_attribute_map
+  last_name: sn
+  email: mail
+  # only use employee_number if the email is unknown
+  # employee_number: emp_id
+  # only use unique_identifier if you do not wish to use email as the main user identification method
+  # unique_identifier: samaccountname
+
+
+# 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
+  # optional setting if script must connect to Socialcast server through a proxy
+  # proxy: "http://username:password@proxy.company.com:3128"
+

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: socialcast
 version: !ruby/object:Gem::Version
-  version: 1.2.1.RC1
-  prerelease: 6
+  version: 1.2.2
+  prerelease: 
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-18 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -192,6 +192,7 @@ files:
 - spec/fixtures/ldap_with_array_permission_mapping.yml
 - spec/fixtures/ldap_with_interpolated_values.yml
 - spec/fixtures/ldap_with_manager_attribute.yml
+- spec/fixtures/ldap_with_plugin_mapping.yml
 - spec/fixtures/ldap_without_permission_mappings.yml
 - spec/net_ldap_ext_spec.rb
 - spec/spec_helper.rb
@@ -209,13 +210,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -357253051264046673
+      hash: 4299609609478338183
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 4299609609478338183
 requirements: []
 rubyforge_project: socialcast
 rubygems_version: 1.8.25
@@ -231,6 +235,7 @@ test_files:
 - spec/fixtures/ldap_with_array_permission_mapping.yml
 - spec/fixtures/ldap_with_interpolated_values.yml
 - spec/fixtures/ldap_with_manager_attribute.yml
+- spec/fixtures/ldap_with_plugin_mapping.yml
 - spec/fixtures/ldap_without_permission_mappings.yml
 - spec/net_ldap_ext_spec.rb
 - spec/spec_helper.rb