weary 0.1.0 → 0.1.2

data/.gitignore

@@ -1,2 +1,2 @@
-examples
-pkg
+pkg/
+doc/

data/Rakefile

@@ -3,17 +3,25 @@ require 'spec/rake/spectask'
 
 task :default => :spec
 
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = 'doc'
+  rdoc.title    = 'weary'
+  rdoc.main     = 'README.md'
+  rdoc.rdoc_files.include('README.*', 'lib/**/*.rb', 'LICENSE')
+  rdoc.options  << '--inline-source'
+end
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "weary"
+    gemspec.rubyforge_project = "weary"
     gemspec.summary = "A little DSL for consuming RESTful web services"
     gemspec.email = "mark@markwunsch.com"
     gemspec.homepage = "http://github.com/mwunsch/weary"
     gemspec.description = "The Weary need REST: a tiny DSL that makes the consumption of RESTful web services simple."
     gemspec.authors = "Mark Wunsch"
-    gemspec.has_rdoc = false
-    gemspec.rubyforge_project = "weary"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"  
@@ -35,7 +43,7 @@ begin
 
         host = "#{config['username']}@rubyforge.org"
         remote_dir = "/var/www/gforge-projects/weary/"
-        local_dir = 'rdoc'
+        local_dir = 'doc'
 
         Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
       end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/examples/repo.rb

@@ -0,0 +1,21 @@
+require File.join(File.dirname(__FILE__), '..', 'lib', 'weary')
+
+class Repository
+  extend Weary
+  
+  @gh_user = "mwunsch"
+  @gh_repo = "weary"
+  
+  on_domain "http://github.com/api/v2/"
+  as_format :yaml
+  
+  get "show",
+      :url => "<domain><format>/repos/show/#{@gh_user}/#{@gh_repo}"
+      
+  get "network",
+      :url => "<domain><format>/repos/show/#{@gh_user}/#{@gh_repo}/network"
+      
+end
+
+weary = Repository.new
+puts weary.show.body

data/examples/status.rb

@@ -0,0 +1,16 @@
+require File.join(File.dirname(__FILE__), '..', 'lib', 'weary')
+
+class Status
+  extend Weary
+  
+  on_domain "http://twitter.com/statuses/"
+  
+  get "user_timeline",
+      :requires => [:id],
+      :with => [:user_id, :screen_name, :since_id, :max_id, :count, :page]
+  
+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']}\""

data/lib/weary.rb

@@ -38,17 +38,14 @@ module Weary
     raise ArgumentError, 'The domain must be a URL.' if parse_domain.empty?
     @domain = parse_domain[0]
   end
-  alias domain= on_domain
 
   def as_format(format)
     @default_format = format.to_sym
   end
-  alias format= as_format
   
   def construct_url(pattern)
     @url_pattern = pattern.to_s
   end
-  alias url= construct_url
 
   def authenticates_with(username,password)
     @username = username
@@ -127,19 +124,22 @@ module Weary
         end
       end
       unless resource.with.nil?
