cloudsponge 0.9.13 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e56bc323a8bf54a660af8749c900d462789a4ef
-  data.tar.gz: 0b22bcc9fd676d2f5210875529bf905a38910b28
+  metadata.gz: e1a01d2d8ae64b616b8a026823eeef87953b9410
+  data.tar.gz: 4a8f24f37f4ad76c015304895e4a83a7e82480fe
 SHA512:
-  metadata.gz: 56cccbb44346a4f8d5397c8590d9a7c6cee13a1451f8c7a32bce262e87bd70261bb68d264a74eea0e68251f6f8d83ca5520cba5adf29aedfc58888752d3d7bae
-  data.tar.gz: cdbb9f9fe62f0fc33f98b27f24c25c49191d16d2d249f4304470a9813c3f8d536feb41b0cbcf8ff3455640c2bcd0d16ac6747d4a545fa7aea7aad08edfea2ba6
+  metadata.gz: f5023ae6e43ae5eea5d4fde43b01da0f665e72350d94f38c372535ef3e0bfa06971f04e007704308fd1b8c0c2a594148f3332d5cba3026c2a8f4bb7f855eea2f
+  data.tar.gz: 6b271864e6c3498ae21f51d64c3d3a65b5ff41ab4d03df03e123bb97d77a4ac967d00aaa225cabeb5cedc51c0f7a3ae1d6794d2eb66e68dca38a44402a084e41

data/Gemfile.lock

@@ -1,16 +1,33 @@
 PATH
   remote: .
   specs:
