omnicontacts 0.1.5 → 0.1.6

data/.gitignore

@@ -1 +1,4 @@
 coverage
+*.iml
+.idea
+.DS_Store

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omnicontacts (0.1.5)
+    omnicontacts (0.1.6)
       json
       rack
 

data/lib/omnicontacts.rb

@@ -1,8 +1,6 @@
-require "rack"
-
 module OmniContacts
 
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 
   autoload :Builder, "omnicontacts/builder"
   autoload :Importer, "omnicontacts/importer"

data/lib/omnicontacts/authorization/oauth1.rb

@@ -14,7 +14,7 @@ require "base64"
 # * access_token_path -> the path to query in order to obtain the access token
 module OmniContacts
   module Authorization
-    module OAuth1 
+    module OAuth1
       include HTTPUtils
 
       OAUTH_VERSION = "1.0"
@@ -41,11 +41,11 @@ module OmniContacts
       end
 
       def random_string
-        (0...50).map{ ('a'..'z').to_a[rand(26)] }.join
+        (0...50).map { ('a'..'z').to_a[rand(26)] }.join
       end
 
       def timestamp
-        Time.now.to_i.to_s 
+        Time.now.to_i.to_s
       end
 
       def values_from_query_string query_string, keys_to_extract
@@ -71,11 +71,11 @@ module OmniContacts
       # The result comprises the access token, the access token secret and a list of additional fields extracted from the server's response.
       # The list of additional fields to extract is specified as last parameter
       def fetch_access_token auth_token, auth_token_secret, auth_verifier, additional_fields_to_extract = []
-        access_token_resp = https_post(auth_host, access_token_path, access_token_req_params(auth_token, auth_token_secret, auth_verifier))      
-        values_from_query_string(access_token_resp, ( ["oauth_token", "oauth_token_secret"] + additional_fields_to_extract) )
+        access_token_resp = https_post(auth_host, access_token_path, access_token_req_params(auth_token, auth_token_secret, auth_verifier))
+        values_from_query_string(access_token_resp, (["oauth_token", "oauth_token_secret"] + additional_fields_to_extract))
       end
 
-      private 
+      private
 
       def access_token_req_params auth_token, auth_token_secret, auth_verifier
         {

data/lib/omnicontacts/authorization/oauth2.rb

@@ -27,13 +27,13 @@ module OmniContacts
 
       def authorize_url_params
         to_query_string({
-          :client_id => client_id,
-          :scope => encode(scope),
-          :response_type => "code",
-          :access_type => "offline",
-          :approval_prompt => "force",
-          :redirect_uri => encode(redirect_uri)
-        })    
+                          :client_id => client_id,
+                          :scope => encode(scope),
+                          :response_type => "code",
+                          :access_type => "offline",
+                          :approval_prompt => "force",
+                          :redirect_uri => encode(redirect_uri)
+                        })
       end
 
       public
@@ -58,7 +58,7 @@ module OmniContacts
       def access_token_from_response response
         json = JSON.parse(response)
         raise json["error"] if json["error"]
-        [ json["access_token"], json["token_type"], json["refresh_token"] ]
+        [json["access_token"], json["token_type"], json["refresh_token"]]
       end
 
       public
@@ -77,7 +77,7 @@ module OmniContacts
           :refresh_token => refresh_token,
           :grant_type => "refresh_token"
         }
-        
+
       end
     end
   end

data/lib/omnicontacts/builder.rb

@@ -2,7 +2,7 @@ require "omnicontacts"
 
 module OmniContacts
   class Builder < Rack::Builder
-    def initialize(app,&block)
+    def initialize(app, &block)
       if rack14?
         super
       else

data/lib/omnicontacts/http_utils.rb

@@ -10,13 +10,13 @@ module OmniContacts
 
     module_function
 
-    def query_string_to_map query_string 
+    def query_string_to_map query_string
       query_string.split('&').reduce({}) do |memo, key_value|
-        (key,value) = key_value.split('=')
+        (key, value) = key_value.split('=')
         memo[key]= value
         memo
-      end 
-    end 
+      end
+    end
 
     def to_query_string map
       map.collect do |key, value|
