woefoo 0.0.9 → 0.0.10

data/lib/woefoo/version.rb

@@ -1,3 +1,3 @@
 module Woefoo
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/woefoo.rb

@@ -56,7 +56,7 @@ module Woefoo
     if opts.include?(:query)
       s = opts[:query]
     else
-      [:line1, :city, :region, :zip, :country_code].each do |l|
+      [:line1, :city, :state, :postal, :country].each do |l|
         s << "#{opts[l]} " if opts.include?(l)
       end
     end
@@ -67,7 +67,7 @@ module Woefoo
   # Build a parameterized query url
   def build_parameterized_url(opts={})
     s = ""
-    [:line1, :city, :state, :postal, :country].each do |l|
+    build_query_keys(opts).each do |l|
       if opts.include?(l)
         val = ::CGI.escape(opts[l])
         s << "&#{l.to_s}=#{val} "
@@ -87,4 +87,15 @@ module Woefoo
     tr = Typhoeus::Request.get(url)
     Woefoo::Response.new(opts, tr) if tr
   end
+  
+  def build_query_keys(opts={})
+    k = [:line1, :city, :state, :postal, :country]
+    if opts.include?(:country)
+      if opts[:country] != "US" && opts[:country] != "CA"
+        k.delete(:state)
+        k.delete(:postal)
+      end
+    end
+    k
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: woefoo
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 0
-  - 9
-  version: 0.0.9
+  - 10
+  version: 0.0.10
 platform: ruby
 authors: 
 - smnirven