-    cloudsponge (0.9.13)
+    cloudsponge (0.10.0)
       json (>= 1.6.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    json (1.8.1)
+    addressable (2.4.0)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    hashdiff (0.2.3)
+    json (1.8.3)
+    rake (10.5.0)
+    safe_yaml (1.0.4)
+    vcr (3.0.0)
+    webmock (1.22.3)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cloudsponge!
+  rake
+  vcr
+  webmock
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -32,6 +32,8 @@ Usage:
       contacts = importer.get_contacts
       break
     end
+    # be nice and take a short break
+    sleep 1
   end
 ```
 
@@ -47,15 +49,24 @@ Install
 -------
 
 ```bash
-sudo gem install cloudsponge
+gem install cloudsponge
 ```
 
+OR using bunder, add 
+
+```ruby
+# cloudsponge integration library
+gem 'cloudsponge', github: 'cloudsponge/cloudsponge-lib-ruby'
+```
+
+to your Gemfile
+
 License
 =======
 
 (The MIT License)
 
-Copyright (c) 2013 Cloud Copy, Inc.
+Copyright (c) Cloud Copy, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/cloudsponge.gemspec

@@ -4,7 +4,6 @@ require File.expand_path("../lib/cloudsponge/version", __FILE__)
 Gem::Specification.new do |s|
   s.name        = "cloudsponge"
   s.version     = Cloudsponge::VERSION
-  s.licenses    = ['MIT']
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Graeme Rouse"]
   s.email       = ["graeme@cloudsponge.com"]
@@ -13,7 +12,10 @@ Gem::Specification.new do |s|
   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.add_runtime_dependency 'json', '~> 1.6', '>= 1.6.1'
+  s.add_dependency "json", ">=1.6.1"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "vcr"
+  s.add_development_dependency "webmock"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/lib/cloudsponge.rb

@@ -1,5 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/cloudsponge/version')
 require File.expand_path(File.dirname(__FILE__) + '/cloudsponge/contact_importer')
+require File.expand_path(File.dirname(__FILE__) + '/cloudsponge/contact_base')
 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')

data/lib/cloudsponge/contact.rb

@@ -1,69 +1,49 @@
 module Cloudsponge
-  
-  class Contact
-    attr_accessor :first_name, :last_name, :emails, :phones, :addresses
-
-    def self.from_array(list)
-      list.map { |contact_data| Contact.new(contact_data) }.compact
-    end
-
+  class Contact < ContactBase
+    attribute :first_name
+    attribute :last_name
+    attribute :phones
+    attribute :emails
+    attribute :addresses
+    attribute :groups
+    attribute :dob
+    attribute :birthday
+    attribute :title
+    attribute :companies
+    attribute :job_title
+    attribute :photos
+    attribute :locations
+    
     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['address'] && contact_data['address'].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 || []
-      
+      @contact_data = contact_data
       self
     end
+    
+    def self.from_array(list)
+      list.map { |contact_data| Contact.new(contact_data) }.compact
+    end
 
     def name
       "#{self.first_name} #{self.last_name}"
     end
-
+   
     def email
-      Contact.get_first_value(self.emails)
-    end
-
-    def phone
-      Contact.get_first_value(self.phones)
+      first_from(:emails)
     end
     
-    def address
-      self.addresses && self.addresses.first && "#{self.addresses.first[:street]} #{self.addresses.first[:city]} #{self.addresses.first[:region]}".strip
+    def phone
+      first_from(:phones)
     end
 
-    def add_array_value(collection, value, type = nil)
-      collection << {:value => value, :type => type}
+    def address
+      first_from(:addresses)
     end
 
-  private
-
-    def self.get_first_value(from_array)
-      from_array && from_array.first && from_array.first[:value]
+    def first_from(field)
+      from_array = self.send(field)  
+      return from_array && from_array.first && from_array.first[:value] unless field.to_sym == :addresses
+      self.addresses && self.addresses.first && "#{self.addresses.first[:street]} #{self.addresses.first[:city]} #{self.addresses.first[:region]}".strip
     end
-
   end
-
-end
+end

data/lib/cloudsponge/contact_base.rb

@@ -0,0 +1,49 @@
+module Cloudsponge
+  class ContactBase
+    def self.attribute(name)
+      plural = {emails: "email", phones: "phone", addresses: "address"}
+      
+      if plural.keys.include? name
+        define_method(name) do
+          send("process_#{plural[name]}", @contact_data[plural[name]])
+        end
+      else
+        define_method(name) do
+          @contact_data[name.to_s]
+        end
+      end
+    end
+
+    private
+    
+      def process_email(content)
+        @emails = content && content.inject([]) do |memo, email|
+          email = email.inject({}){|i,(k,v)| i[k.to_sym] = v; i}
+          memo << {:value => email[:address], :type => email[:type]}
+        end || []
+        @emails
+      end
+      
+      def process_phone(content)
+        @phones = content && content.inject([]) do |memo, phone|
+          phone = phone.inject({}){|i,(k,v)| i[k.to_sym] = v; i}
+          memo << {:value => phone[:number], :type => phone[:type]}
+        end || []
+        @phones
+      end
+      
+      def process_address(content)
+        @addresses = content && content.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 || []
+        @addresses
+      end
+  end
+end

data/lib/cloudsponge/contact_importer.rb

@@ -64,7 +64,7 @@ module Cloudsponge
       full_url = generate_poll_url(EVENTS_PATH, import_id)
 
       # get the response from the server and decode it
-      resp = Utility.get_and_decode_response(full_url)
+      resp = Utility.get_and_decode_response(full_url, auth)
       # interpret the result
       Event.from_array(resp['events'])
     end
@@ -91,7 +91,7 @@ module Cloudsponge
 
       # get the response from the server and decode it
       begin
-        resp = Utility.get_and_decode_response(generate_poll_url(CONTACTS_PATH, import_id))
+        resp = Utility.get_and_decode_response(generate_poll_url(CONTACTS_PATH, import_id), auth)
       rescue CsException => e
         raise e unless e.code == 404
       end
@@ -110,7 +110,7 @@ module Cloudsponge
 
       # get and decode the response into an associated array
       # Throws an exception if there was a problem at the server
-      Utility.post_and_decode_response(full_url(CONSENT_PATH), authenticated_params(params))
+      Utility.post_and_decode_response(full_url(CONSENT_PATH), params, auth)
     end
 
     # invokes the begin import action for the desktop applet import process.
@@ -122,7 +122,7 @@ module Cloudsponge
 
       # get and decode the response into an associated array
       # Throws an exception if there was a problem at the server
-      Utility.post_and_decode_response(full_url(APPLET_PATH), authenticated_params(params))
+      Utility.post_and_decode_response(full_url(APPLET_PATH), params, auth)
     end
 
     # invokes the begin import action for the desktop applet import process.
@@ -134,7 +134,7 @@ module Cloudsponge
 
       # get and decode the response into an associated array
       # Throws an exception if there was a problem at the server
-      Utility.post_and_decode_response(full_url(IMPORT_PATH), authenticated_params(params))
+      Utility.post_and_decode_response(full_url(IMPORT_PATH), params, auth)
     end
     
     def full_url(path)
@@ -146,9 +146,13 @@ module Cloudsponge
       params.merge({:domain_key => self.key, :domain_password => self.password})
     end
 
+    def auth
+      {:domain_key => self.key, :domain_password => self.password}
+    end
+
     def authenticated_query(params = {})
       # append domain_key, domain_password to params and serialze into a query string
-      Utility.object_to_query(authenticated_params(params))
+      Utility.object_to_query(params)
     end
 
     def create_applet_tag(id, url)

data/lib/cloudsponge/utility.rb

@@ -13,18 +13,18 @@ module Cloudsponge
     
     def self.object_to_query(object)
       return object unless object.is_a? Hash
-      object.map{ |k,v| "#{URI.encode(k.to_s)}=#{URI.encode(v.to_s)}" }.join('&')
+      object.map{ |k,v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join('&')
     end
     
-    def self.post_and_decode_response(url, params)
+    def self.post_and_decode_response(url, params, auth)
       # post the response
-      response = post_url(url, params)
+      response = post_url(url, params, auth)
       decode_response(response)
     end
 
-    def self.get_and_decode_response(full_url)
+    def self.get_and_decode_response(full_url, auth)
       # get the response
-      response = get_url(full_url)
+      response = get_url(full_url, auth)
       decode_response(response)
     end
     
@@ -54,24 +54,29 @@ module Cloudsponge
       object
     end
 
-    def self.get_url(url)
+    def self.get_url(url, auth)
       url = URI.parse(url)
-      open_http(url).get("#{url.path}?#{url.query}")
+      open_http(url, url.query, auth, :get)
     end
 
-    def self.post_url(url, params)
+    def self.post_url(url, params, auth)
       url = URI.parse(url)
-      open_http(url).post("#{url.path}","#{object_to_query(params)}")
+      open_http(url, params, auth, :post)
     end
 
-    def self.open_http(url)
+    def self.open_http(url, params, auth, method)
       http = Net::HTTP.new(url.host, url.port)
-      # @csimport_http.read_timeout = @timeout || 30
       if url.port == 443
         http.use_ssl = true
+      end 
+      request = if method == :post
+        Net::HTTP::Post.new(url.request_uri)
+      else
+        Net::HTTP::Get.new(url.request_uri)
       end
-      http.start unless http.started?
-      http
+      request.set_form_data(params) if method == :post
+      request.basic_auth(auth[:domain_key], auth[:domain_password])
+      http.request(request)
     end
   end
 end

data/lib/cloudsponge/version.rb

@@ -1,3 +1,3 @@
 module Cloudsponge
-  VERSION = "0.9.13"
+  VERSION = "0.10.0"
 end

data/shippable.yml

@@ -0,0 +1,16 @@
+language: ruby
+rvm:
+  - 2.1.5
+
+bundler_args:
+  --path $SHIPPABLE_BUILD_DIR/_vendor
+
+build:
+  ci:
+    # install bundle into the cached _vendor path
+    - bundle install --gemfile=$SHIPPABLE_GEMFILE $SHIPPABLE_BUNDLER_ARGS
+
+    # run specs
+    - bundle exec rake test
+
+  cache: true

data/test/test_contact.rb

@@ -17,6 +17,73 @@ class TestContact < Test::Unit::TestCase
     assert_equal data['last_name'], contact.last_name
     assert_equal "#{data['first_name']} #{data['last_name']}", contact.name
     assert_equal 'joe@example.com', contact.email
-    assert_equal '555-1234', contact.phone
+    assert_equal '555-1234'       , contact.phone
+  end
+  
+  def test_from_all_possible_attributes
+    data = { "first_name" =>"Abigale Kirlin",
+             "last_name"  =>"Kautzer",
+             "phone"=>
+              [{"number" => "1-274-714-0088", "type" => "Business fax"},
+               {"number" => "(719) 110-7733 x682", "type" => "Home"},
+               {"number" => "(425) 385-9484 x8245", "type" => "Other"},
+               {"number" => "906.146.3215", "type" => "Mobile"},
+               {"number" => "935.208.5960", "type" => "Primary"},
+               {"number" => "528.604.8156 x570", "type" => "Home fax"},
+               {"number" => "119.297.9772 x184", "type" => "Business"},
+               {"number" => "(712) 636-9651 x6347", "type" => "Other fax"}],
+             "email"=>
+              [{"address"=>"cesar@kub.info", "type"=>"E-mail 1"},
+               {"address"=>"germaine.gorczany@stroman.org", "type"=>"E-mail 2"},
+               {"address"=>"onie_pfannerstill@herzog.co", "type"=>"E-mail 3"}],
+             "address"=>
+              [{"type"=>"Home",
+                "street"=>"4535 Bednar Trace ",
+                "city"=>"Turnermouth",
+                "region"=>"Wisconsin",
+                "postal_code"=>"45589-5220",
+                "country"=>"Ghana"},
+               {"type"=>"Business",
+                "street"=>"3000 White Mill ",
+                "city"=>"Dachburgh",
+                "region"=>"South Dakota",
+                "postal_code"=>"38529-1507",
+                "country"=>"Sweden"},
+               {"type"=>"Other",
+                "street"=>"5997 Wolf Underpass ",
+                "city"=>"Port Tyrese",
+                "region"=>"Colorado",
+                "postal_code"=>"32992-0271",
+                "country"=>"Tanzania"}],
+             "groups"=>[],
+             "dob"=>"1994-08-27",
+             "birthday"=>"08-27",
+             "companies"=>["O'Conner Inc"],
+             "title"=> "Mr.",
+             "job_title"=>"District Integration Administrator",
+             "photos"=>[],
+             "locations"=>[]}
+  
+    assert contact = Cloudsponge::Contact.new(data)
+    assert_equal data['first_name'], contact.first_name
+    assert_equal data['last_name'], contact.last_name
+    assert_equal "#{data['first_name']} #{data['last_name']}", contact.name
+    
+    assert_equal 'cesar@kub.info', contact.email
+    assert_equal '1-274-714-0088', contact.phone
+    assert_equal '4535 Bednar Trace  Turnermouth Wisconsin', contact.address
+    
+    assert_equal Array, contact.emails.class
+    assert_equal Array, contact.phones.class
+    assert_equal Array, contact.addresses.class
+
+    assert_equal data["groups"]   , contact.groups
+    assert_equal data["dob"]      , contact.dob
+    assert_equal data["birthday"] , contact.birthday
+    assert_equal data["companies"], contact.companies
+    assert_equal data["title"]    , contact.title
+    assert_equal data["job_title"], contact.job_title
+    assert_equal data["photos"]   , contact.photos
+    assert_equal data["locations"], contact.locations
   end
 end