Merge remote-tracking branch 'jvirtanen/cleanups/client'

Conflicts:
	lib/reittiopas2/client.rb
	lib/reittiopas2/routing.rb

lib/reittiopas2.rb

@@ -1,4 +1,4 @@
-require 'reittiopas2/connection'
+require 'reittiopas2/client'
 require 'reittiopas2/geocoding'
 require 'reittiopas2/routing'
 require 'reittiopas2/utilities'
@@ -9,7 +9,7 @@ class Reittiopas2
   include Routing 
 
   def initialize(username, password)
-    @connection = Reittiopas2::Connection.new(username, password)
+    @client = Reittiopas2::Client.new(username, password)
   end
 end
 

lib/reittiopas2/connection.rb → lib/reittiopas2/client.rb

@@ -11,14 +11,14 @@ class Reittiopas2
 # parsing response into Ruby readable form.
 #
 # @api private
-class Connection
+class Client
   include Utilities
 
   def initialize(username, password)
     @base_url = "http://api.reittiopas.fi/hsl/prod/"
     @base_query = {"user" => username, "pass" => password}
   end
- 
+
   # Forms proper query from credentials + given query and sends it to API
   # endpoint. Also parses response into Ruby readable form.
   #

lib/reittiopas2/geocoding.rb

@@ -73,7 +73,7 @@ module Geocoding
   def geocode(place_name, opts={})
     clean = select_keys(opts, GEOCODE_KEYS)
     query = {'request' =>'geocode', 'key' => place_name}.merge(clean)
-    @connection.perform_query(query)
+    @client.perform_query(query)
   end
 
   # Do reverse geocode search to find information about given coordinates.
@@ -96,7 +96,7 @@ def geocode(place_name, opts={})
   def reverse_geocode(coords, opts={})
     clean = select_keys(opts, REVERSE_GEOCODE_KEYS)
     query = {'request' => 'reverse_geocode', 'coordinate' => coords}.merge(clean)
-    @connection.perform_query(query)
+    @client.perform_query(query)
   end
 
   GEOCODE_KEYS = ['key', 'cities', 'loc_types', 'disable_error_correction',

lib/reittiopas2/routing.rb

@@ -101,7 +101,7 @@ def route(from, to, opts={})
     end
 
     clean_opts = select_keys(opts, KEYS + MODE_COSTS)
-    @connection.perform_query(clean_opts.merge(query))
+    @client.perform_query(clean_opts.merge(query))
   end
 
   private

spec/connection_spec.rb → spec/client_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Reittiopas2::Connection do
+describe Reittiopas2::Client do
   before :each do
     @user = "username"
     @pwd = "password"
-    @conn = Reittiopas2::Connection.new @user, @pwd
+    @client = Reittiopas2::Client.new @user, @pwd
 
     @base_url = "http://api.reittiopas.fi/hsl/prod/"
     @query = {"user" => @user, "pass" => @pwd}
@@ -18,15 +18,15 @@
       stub_request(:get, @base_url).
         with(:query => expected_q)
 
-      @conn.perform_query(q)
+      @client.perform_query(q)
       a_request(:get, @base_url).with(:query => expected_q).should have_been_made
     end
 
     it "should form query only with credentials in case no query given." do
       stub_request(:get, @base_url).
         with(:query => @query)
 
-      @conn.perform_query
+      @client.perform_query
       a_request(:get, @base_url).with(:query => @query).should have_been_made
     end
   end
@@ -40,7 +40,7 @@
         with(:query => query).
         to_return(:body => body)
 
-      ret = @conn.perform_query(query)
+      ret = @client.perform_query(query)
       ret.should == {"max" => 5000, "used" => 44}
     end
 
@@ -51,7 +51,7 @@
         with(:query => @query).
         to_return(:status => 500, :body => body)
 
-      ret = @conn.perform_query
+      ret = @client.perform_query
       ret.should == {'error' => body}
     end
 
@@ -62,7 +62,7 @@
         with(:query => @query).
         to_return(:body => body)
 
-      ret = @conn.perform_query
+      ret = @client.perform_query
       ret['error'].should_not be_nil
     end
 
@@ -71,7 +71,7 @@
         with(:query => @query).
         to_return(:body => '')
 
-      ret = @conn.perform_query
+      ret = @client.perform_query
       ret.should == {'error' => 'Response body was empty!'}
     end
   end