weary 0.2.3 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/examples/status.rb

@@ -13,5 +13,5 @@ class Status
 end
 
 toots = Status.new
-recent_toot = toots.user_timeline(:id => "markwunsch", :count => 1).parse
-puts "@" + recent_toot[0]["user"]["screen_name"] + ": " + "\"#{recent_toot[0]['text']}\""
+recent_toot = toots.user_timeline(:id => "markwunsch")[0]
+puts "@" + recent_toot["user"]["screen_name"] + ": " + "\"#{recent_toot['text']}\""

data/lib/weary.rb

@@ -76,8 +76,8 @@ module Weary
   #
   # Methods that are understood are:
   # [<tt>via</tt>] Get, Post, etc. Defaults to a GET request
-  # [<tt>with</tt>] An array of parameters that will be passed to the body or query of the request.
-  # [<tt>requires</tt>] Members of <tt>:with</tt> that are required by the resource.
+  # [<tt>with</tt>] An array of parameters that will be passed to the body or query of the request. If you pass a hash, it will define default <tt>values</tt> for params <tt>keys</tt>
+  # [<tt>requires</tt>] Array of members of <tt>:with</tt> that are required by the resource.
   # [<tt>authenticates</tt>] Boolean value; does the resource require authentication?
   # [<tt>url</tt>] The url of the resource. You can use the same flags as #construct_url
   # [<tt>format</tt>] The format you would like to request. Defaults to json
@@ -127,7 +127,7 @@ module Weary
       if resource.authenticates?
         raise StandardError, "Can not authenticate unless username and password are defined" unless (@username && @password)
       end
-      @resources ||= []      
+      @resources ||= []
       @resources << resource.to_hash 
       craft_methods(resource)
       return resource.to_hash
@@ -139,15 +139,34 @@ module Weary
           options ||= {}
           url = "#{resource.url}"
       }
-      unless resource.requires.empty?
-        resource.requires.each do |required|
-          code << %Q{raise ArgumentError, "This resource requires parameter: ':#{required}'" unless params.has_key?(:#{required}) \n}
+      if resource.with.is_a?(Hash)
+        hash_string = ""
+        resource.with.each_pair {|k,v| hash_string << ":#{k} => '#{v}',"}
+        code << %Q{
+          params = {#{hash_string.chop}}.delete_if {|key,value| value.empty? }.merge(params)
+        }
+      end
+      unless resource.requires.nil?
+        if resource.requires.is_a?(Array)
+          resource.requires.each do |required|
+            code << %Q{  raise ArgumentError, "This resource requires parameter: ':#{required}'" unless params.has_key?(:#{required}) \n}
+          end
+        else
+          resource.requires.each_key do |required|
+            code << %Q{  raise ArgumentError, "This resource requires parameter: ':#{required}'" unless params.has_key?(:#{required}) \n}
+          end
         end
       end
       unless resource.with.empty?
-        with = %Q{[#{resource.with.collect {|x| ":#{x}"}.join(',')}]}
-        code << %Q{unnecessary = params.keys - #{with} \n}
-        code << %Q{unnecessary.each { |x| params.delete(x) } \n}
+        if resource.with.is_a?(Array)
+          with = %Q{[#{resource.with.collect {|x| ":#{x}"}.join(',')}]}
+        else
+          with = %Q{[#{resource.with.keys.collect {|x| ":#{x}"}.join(',')}]}
+        end
+        code << %Q{ 
+          unnecessary = params.keys - #{with} 
+          unnecessary.each { |x| params.delete(x) } 
+        }
       end
       if resource.via == (:post || :put)
         code << %Q{options[:body] = params unless params.empty? \n}

data/lib/weary/resource.rb

@@ -50,16 +50,26 @@ module Weary
     end
         
     def with=(params)
-      unless @requires.nil?
-        @with = params.collect {|x| x.to_sym} | @requires
+      if params.is_a?(Hash)
+        @requires.each { |key| params[key] = nil unless params.has_key?(key) }
+        @with = params
       else
-        @with = params.collect {|x| x.to_sym}
+        unless @requires.nil?
+          @with = params.collect {|x| x.to_sym} | @requires
+        else
+          @with = params.collect {|x| x.to_sym}
+        end
       end
     end
     
-    def requires=(params)
-      @with = @with | params.collect {|x| x.to_sym}
-      @requires = params.collect {|x| x.to_sym}
+    def requires=(params)        
+      if @with.is_a?(Hash)
+        params.each { |key| @with[key] = nil unless @with.has_key?(key) }
+        @requires = params.collect {|x| x.to_sym}
+      else
+        @with = @with | params.collect {|x| x.to_sym}
+        @requires = params.collect {|x| x.to_sym}
+      end
     end
     
     def url=(pattern)

data/spec/weary/request_spec.rb

@@ -19,7 +19,7 @@ describe Weary::Request do
   
   it "should perform the request and retrieve a response" do
     test = Weary::Request.new("http://foo.bar")
-    method = test.method   
+    method = test.method
     response = Weary::Response.new(mock_response(method, 301, {'Location' => 'http://bar.foo'}), method)
     test.stub!(:perform).and_return(response)
     test.perform.code.should == 301

data/spec/weary/resource_spec.rb

@@ -8,6 +8,7 @@ describe Weary::Resource do
   it 'defaults to a GET request' do
     @test.via.should == :get
   end
+  
   it 'should add requirements to the "with" array' do
     @test.requires = [:foo, :bar]
     @test.with.should == [:foo, :bar]
@@ -18,6 +19,15 @@ describe Weary::Resource do
     @test.with.should == [:foo, :bar]
   end
   
+  it 'with params could be a hash' do
+    @test.with = {:foo => "Foo", :bar => "Bar"}
+    @test.with.should == {:foo => "Foo", :bar => "Bar"}
+    @test.requires = [:id, :user]
+    @test.with.should == {:bar=>"Bar", :user => nil, :foo => "Foo", :id => nil}
+    @test.with = [:foo, :bar]
+    @test.with.should == [:foo, :bar, :id, :user]
+  end
+  
   it 'authenticates? should be boolean' do
     @test.authenticates = "foobar"
     @test.authenticates?.should == true

data/spec/weary_spec.rb

@@ -6,7 +6,7 @@ describe Weary do
     @test.instance_eval { extend Weary }
   end
   
-  describe 'default domain' do
+  describe 'Default Domain' do
     it 'should be set with a url' do
       @test.on_domain 'http://twitter.com/'
       @test.domain.should == 'http://twitter.com/'
@@ -22,7 +22,7 @@ describe Weary do
     end
   end
   
-  describe 'default format' do
+  describe 'Default Format' do
     it 'can be set' do
       @test.as_format(:xml)
       @test.instance_variable_get(:@default_format).should == :xml
@@ -35,7 +35,7 @@ describe Weary do
     end
   end
   
-  describe 'default url pattern' do
+  describe 'Default URL Pattern' do
     it 'can be set' do
       @test.construct_url("<domain><resource>.<format>")
       @test.instance_variable_defined?(:@url_pattern).should == true
@@ -47,7 +47,7 @@ describe Weary do
     end
   end
   
-  describe "basic authentication credentials" do
+  describe "Basic Authentication Credentials" do
     # i want to change this to be more specific about it being
     # basic authentication
     it "should accept a username and password" do
@@ -57,7 +57,20 @@ describe Weary do
     end
   end
   
-  describe 'resource declaration' do
+  describe "Set Headers" do
+    it "should be a hash of values to pass in the Request head"
+  end
+  
+  describe "Common Request Paramaters" do
+    it "should define with params that every resource inherits"
+      # #always_with && #always_requires methods will set with/requires in
+      # the prepare_resource method of Weary
+    
+    it "should be able to be a hash"
+      # new feature of Resources
+  end
+  
+  describe 'Resource Declaration' do
     before do
       @test.on_domain "http://foobar.com/"
     end

data/weary.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{weary}
-  s.version = "0.2.3"
+  s.version = "0.3.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-15}
+  s.date = %q{2009-06-18}
   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 = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weary
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - Mark Wunsch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 -04:00
+date: 2009-06-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency