wordnik 4.11 → 4.12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordnik (4.11)
+    wordnik (4.12)
       activemodel (>= 3.0.3)
       addressable (>= 2.2.4)
       htmlentities (>= 4.2.4)
@@ -28,7 +28,7 @@ GEM
     diff-lcs (1.1.3)
     htmlentities (4.3.1)
     i18n (0.6.1)
-    json (1.7.5)
+    json (1.7.6)
     mime-types (1.19)
     multi_json (1.3.6)
     nokogiri (1.5.5)

data/Rakefile

@@ -46,4 +46,4 @@ task :swagger do
     resource.write_convenience_methods
   end
   
-end
+end

data/lib/wordnik/response.rb

@@ -57,7 +57,7 @@ module Wordnik
     # Extract the response format from the header hash
     # e.g. {'Content-Type' => 'application/json'}
     def format
-      headers['Content-Type'].split("/").last.to_s
+      headers['Content-Type'].split(";").first.strip.split("/").last.to_s
     end
 
     def json?
@@ -91,4 +91,4 @@ module Wordnik
     end
 
   end
-end
+end

data/lib/wordnik/version.rb

@@ -1,3 +1,3 @@
 module Wordnik
-  VERSION = "4.11"
+  VERSION = "4.12"
 end

data/spec/response_spec.rb

@@ -4,9 +4,7 @@ describe Wordnik::Response do
 
   before(:each) do
 
-    #VCR.use_cassette('word_resource', :record => :new_episodes) do
-      @raw = Typhoeus::Request.get("http://#{Wordnik.configuration.host}#{Wordnik.configuration.base_path}/word.json")
-    #end
+    @raw = Typhoeus::Request.get("http://#{Wordnik.configuration.host}#{Wordnik.configuration.base_path}/word.json")
 
     @response = Wordnik::Response.new(@raw)
   end
@@ -29,10 +27,8 @@ describe Wordnik::Response do
 
   describe "unauthorized" do
     it "raises an error when initialized" do
-      #VCR.use_cassette('get_dog_images', :record => :new_episodes) do
-        @unauthorized_raw = Typhoeus::Request.get("http://#{Wordnik.configuration.host}#{Wordnik.configuration.base_path}/word.json/dog/images/flickr")
-        expect { Wordnik::Response.new(@unauthorized_raw) }.to raise_error(ClientError)
-      #end
+      @unauthorized_raw = Typhoeus::Request.get("http://#{Wordnik.configuration.host}#{Wordnik.configuration.base_path}/word.json/dog/images/flickr")
+      expect { Wordnik::Response.new(@unauthorized_raw) }.to raise_error(ClientError)
     end
   end
 
@@ -44,9 +40,7 @@ describe Wordnik::Response do
     end
 
     it "recognizes xml" do
-      #VCR.use_cassette('xml_response_request', :record => :new_episodes) do
-        @raw = Typhoeus::Request.get("http://#{Wordnik.configuration.host}#{Wordnik.configuration.base_path}/word.xml")
-      #end
+      @raw = Typhoeus::Request.get("http://#{Wordnik.configuration.host}#{Wordnik.configuration.base_path}/word.xml")
       @response = Wordnik::Response.new(@raw)
       @response.format.should == 'xml'
       @response.xml?.should == true
@@ -62,17 +56,13 @@ describe Wordnik::Response do
 
     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/hero/pronunciations", :params => {:limit => 1})
-        @response = @request.response
-      #end
+      @request = Wordnik::Request.new(:get, "word.xml/hero/pronunciations", :params => {:limit => 1})
+      @response = @request.response
       @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://#{Wordnik.configuration.host}#{Wordnik.configuration.base_path}/word.xml")
-      #end
+      @raw = Typhoeus::Request.get("http://#{Wordnik.configuration.host}#{Wordnik.configuration.base_path}/word.xml")
       @response = Wordnik::Response.new(@raw)
       @response.pretty_body.should =~ /\?xml/
     end

data/spec/spec_helper.rb

@@ -42,7 +42,7 @@ def configure_wordnik
     config.password = CREDENTIALS[:password]
     config.logger = CREDENTIALS[:logfile] ? Logger.new(CREDENTIALS[:logfile]) : Logger.new('/dev/null')
 
-    config.host = CREDENTIALS[:host] || 'beta.wordnik.com'
+    config.host = CREDENTIALS[:host] || 'beta.api.wordnik.com'
     config.hosts = CREDENTIALS[:hosts] || []
     config.base_path = CREDENTIALS[:base_path] || '/v4'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wordnik
 version: !ruby/object:Gem::Version
-  version: '4.11'
+  version: '4.12'
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -308,18 +308,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2965605732452902667
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2965605732452902667
 requirements: []
 rubyforge_project: wordnik
 rubygems_version: 1.8.24