@@ -34,11 +34,11 @@ module OmniContacts
     # If port is 80 the result is scheme://host
     # According to Rack specification the HTTP_HOST variable is preferred over SERVER_NAME.
     def host_url_from_rack_env env
-      port = ( (env["SERVER_PORT"] == 80) && "") || ":#{env['SERVER_PORT']}"  
+      port = ((env["SERVER_PORT"] == 80) && "") || ":#{env['SERVER_PORT']}"
       host = (env["HTTP_HOST"]) || (env["SERVER_NAME"] + port)
       scheme(env) + "://" + host
     end
-    
+
     def scheme env
       if env['HTTPS'] == 'on'
         'https'
@@ -65,8 +65,8 @@ module OmniContacts
 
     # Executes an HTTP POST request over SSL
     # It raises a RuntimeError if the response code is not equal to 200
-    def https_post host,path, params
-      https_connection host do |connection| 
+    def https_post host, path, params
+      https_connection host do |connection|
         connection.request_post(path, to_query_string(params))
       end
     end
@@ -74,7 +74,7 @@ module OmniContacts
     # Executes an HTTP GET request over SSL
     # It raises a RuntimeError if the response code is not equal to 200
     def https_get host, path, params, headers =[]
-      https_connection host  do |connection|
+      https_connection host do |connection|
         connection.request_get(path + "?" + to_query_string(params), headers)
       end
     end

data/lib/omnicontacts/importer/gmail.rb

@@ -18,18 +18,18 @@ module OmniContacts
       end
 
       def fetch_contacts_using_access_token access_token, token_type
-        contacts_response = https_get(@contacts_host, @contacts_path, contacts_req_params, contacts_req_headers(access_token, token_type))    
+        contacts_response = https_get(@contacts_host, @contacts_path, contacts_req_params, contacts_req_headers(access_token, token_type))
         parse_contacts contacts_response
       end
 
-      private 
+      private
 
       def contacts_req_params
-        { "max-results" => "100"}
+        {"max-results" => "100"}
       end
 
       def contacts_req_headers token, token_type
-        {"GData-Version" => "3.0",  "Authorization" => "#{token_type} #{token}"}  
+        {"GData-Version" => "3.0", "Authorization" => "#{token_type} #{token}"}
       end
 
       def parse_contacts contacts_as_xml
@@ -46,7 +46,7 @@ module OmniContacts
             contacts << contact
           end
         end
-        contacts 
+        contacts
       end
 
     end

data/lib/omnicontacts/importer/hotmail.rb

@@ -18,14 +18,14 @@ module OmniContacts
       end
 
       def fetch_contacts_using_access_token access_token, access_token_secret
-        contacts_response = https_get(@contacts_host, @contacts_path, :access_token =>access_token)
+        contacts_response = https_get(@contacts_host, @contacts_path, :access_token => access_token)
         contacts_from_response contacts_response
       end
 
       private
 
       def contacts_from_response contacts_as_json
-        json = JSON.parse(escape_windows_format(contacts_as_json)) 
+        json = JSON.parse(escape_windows_format(contacts_as_json))
         result = []
         json["data"].each do |contact|
           result << {:email => contact["name"]} if valid_email? contact["name"]
@@ -34,7 +34,7 @@ module OmniContacts
       end
 
       def escape_windows_format value
-        value.gsub(/[\r\s]/,'')
+        value.gsub(/[\r\s]/, '')
       end
 
       def valid_email? value

data/lib/omnicontacts/importer/yahoo.rb

@@ -3,7 +3,7 @@ require "json"
 
 module OmniContacts
   module Importer
-    class Yahoo < Middleware::OAuth1 
+    class Yahoo < Middleware::OAuth1
 
       attr_reader :auth_host, :auth_token_path, :auth_path, :access_token_path
 
@@ -19,7 +19,7 @@ module OmniContacts
       def fetch_contacts_from_token_and_verifier auth_token, auth_token_secret, auth_verifier
         (access_token, access_token_secret, guid) = fetch_access_token(auth_token, auth_token_secret, auth_verifier, ["xoauth_yahoo_guid"])
         contacts_path = "/v1/user/#{guid}/contacts"
-        contacts_response = http_get(@contacts_host, contacts_path, contacts_req_params(access_token, access_token_secret, contacts_path) )
+        contacts_response = http_get(@contacts_host, contacts_path, contacts_req_params(access_token, access_token_secret, contacts_path))
         contacts_from_response contacts_response
       end
 
