wordnik 0.4.4 → 0.4.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordnik (0.4.2)
+    wordnik (0.4.5)
       activemodel (>= 3.0.3)
       addressable (>= 2.2.4)
       htmlentities (>= 4.2.4)
@@ -12,16 +12,16 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.5)
+      i18n (~> 0.5.0)
+    activesupport (3.0.6)
     addressable (2.2.4)
     builder (2.1.2)
     crack (0.1.8)
     diff-lcs (1.1.2)
-    htmlentities (4.2.4)
+    htmlentities (4.3.0)
     i18n (0.5.0)
     json (1.5.1)
     mime-types (1.16)

data/lib/wordnik/request.rb

@@ -165,14 +165,11 @@ module Wordnik
           :headers => self.headers.stringify_keys
         )
       end
-
-      @response_obj = Response.new(response)
+      Response.new(response)
     end
   
-    # If the request has been made, return the existing response
-    # If not, make the request and return the response
     def response
-      @response_obj || self.make
+      self.make
     end
   
     def response_code_pretty

data/lib/wordnik/resource.rb

@@ -58,11 +58,25 @@ module Wordnik
       # 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'}
-      params = args.last.is_a?(Hash) ? args.pop : {}
+      last_arg = args.pop if args.last.is_a?(Hash)
+      last_arg = args.pop if args.last.is_a?(Array)
+      last_arg ||= {}
+      
+      if [:post, :put].include?(http_method)
+        params = nil
+        body = last_arg
+      else
+        params = last_arg
+        body = nil
+      end
       
       # Find the path that corresponds to this method nickname
       # e.g. post_words -> "/wordList.{format}/{wordListId}/words"
-      path = self.path_for_operation_nickname(nickname)
+      begin
+        path = self.path_for_operation_nickname(nickname)
+      rescue
+        raise "Cannot find a resource path that corresponds to the method nickname '#{nickname}'"
+      end
       
       # Take the '.{format}' portion out of the string so it doesn't interfere with 
       # the interpolation we're going to do on the path.
@@ -75,7 +89,7 @@ module Wordnik
       
       # TODO: treat kwargs as body instead of params if request method is post or put
 
-      request = Wordnik::Request.new(http_method, path, :params => params)
+      request = Wordnik::Request.new(http_method, path, :params => params, :body => body)
       
       if build_only
         request 

data/lib/wordnik/version.rb

@@ -1,3 +1,3 @@
 module Wordnik
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/spec_helper.rb

@@ -46,4 +46,4 @@ configure_wordnik
 
 # A random string to tack onto stuff to ensure we're not seeing 
 # data from a previous test run
-RAND = ("a".."z").to_a.sample(4).join
+RAND = ("a".."z").to_a.sample(8).join

data/spec/wordnik_spec.rb

@@ -106,7 +106,19 @@ describe Wordnik do
          @request.query_string.should == "?limit=10&skip=2"
        end
        
-       it "puts key-value arguments in the request body instead of the query params"
+       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
     
@@ -114,28 +126,48 @@ describe Wordnik do
       
       before do
         configure_wordnik
-        Wordnik.authenticate        
+        Wordnik.authenticate
+        @permalink = "wordnik-ruby-test-list-#{RAND}"
       end
       
       it "creates a wordlist" do
         body = {
-          :name=> "Wordnik Ruby Test List #{RAND}",
+          :name => "Wordnik Ruby Test List #{RAND}",
           :description => 'This is created by the test suite.',
           :type => 'PUBLIC',
           :user_id => Wordnik.configuration.user_id
         }
-        request = Wordnik::Request.new(:post, "wordLists", :body => body)
-        request.response.body.should be_a_kind_of(Hash)
-        request.response.body.should have_key('permalink')
+        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" do
+      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("wordnik-ruby-test-list-#{RAND}")
+        permalinks.should include(@permalink)
       end
 
-      it "finds the new wordlist and adds words to it"
+      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"
       

metadata

@@ -2,7 +2,7 @@
 name: wordnik
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Zeke Sikelianos
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 -07:00
+date: 2011-04-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency