monster_mash 0.1.1 → 0.1.2

data/CHANGELOG.markdown

@@ -0,0 +1,4 @@
+0.1.2
+------------
+* Fixed specs for Ruby 1.9.1, passed them.
+* Make sure to check HTTP status and raise/pass errors for handling.

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["David Balatero"]
     gem.add_dependency "typhoeus", ">= 0.1.25"
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_development_dependency "typhoeus_spec_cache", ">= 0.2.1"
+    gem.add_development_dependency "typhoeus_spec_cache", ">= 0.2.2"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/monster_mash/base.rb

@@ -93,6 +93,7 @@ module MonsterMash
         if hydra.nil?
           # serial request.
           response = request.run_serial_request
+          check_response_and_raise!(response)
           request.handler.call(response)
         else
           # parallel hydra request.
@@ -100,6 +101,7 @@ module MonsterMash
           typhoeus_request.on_complete do |response|
             result, error = nil, nil
             begin
+              check_response_and_raise!(response)
               result = request.handler.call(response)
             rescue => e
               error = e

data/monster_mash.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{monster_mash}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Balatero"]
-  s.date = %q{2010-05-15}
+  s.date = %q{2010-07-16}
   s.description = %q{Provides a fun HTTP interface on top of Typhoeus!}
   s.email = %q{dbalatero@gmail.com}
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     "CHANGELOG.markdown",
      "LICENSE",
      "README.markdown",
      "Rakefile",
@@ -54,16 +55,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<typhoeus>, [">= 0.1.25"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<typhoeus_spec_cache>, [">= 0.2.1"])
+      s.add_development_dependency(%q<typhoeus_spec_cache>, [">= 0.2.2"])
     else
       s.add_dependency(%q<typhoeus>, [">= 0.1.25"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<typhoeus_spec_cache>, [">= 0.2.1"])
+      s.add_dependency(%q<typhoeus_spec_cache>, [">= 0.2.2"])
     end
   else
     s.add_dependency(%q<typhoeus>, [">= 0.1.25"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<typhoeus_spec_cache>, [">= 0.2.1"])
+    s.add_dependency(%q<typhoeus_spec_cache>, [">= 0.2.2"])
   end
 end
 

data/spec/monster_mash/base_spec.rb

@@ -3,26 +3,26 @@ require File.dirname(__FILE__) + '/../spec_helper'
 class MockApi < MonsterMash::Base
 end
 
-describe MonsterMash::Base do
-  describe "inheriting defaults from superclasses" do
-    before(:all) do
-      class A < MonsterMash::Base
-        defaults do
-          cache_timeout 9999
-          timeout 500
-        end
-      end
+class CustomMockError < StandardError; end
 
-      class B < A
-      end
+class A < MonsterMash::Base
+  defaults do
+    cache_timeout 9999
+    timeout 500
+  end
+end
 
-      class C < A
-        defaults do
-          cache_timeout 100
-        end
-      end
-    end
+class B < A
+end
 
+class C < A
+  defaults do
+    cache_timeout 100
+  end
+end
+
+describe MonsterMash::Base do
+  describe "inheriting defaults from superclasses" do
     it "should propagate defaults to B" do
       B.defaults.should == A.defaults
       B.defaults.should have(1).thing
@@ -154,8 +154,6 @@ describe MonsterMash::Base do
     describe "error propagation" do
       typhoeus_spec_cache("spec/cache/errors") do |hydra|
         before(:all) do
-          class CustomMockError < StandardError; end
-
           MockApi.build_method(:get, :google_json2) do |search|
             uri 'http://ajax.googleapis.com/ajax/services/search/web'
             params({

data/spec/monster_mash/request_spec.rb

@@ -1,5 +1,19 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
+class ApplyDefaultsA < MonsterMash::Base
+  defaults do
+    timeout 100
+    cache_timeout 9999
+  end
+end
+
+class ApplyDefaultsB < ApplyDefaultsA
+  defaults do
+    timeout 50
+  end
+end
+
+
 describe MonsterMash::Request do
   describe "#new" do
     it "should evaluate the passed in block in context" do
@@ -45,21 +59,6 @@ describe MonsterMash::Request do
   end
 
   describe "#apply_defaults" do
-    before(:all) do
-      class ApplyDefaultsA < MonsterMash::Base
-        defaults do
-          timeout 100
-          cache_timeout 9999
-        end
-      end
-
-      class ApplyDefaultsB < ApplyDefaultsA
-        defaults do
-          timeout 50
-        end
-      end
-    end
-
     it "should apply the defaults in inheritance order" do
       request = MonsterMash::Request.new(:get)
       request.apply_defaults(ApplyDefaultsB.defaults)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Balatero
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-15 00:00:00 -07:00
+date: 2010-07-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,8 +55,8 @@ dependencies:
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 2
+        version: 0.2.2
   type: :development
   version_requirements: *id003
 description: Provides a fun HTTP interface on top of Typhoeus!
@@ -72,6 +72,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- CHANGELOG.markdown
 - LICENSE
 - README.markdown
 - Rakefile