httparty 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.2 2008-08-09
+
+* 1 major enhancement:
+	* default_params were not being appended to query string if option[:query] was blank
+
 == 0.1.1 2008-07-30
 
 * 2 major enhancement:

data/README.txt

@@ -30,13 +30,14 @@ That works and all but what if you don't want to embed your username and passwor
 	class Twitter
 	  include HTTParty
 	  base_uri 'twitter.com'
-  
-	  def initialize(user, pass)
-	    self.class.basic_auth user, pass
+
+	  def initialize(u, p)
+	    @auth = {:username => u, :password => p}
 	  end
-  
+
 	  def post(text)
-	    self.class.post('/statuses/update.json', :query => {:status => text})
+	    options = { :query => {:status => text}, :basic_auth => @auth }
+	    self.class.post('/statuses/update.json', options)
 	  end
 	end
 	

data/httparty.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name = %q{httparty}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2008-07-31}
+  s.date = %q{2008-08-09}
   s.description = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
   s.email = ["nunemaker@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt"]
@@ -30,4 +30,4 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>, [">= 2.1"])
   end
-end
+end

data/lib/httparty.rb

@@ -78,7 +78,7 @@ module HTTParty
     end
     
     private
-      def http(uri)
+      def http(uri) #:nodoc:
         if @http.blank?
           @http = Net::HTTP.new(uri.host, uri.port)
           @http.use_ssl = (uri.port == 443)
@@ -94,7 +94,7 @@ module HTTParty
       #   body        => hash of keys/values or a query string (foo=bar&baz=poo)
       #   headers     => hash of headers to send request with
       #   basic_auth  => :username and :password to use as basic http authentication (overrides @auth class instance variable)
-      def send_request(method, path, options={})
+      def send_request(method, path, options={}) #:nodoc:
         raise ArgumentError, 'only get, post, put and delete methods are supported' unless %w[get post put delete].include?(method.to_s)
         raise ArgumentError, ':headers must be a hash' if options[:headers] && !options[:headers].is_a?(Hash)
         raise ArgumentError, ':basic_auth must be a hash' if options[:basic_auth] && !options[:basic_auth].is_a?(Hash)
@@ -104,7 +104,7 @@ module HTTParty
         uri            = URI.parse("#{base_uri}#{path}")
         existing_query = uri.query ? "#{uri.query}&" : ''
         uri.query      = if options[:query].blank?
-          existing_query
+          existing_query + default_params.to_query
         else
           existing_query + (options[:query].is_a?(Hash) ? default_params.merge(options[:query]).to_query : options[:query])
         end
@@ -119,7 +119,7 @@ module HTTParty
         parse_response(response.body)
       end
       
-      def parse_response(body)
+      def parse_response(body) #:nodoc:
         case @format
         when 'xml'
           Hash.from_xml(body)
@@ -132,7 +132,7 @@ module HTTParty
       end
     
       # Makes it so uri is sure to parse stuff like google.com with the http
-      def normalize_base_uri(str)
+      def normalize_base_uri(str) #:nodoc:
         str =~ /^https?:\/\// ? str : "http#{'s' if str.include?(':443')}://#{str}"
       end
       
@@ -140,7 +140,7 @@ module HTTParty
       # Just does simple pattern matching on file extention:
       #   /foobar.xml => 'xml'
       #   /foobar.json => 'json'
-      def format_from_path(path)
+      def format_from_path(path) #:nodoc:
         ext = File.extname(path)[1..-1]
         !ext.blank? && AllowedFormats.include?(ext) ? ext : nil
       end

data/lib/httparty/version.rb

@@ -2,7 +2,7 @@ module HTTParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/tasks/deployment.rake

@@ -1,3 +1,12 @@
+desc 'Preps the gem for a new release'
+task :prep_for_release do
+  require 'rio'
+  Rake::Task['manifest:refresh'].invoke
+  gemspec = %x[rake debug_gem]
+  lines = gemspec.split("\n")
+  rio('httparty.gemspec') < lines[1, lines.length-1].join("\n")
+end
+
 desc 'Release the website and new gem version'
 task :deploy => [:check_version, :website, :release] do
   puts "Remember to create SVN tag:"

data/tasks/website.rake

@@ -14,4 +14,4 @@ task :website_upload do
 end
 
 desc 'Generate and upload website files'
-task :website => [:website_generate, :website_upload, :publish_docs]
+task :website => [:website_upload, :publish_docs]

data/website/index.html

@@ -15,6 +15,7 @@
 		<ul id="nav">
 			<li><a href="rdoc/">Docs</a></li> 
 			<li><a href="http://github.com/jnunemaker/httparty">Github</a></li>
+			<li><a href="http://jnunemaker.lighthouseapp.com/projects/14842-httparty/tickets">Lighthouse</a></li>
 			<li><a href="http://rubyforge.org/projects/httparty/">Rubyforge</a></li> 
 		</ul> 
 	</div> 
@@ -43,12 +44,13 @@ Twitter.post('/statuses/update.json', :query => {:status => "It's an HTTParty an
   include HTTParty
   base_uri 'twitter.com'
 
-  def initialize(user, pass)
-    self.class.basic_auth user, pass
+  def initialize(u, p)
+    @auth = {:username => u, :password => p}
   end
 
   def post(text)
-    self.class.post('/statuses/update.json', :query => {:status => text})
+    options = { :query => {:status => text}, :basic_auth => @auth }
+    self.class.post('/statuses/update.json', options)
   end
 end
 
@@ -66,12 +68,16 @@ Twitter.new('username', 'password').post("It's an HTTParty and everyone is invit
 		<p>Created by <a href="http://addictedtonew.com/about/">John Nunemaker</a></p> 
 	</div> 
 </div> 
+
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+var pageTracker = _gat._getTracker("UA-85301-19");
+pageTracker._initData();
+pageTracker._trackPageview();
+</script>
  
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script> 
-<script type="text/javascript">_uacct = "UA-85301-9"; urchinTracker();</script> 
- 
-<!-- 103bees.com 'bee' code v1.11 - please do not make any changes! --> 
-<script type="text/javascript" src="http://103bees.com/bees/?bee=3672&amp;fid=5643"></script> 
-<!-- 103bees.com 'bee' code --> 
 </body> 
 </html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: httparty
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-31 00:00:00 -04:00
+date: 2008-08-09 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency