wordnik 4.06.10 → 4.06.11

data/lib/wordnik/resource_modules/word.rb

@@ -411,33 +411,6 @@ module WordMethods
     request_only ? request : request.response.body
   end
 
-  # Return related words (thesaurus data) for a word
-  #
-  def get_related_words(word, *args)
-    http_method = :get
-    path = '/word/{word}/related'
-    path.sub!('{word}', word.to_s)
-
-    # Ruby turns all key-value arguments at the end into a single hash
-    # e.g. Wordnik.word.get_examples('dingo', :limit => 10, :part_of_speech => 'verb')
-    # becomes {:limit => 10, :part_of_speech => 'verb'}
-    last_arg = args.pop if args.last.is_a?(Hash)
-    last_arg = args.pop if args.last.is_a?(Array)
-    last_arg ||= {}
-
-    # Look for a kwarg called :request_only, whose presence indicates
-    # that we want the request itself back, not the response body
-    if last_arg.is_a?(Hash) && last_arg[:request_only].present?
-      request_only = true
-      last_arg.delete(:request_only)
-    end
-
-    params = last_arg
-    body ||= {}
-    request = Wordnik::Request.new(http_method, path, :params => params, :body => body)
-    request_only ? request : request.response.body
-  end
-
   # Returns WordLists containing a word
   #
   def get_listed_in(word, *args)
@@ -1086,6 +1059,33 @@ module WordMethods
     request_only ? request : request.response.body
   end
 
+  # Return related words (thesaurus data) for a word
+  #
+  def get_related(word, *args)
+    http_method = :get
+    path = '/word/{word}/related'
+    path.sub!('{word}', word.to_s)
+
+    # Ruby turns all key-value arguments at the end into a single hash
+    # e.g. Wordnik.word.get_examples('dingo', :limit => 10, :part_of_speech => 'verb')
+    # becomes {:limit => 10, :part_of_speech => 'verb'}
+    last_arg = args.pop if args.last.is_a?(Hash)
+    last_arg = args.pop if args.last.is_a?(Array)
+    last_arg ||= {}
+
+    # Look for a kwarg called :request_only, whose presence indicates
+    # that we want the request itself back, not the response body
+    if last_arg.is_a?(Hash) && last_arg[:request_only].present?
+      request_only = true
+      last_arg.delete(:request_only)
+    end
+
+    params = last_arg
+    body ||= {}
+    request = Wordnik::Request.new(http_method, path, :params => params, :body => body)
+    request_only ? request : request.response.body
+  end
+
   # Fetches etymology data
   #
   def get_etymologies(word, *args)

data/lib/wordnik/resource_modules/words.rb

@@ -239,7 +239,7 @@ module WordsMethods
     request_only ? request : request.response.body
   end
 
-  # Returns an array of random WordObjects, in the format specified by the URL
+  # Returns an array of random WordObjects
   #
   def get_random_words(*args)
     http_method = :get
@@ -265,7 +265,7 @@ module WordsMethods
     request_only ? request : request.response.body
   end
 
-  # Returns a single random WordObject, in the format specified by the URL
+  # Returns a single random WordObject
   #
   def get_random_word(*args)
     http_method = :get

data/lib/wordnik/response.rb

@@ -50,23 +50,23 @@ module Wordnik
     # Extract the response format from the header hash
     # e.g. {'Content-Type' => 'application/json'}
     def format
-      headers['Content-Type'].split("/").last.to_sym
+      headers['Content-Type'].split("/").last.to_s
     end
 
     def json?
-      format == :json
+      format == 'json'
     end
 
     def xml?
-      format == :xml
+      format == 'xml'
     end
 
     def pretty_body
       return unless body.present?
       case format
-      when :json
+      when 'json'
         JSON.pretty_generate(body).gsub(/\n/, '<br/>')
-      when :xml
+      when 'xml'
         xsl = Nokogiri::XSLT(File.open(File.join(File.dirname(__FILE__), "../../config/pretty_print.xsl")))
         xml = Nokogiri(body)
         coder = HTMLEntities.new

data/lib/wordnik/version.rb

@@ -1,4 +1,4 @@
 module Wordnik
-  VERSION = "4.06.10"
+  VERSION = "4.06.11"
 end
 

data/spec/operation_parameter_spec.rb

@@ -28,10 +28,6 @@ describe Wordnik::OperationParameter do
     end
   end
   
-  it "has an array of allowable values" do
-    @operation_parameter.allowable_values.should be_an(Array)
-  end
-  
   it "is required if it's a path param" do
     @operation_parameter.should_receive(:required).and_return(false)
     @operation_parameter.should_receive(:param_type).and_return('path')

data/spec/request_spec.rb

@@ -13,7 +13,7 @@ describe Wordnik::Request do
 
   describe "initialization" do
     it "sets default response format to json" do
-      @request.format.should == :json
+      @request.format.should == 'json'
     end
     
     it "allows params to be nil" do

data/spec/resource_spec.rb

@@ -50,7 +50,7 @@ describe Wordnik::Resource do
         @response_body = Wordnik.word.get_word('dynamo')
       end
       @response_body.class.should == Hash
