weary 0.3.1 → 0.4.0

data/README.md

@@ -61,12 +61,13 @@ Besides the name of the resource, you can also give `declare_resource` a block l
 
 	declare "foo" do |r|
 		r.url = "path/to/foo"
-		r.via = :post 				# defaults to :get
-		r.format = :xml 			# defaults to :json
-		r.requires = [:id, :bar] 	# an array of params that the resource requires to be in the query/body
-		r.with = [:blah]			# an array of params that you can optionally send to the resource
-		r.authenticates = false		# does the method require basic authentication? defaults to false
-		r.follows = false			# if this is set to false, the formed request will not follow redirects.
+		r.via = :post 							# defaults to :get
+		r.format = :xml 						# defaults to :json
+		r.requires = [:id, :bar] 				# an array of params that the resource requires to be in the query/body
+		r.with = [:blah]						# an array of params that you can optionally send to the resource
+		r.authenticates = false					# does the method require basic authentication? defaults to false
+		r.follows = false						# if this is set to false, the formed request will not follow redirects.
+		r.headers = {'Accept' => 'text/html'}	# send custom headers. defaults to nil.
 	end
 					
 So this would form a method:

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/weary.rb

@@ -75,6 +75,11 @@ module Weary
   def always_with(params)
     @always_with = params
   end
+  
+  # Set custom Headers for your Request
+  def set_headers(headers)
+    @headers = headers
+  end
 
   # Declare a resource. Use it with a block to setup the resource
   #
@@ -125,6 +130,7 @@ module Weary
       preparation.domain = @domain
       preparation.url = (@url_pattern || "<domain><resource>.<format>")
       preparation.with = @always_with unless @always_with.nil?
+      preparation.headers = @headers unless (@headers.nil? || @headers.empty?)
       return preparation
     end
     
@@ -146,7 +152,14 @@ module Weary
       }
       if resource.with.is_a?(Hash)
         hash_string = ""
-        resource.with.each_pair {|k,v| hash_string << ":#{k} => '#{v}',"}
+        resource.with.each_pair {|k,v| 
+          if k.is_a?(Symbol)
+            k_string = ":#{k}"
+          else
+            k_string = "'#{k}'"
+          end
+          hash_string << "#{k_string} => '#{v}',"
+        }
         code << %Q{
           params = {#{hash_string.chop}}.delete_if {|key,value| value.empty? }.merge(params)
         }
@@ -181,6 +194,13 @@ module Weary
           url << "?" + options[:query].to_params unless options[:query].nil?
         }
       end
+      unless (resource.headers.nil? || resource.headers.empty?)
+        header_hash = ""
+        resource.headers.each_pair {|k,v|
+          header_hash << "'#{k}' => '#{v}',"
+        }
+        code << %Q{ options[:headers] = {#{header_hash.chop}} \n}
+      end
       if resource.authenticates?
         code << %Q{options[:basic_auth] = {:username => "#{@username}", :password => "#{@password}"} \n}
       end

data/lib/weary/request.rb

@@ -73,6 +73,11 @@ module Weary
         end
         prepare.body = options[:body].is_a?(Hash) ? options[:body].to_params : options[:body] if options[:body]
         prepare.basic_auth(options[:basic_auth][:username], options[:basic_auth][:password]) if options[:basic_auth]
+        if options[:headers]
+          options[:headers].each_pair do |key, value|
+            prepare[key] = value
+          end
+        end
         prepare
       end
 

data/lib/weary/resource.rb

@@ -1,6 +1,6 @@
 module Weary
   class Resource
-    attr_accessor :name, :domain, :with, :requires, :via, :format, :url, :authenticates, :follows
+    attr_accessor :name, :domain, :with, :requires, :via, :format, :url, :authenticates, :follows, :headers
     
     def initialize(name)
       self.name = name
@@ -106,7 +106,8 @@ module Weary
                          :authenticates => authenticates?,
                          :format => @format,
                          :url => @url,
-                         :domain => @domain}}
+                         :domain => @domain,
+                         :headers => @headers}}
     end
     
   end

data/spec/weary/resource_spec.rb

@@ -64,6 +64,9 @@ describe Weary::Resource do
     lambda { @test.format = :foobar }.should raise_error
   end
   
-  it 'should be able to set Headers'
+  it 'should be able to set Headers' do
+    @test.headers = {'Content-Type' => 'text/html'}
+    @test.headers.should == {'Content-Type' => 'text/html'}
+  end
   
 end

data/spec/weary_spec.rb

@@ -58,7 +58,12 @@ describe Weary do
   end
   
   describe "Set Headers" do
-    it "should be a hash of values to pass in the Request head"
+    it "should be a hash of values to pass in the Request head" do
+      @test.on_domain "http://foo.bar"
+      @test.set_headers "Content-Type" => "text/html"
+      r = @test.get "resource"
+      r.headers.should == {"Content-Type"=>'text/html'}
+    end
   end
   
   describe "Common Request Paramaters" do

data/weary.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{weary}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Wunsch"]
-  s.date = %q{2009-06-18}
+  s.date = %q{2009-06-24}
   s.description = %q{The Weary need REST: a tiny DSL that makes the consumption of RESTful web services simple.}
   s.email = %q{mark@markwunsch.com}
   s.extra_rdoc_files = [
@@ -36,11 +36,12 @@ Gem::Specification.new do |s|
      "spec/weary_spec.rb",
      "weary.gemspec"
   ]
+  s.has_rdoc = true
   s.homepage = %q{http://github.com/mwunsch/weary}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{weary}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{A little DSL for consuming RESTful web services}
   s.test_files = [
     "spec/spec_helper.rb",
@@ -54,7 +55,7 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+    s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<crack>, [">= 0.1.2"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weary
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - Mark Wunsch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -04:00
+date: 2009-06-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,6 @@ files:
 - weary.gemspec
 has_rdoc: true
 homepage: http://github.com/mwunsch/weary
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -77,9 +75,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: weary
-rubygems_version: 1.3.4
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: A little DSL for consuming RESTful web services
 test_files: 
 - spec/spec_helper.rb