monster_mash 0.2.3 → 0.3.0

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+Current master
+----------------------
+* added more Typhoeus options [ezkl]
+* Accidentally removed `params`, fixed. [darkel]
+
 0.2.3
 -----
 * bumped typhoeus to 0.2.4 to fix POST forms

data/Gemfile

@@ -1,9 +1,9 @@
 source :rubygems
 
-gem 'typhoeus', '>= 0.2.4'
+gem 'typhoeus', '>= 0.3.3'
 
 group :test do
-  gem 'rspec', '1.3.1'
+  gem 'rspec', '~> 2.6'
   gem 'json'
   gem 'vcr', '>= 1.3.0'
 end

data/Gemfile.lock

@@ -1,19 +1,26 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    json (1.4.6)
-    mime-types (1.16)
-    rspec (1.3.1)
-    typhoeus (0.2.4)
+    diff-lcs (1.1.2)
+    json (1.5.3)
+    mime-types (1.17.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    typhoeus (0.3.3)
       mime-types
-      mime-types
-    vcr (1.3.0)
+    vcr (1.10.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   json
-  rspec (= 1.3.1)
-  typhoeus (>= 0.2.4)
+  rspec (~> 2.6)
+  typhoeus (>= 0.3.3)
   vcr (>= 1.3.0)

data/README.markdown

@@ -126,6 +126,23 @@ If you have Typhoeus settings you want to happen for every request, you can set
       # ...
     end
 
+If all of your requests share a common base URI, you can set that in your
+defaults block:
+
+    class GoogleJson < MonsterMash::Base
+      defaults do
+        base_uri "http://google.com"
+      end
+
+      get(:search) do
+        uri "/search" # expands to http://google.com/search
+      end
+
+      post(:authenticate) do
+        uri "https://auth.google.com" # ignores the base_uri
+      end
+    end
+
 As well, if you set `params` or `headers` in the `defaults` block, any `params` or `headers` added later will be `merge`d into the hash.
 
     class GoogleJson < MonsterMash::Base

data/Rakefile

@@ -10,8 +10,8 @@ begin
     gem.email = "dbalatero@gmail.com"
     gem.homepage = "http://github.com/dbalatero/monster_mash"
     gem.authors = ["David Balatero"]
-    gem.add_dependency "typhoeus", ">= 0.2.4"
-    gem.add_development_dependency "rspec", "1.3.1"
+    gem.add_dependency "typhoeus", ">= 0.3.3"
+    gem.add_development_dependency "rspec", "~> 2.6"
     gem.add_development_dependency "vcr", ">= 1.3.0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
@@ -26,12 +26,11 @@ RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

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

data/lib/monster_mash/request.rb

@@ -61,9 +61,17 @@ module MonsterMash
 
     def uri(value = nil)
       if value
-        @uri = value
+        @uri = base_uri ? URI.join(base_uri, value).to_s : value
       end
-      @uri
+
+      @uri || base_uri
+    end
+
+    def base_uri(value = nil)
+      if value
+        @base_uri = value
+      end
+      @base_uri
     end
 
     def handler(&block)
@@ -74,9 +82,7 @@ module MonsterMash
     end
 
     # Typhoeus options.
-    [:body, :headers, :timeout, :cache_timeout, :params,
-     :user_agent, :follow_location, :max_redirects, :verbose,
-     :proxy, :disable_ssl_peer_verification].each do |method|
+    Typhoeus::Request.options.each do |method|
       class_eval <<-EOF
         def #{method}(value = nil, &block)
           assign_or_return_option!(:#{method}, value, &block)

data/monster_mash.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{monster_mash}
-  s.version = "0.2.3"
+  s.name = "monster_mash"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Balatero"]
-  s.date = %q{2011-02-24}
-  s.description = %q{Provides a fun HTTP interface on top of Typhoeus!}
-  s.email = %q{dbalatero@gmail.com}
+  s.date = "2011-11-18"
+  s.description = "Provides a fun HTTP interface on top of Typhoeus!"
+  s.email = "dbalatero@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.markdown",
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".rspec",
     "CHANGELOG.markdown",
     "Gemfile",
     "Gemfile.lock",
@@ -36,13 +37,12 @@ Gem::Specification.new do |s|
     "spec/fixtures/vcr_cassettes/google/valid.yml",
     "spec/monster_mash/base_spec.rb",
     "spec/monster_mash/request_spec.rb",
-    "spec/spec.opts",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/dbalatero/monster_mash}
+  s.homepage = "http://github.com/dbalatero/monster_mash"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Provides a fun HTTP interface on top of Typhoeus!}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Provides a fun HTTP interface on top of Typhoeus!"
   s.test_files = [
     "spec/monster_mash/base_spec.rb",
     "spec/monster_mash/request_spec.rb",
@@ -50,24 +50,23 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0.2.4"])
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0.2.4"])
-      s.add_development_dependency(%q<rspec>, ["= 1.3.1"])
+      s.add_runtime_dependency(%q<typhoeus>, [">= 0.3.3"])
+      s.add_runtime_dependency(%q<typhoeus>, [">= 0.3.3"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.6"])
       s.add_development_dependency(%q<vcr>, [">= 1.3.0"])
     else
-      s.add_dependency(%q<typhoeus>, [">= 0.2.4"])
-      s.add_dependency(%q<typhoeus>, [">= 0.2.4"])
-      s.add_dependency(%q<rspec>, ["= 1.3.1"])
+      s.add_dependency(%q<typhoeus>, [">= 0.3.3"])
+      s.add_dependency(%q<typhoeus>, [">= 0.3.3"])
+      s.add_dependency(%q<rspec>, ["~> 2.6"])
       s.add_dependency(%q<vcr>, [">= 1.3.0"])
     end
   else
-    s.add_dependency(%q<typhoeus>, [">= 0.2.4"])
-    s.add_dependency(%q<typhoeus>, [">= 0.2.4"])
-    s.add_dependency(%q<rspec>, ["= 1.3.1"])
+    s.add_dependency(%q<typhoeus>, [">= 0.3.3"])
+    s.add_dependency(%q<typhoeus>, [">= 0.3.3"])
+    s.add_dependency(%q<rspec>, ["~> 2.6"])
     s.add_dependency(%q<vcr>, [">= 1.3.0"])
   end
 end

data/spec/monster_mash/request_spec.rb

@@ -113,6 +113,39 @@ describe MonsterMash::Request do
       @request.uri "http://google.com"
       @request.uri.should == "http://google.com"
     end
+
+    context "when a base uri is set" do
+      before do
+        @request.base_uri "http://google.com"
+      end
+
+      it "joins the two uris" do
+        @request.uri "/test"
+        @request.uri.should eq "http://google.com/test"
+      end
+
+      it "can be overridden" do
+        @request.uri "http://test.local"
+        @request.uri.should eq "http://test.local"
+      end
+
+      context "but no uri is specified" do
+        it "defaults to the base uri" do
+          @request.uri.should eq "http://google.com"
+        end
+      end
+    end
+  end
+
+  describe "#base_uri" do
+    before(:each) do
+      @request = MonsterMash::Request.new(:get)
+    end
+
+    it "should set the base uri, and return it" do
+      @request.base_uri "http://google.com"
+      @request.base_uri.should eq "http://google.com"
+    end
   end
 
   describe "method_missing methods" do

data/spec/spec_helper.rb

@@ -1,8 +1,8 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'monster_mash'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 require 'json'
 require 'vcr'
 
@@ -11,6 +11,6 @@ VCR.config do |c|
   c.stub_with :typhoeus
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.extend VCR::RSpec::Macros
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: monster_mash
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - David Balatero
@@ -15,61 +15,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -08:00
-default_executable: 
+date: 2011-11-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 21
         segments: 
         - 0
-        - 2
-        - 4
-        version: 0.2.4
+        - 3
+        - 3
+        version: 0.3.3
+  version_requirements: *id001
   name: typhoeus
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  type: :runtime
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 21
         segments: 
         - 0
-        - 2
-        - 4
-        version: 0.2.4
+        - 3
+        - 3
+        version: 0.3.3
+  version_requirements: *id002
   name: typhoeus
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 15
         segments: 
-        - 1
-        - 3
-        - 1
-        version: 1.3.1
+        - 2
+        - 6
+        version: "2.6"
+  version_requirements: *id003
   name: rspec
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  type: :development
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -80,8 +76,10 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
+  version_requirements: *id004
   name: vcr
-  requirement: *id004
+  prerelease: false
+  type: :development
 description: Provides a fun HTTP interface on top of Typhoeus!
 email: dbalatero@gmail.com
 executables: []
@@ -94,6 +92,7 @@ extra_rdoc_files:
 - README.markdown.html
 files: 
 - .document
+- .rspec
 - CHANGELOG.markdown
 - Gemfile
 - Gemfile.lock
@@ -111,10 +110,8 @@ files:
 - spec/fixtures/vcr_cassettes/google/valid.yml
 - spec/monster_mash/base_spec.rb
 - spec/monster_mash/request_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - README.markdown.html
-has_rdoc: true
 homepage: http://github.com/dbalatero/monster_mash
 licenses: []
 
@@ -144,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Provides a fun HTTP interface on top of Typhoeus!