@@ -35,13 +35,13 @@ module OmniContacts
           :oauth_token => access_token,
           :oauth_version => OmniContacts::Authorization::OAuth1::OAUTH_VERSION,
           :view => "compact"
-        } 
+        }
         contacts_url = "http://#{@contacts_host}#{contacts_path}"
         params["oauth_signature"] = oauth_signature("GET", contacts_url, params, access_token_secret)
         params
       end
 
-      def contacts_from_response contacts_as_json 
+      def contacts_from_response contacts_as_json
         json = JSON.parse(contacts_as_json)
         result = []
         return result unless json["contacts"]["contact"]

data/lib/omnicontacts/middleware/base_oauth.rb

@@ -49,13 +49,13 @@ module OmniContacts
       private
 
       def handle_initial_request
-        execute_and_rescue_exceptions do 
+        execute_and_rescue_exceptions do
           request_authorization_from_user
         end
       end
 
       def handle_callback
-        execute_and_rescue_exceptions do 
+        execute_and_rescue_exceptions do
           @env["omnicontacts.contacts"] = fetch_contacts
           @app.call(@env)
         end
@@ -64,13 +64,13 @@ module OmniContacts
       #  This method rescues executes a block of code and
       #  rescue all exceptions. In case of an exception the 
       #  user is redirected to the failure endpoint.
-      def execute_and_rescue_exceptions 
+      def execute_and_rescue_exceptions
         yield
       rescue AuthorizationError => e
         handle_error :not_authorized, e
       rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
         handle_error :timeout, e
-      rescue  ::RuntimeError => e
+      rescue ::RuntimeError => e
         handle_error :internal_error, e
       end
 

data/lib/omnicontacts/middleware/oauth1.rb

@@ -35,11 +35,11 @@ module OmniContacts
         (auth_token, auth_token_secret) = fetch_authorization_token
         session[@token_prop_name] = auth_token
         session[token_secret_prop_name(auth_token)] = auth_token_secret
-        redirect_to_authorization_site(auth_token) 
+        redirect_to_authorization_site(auth_token)
       end
 
       def token_secret_prop_name oauth_token
-        "#{base_prop_name}.#{oauth_token}.oauth_token_secret"  
+        "#{base_prop_name}.#{oauth_token}.oauth_token_secret"
       end
 
       def redirect_to_authorization_site auth_token

data/lib/omnicontacts/middleware/oauth2.rb

@@ -41,7 +41,7 @@ module OmniContacts
       # If no authorization code is found in the query string an
       # AuthoriazationError is raised.
       def fetch_contacts
-        code =  query_string_to_map(@env["QUERY_STRING"])["code"]
+        code = query_string_to_map(@env["QUERY_STRING"])["code"]
         if code
           refresh_token = session[refresh_token_prop_name(code)]
           (access_token, token_type, refresh_token) = if refresh_token

data/spec/omnicontacts/authorization/oauth1_spec.rb

@@ -1,11 +1,11 @@
 require "spec_helper"
 require "omnicontacts/authorization/oauth1"
 
-describe OmniContacts::Authorization::OAuth1 do 
+describe OmniContacts::Authorization::OAuth1 do
 
-  before(:all) do 
+  before(:all) do
     OAuth1TestClass= Struct.new(:consumer_key, :consumer_secret, :auth_host, :auth_token_path, :auth_path, :access_token_path, :callback)
-    class OAuth1TestClass 
+    class OAuth1TestClass
       include OmniContacts::Authorization::OAuth1
     end
   end
@@ -14,9 +14,9 @@ describe OmniContacts::Authorization::OAuth1 do
     OAuth1TestClass.new("consumer_key", "secret1", "auth_host", "auth_token_path", "auth_path", "access_token_path", "callback")
   end
 
-  describe "fetch_authorization_token" do 
+  describe "fetch_authorization_token" do
 
-    it "should request the token providing all mandatory parameters" do 
+    it "should request the token providing all mandatory parameters" do
       test_target.should_receive(:https_post) do |host, path, params|
         host.should eq(test_target.auth_host)
         path.should eq(test_target.auth_token_path)
