reittiopas2 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f61d78bc33cb927d5e288ba20c7f5b9385bf56a
-  data.tar.gz: 9587070a1c875a2b75bb7ce4fb3714b1cd4fac9c
+  metadata.gz: b8b3c7b2da73211b4625740a06095a6b5311ac5c
+  data.tar.gz: 3da51d3fa7d8be313364e1f0ce4dab1619bdf26e
 SHA512:
-  metadata.gz: 991f00ec596342b691c3988e33e4617ce27e2ed3fa2bdb798b245bca664addba83e20ce2c6ef5595d1543edebc3bda15904c451c81b786344894488c3c4690ea
-  data.tar.gz: eff294c382393227a67e683dc15e6455b8173e94369910128ad1a724cd51198acae06eeb8d9d63f936208d45b3001f15f6bb372980d01cb94ebfe6b6f915afcf
+  metadata.gz: a5b9646c750f603ac549fa18769a65961aa3e8e3b577453700f98049d2262de4f759253937beb69a6fb1847e07f6f7db5c02c9c5c909ec9220d8740aa25bb45e
+  data.tar.gz: 9edc016afdc19c8daf25543f5f07da1b98e5753e260218012ab97213b6296e3a0fba61fe40f473ea7eb6d6dc5fbad09b02f2227ebe6d1aa4e90998b8b9aa3e2b

data/lib/reittiopas2/connection.rb

@@ -1,3 +1,5 @@
+require 'reittiopas2/util'
+
 require 'addressable/uri'
 require 'json'
 require 'net/http'
@@ -32,7 +34,7 @@ class Connection
   # @return [Hash] the whatever data was requested from API, or Hash containing
   #   key 'error' containing error message.
   def perform_query(query={})
-    query = fix_arrays(query)
+    query = Util.convert_array_values(query)
     uri = Addressable::URI.parse(@base_url)
     uri.query_values = @base_query.merge(query)
 
@@ -51,38 +53,6 @@ class Connection
     {'error' => ex.class}
   end
 
-
-  private
-
-
-  # Reittiopas API wants arrays as values seperated with pipes. This method
-  # checks query for arrays and converts them to API friendly versions.
-  #
-  # @param [Hash] query the query to be checked for arrays to convert.
-  # @return [Hash] hash where arrays are converted to pipe presentation.
-  def fix_arrays(query)
-    retval = {}
-    query.each do |key, val|
-      if val.is_a? Array
-        retval[key] = array_to_query_form(val)
-      else
-        retval[key] = val
-      end
-    end
-    retval
-  end
-
-
-  def array_to_query_form(arr)
-    raise(ArgumentError, "arr is not Array") unless arr.is_a? Array
-
-    retval = ""
-    arr.each do |val|
-      retval << val << "|"
-    end
-
-    retval[0..-2] # Remove last pipe
-  end
 end
 
 end

data/lib/reittiopas2/util.rb

@@ -2,6 +2,23 @@ class Reittiopas2
 
 module Util
 
+  # Converts array values into string values containing array members joined
+  # by pipe ('|') characters.
+  #
+  # @param [Hash] a hash
+  # @return [Hash] a hash
+  def self.convert_array_values(hash)
+    result = hash.map do |key, value|
+      if value.is_a? Array
+        [key, value.join('|')]
+      else
+        [key, value]
+      end
+    end
+
+    Hash[result]
+  end
+
   def self.select_keys(hash, keys)
     hash.select do |key, value|
       keys.include? key

data/lib/reittiopas2/version.rb

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

data/reittiopas2.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Reittiopas version 2 API library.}
   gem.summary       = %q{Gem providing easy access to reittiopas version 2 API.}
   gem.homepage      = "https://github.com/orva/reittiopas2"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reittiopas2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Iivari Äikäs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -137,7 +137,8 @@ files:
 - spec/routing_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/orva/reittiopas2
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []