weary 1.0.0 → 1.0.1

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    weary (1.0.0)
+    weary (1.0.1)
       addressable (~> 2.2.7)
-      multi_json (~> 1.1.0)
+      multi_json (~> 1.2.0)
       promise (~> 0.3.0)
       rack (~> 1.4.0)
       simple_oauth (~> 0.1.5)
@@ -14,7 +14,7 @@ GEM
     addressable (2.2.7)
     crack (0.3.1)
     diff-lcs (1.1.3)
-    multi_json (1.1.0)
+    multi_json (1.2.0)
     promise (0.3.0)
     rack (1.4.1)
     rake (0.9.2.2)

data/README.md

@@ -47,7 +47,7 @@ This is a basic example of a client you will build using the Weary framework. If
 Inherit from `Weary::Client` for a set of class methods that craft "Resources" (more on that later).
 
 ```ruby
-MyClass < Weary::Client
+class MyClass < Weary::Client
   get :resource, "http://host.com/path/to/resource" do |resource|
     resource.optional :optional_parameter
   end

data/lib/weary/middleware/basic_auth.rb

@@ -3,7 +3,7 @@ module Weary
     class BasicAuth
       AUTH_HEADER = "HTTP_AUTHORIZATION"
 
-      def initialize(app, credentials)
+      def initialize(app, *credentials)
         @app = app
         @auth = [credentials.join(':')].pack('m*')
       end

data/lib/weary/resource.rb

@@ -22,7 +22,7 @@ module Weary
     #
     # Returns an Addressable::Template
     def url(uri=nil)
-      @uri = Addressable::Template.new(uri.gsub(/:(\w+)/) { "{#{$1}}" }) unless uri.nil?
+      @uri = Addressable::Template.new(uri.gsub(/:(?![0-9])(\w+)/) { "{#{$1}}" }) unless uri.nil?
       @uri
     end
 
@@ -156,4 +156,4 @@ module Weary
 
 
   end
-end
+end

data/lib/weary/version.rb

@@ -1,3 +1,3 @@
 module Weary
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/weary/resource_spec.rb

@@ -32,6 +32,12 @@ describe Weary::Resource do
       resource = Weary::Resource.new "GET", url
       resource.url.variables.should include 'user'
     end
+
+    it "accepts port numbers in the url" do
+      url = "http://localhost:3000/api/v2/"
+      resource = Weary::Resource.new "GET", url
+      resource.url.variables.should_not include '3000'
+    end
   end
 
   describe "#optional" do
@@ -253,4 +259,4 @@ describe Weary::Resource do
       req.params.should eql "user_id=markwunsch"
     end
   end
-end
+end

data/weary.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "addressable", "~> 2.2.7"
   s.add_runtime_dependency "promise", "~> 0.3.0"
   s.add_runtime_dependency "simple_oauth", "~> 0.1.5"
-  s.add_runtime_dependency "multi_json", "~> 1.1.0"
+  s.add_runtime_dependency "multi_json", "~> 1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weary
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70118788987500 !ruby/object:Gem::Requirement
+  requirement: &70166012867980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70118788987500
+  version_requirements: *70166012867980
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70118788986800 !ruby/object:Gem::Requirement
+  requirement: &70166012867300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *70118788986800
+  version_requirements: *70166012867300
 - !ruby/object:Gem::Dependency
   name: promise
-  requirement: &70118788985960 !ruby/object:Gem::Requirement
+  requirement: &70166012866680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70118788985960
+  version_requirements: *70166012866680
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70118788985280 !ruby/object:Gem::Requirement
+  requirement: &70166012866020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +54,18 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70118788985280
+  version_requirements: *70166012866020
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70118788984680 !ruby/object:Gem::Requirement
+  requirement: &70166012864500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70118788984680
+  version_requirements: *70166012864500
 description: ! 'A framework and DSL to construct Ruby clients to RESTful web services. '
 email: mark@markwunsch.com
 executables: []
@@ -125,18 +125,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -931495693225517600
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -931495693225517600
 requirements: []
 rubyforge_project: weary
 rubygems_version: 1.8.11