@@ -32,25 +32,25 @@ describe OmniContacts::Authorization::OAuth1 do
       test_target.fetch_authorization_token
     end
 
-    it "should successfully parse the result" do 
+    it "should successfully parse the result" do
       test_target.should_receive(:https_post).and_return("oauth_token=token&oauth_token_secret=token_secret")
       test_target.fetch_authorization_token.should eq(["token", "token_secret"])
     end
 
-    it "should raise an error if request is invalid" do 
+    it "should raise an error if request is invalid" do
       test_target.should_receive(:https_post).and_return("invalid_request")
-      expect{test_target.fetch_authorization_token}.should raise_error
+      expect { test_target.fetch_authorization_token }.should raise_error
     end
 
   end
 
-  describe "authorization_url" do 
-    subject{test_target.authorization_url("token")}
-    it{should eq("https://#{test_target.auth_host}#{test_target.auth_path}?oauth_token=token")}
+  describe "authorization_url" do
+    subject { test_target.authorization_url("token") }
+    it { should eq("https://#{test_target.auth_host}#{test_target.auth_path}?oauth_token=token") }
   end
 
-  describe "fetch_access_token" do 
-    it "should request the access token using all required parameters" do 
+  describe "fetch_access_token" do
+    it "should request the access token using all required parameters" do
       auth_token = "token"
       auth_token_secret = "token_secret"
       auth_verifier = "verifier"
@@ -69,14 +69,14 @@ describe OmniContacts::Authorization::OAuth1 do
       test_target.fetch_access_token auth_token, auth_token_secret, auth_verifier, ["other_param"]
     end
 
-    it "should successfully extract access_token and the other fields" do 
+    it "should successfully extract access_token and the other fields" do
       test_target.should_receive(:https_post).and_return("oauth_token=access_token&oauth_token_secret=access_token_secret&other_param=other_value")
-      test_target.fetch_access_token("token","token_scret","verified",["other_param"]).should eq(["access_token", "access_token_secret", "other_value"])
+      test_target.fetch_access_token("token", "token_scret", "verified", ["other_param"]).should eq(["access_token", "access_token_secret", "other_value"])
     end
   end
 
   describe "oauth_signature" do
-    subject{ test_target.oauth_signature("GET", "http://social.yahooapis.com/v1/user", {:name => "diego", :surname => "castorina"}, "secret2")}
-    it{ should eq("ZqWoQISWcuz%2FSDnDxWihtsFDKwc%3D")}
+    subject { test_target.oauth_signature("GET", "http://social.yahooapis.com/v1/user", {:name => "diego", :surname => "castorina"}, "secret2") }
+    it { should eq("ZqWoQISWcuz%2FSDnDxWihtsFDKwc%3D") }
   end
 end

data/spec/omnicontacts/authorization/oauth2_spec.rb

@@ -1,32 +1,32 @@
 require "spec_helper"
 require "omnicontacts/authorization/oauth2"
 
-describe OmniContacts::Authorization::OAuth2 do 
+describe OmniContacts::Authorization::OAuth2 do
 
-  before(:all) do 
-    OAuth2TestClass= Struct.new(:auth_host, :authorize_path, :client_id, :client_secret, :scope, :redirect_uri,:auth_token_path)
-    class OAuth2TestClass 
+  before(:all) do
+    OAuth2TestClass= Struct.new(:auth_host, :authorize_path, :client_id, :client_secret, :scope, :redirect_uri, :auth_token_path)
+    class OAuth2TestClass
       include OmniContacts::Authorization::OAuth2
     end
   end
 
-  let(:test_target) do 
+  let(:test_target) do
     OAuth2TestClass.new("auth_host", "authorize_path", "client_id", "client_secret", "scope", "redirect_uri", "auth_token_path")
   end
 
-  describe "authorization_url" do 
+  describe "authorization_url" do
 
-    subject {test_target.authorization_url}
+    subject { test_target.authorization_url }
 
-    it {should include("https://#{test_target.auth_host}#{test_target.authorize_path}")}
-    it {should include("client_id=#{test_target.client_id}")}
-    it {should include("scope=#{test_target.scope}")}
-    it {should include("redirect_uri=#{test_target.redirect_uri}")}
-    it {should include("access_type=offline")}
-    it {should include("response_type=code")}
+    it { should include("https://#{test_target.auth_host}#{test_target.authorize_path}") }
+    it { should include("client_id=#{test_target.client_id}") }
+    it { should include("scope=#{test_target.scope}") }
+    it { should include("redirect_uri=#{test_target.redirect_uri}") }
+    it { should include("access_type=offline") }
+    it { should include("response_type=code") }
   end
 
-  let(:access_token_response) {%[{"access_token": "access_token", "token_type":"token_type", "refresh_token":"refresh_token"}] }
+  let(:access_token_response) { %[{"access_token": "access_token", "token_type":"token_type", "refresh_token":"refresh_token"}] }
 
   describe "fetch_access_token" do
 
@@ -45,7 +45,7 @@ describe OmniContacts::Authorization::OAuth2 do
       test_target.fetch_access_token code
     end
 
-    it "should successfully parse the token from the JSON response" do 
+    it "should successfully parse the token from the JSON response" do
       test_target.should_receive(:https_post).and_return(access_token_response)
       (access_token, token_type, refresh_token) = test_target.fetch_access_token "code"
       access_token.should eq("access_token")
@@ -53,19 +53,19 @@ describe OmniContacts::Authorization::OAuth2 do
       refresh_token.should eq("refresh_token")
     end
 
-    it "should raise if the http request fails" do 
+    it "should raise if the http request fails" do
       test_target.should_receive(:https_post).and_raise("Invalid code")
-      expect{test_target.fetch_access_token("code")}.should raise_error
+      expect { test_target.fetch_access_token("code") }.should raise_error
     end
 
     it "should raise an error if the JSON response contains an error field" do
       test_target.should_receive(:https_post).and_return(%[{"error": "error_message"}])
-      expect{test_target.fetch_access_token("code")}.should raise_error
+      expect { test_target.fetch_access_token("code") }.should raise_error
     end
   end
 
-  describe "refresh_access_token" do 
-    it "should provide all mandatory fields in a https post request" do 
+  describe "refresh_access_token" do
+    it "should provide all mandatory fields in a https post request" do
       refresh_token = "refresh_token"
       test_target.should_receive(:https_post) do |host, path, params|
         host.should eq(test_target.auth_host)
@@ -79,7 +79,7 @@ describe OmniContacts::Authorization::OAuth2 do
       test_target.refresh_access_token refresh_token
     end
 
-    it "should successfully parse the token from the JSON response" do 
+    it "should successfully parse the token from the JSON response" do
       test_target.should_receive(:https_post).and_return(access_token_response)
       (access_token, token_type, refresh_token) = test_target.refresh_access_token "refresh_token"
       access_token.should eq("access_token")

data/spec/omnicontacts/http_utils_spec.rb

@@ -6,13 +6,13 @@ describe OmniContacts::HTTPUtils do
   describe "to_query_string" do
     it "should create a query string from a map" do
       OmniContacts::HTTPUtils.to_query_string(:name => "john", :surname => "doe").should eq("name=john&surname=doe")
-    end 
+    end
   end
 
   describe "encode" do
     it "should encode the space" do
       OmniContacts::HTTPUtils.encode("name=\"john\"").should eq("name%3D%22john%22")
-    end 
+    end
   end
 
   describe "query_string_to_map" do
@@ -26,7 +26,7 @@ describe OmniContacts::HTTPUtils do
 
   describe "host_url_from_rack_env" do
     it "should calculate the host url using the HTTP_HOST variable" do
-      env = {"rack.url_scheme" => "http", "HTTP_HOST" => "localhost:8080","SERVER_NAME" => "localhost", "SERVER_PORT" => 8080}
+      env = {"rack.url_scheme" => "http", "HTTP_HOST" => "localhost:8080", "SERVER_NAME" => "localhost", "SERVER_PORT" => 8080}
       OmniContacts::HTTPUtils.host_url_from_rack_env(env).should eq("http://localhost:8080")
     end
 
@@ -38,7 +38,7 @@ describe OmniContacts::HTTPUtils do
 
   describe "https_post" do
 
-    before(:each) do 
+    before(:each) do
       @connection = double
       Net::HTTP.should_receive(:new).and_return(@connection)
       @connection.should_receive(:use_ssl=).with(true)
