weary 0.4.1 → 0.4.3

data/README.md

@@ -29,7 +29,7 @@ You do have Rubygems right?
 	class TwitterUser
 		extend Weary
 		
-		on_domain "http://twitter.com/users/"
+		domain "http://twitter.com/users/"
 		
 		get "show" do |resource|
 			resource.with = [:id, :user_id, :screen_name]
@@ -106,9 +106,9 @@ There are many ways to form URLs in Weary. You can define URLs for the entire cl
 	class Foo
 		extend Weary
 		
-		on_domain "http://foo.bar/"
-		construct_url "<domain><resource>.<format>"
-		as_format :xml
+		domain "http://foo.bar/"
+		url "<domain><resource>.<format>"
+		format :xml
 		
 		get "show_users"
 	end

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.3

data/examples/repo.rb

@@ -6,8 +6,8 @@ class Repository
   @gh_user = "mwunsch"
   @gh_repo = "weary"
   
-  on_domain "http://github.com/api/v2/"
-  as_format :yaml
+  domain "http://github.com/api/v2/"
+  format :yaml
   
   get "show" do |r|
     r.url = "<domain><format>/repos/show/#{@gh_user}/#{@gh_repo}"

data/examples/status.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'weary')
 class Status
   extend Weary
   
-  on_domain "http://twitter.com/statuses/"
+  domain "http://twitter.com/statuses/"
   
   get "user_timeline" do |resource|
     resource.requires = [:id]

data/lib/weary.rb

@@ -37,24 +37,30 @@ module Weary
     req.parse
   end
   
-  attr_reader :domain, :resources
+  attr_reader :resources
   
-  # Sets the domain the resource is on. 
+  # Sets the domain the resource is on or use it to retrieve a domain you've already set.
+  # It's a getter and a setter. It's an attribute!
   #
   # If the domain is not provided and you use a URL pattern that asks for it, 
   # an exception will be raised.
-  def on_domain(domain)
-    parse_domain = URI.extract(domain)
-    raise ArgumentError, 'The domain must be a URL.' if parse_domain.empty?
-    @domain = parse_domain[0]
+  def domain(dom=nil)
+    raise ArgumentError, 'No domain provided' if (dom.nil? && @domain.nil?)
+    if (!dom.nil?)
+      parse_domain = URI.extract(dom)
+      raise ArgumentError, 'The domain must be a URL.' if parse_domain.empty?
+      @domain = parse_domain[0]
+    end
     return @domain
   end
+  alias on_domain domain
   
   # Sets a default format to make your Requests in.
   # Defaults to JSON.
-  def as_format(format) 
+  def format(format) 
     @default_format = format
   end
+  alias as_format format
   
   # Construct a URL pattern for your resources to follow.
   # You can use flags like
@@ -62,24 +68,28 @@ module Weary
   # * <format>
   # * <resource>
   # To aid your construction. Defaults to "<domain><resource>.<format>"
-  def construct_url(pattern)
+  def url(pattern)
     @url_pattern = pattern.to_s
   end
+  alias construct_url url
 
-  def authenticates_with(username,password)
+  def authenticates(username,password)
     @username = username
     @password = password
     return nil
   end
+  alias authenticates_with authenticates
   
-  def always_with(params)
+  def with(params)
     @always_with = params
   end
+  alias always_with with
   
   # Set custom Headers for your Request
-  def set_headers(headers)
+  def headers(headers)
     @headers = headers
   end
+  alias set_headers headers
 
   # Declare a resource. Use it with a block to setup the resource
   #

data/lib/weary/resource.rb

@@ -54,10 +54,10 @@ module Weary
         @requires.each { |key| params[key] = nil unless params.has_key?(key) }
         @with = params
       else
-        unless @requires.nil?
-          @with = params.collect {|x| x.to_sym} | @requires
-        else
+        if @requires.nil?
           @with = params.collect {|x| x.to_sym}
+        else
+          @with = params.collect {|x| x.to_sym} | @requires
         end
       end
     end

data/weary.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{weary}
-  s.version = "0.4.1"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Wunsch"]
-  s.date = %q{2009-06-24}
+  s.date = %q{2009-06-30}
   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.4.1
+  version: 0.4.3
 platform: ruby
 authors: 
 - Mark Wunsch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-24 00:00:00 -04:00
+date: 2009-06-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency