wordnik 0.3.7 → 0.3.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordnik (0.3.6)
+    wordnik (0.3.8)
       activemodel (>= 3.0.3)
       addressable (>= 2.2.4)
       htmlentities (>= 4.2.4)

data/lib/wordnik/request.rb

@@ -89,9 +89,10 @@ module Wordnik
     def query_string_params(obfuscated=false)
       qsp = {}
       self.params.each_pair do |key, value|
-        next if self.path.include? "{#{key}}"
-        next if value.blank?
-        value = "YOUR_API_KEY" if key.to_sym == :api_key && obfuscated
+        next if self.path.include? "{#{key}}"                                   # skip path params
+        next if value.blank?                                                    # skip empties
+        value = "YOUR_API_KEY" if key.to_sym == :api_key && obfuscated          # obscure the API key
+        key = key.to_s.camelize(:lower).to_sym unless key.to_sym == :api_key    # api_key is not a camelCased param
         qsp[key] = value.to_s
       end
       qsp

data/lib/wordnik/response.rb

@@ -25,9 +25,9 @@ module Wordnik
     # TODO: If body is XML, parse it
     # Otherwise return raw string
     def body
-      JSON.parse(raw.body)
+      JSON.parse raw.body.encode(::Encoding::UTF_8, undef: :replace)
     rescue
-      raw.body
+      raw.body.encode(::Encoding::UTF_8, undef: :replace)
     end
 
     def headers

data/lib/wordnik/version.rb

@@ -1,3 +1,3 @@
 module Wordnik
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/spec/request_spec.rb

@@ -133,7 +133,15 @@ describe Wordnik::Request do
       @request.url_with_query_string.should =~ /\?limit=100/
     end
     
-    it "camelCases parameters"
+    it "camelCases parameters" do
+      @request = Wordnik::Request.new(@default_http_method, @default_path, @default_params.merge({
+        :params => {
+          :bad_dog => 'bud',
+          :goodDog => "dud"
+        }
+      }))
+      @request.query_string.should == "?badDog=bud&goodDog=dud"
+    end
     
   end
   

data/spec/response_spec.rb

@@ -52,6 +52,15 @@ describe Wordnik::Response do
       @response.pretty_body.should =~ /\{.*\}/
     end
     
+    it "has a pretty XML body even in the face of adverse characters" do
+      configure_wordnik
+      VCR.use_cassette('crazier_json_request', :record => :new_episodes) do
+        # @request = Wordnik::Request.new(:get, "word.xml/cat/definitions", :params => {:source_dictionaries => "century"})
+        @request = Wordnik::Request.new(:get, "word.xml/hero/pronunciations", :params => {:limit => 1})
+      end
+      @request.response.pretty_body.should =~ /\?xml/
+    end    
+    
     it "has a pretty xml body" do
       VCR.use_cassette('xml_response_request', :record => :new_episodes) do
         @raw = Typhoeus::Request.get("http://api.wordnik.com/v4/word.xml/help")

metadata

@@ -2,7 +2,7 @@
 name: wordnik
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Zeke Sikelianos