reittiopas2 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd7af7e068a579e9245cfb7ca79121e9a4310fdd
-  data.tar.gz: 5445ce3e8a5846c31ac8ccad61c557eb3375594c
+  metadata.gz: 0f61d78bc33cb927d5e288ba20c7f5b9385bf56a
+  data.tar.gz: 9587070a1c875a2b75bb7ce4fb3714b1cd4fac9c
 SHA512:
-  metadata.gz: 9377560e0fa31558ccc6f733a4c0de539b47d86686d7adb62240c833bf49a67a5959270518c2d1bbae3495a13a2d3a225acb7b9b60c78d16b052c0bd7da91a5b
-  data.tar.gz: 7fc721b52e394ae44299c1e32a9fab26a157dfe139fd97f421adac22be4d68378494288748f2281becf3733627593a35626f76f7fed7ddd6787b276303cd244d
+  metadata.gz: 991f00ec596342b691c3988e33e4617ce27e2ed3fa2bdb798b245bca664addba83e20ce2c6ef5595d1543edebc3bda15904c451c81b786344894488c3c4690ea
+  data.tar.gz: eff294c382393227a67e683dc15e6455b8173e94369910128ad1a724cd51198acae06eeb8d9d63f936208d45b3001f15f6bb372980d01cb94ebfe6b6f915afcf

data/lib/reittiopas2/connection.rb

@@ -1,3 +1,7 @@
+require 'addressable/uri'
+require 'json'
+require 'net/http'
+
 class Reittiopas2
 
 # Handles connectting to Reittiopas API and transforms query hashes into form

data/lib/reittiopas2/geocoding.rb

@@ -1,3 +1,5 @@
+require "reittiopas2/util"
+
 class Reittiopas2
 
 # Module containing public API to perform geocoding and reverse geocoding
@@ -68,7 +70,7 @@ module Geocoding
   # @return [Array<Hash>] array containing location hashes matched given query.
   # @see #reverse_geocode
   def geocode(place_name, opts={})
-    clean = geocode_remove_invalid_keys(opts)
+    clean = Util.select_keys(opts, GEOCODE_KEYS)
     query = {'request' =>'geocode', 'key' => place_name}.merge(clean)
     @connection.perform_query(query)
   end
@@ -92,31 +94,17 @@ module Geocoding
   #   coordinates.
   # @see #geocode
   def reverse_geocode(coords, opts={})
-    clean = reverse_geocode_remove_invalid_keys(opts)
+    clean = Util.select_keys(opts, REVERSE_GEOCODE_KEYS)
     query = {'request' => 'reverse_geocode', 'coordinate' => coords}.merge(clean)
     @connection.perform_query(query)
   end
 
 
-  private 
-
-
-  def geocode_remove_invalid_keys(query)
-    whitelist = [ 'key', 'cities', 'loc_types', 'disable_error_correction', 
-      'disable_unique_stop_names' ]
+  GEOCODE_KEYS = ['key', 'cities', 'loc_types', 'disable_error_correction',
+    'disable_unique_stop_names']
 
-    query.select do |key, val|
-      whitelist.include? key
-    end
-  end
-
-  def reverse_geocode_remove_invalid_keys(query)
-    whitelist = [ 'coordinate', 'limit', 'radius', 'result_contains' ]
+  REVERSE_GEOCODE_KEYS = ['coordinate', 'limit', 'radius', 'result_contains']
 
-    query.select do |key, val|
-      whitelist.include? key
-    end
-  end
 end
 
 

data/lib/reittiopas2/routing.rb

@@ -1,3 +1,4 @@
+require 'reittiopas2/util'
 
 class Reittiopas2
 
@@ -98,7 +99,7 @@ module Routing
       return {'error' => 'ArgumentError: locations were not acceptable types'}
     end
 
-    clean_opts = route_remove_invalid_keys(opts)
+    clean_opts = Util.select_keys(opts, KEYS + MODE_COSTS)
     @connection.perform_query(clean_opts.merge(query))
   end
 
@@ -122,24 +123,16 @@ module Routing
     }
   end
 
-  def route_remove_invalid_keys(opts)
-    keys = ['via', 'date', 'time', 'timetype', 'via_time', 'zone',
-      'transport_types', 'optimize', 'change_margin', 'change_cost', 
-      'wait_cost', 'walk_cost', 'walk_speed', 'detail', 'show'] 
-    mode_costs = ['mode_cost_1', 'mode_cost_2', 'mode_cost_3', 'mode_cost_4',
+  KEYS = ['via', 'date', 'time', 'timetype', 'via_time', 'zone',
+    'transport_types', 'optimize', 'change_margin', 'change_cost',
+    'wait_cost', 'walk_cost', 'walk_speed', 'detail', 'show']
+
+  MODE_COSTS = ['mode_cost_1', 'mode_cost_2', 'mode_cost_3', 'mode_cost_4',
       'mode_cost_5', 'mode_cost_6', 'mode_cost_7', 'mode_cost_7', 
       'mode_cost_8', 'mode_cost_12', 'mode_cost_21', 'mode_cost_22',
       'mode_cost_23', 'mode_cost_24', 'mode_cost_25', 'mode_cost_36', 
       'mode_cost_39']
 
-    whitelist = []  
-    whitelist.concat keys
-    whitelist.concat mode_costs
-
-    opts.select do |key, val|
-      whitelist.include? key
-    end
-  end
 end
 
 end

data/lib/reittiopas2/util.rb

@@ -0,0 +1,13 @@
+class Reittiopas2
+
+module Util
+
+  def self.select_keys(hash, keys)
+    hash.select do |key, value|
+      keys.include? key
+    end
+  end
+
+end
+
+end

data/lib/reittiopas2/version.rb

@@ -1,3 +1,3 @@
 class Reittiopas2
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/reittiopas2.rb

@@ -1,12 +1,8 @@
-require "net/http"
-require "addressable/uri"
-require "json"
-
-require "reittiopas2/version"
-
 require "reittiopas2/connection"
 require "reittiopas2/geocoding"
 require "reittiopas2/routing"
+require "reittiopas2/util"
+require "reittiopas2/version"
 
 class Reittiopas2
   include Geocoding

data/reittiopas2.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "json",        "~> 1.8"
   gem.add_dependency "addressable", "~> 2.3"
 
+  gem.add_development_dependency "rake",        "~> 10.1"
   gem.add_development_dependency "rspec",       "~> 2.14"
   gem.add_development_dependency "webmock",     "~> 1.15"
   gem.add_development_dependency "guard-rspec", "~> 4.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reittiopas2
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Iivari Äikäs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -39,6 +39,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +127,7 @@ files:
 - lib/reittiopas2/connection.rb
 - lib/reittiopas2/geocoding.rb
 - lib/reittiopas2/routing.rb
+- lib/reittiopas2/util.rb
 - lib/reittiopas2/version.rb
 - reittiopas2.gemspec
 - spec/connection_spec.rb
@@ -140,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Gem providing easy access to reittiopas version 2 API.