wordnik 0.4.5 → 0.4.6

data/spec/resource_spec.rb

@@ -4,7 +4,7 @@ describe Wordnik::Resource do
 
   before(:each) do
     VCR.use_cassette('words', :record => :new_episodes) do
-      @response = Typhoeus::Request.get("http://api.wordnik.com/v4/word.json")
+      @response = Typhoeus::Request.get("http://beta.wordnik.com/v4/word.json")
     end
 
     @default_params = {
@@ -22,10 +22,139 @@ describe Wordnik::Resource do
     end
 
     it "sets endpoints" do
-      @resource.endpoints.size.should == 10
+      @resource.endpoints.size.should >= 10
       @resource.endpoints.first.class.should == Wordnik::Endpoint
     end
+     
+    it "defines a method for each operation nickname" do
+      @resource.public_methods.should include(:get_word)
+      @resource.public_methods.should include(:get_definitions)
+      @resource.public_methods.should include(:contextual_lookup_post)
+      @resource.public_methods.should_not include(:get_busy)
+    end
 
   end
+  
+  describe "auto-generated methods" do
+    
+    before(:each) do
+      configure_wordnik
+      Wordnik.authenticate
+    end
 
+    it "builds requests but doesn't run them if :request_only is passed" do
+      @request = Wordnik.word.get_word('dynamo', :request_only => true)
+      @request.class.should == Wordnik::Request
+    end
+
+    it "runs requests and returns their body if :request_only is absent" do
+      @response_body = Wordnik.word.get_word('dynamo')
+      @response_body.class.should == Hash
+      @response_body.keys.sort.should == %w(canonicalForm word)
+    end
+    
+    it "allows the same auto-generated method to be called with different parameters" do
+      request1 = Wordnik.word_list.get_word_list_by_id('dog', :request_only => true)
+      request2 = Wordnik.word_list.get_word_list_by_id('cat', :request_only => true)
+      request1.path.should_not == request2.path
+    end
+    
+    context "argument handling" do
+
+      before(:each) do
+         @request = Wordnik.word.get_examples('dynamo', :skip => 2, :limit => 10, :request_only => true)
+       end
+       
+       it "injects required arguments into the path" do
+         @request.path.should == "/word/dynamo/examples"
+       end
+
+       it "passes optional key-value arguments to the query string" do
+         @request.query_string.should == "?limit=10&skip=2"
+       end
+       
+       it "puts key-value arguments in the request body instead of the query params for POSTs and PUTs" do
+         body = {
+           :name => "Wordnik Ruby Test List #{RAND}",
+           :description => 'This is created by the test suite.',
+           :type => 'PUBLIC',
+           :user_id => Wordnik.configuration.user_id,
+           :request_only => true
+         }
+         @request = Wordnik.word_lists.create_word_list(body)
+         @request.body.should have_key(:name)
+         @request.body.should have_key(:description)
+         @request.body.should have_key(:type)
+         @request.body.should have_key(:userId)
+       end
+       
+    end
+    
+    context "response transmogrification" do
+      
+      it "converts definitions response into an array of definition objects" # do
+        # defs = Wordnik.word.get_definitions('boogaloo')
+        # defs.should be_an(Array)
+        # defs.first.should be_a(Wordnik::Definition)
+      # end
+      
+    end
+    
+  end
+  
+  context "wordlists" do
+    
+    before do
+      configure_wordnik
+      Wordnik.authenticate
+      @permalink = "wordnik-ruby-test-list-#{RAND}"
+    end
+    
+    it "creates a wordlist" do
+      body = {
+        :name => "Wordnik Ruby Test List #{RAND}",
+        :description => 'This is created by the test suite.',
+        :type => 'PUBLIC',
+        :user_id => Wordnik.configuration.user_id,
+        :request_only => true
+      }
+      request = Wordnik.word_lists.create_word_list(body)
+      response = request.response
+      response.body.should be_a_kind_of(Hash)
+      response.body.should have_key('permalink')
+      response.body['permalink'].should == @permalink
+    end
+    
+    it "finds the new wordlist (method 1, using the wordList resource)" do
+      list = Wordnik.word_list.get_word_list_by_id(@permalink)
+      list.should have_key('permalink')
+      list['permalink'].should == @permalink
+    end
+    
+    it "finds the new wordlist (method 2, among user's wordlists)" do
+      lists = Wordnik.account.get_word_lists_for_current_user
+      permalinks = lists.map { |list| list['permalink'] }
+      permalinks.should include(@permalink)
+    end
+
+    it "adds words to it" #do
+    #   body = [
+    #     {:word => 'foo'},
+    #     {:word => 'bar'},
+    #     {:word => 'metasyntactic'},
+    #   ]
+    #   request = Wordnik.word_list.post_words(@permalink, body)
+    #   # raise request.response.inspect
+    #   
+    #   list = Wordnik.word_list.get(@permalink)
+    #   # raise list.inspect
+    # end
+    
+    it "updates words"
+    
+    it "get all the words"
+    
+    it "deletes a wordlist"
+    
+  end
 end

data/spec/response_spec.rb

@@ -5,7 +5,7 @@ describe Wordnik::Response do
   before(:each) do
 
     VCR.use_cassette('default_response_request', :record => :new_episodes) do
-      @raw = Typhoeus::Request.get("http://api.wordnik.com/v4/word.json")
+      @raw = Typhoeus::Request.get("http://beta.wordnik.com/v4/word.json")
     end
 
     @response = Wordnik::Response.new(@raw)
@@ -37,7 +37,7 @@ describe Wordnik::Response do
 
     it "recognizes xml" do
       VCR.use_cassette('xml_response_request', :record => :new_episodes) do
-        @raw = Typhoeus::Request.get("http://api.wordnik.com/v4/word.xml/help")
+        @raw = Typhoeus::Request.get("http://beta.wordnik.com/v4/word.xml/help")
       end
       @response = Wordnik::Response.new(@raw)
       @response.format.should == :xml
@@ -63,7 +63,7 @@ describe Wordnik::Response do
     
     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")
+        @raw = Typhoeus::Request.get("http://beta.wordnik.com/v4/word.xml/help")
       end
       @response = Wordnik::Response.new(@raw)
       @response.pretty_body.should =~ /\?xml/

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'vcr'
 require 'typhoeus'
 require 'json'
 require 'yaml'
+require 'rspec'
 
 RSpec.configure do |config|
   # some (optional) config here

data/spec/wordnik_spec.rb

@@ -1,4 +1,5 @@
-require 'spec_helper'
+# require 'spec_helper'
+require File.dirname(__FILE__) + '/spec_helper'
 
 describe Wordnik do
 
@@ -22,7 +23,7 @@ describe Wordnik do
       end
 
       it "assigns resource keys that match the resource names" do
-        Wordnik.resources[:word].name.should == :word
+        Wordnik.resources[:word].name.should == :word 
       end
 
     end
@@ -74,109 +75,9 @@ describe Wordnik do
     
   end
   
-  context "dynamic method_missing magic" do
-    
-    it "maps shorthand Wordnik.resource calls to their resources" do
-      Wordnik.word.class.should == Wordnik::Resource
-      Wordnik.word.name.should == :word
-    end
-
-    it "builds requests but doesn't run them if method name begins with 'build_'" do
-      @request = Wordnik.word.build_get('dynamo')
-      @request.class.should == Wordnik::Request
-    end
-
-    it "runs requests and returns their body if method name doesn't begin with 'build_'" do
-      @response_body = Wordnik.word.get('dynamo')
-      @response_body.class.should == Hash
-      @response_body.keys.sort.should == %w(canonicalForm word)
-    end
-    
-    context "argument handling" do
-
-      before(:each) do
-         @request = Wordnik.word.build_get_examples('dynamo', :skip => 2, :limit => 10)
-       end
-       
-       it "injects required arguments into the path" do
-         @request.path.should == "/word/dynamo/examples"
-       end
-
-       it "passes optional key-value arguments to the query string" do
-         @request.query_string.should == "?limit=10&skip=2"
-       end
-       
-       it "puts key-value arguments in the request body instead of the query params for POSTs and PUTs" do
-         body = {
-           :name => "Wordnik Ruby Test List #{RAND}",
-           :description => 'This is created by the test suite.',
-           :type => 'PUBLIC',
-           :user_id => Wordnik.configuration.user_id         
-         }
-         @request = Wordnik.word_lists.build_post(body)
-         @request.body.should have_key(:name)
-         @request.body.should have_key(:description)
-         @request.body.should have_key(:type)
-         @request.body.should have_key(:userId)
-       end
-       
-    end
-    
-    context "wordlists" do
-      
-      before do
-        configure_wordnik
-        Wordnik.authenticate
-        @permalink = "wordnik-ruby-test-list-#{RAND}"
-      end
-      
-      it "creates a wordlist" do
-        body = {
-          :name => "Wordnik Ruby Test List #{RAND}",
-          :description => 'This is created by the test suite.',
-          :type => 'PUBLIC',
-          :user_id => Wordnik.configuration.user_id
-        }
-        request = Wordnik.word_lists.build_post(body)
-        response = request.response
-        response.body.should be_a_kind_of(Hash)
-        response.body.should have_key('permalink')
-        response.body['permalink'].should == @permalink
-      end
-      
-      it "finds the new wordlist (method 1, using the wordList resource)" do
-        list = Wordnik.word_list.get(@permalink)
-        list.should have_key('permalink')
-        list['permalink'].should == @permalink
-      end
-      
-      it "finds the new wordlist (method 2, among user's wordlists)" do
-        lists = Wordnik.account.get_word_lists
-        permalinks = lists.map { |list| list['permalink'] }
-        permalinks.should include(@permalink)
-      end
-
-      it "adds words to it" do
-        body = [
-          {:word => 'foo'},
-          {:word => 'bar'},
-          {:word => 'metasyntactic'},
-        ]
-        request = Wordnik.word_list.build_post_words(@permalink, body)
-        # raise request.response.inspect
-        
-        list = Wordnik.word_list.get(@permalink)
-        # raise list.inspect
-      end
-      
-      it "updates words"
-      
-      it "get all the words"
-      
-      it "deletes a wordlist"
-      
-    end
-        
-  end
+  it "maps shorthand Wordnik.resource calls to their resources" do
+    Wordnik.word.class.should == Wordnik::Resource
+    Wordnik.word.name.should == :word
+  end  
   
 end

data/wordnik.gemspec

@@ -21,7 +21,7 @@ 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.4.0'
+  s.add_development_dependency 'rspec', '>=2.5.0'
   s.add_development_dependency 'vcr', '>=1.5.1'
   s.add_development_dependency 'webmock', '>=1.6.2'
 

metadata

@@ -2,7 +2,7 @@
 name: wordnik
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - Zeke Sikelianos
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -07:00
+date: 2011-05-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,7 +88,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.5.0
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec-tm
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -151,6 +152,13 @@ files:
 - lib/wordnik/operation_parameter.rb
 - lib/wordnik/request.rb
 - lib/wordnik/resource.rb
+- lib/wordnik/resource_modules/account.rb
+- lib/wordnik/resource_modules/system.rb
+- lib/wordnik/resource_modules/user.rb
+- lib/wordnik/resource_modules/word.rb
+- lib/wordnik/resource_modules/word_list.rb
+- lib/wordnik/resource_modules/word_lists.rb
+- lib/wordnik/resource_modules/words.rb
 - lib/wordnik/response.rb
 - lib/wordnik/version.rb
 - spec/active_support_spec.rb