@@ -62,7 +62,7 @@ describe OmniContacts::HTTPUtils do
       @connection.should_receive(:request_get).and_return(@response)
       @response.should_receive(:code).and_return("500")
       @response.should_receive(:body).and_return("some error message")
-      expect {@test_target.send(:https_get, "host", "path", {})}.should raise_error
+      expect { @test_target.send(:https_get, "host", "path", {}) }.should raise_error
     end
   end
 end

data/spec/omnicontacts/importer/gmail_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 require "omnicontacts/importer/gmail"
 
-describe OmniContacts::Importer::Gmail do 
+describe OmniContacts::Importer::Gmail do
 
-  let(:gmail) { OmniContacts::Importer::Gmail.new( {}, "client_id", "client_secret") }
+  let(:gmail) { OmniContacts::Importer::Gmail.new({}, "client_id", "client_secret") }
 
   let(:contacts_as_xml) {
     "<entry xmlns:gd='http://schemas.google.com/g/2005'>
@@ -14,12 +14,12 @@ describe OmniContacts::Importer::Gmail do
      </entry>"
   }
 
-  describe  "fetch_contacts_using_access_token" do 
+  describe "fetch_contacts_using_access_token" do
 
-    let(:token) { "token"}
+    let(:token) { "token" }
     let(:token_type) { "token_type" }
 
-    it "should request the contacts by specifying version and code in the http headers" do 
+    it "should request the contacts by specifying version and code in the http headers" do
       gmail.should_receive(:https_get) do |host, path, params, headers|
         headers["GData-Version"].should eq("3.0")
         headers["Authorization"].should eq("#{token_type} #{token}")
@@ -28,7 +28,7 @@ describe OmniContacts::Importer::Gmail do
       gmail.fetch_contacts_using_access_token token, token_type
     end
 
-    it "should correctly parse name and email" do 
+    it "should correctly parse name and email" do
       gmail.should_receive(:https_get).and_return(contacts_as_xml)
       result = gmail.fetch_contacts_using_access_token token, token_type
       result.size.should be(1)

data/spec/omnicontacts/importer/hotmail_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 require "omnicontacts/importer/hotmail"
 
-describe OmniContacts::Importer::Hotmail do 
+describe OmniContacts::Importer::Hotmail do
 
-  let(:hotmail) {OmniContacts::Importer::Hotmail.new({}, "client_id", "client_secret") }
+  let(:hotmail) { OmniContacts::Importer::Hotmail.new({}, "client_id", "client_secret") }
 
   let(:contacts_as_json) {
     "{
@@ -20,28 +20,28 @@ describe OmniContacts::Importer::Hotmail do
        \"birth_day\": 29, 
        \"birth_month\": 3 
        }]
-    }"}
+    }" }
 
-    describe "fetch_contacts_using_access_token" do 
+  describe "fetch_contacts_using_access_token" do
 
-      let(:token) { "token"}
-      let(:token_type) { "token_type" }
+    let(:token) { "token" }
+    let(:token_type) { "token_type" }
 
-      it "should request the contacts by providing the token in the url" do
-        hotmail.should_receive(:https_get) do |host, path, params, headers|
-          params[:access_token].should eq(token)
-          contacts_as_json
-        end
-        hotmail.fetch_contacts_using_access_token token, token_type
+    it "should request the contacts by providing the token in the url" do
+      hotmail.should_receive(:https_get) do |host, path, params, headers|
+        params[:access_token].should eq(token)
+        contacts_as_json
       end
+      hotmail.fetch_contacts_using_access_token token, token_type
+    end
 
-      it "should correctly parse the contacts" do 
-        hotmail.should_receive(:https_get).and_return(contacts_as_json)
-        result = hotmail.fetch_contacts_using_access_token token, token_type
-        result.size.should be(1)
-        result.first[:name].should be_nil
-        result.first[:email].should eq("henrik@hotmail.com")
-      end
+    it "should correctly parse the contacts" do
+      hotmail.should_receive(:https_get).and_return(contacts_as_json)
+      result = hotmail.fetch_contacts_using_access_token token, token_type
+      result.size.should be(1)
+      result.first[:name].should be_nil
+      result.first[:email].should eq("henrik@hotmail.com")
     end
