cloudsponge 0.9.6 → 0.9.7

data/cloudsponge/.gitignore

@@ -0,0 +1 @@
+*.gem

data/cloudsponge/Gemfile

@@ -0,0 +1,4 @@
+source :gemcutter
+
+# Specify your gem's dependencies in my.gemspec
+gemspec

data/cloudsponge/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    cloudsponge (0.9.7)
+      json (>= 1.6.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    columnize (0.3.0)
+    json (1.6.1)
+    linecache (0.43)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (>= 1.0.0)
+  cloudsponge!
+  json (>= 1.6.1)
+  ruby-debug (>= 0.10.3)

data/cloudsponge/HISTORY

@@ -0,0 +1,10 @@
+===
+0.9.7 / 2011-09-19
+
+* Added options to initialize and begin_import signatures
+* Added import_id to initialize signature
+
+=== 0.9.2 / 2010-04-20
+
+* Created Gem version of basic library functionality
+

data/cloudsponge/Rakefile

@@ -0,0 +1,4 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'

data/cloudsponge/cloudsponge.gemspec

@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path("../lib/cloudsponge/version", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "cloudsponge"
+  s.version     = Cloudsponge::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Graeme Rouse"]
+  s.email       = ["graeme@cloudsponge.com"]
+  s.homepage    = "http://rubygems.org/gems/cloudsponge"
+  s.summary     = "CloudSponge integration library for Ruby"
+  s.description = "CloudSponge is the tool that you need to go viral. Create an account at http://www.cloudsponge.com and integrate with this library. In a few lines of code you'll have access to your users' contact lists."
+
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "cloudsponge"
+
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "ruby-debug", ">= 0.10.3"
+  s.add_dependency "json", ">=1.6.1"
+
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
+end

data/{lib → cloudsponge/lib}/cloudsponge.rb

@@ -3,7 +3,3 @@ require File.expand_path(File.dirname(__FILE__) + '/cloudsponge/contact')
 require File.expand_path(File.dirname(__FILE__) + '/cloudsponge/event')
 require File.expand_path(File.dirname(__FILE__) + '/cloudsponge/cs_exception')
 require File.expand_path(File.dirname(__FILE__) + '/cloudsponge/utility')
-
-module Cloudsponge
-  VERSION = '0.9.6'
-end

data/{lib → cloudsponge/lib}/cloudsponge/contact.rb

@@ -1,25 +1,40 @@
 module Cloudsponge
   
   class Contact
-    attr_accessor :first_name, :last_name, :emails, :phones
+    attr_accessor :first_name, :last_name, :emails, :phones, :addresses
 
     def self.from_array(list)
       list.map { |contact_data| Contact.new(contact_data) }.compact
     end
 
     def initialize(contact_data)
+      super()
       # get the basic data
       self.first_name = contact_data['first_name']
       self.last_name = contact_data['last_name']
+
       # get the phone numbers
       self.phones = []
       contact_data['phone'] && contact_data['phone'].each do |phone|
         self.add_array_value(self.phones, phone['number'], phone['type'])
       end
+
       self.emails = []
       contact_data['email'] && contact_data['email'].each do |email|
         self.add_array_value(self.emails, email['address'], email['type'])
       end
+
+      @addresses = contact_data['addresses'] && contact_data['addresses'].inject([]) do |memo, address|
+        memo << {
+          :type => address['type'], 
+          :street => address["street"], 
+          :city => address["city"], 
+          :region => address["region"], 
+          :country => address["country"], 
+          :postal_code => address["postal_code"], 
+          :formatted => address["formatted"]}
+      end || []
+      
       self
     end
 
@@ -34,6 +49,10 @@ module Cloudsponge
     def phone
       Contact.get_first_value(self.phones)
     end
+    
+    def address
+      Contact.get_first_value(self.addresses)
+    end
 
     def add_array_value(collection, value, type = nil)
       collection << {:value => value, :type => type}

data/{lib → cloudsponge/lib}/cloudsponge/contact_importer.rb

@@ -19,8 +19,8 @@ module Cloudsponge
   class ContactImporter
     attr_accessor :key, :password, :import_id
 
-    def initialize(key = nil, password = nil)
-      @key, @password = [key, password]
+    def initialize(key = nil, password = nil, import_id = nil, opts = {})
+      @key, @password, @import_id, @options = [key, password, import_id, opts]
     end
 
     # guesses the most appropriate invocation for begin_import_xxx()
@@ -30,10 +30,11 @@ module Cloudsponge
     #      :consent_url => nil | <consent_url>,
     #      :applet_tag  => nil | <applet_tag>
     #    ]
-    def begin_import(source_name, username = nil, password = nil, user_id = '', redirect_url = nil)
+    def begin_import(source_name, username = nil, password = nil, user_id = '', redirect_url = nil, opts = {})
       id = nil
       consent_url = nil
       applet_tag = nil
+      @options.update(opts)
 
       # look at the given service and decide how which begin function to invoke.
       unless username.nil? || username.empty?
@@ -104,7 +105,7 @@ module Cloudsponge
     #   throws an exception if an invalid service is invoked.
     def begin_import_consent(source_name, user_id = nil, redirect_url = nil)
       # we need to pass in all params to the call
-      params = {:service => source_name, :user_id => user_id, :redirect_url => redirect_url}.reject{ |k,v| v.nil? || v.empty? }
+      params = {:service => source_name, :user_id => user_id, :redirect_url => redirect_url, :include => @options["include"]}.reject{ |_,v| v.nil? || v.empty? }
 
       # get and decode the response into an associated array
       # Throws an exception if there was a problem at the server
@@ -116,7 +117,7 @@ module Cloudsponge
     # throws an exception if an invalid service is invoked.
     def begin_import_applet(source_name, user_id = nil)
       # we need to pass in all params to the call
-      params = {:service => source_name, :user_id => user_id}
+      params = {:service => source_name, :user_id => user_id, :include => @options["include"]}.reject{ |_,v| v.nil? || v.empty? }
 
       # get and decode the response into an associated array
       # Throws an exception if there was a problem at the server
@@ -128,7 +129,7 @@ module Cloudsponge
     # throws an exception if an invalid service is invoked.
     def begin_import_username_password(source_name, username, password, user_id)
       # we need to pass in all params to the call
-      params = {:service => source_name, :user_id => user_id, :username => username, :password => password}
+      params = {:service => source_name, :user_id => user_id, :username => username, :password => password, :include => @options["include"]}.reject{ |_,v| v.nil? || v.empty? }
 
       # get and decode the response into an associated array
       # Throws an exception if there was a problem at the server
@@ -151,12 +152,39 @@ module Cloudsponge
 
     def create_applet_tag(id, url)
       <<-EOS
-  <APPLET archive="#{url}" code="ContactsApplet" id="Contact_Importer" width="0" height="0">
-    <PARAM name="cookieValue" value="document.cookie"/>
-    <PARAM name="importId" value="#{id}"/>
-    Your browser does not support Java which is required for this utility to operate correctly.
-  </APPLET>
+  <!--[if !IE]> Firefox and others will use outer object -->
+    <object classid="java:ContactsApplet" type="application/x-java-applet" archive="#{url}" height="1" width="1" >
+      <!-- Konqueror browser needs the following param -->
+      <param name="archive" value="#{url}" />
+      <param name="cookieValue" value="document.cookie"/>
+      <param name="importId" value="#{id}"/>
+      <!--<![endif]-->
+      <!-- MSIE (Microsoft Internet Explorer) will use inner object --> 
+      <object classid="clsid:8AD9C840-044E-11D1-B3E9-00805F499D93" 
+              codebase="http://java.sun.com/update/1.5.0/jinstall-1_5_0-windows-i586.cab"
+              height="0" width="0" > 
+        <param name="code" value="ContactsApplet" />
+        <param name="archive" value="#{url}" />
+        <param name="cookieValue" value="document.cookie"/>
+        <param name="importId" value="#{id}"/>  <strong>
+          This browser does not have a Java Plug-in.
+          <br />
+          <a href="http://java.sun.com/products/plugin/downloads/index.html">
+            Get the latest Java Plug-in here.
+          </a>
+        </strong>
+      </object> 
+    <!--[if !IE]> close outer object -->
+    </object>
+  <!--<![endif]-->
   EOS
+  #     <<-EOS
+  # <APPLET archive="#{url}" code="ContactsApplet" id="Contact_Importer" width="0" height="0">
+  #   <PARAM name="cookieValue" value="document.cookie"/>
+  #   <PARAM name="importId" value="#{id}"/>
+  #   Your browser does not support Java which is required for this utility to operate correctly.
+  # </APPLET>
+  # EOS
     end
 
     def generate_poll_url(path, import_id)

data/cloudsponge/lib/cloudsponge/version.rb

@@ -0,0 +1,3 @@
+module Cloudsponge
+  VERSION = "0.9.7"
+end

data/{test → cloudsponge/test}/test_contact_importer.rb

@@ -1,5 +1,4 @@
-require "test/unit"
-require File.dirname(__FILE__) + "/../lib/cloudsponge"
+require 'test/test_helper'
 
 class TestContactImporter < Test::Unit::TestCase
   def test_version_exists
@@ -10,25 +9,31 @@ class TestContactImporter < Test::Unit::TestCase
   DOMAIN_PASSWORD = "Your Domain Password"
   
   def test_u_p_import
-    contacts = nil
     importer = Cloudsponge::ContactImporter.new(DOMAIN_KEY, DOMAIN_PASSWORD)
-    importer.begin_import('AOL', 'username', 'password')
-    loop do
-      events = importer.get_events
-      break unless events.select{ |e| e.is_error? }.empty?
-      unless events.select{ |e| e.is_complete? }.empty?
-        contacts = importer.get_contacts
-        break
-      end
-    end
+    importer.begin_import('AOL', 'u', 'p')
+    contacts = events_wait(importer)
     assert contacts
   end
-
+  
   def test_auth_import
-    contacts = nil
     importer = Cloudsponge::ContactImporter.new(DOMAIN_KEY, DOMAIN_PASSWORD)
     resp = importer.begin_import('YAHOO')
     puts "Navigate to #{resp[:consent_url]} and complete the authentication process."
+    contacts = events_wait(importer)
+    assert contacts
+  end
+  
+  def test_contacts_with_mailing_addresses
+    importer = Cloudsponge::ContactImporter.new(DOMAIN_KEY, DOMAIN_PASSWORD, nil, {"include" => "mailing_address"})
+    importer.begin_import('AOL', 'u', 'p')
+    contacts = events_wait(importer)
+    assert contacts[0].detect{ |contact| contact.addresses }
+  end
+  
+  private
+  
+  def events_wait(importer)
+    contacts = nil
     loop do
       events = importer.get_events
       break unless events.select{ |e| e.is_error? }.empty?
@@ -36,7 +41,8 @@ class TestContactImporter < Test::Unit::TestCase
         contacts = importer.get_contacts
         break
       end
+      sleep 1
     end
-    assert contacts
+    contacts
   end
 end

data/cloudsponge/test/test_helper.rb

@@ -0,0 +1,5 @@
+require "test/unit"
+require "cloudsponge"
+require 'rubygems'
+require 'ruby-debug'
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudsponge
 version: !ruby/object:Gem::Version 
+  hash: 53
   prerelease: false
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Graeme Rouse
@@ -14,38 +15,90 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 -07:00
+date: 2011-09-19 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
-description: "    Usage:\n      contacts = nil\n      importer = Cloudsponge::ContactImporter.new(DOMAIN_KEY, DOMAIN_PASSWORD)\n      importer.begin_import('YAHOO')\n      loop do\n        events = importer.get_events\n        break unless events.select{ |e| e.is_error? }.empty?\n        unless events.select{ |e| e.is_completed? }.empty?\n          contacts = importer.get_contacts\n          break\n        end\n      end\n"
-email: graeme@cloudsponge.com
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 10
+        - 3
+        version: 0.10.3
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 6
+        - 1
+        version: 1.6.1
+  type: :runtime
+  version_requirements: *id003
+description: CloudSponge is the tool that you need to go viral. Create an account at http://www.cloudsponge.com and integrate with this library. In a few lines of code you'll have access to your users' contact lists.
+email: 
+- graeme@cloudsponge.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
-- HISTORY
-- TODO
+extra_rdoc_files: []
+
 files: 
-- HISTORY
-- lib/cloudsponge/contact.rb
-- lib/cloudsponge/contact_importer.rb
-- lib/cloudsponge/cs_exception.rb
-- lib/cloudsponge/event.rb
-- lib/cloudsponge/utility.rb
-- lib/cloudsponge.rb
-- Manifest.txt
-- Rakefile
-- README
-- test/test_contact.rb
-- test/test_contact_importer.rb
-- test/test_cs_exception.rb
-- test/test_utility.rb
-- TODO
+- cloudsponge/.gitignore
+- cloudsponge/Gemfile
+- cloudsponge/Gemfile.lock
+- cloudsponge/HISTORY
+- cloudsponge/Manifest.txt
+- cloudsponge/README
+- cloudsponge/Rakefile
+- cloudsponge/TODO
+- cloudsponge/cloudsponge.gemspec
+- cloudsponge/lib/cloudsponge.rb
+- cloudsponge/lib/cloudsponge/contact.rb
+- cloudsponge/lib/cloudsponge/contact_importer.rb
+- cloudsponge/lib/cloudsponge/cs_exception.rb
+- cloudsponge/lib/cloudsponge/event.rb
+- cloudsponge/lib/cloudsponge/utility.rb
+- cloudsponge/lib/cloudsponge/version.rb
+- cloudsponge/test/test_contact.rb
+- cloudsponge/test/test_contact_importer.rb
+- cloudsponge/test/test_cs_exception.rb
+- cloudsponge/test/test_helper.rb
+- cloudsponge/test/test_utility.rb
 has_rdoc: true
-homepage: http://www.cloudsponge.com
+homepage: http://rubygems.org/gems/cloudsponge
 licenses: []
 
 post_install_message: 
@@ -54,25 +107,31 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: cloudsponge
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A library wrapper for Cloudsponge.com's API
+summary: CloudSponge integration library for Ruby
 test_files: []
 

data/HISTORY

@@ -1,4 +0,0 @@
-=== 0.9.2 / 2010-04-20
-
-* Created Gem version of basic library functionality
-

data/Rakefile

@@ -1,44 +0,0 @@
-# -*- ruby -*-
-
-require 'rubygems'
-require 'rake'
-require 'rake/gempackagetask'
-require 'lib/cloudsponge'
-
-PKG_FILES = FileList["**/*"].exclude(/CVS|pkg|tmp|coverage|Makefile|\.nfs\./)
-
-spec = Gem::Specification.new do |s|
-  s.name = 'cloudsponge'
-  s.version = Cloudsponge::VERSION
-  s.author = "Graeme Rouse"
-  s.email = "graeme@cloudsponge.com"
-  s.homepage = "http://www.cloudsponge.com"
-  s.platform  = Gem::Platform::RUBY
-  s.summary = "A library wrapper for Cloudsponge.com's API"
-  s.description = <<-EOF
-    Usage:
-      contacts = nil
-      importer = Cloudsponge::ContactImporter.new(DOMAIN_KEY, DOMAIN_PASSWORD)
-      importer.begin_import('YAHOO')
-      loop do
-        events = importer.get_events
-        break unless events.select{ |e| e.is_error? }.empty?
-        unless events.select{ |e| e.is_completed? }.empty?
-          contacts = importer.get_contacts
-          break
-        end
-      end
-  EOF
-  
-  #s.files = FileList["{test,lib}/**/*"].exclude("rdoc").to_a
-  s.files = PKG_FILES
-#  s.files = PKG_FILES
-  s.require_path = "lib"
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "HISTORY", "TODO"]
-end
-
-
-Rake::GemPackageTask.new(spec) do |pkg| 
-  pkg.need_tar = true 
-end