-      @response_body.keys.sort.should == %w(canonicalForm word)
+      @response_body.keys.sort.should == %w(canonicalForm id word)
     end
     
     it "allows the same auto-generated method to be called with different parameters" do

data/spec/response_spec.rb

@@ -39,7 +39,7 @@ describe Wordnik::Response do
   describe "format" do
 
     it "recognizes json" do
-      @response.format.should == :json
+      @response.format.should == 'json'
       @response.json?.should == true
     end
 
@@ -48,7 +48,7 @@ describe Wordnik::Response do
         @raw = Typhoeus::Request.get("http://localhost:8001/admin/api/word.xml")
       end
       @response = Wordnik::Response.new(@raw)
-      @response.format.should == :xml
+      @response.format.should == 'xml'
       @response.xml?.should == true
     end
 

data/spec/spec_helper.rb

@@ -18,9 +18,9 @@ end
 
 def help
   puts "\nOh noes! You gotta stuff your wordnik credentials in ~/.wordnik.yml like so:\n\n"
-  puts "api_key: '12345abcdefg'"
-  puts "username: 'fumanchu'"
-  puts "password: 'kalamazoo'\n\n"
+  puts "api_key: '12345abcdefg'   (required)"
+  puts "username: 'fumanchu'      (optional)"
+  puts "password: 'kalamazoo'     (optional)\n\n"
   exit
 end
 
@@ -39,6 +39,7 @@ def configure_wordnik
     config.api_key = CREDENTIALS[:api_key]
     config.username = CREDENTIALS[:username]
     config.password = CREDENTIALS[:password]
+    config.logger = Logger.new('/dev/null')
 
     # Normal..
     # config.host = 'beta.wordnik.com'

data/wordnik.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'activemodel', '>=3.0.3'
   s.add_dependency 'json', '>=1.4.6'
 
-  s.add_development_dependency 'rspec', '>=2.5.0'
-  s.add_development_dependency 'vcr', '>=1.5.1'
+  s.add_development_dependency 'rspec', '~> 2.7.0'
+  s.add_development_dependency 'vcr', '~> 1.11.3'
   s.add_development_dependency 'webmock', '>=1.6.2'
   s.add_development_dependency 'autotest'  
   s.add_development_dependency 'autotest-rails-pure'

metadata

@@ -1,150 +1,148 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: wordnik
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 4.06.11
   prerelease: 
-  version: 4.06.10
 platform: ruby
-authors: 
+authors:
 - Zeke Sikelianos
 - John McGrath
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-03 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: typhoeus
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70209736540900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: htmlentities
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70209736540900
+- !ruby/object:Gem::Dependency
+  name: htmlentities
+  requirement: &70209736540400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 4.2.4
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70209736540400
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &70209736539940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70209736539940
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70209736539480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70209736539480
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70209736539020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70209736539020
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70209736538560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.6
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70209736538560
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70209736538100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.7.0
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: vcr
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70209736538100
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &70209736537640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.1
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.11.3
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70209736537640
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70209736537180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: autotest
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70209736537180
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: &70209736536800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: autotest-rails-pure
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *70209736536800
+- !ruby/object:Gem::Dependency
+  name: autotest-rails-pure
+  requirement: &70209736536340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-description: This gem provides a simple interface to the entire Wordnik API. Its methods are defined by the documentation that comes from the API itself, so it's guaranteed to be up to date.
-email: 
+  prerelease: false
+  version_requirements: *70209736536340
+description: This gem provides a simple interface to the entire Wordnik API. Its methods
+  are defined by the documentation that comes from the API itself, so it's guaranteed
+  to be up to date.
+email:
 - zeke@wordnik.com
 - john@wordnik.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rspec-tm
@@ -157,6 +155,7 @@ files:
 - api_docs/analytics.json
 - api_docs/corpus.json
 - api_docs/document.json
+- api_docs/feeds.json
 - api_docs/glossary.json
 - api_docs/suggest.json
 - api_docs/system.json
@@ -201,45 +200,33 @@ files:
 - spec/response_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/vcr/crazier_json_request.yml
-- spec/vcr/default_response.yml
-- spec/vcr/get_dog_images.yml
-- spec/vcr/get_word_dynamo.yml
-- spec/vcr/unauthorized_response.yml
-- spec/vcr/word_resource.yml
-- spec/vcr/wordnik_authenticate.yml
-- spec/vcr/wordnik_authenticate_fail.yml
-- spec/vcr/xml_response_request.yml
 - spec/wordnik_spec.rb
 - wordnik.gemspec
 homepage: http://developer.wordnik.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: wordnik
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A ruby wrapper for the Wordnik API
-test_files: 
+test_files:
 - spec/active_support_spec.rb
 - spec/endpoint_spec.rb
 - spec/operation_parameter_spec.rb
@@ -249,13 +236,4 @@ test_files:
 - spec/response_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/vcr/crazier_json_request.yml
-- spec/vcr/default_response.yml
-- spec/vcr/get_dog_images.yml
-- spec/vcr/get_word_dynamo.yml
-- spec/vcr/unauthorized_response.yml
-- spec/vcr/word_resource.yml
-- spec/vcr/wordnik_authenticate.yml
-- spec/vcr/wordnik_authenticate_fail.yml
-- spec/vcr/xml_response_request.yml
 - spec/wordnik_spec.rb