-        with = %Q\[#{resource.with.collect {|x| ":#{x}"}.join(',')}]\
-        code << "unnecessary = params.keys - #{with} \n"
-        code << "unnecessary.each { |x| params.delete(x) } \n"
+        with = %Q{[#{resource.with.collect {|x| ":#{x}"}.join(',')}]}
+        code << %Q{unnecessary = params.keys - #{with} \n}
+        code << %Q{unnecessary.each { |x| params.delete(x) } \n}
       end
       if resource.via == (:post || :put)
-        code << "options[:body] = params unless params.empty? \n"
+        code << %Q{options[:body] = params unless params.empty? \n}
       else
-        code << "options[:query] = params unless params.empty? \n"
+        code << %Q{options[:query] = params unless params.empty? \n}
         code << %Q{url << "?" + options[:query].to_params unless options[:query].nil? \n}
       end
       if resource.authenticates?
         code << %Q{options[:basic_auth] = {:username => "#{@username}", :password => "#{@password}"} \n}
       end
+      unless resource.follows_redirects?
+        code << %Q{options[:no_follow] = true \n}
+      end
       code << %Q{
           Weary::Request.new(url, :#{resource.via}, options).perform
         end

data/lib/weary/resource.rb

@@ -62,12 +62,12 @@ module Weary
     
     def to_hash
       {@name.to_sym => {:via => @via,
-                        :with => @with,
-                        :requires => @requires,
-                        :authenticates => authenticates?,
-                        :format => @format,
-                        :url => @url},
-                        :no_follow => !follows_redirects?}
+                       :with => @with,
+                       :requires => @requires,
+                       :no_follow => !follows_redirects?,
+                       :authenticates => authenticates?,
+                       :format => @format,
+                       :url => @url}}
     end
     
   end

data/spec/weary_spec.rb

@@ -15,11 +15,6 @@ describe Weary do
       @test.domain.should == "http://twitter.com/"
     end
     
-    it "should also be set by it's alias" do
-      @test.domain = "http://twitter.com/"
-      @test.domain.should == "http://twitter.com/"
-    end
-    
     it 'should raise an exception when a url is not present' do
       lambda { @test.on_domain("foobar") }.should raise_error
     end
@@ -36,11 +31,6 @@ describe Weary do
       @test.instance_variable_defined?(:@default_format).should == true
     end
     
-    it "should also be set by it's alias" do
-      @test.format = "xml"
-      @test.instance_variable_defined?(:@default_format).should == true
-    end
-    
     it 'should be a symbol' do
       @test.as_format("xml")
       @test.instance_variable_get(:@default_format).class.should == Symbol
@@ -53,11 +43,6 @@ describe Weary do
       @test.instance_variable_defined?(:@url_pattern).should == true
     end
     
-    it "should also be set by it's alias" do
-      @test.url = "<domain><resource>.<format>"
-      @test.instance_variable_defined?(:@url_pattern).should == true
-    end
-    
     it 'should be a string' do
       @test.construct_url(123)
       @test.instance_variable_get(:@url_pattern).class.should == String
@@ -74,7 +59,7 @@ describe Weary do
   
   describe "resource declaration" do  
     before do
-      @test.domain = "http://twitter.com/"
+      @test.on_domain "http://twitter.com/"
     end
     
     it "should adds a new resource" do
@@ -91,12 +76,12 @@ describe Weary do
     end
     
     it "should use the declared format, if a specific format is not defined" do
-      @test.format = :xml
+      @test.as_format :xml
       @test.declare_resource("resource")[:resource][:format].should == :xml
     end
     
     it "should override the default format with it's own format" do
-      @test.format = :xml
+      @test.as_format :xml
       @test.declare_resource("resource",{:format => :yaml})[:resource][:format].should == :yaml
     end
     

data/weary.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{weary}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Wunsch"]
-  s.date = %q{2009-06-08}
+  s.date = %q{2009-06-09}
   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 = [
@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION",
+     "examples/repo.rb",
+     "examples/status.rb",
      "lib/weary.rb",
      "lib/weary/exceptions.rb",
      "lib/weary/request.rb",
@@ -28,6 +30,7 @@ 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"]
@@ -37,7 +40,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/weary/request_spec.rb",
      "spec/weary_spec.rb",
-     "examples/test.rb"
+     "examples/repo.rb",
+     "examples/status.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: weary
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors: 
 - Mark Wunsch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 -04:00
+date: 2009-06-09 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,8 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- examples/repo.rb
+- examples/status.rb
 - lib/weary.rb
 - lib/weary/exceptions.rb
 - lib/weary/request.rb
@@ -36,7 +38,7 @@ files:
 - spec/weary/request_spec.rb
 - spec/weary_spec.rb
 - weary.gemspec
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/mwunsch/weary
 post_install_message: 
 rdoc_options: 
@@ -65,4 +67,5 @@ summary: A little DSL for consuming RESTful web services
 test_files: 
 - spec/weary/request_spec.rb
 - spec/weary_spec.rb
-- examples/test.rb
+- examples/repo.rb
+- examples/status.rb

data/examples/test.rb

@@ -1,4 +0,0 @@
-require File.join(File.dirname(__FILE__), '..', 'lib', 'weary')
-require 'pp'
-
-r = Weary::Request.new("http://markwunsch.com").perform.search("h1 a")