socialcast 1.3.1 → 1.3.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjNhNDIwYjFlZTRhZTk4MDE4MWI3YzE2NmNkMmJkZDU0ZWZhYTUyNw==
+  data.tar.gz: !binary |-
+    MjNhYzZiMDlhN2VjZDZhNjUzNDRiODFjNTZhYmQ0N2Q1NWVkMmM0OQ==
+SHA512:
+  metadata.gz: !binary |-
+    YWE3ZTdlMDNhMjk5ZTA2Mjc3NjkxOGNlYzkwOWYxNjMyNDU3NDllY2U3MmI5
+    ODBjNDM2NjllNDNjMjM0MmY1OTM0NmE1NjBhYWNjODQ1NDVlNTk0M2EyNGQw
+    MmNiMjQzOGJiYWQ1MDg3NTBjOWRkZDYwYjczODM2ZWRmMDQ2Yjc=
+  data.tar.gz: !binary |-
+    Y2M0MTZkM2Q3YTlhOTQwNDBlOGI2NWJmYTIwYWZkODg4ODQ0NTBkNjM1YTZm
+    NjUzMmUzZDkxM2U3MjI3NjA1YWQwNjY3OWFiNTEwZTMxYjRjN2U3OWEyZmZh
+    ZTA1ZGVmZmY5NTFiMWRmM2Y2ODhiMjQ1ZDIyYjU1NDQyNzE3ODc=

data/lib/socialcast/command_line/provision.rb

@@ -115,6 +115,15 @@ module Socialcast
         each_ldap_entry do |ldap, entry, attr_mappings, _|
           email = grab(entry, attr_mappings['email'])
           if profile_photo_data = grab(entry, attr_mappings['profile_photo'])
+            if profile_photo_data.start_with?('http')
+              begin
+                profile_photo_data = RestClient.get(profile_photo_data)
+              rescue => e
+                puts "Unable to download photo #{profile_photo_data} for #{email}"
+                puts e.response
+                next
+              end
+            end
             profile_photo_data = profile_photo_data.force_encoding('binary')
 
             user_search_response = search_users_resource.get(:params => { :q => email, :per_page => 1 }, :accept => :json)

data/lib/socialcast/command_line/version.rb

@@ -1,5 +1,5 @@
 module Socialcast
   module CommandLine
-    VERSION = "1.3.1"
+    VERSION = "1.3.2"
   end
 end

data/spec/fixtures/ldap.yml

@@ -11,7 +11,7 @@ connections:
 
 
 # LDAP attribute mappings
-mappings: 
+mappings:
   first_name: givenName
   last_name: sn
   email: mail

data/spec/fixtures/ldap_with_profile_photo.yml

@@ -1,4 +1,4 @@
---- 
+---
 connections:
   example_connection_1:
     username: "cn=Directory Manager"
@@ -9,7 +9,7 @@ connections:
     filter: "(mail=*)"
 
 # LDAP attribute mappings
-mappings: 
+mappings:
   first_name: givenName
   last_name: sn
   email: mail

data/spec/socialcast/command_line/provision_spec.rb

@@ -15,6 +15,7 @@ describe Socialcast::CommandLine::Provision do
   let!(:ldap_with_plugin_mapping_config) { YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'ldap_with_plugin_mapping.yml')) }
   let!(:ldap_with_roles_without_account_type_config) { YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'ldap_with_roles_without_account_type.yml')) }
   let!(:ldap_with_unique_identifier_config) { YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'ldap_with_unique_identifier.yml')) }
+  let!(:ldap_with_profile_photo) { YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'ldap_with_profile_photo.yml')) }
   let!(:ldap_without_account_type_or_roles_config) { YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'ldap_without_account_type_or_roles.yml')) }
   let!(:ldap_without_filter_config) { YAML.load_file(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'ldap_without_filter.yml')) }
 
@@ -586,4 +587,71 @@ describe Socialcast::CommandLine::Provision do
       end
     end
   end
+
+  describe '#sync_photos' do
+    let(:user_search_resource) { double(:user_search_resource) }
+    let(:search_api_response) do
+      {
+        'users' => [
+          {
+            'id' => 7,
+            'avatars' => {
+              'is_system_default' => true
+            }
+          }
+        ]
+      }
+    end
+    before do
+      entry = create_entry :mail => 'user@example.com', :givenName => 'first name', :sn => 'last name', :jpegPhoto => photo_data
+      Net::LDAP.any_instance.should_receive(:search).once.with(hash_including(:attributes => ['givenName', 'sn', 'mail', 'jpegPhoto', 'memberof'])).and_yield(entry)
+
+      Socialcast::CommandLine.stub(:resource_for_path).with('/api/users/search', anything).and_return(user_search_resource)
+    end
+    let(:sync_photos) { Socialcast::CommandLine::Provision.new(ldap_with_profile_photo, {}).sync_photos }
+
+    context 'for when it does successfully post the photo' do
+      before do
+        user_search_resource.should_receive(:get).and_return(search_api_response.to_json)
+        user_resource = double(:user_resource)
+        user_resource.should_receive(:put) do |data|
+          uploaded_data = data[:user][:profile_photo][:data]
+          uploaded_data.path.should =~ /\.png\Z/
+        end
+        Socialcast::CommandLine.stub(:resource_for_path).with('/api/users/7', anything).and_return(user_resource)
+      end
+      context 'for a binary file' do
+        let(:photo_data) { "\x89PNGabc" }
+        before do
+          RestClient.should_not_receive(:get)
+          sync_photos
+        end
+        it 'uses the original binary to upload the photo' do end
+      end
+      context 'for an image file' do
+        let(:photo_data) { "http://socialcast.com/someimage.png" }
+        context 'when it successfully downloads' do
+          before do
+            RestClient.should_receive(:get).with(photo_data).and_return("\x89PNGabc")
+            sync_photos
+          end
+          it 'downloads the image form the web to upload the photo' do end
+        end
+      end
+    end
+
+    context 'for when it does not successfully post the photo' do
+      context 'for an image file' do
+        let(:photo_data) { "http://socialcast.com/someimage.png" }
+        before do
+          user_search_resource.should_not_receive(:get)
+          RestClient.should_receive(:get).with(photo_data).and_raise(RestClient::ResourceNotFound)
+          sync_photos
+        end
+        it 'tries to download the image from the web and rescues 404' do end
+      end
+    end
+
+  end
+
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socialcast
 version: !ruby/object:Gem::Version
-  version: 1.3.1
-  prerelease: 
+  version: 1.3.2
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -43,7 +39,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +49,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,7 +59,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -87,7 +79,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -98,7 +89,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: socialcast-net-ldap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -109,7 +99,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -120,7 +109,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -128,7 +116,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -136,7 +123,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -144,7 +130,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -152,7 +137,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -160,7 +144,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -168,7 +151,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -179,7 +161,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,7 +171,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -198,7 +178,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -206,7 +185,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -214,7 +192,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -275,27 +252,26 @@ files:
 homepage: http://github.com/socialcast/socialcast-command-line
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: socialcast
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: command line interface to socialcast api
 test_files:
 - spec/fixtures/credentials.yml