+  end
 
 end

data/spec/omnicontacts/importer/yahoo_spec.rb

@@ -9,9 +9,9 @@ describe OmniContacts::Importer::Yahoo do
       {"start":1, "count":1, 
       "contact":[{"id":10, "fields":[{"id":819, "type":"email", "value":"john@yahoo.com"},
        {"type":"name", "value": { "givenName":"John", "familyName":"Doe"} }] }] 
-    } }'}
+    } }' }
 
-    let(:yahoo) { OmniContacts::Importer::Yahoo.new( {}, "consumer_key", "consumer_secret" ) }
+    let(:yahoo) { OmniContacts::Importer::Yahoo.new({}, "consumer_key", "consumer_secret") }
 
     it "should request the contacts by specifying all required parameters" do
       yahoo.should_receive(:fetch_access_token).and_return(["access_token", "access_token_secret", "guid"])

data/spec/omnicontacts/middleware/oauth1_spec.rb

@@ -17,13 +17,14 @@ describe OmniContacts::Middleware::OAuth1 do
         "http://www.example.com"
       end
 
-     def fetch_contacts_from_token_and_verifier oauth_token, ouath_token_secret, oauth_verifier
+      def fetch_contacts_from_token_and_verifier oauth_token, ouath_token_secret, oauth_verifier
         [{:name => "John Doe", :email => "john@example.com"}]
       end
 
       def self.mock_session
         @mock_session ||= {}
       end
+
       def session
         OAuth1Middleware.mock_session
       end
@@ -32,8 +33,8 @@ describe OmniContacts::Middleware::OAuth1 do
 
   let(:app) {
     Rack::Builder.new do |b|
-    b.use OAuth1Middleware, "consumer_id", "consumer_secret"
-    b.run lambda{ |env| [200, {"Content-Type" => "text/html"}, ["Hello World"]] }
+      b.use OAuth1Middleware, "consumer_id", "consumer_secret"
+      b.run lambda { |env| [200, {"Content-Type" => "text/html"}, ["Hello World"]] }
     end.to_app
   }
 
@@ -61,11 +62,11 @@ describe OmniContacts::Middleware::OAuth1 do
       last_request.env["omnicontacts.contacts"].size.should be(1)
     end
 
-    it "should redirect to failure url if oauth_token_secret is not found in the session" do 
+    it "should redirect to failure url if oauth_token_secret is not found in the session" do
       OAuth1Middleware.mock_session.should_receive(:[]).and_return(nil)
       get "/contacts/oauth1middleware/callback?oauth_token=token&oauth_verifier=verifier"
       last_response.should be_redirect
-      last_response.headers["location"].should eq("/contacts/failure?error_message=not_authorized") 
+      last_response.headers["location"].should eq("/contacts/failure?error_message=not_authorized")
     end
   end
 end

data/spec/omnicontacts/middleware/oauth2_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 require "omnicontacts/middleware/oauth2"
 
-describe OmniContacts::Middleware::OAuth2 do 
+describe OmniContacts::Middleware::OAuth2 do
 
-  before(:all) do 
+  before(:all) do
     class OAuth2Middleware < OmniContacts::Middleware::OAuth2
       def authorization_url
         "http://www.example.com"
@@ -18,11 +18,11 @@ describe OmniContacts::Middleware::OAuth2 do
       end
 
       def session
-        OAuth2Middleware.mock_session  
+        OAuth2Middleware.mock_session
       end
 
       def fetch_access_token code
-        ["access_token", "token_type", "token_refresh"]  
+        ["access_token", "token_type", "token_refresh"]
       end
 
       def fetch_contacts_using_access_token token, token_type
@@ -33,8 +33,8 @@ describe OmniContacts::Middleware::OAuth2 do
 
   let(:app) {
     Rack::Builder.new do |b|
-    b.use OAuth2Middleware, "client_id", "client_secret"
-    b.run lambda{ |env| [200, {"Content-Type" => "text/html"}, ["Hello World"]] }
+      b.use OAuth2Middleware, "client_id", "client_secret"
+      b.run lambda { |env| [200, {"Content-Type" => "text/html"}, ["Hello World"]] }
     end.to_app
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnicontacts
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack