httparty 0.1.6 → 0.1.7

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.7 2008-11-30
+* 1 major enhancement
+  * fixed multiple class definitions overriding each others options
+  
 == 0.1.6 2008-11-26
 * 1 major enhancement
   * now passing :query to set_form_data if post request to avoid content length errors

data/httparty.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{httparty}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2008-11-26}
+  s.date = %q{2008-11-30}
   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"]

data/lib/httparty.rb

@@ -10,19 +10,48 @@ $:.unshift(directory) unless $:.include?(directory) || $:.include?(File.expand_p
 
 require 'httparty/request'
 
+module ModuleLevelInheritableAttributes
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+  
+  module ClassMethods
+    def mattr_inheritable(*args)
+      @mattr_inheritable_attrs ||= [:mattr_inheritable_attrs]
+      @mattr_inheritable_attrs += args
+      args.each do |arg|
+        module_eval %(
+          class << self; attr_accessor :#{arg} end
+        )
+      end
+      @mattr_inheritable_attrs
+    end
+
+    def inherited(subclass)
+      @mattr_inheritable_attrs.each do |inheritable_attribute|
+        instance_var = "@#{inheritable_attribute}" 
+        subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
+      end
+    end
+  end
+end
+
 module HTTParty
   class UnsupportedFormat < StandardError; end
   class RedirectionTooDeep < StandardError; end
-
+  
   AllowedFormats = {:xml => 'text/xml', :json => 'application/json', :html => 'text/html'}
   
   def self.included(base)
     base.extend ClassMethods
+    base.send :include, ModuleLevelInheritableAttributes
+    base.send(:mattr_inheritable, :default_options)
+    base.instance_variable_set("@default_options", {})
   end
   
-  module ClassMethods
+  module ClassMethods    
     def default_options
-      @@default_options ||= {}
+      @default_options
     end
 
     #

data/lib/httparty/version.rb

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

data/spec/httparty_spec.rb

@@ -5,9 +5,16 @@ class Foo
   base_uri 'api.foo.com/v1'
 end
 
-class FooWithHttps
+class GRest
   include HTTParty
-  base_uri 'api.foo.com/v1:443'
+  base_uri "grest.com"
+  default_params :one => 'two'
+end
+
+class HRest
+  include HTTParty
+  base_uri "hrest.com"
+  default_params :two => 'three'
 end
 
 describe HTTParty do
@@ -117,4 +124,11 @@ describe HTTParty do
       end.should raise_error(HTTParty::RedirectionTooDeep)
     end
   end
+  
+  describe "with multiple class definitions" do
+    it "should not run over each others options" do
+      HRest.default_options.should == {:base_uri => 'http://hrest.com', :default_params => {:two => 'three'}}
+      GRest.default_options.should == {:base_uri => 'http://grest.com', :default_params => {:one => 'two'}}
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: httparty
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-26 00:00:00 -05:00
+date: 2008-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency