quake 0.0.1 → 0.0.2

data/README.md

@@ -29,9 +29,11 @@ Fetch all the earthquakes from the past hour:
 
     events = Quake::Event.last_hour
 
-Fetch all the earthquakes from the past week with a magnitude of at least 2:
+Fetch all the earthquakes from the past [week|day|hour] with minimum and/or maximum magnitudes:
 
-    events = Quake::Event.last_week(2)
+    events = Quake::Event.last_week :min_magnitude => 3
+    events = Quake::Event.last_week :max_magnitude => 4
+    events = Quake::Event.last_week :min_magnitude => 3, :max_magnitude => 4
 
 Questions or Problems?
 ----------------------

data/lib/quake/event.rb

@@ -15,19 +15,19 @@ module Quake
     attr_accessor :nst
     attr_accessor :region
     
-    def self.last_week(minimum_magnitude=2.5)
+    def self.last_week(criteria = {:min_magnitude => 2.5, :max_magnitude => 10})
       raw_items = CSV.parse(Curl::Easy.perform(WEEK).body_str)
-      create_events(raw_items, minimum_magnitude)
+      create_events(raw_items, criteria)
     end
     
-    def self.last_day(minimum_magnitude=0)
+    def self.last_day(criteria = {:max_magnitude => 10})
       raw_items = CSV.parse(Curl::Easy.perform(DAY).body_str)
-      create_events(raw_items, minimum_magnitude)
+      create_events(raw_items, criteria)
     end
     
-    def self.last_hour(minimum_magnitude=0)
+    def self.last_hour(criteria = {:max_magnitude => 10})
       raw_items = CSV.parse(Curl::Easy.perform(HOUR).body_str)
-      create_events(raw_items, minimum_magnitude)
+      create_events(raw_items, criteria)
     end
     
     def initialize(raw)
@@ -45,14 +45,22 @@ module Quake
     
     private
     
-    def self.create_events(raw_items, minimum_magnitude)
+    def self.create_events(raw_items, criteria)
+      criteria[:max_magnitude] = 10 unless criteria[:max_magnitude]
       raw_items.shift
       events = []
       raw_items.each do |raw_item|
         event = Event.new(raw_item)
-        if event.magnitude >= minimum_magnitude
-          events << Event.new(raw_item)
+        valid_event = true
+        criteria.keys.each do |criterion|
+          case criterion
+          when :min_magnitude
+            valid_event = false unless event.magnitude >= criteria[criterion]
+          when :max_magnitude
+            valid_event = false unless event.magnitude <= criteria[criterion]
+          end
         end
+        events << Event.new(raw_item) if valid_event
       end
       events
     end

data/lib/quake/version.rb

@@ -1,3 +1,3 @@
 module Quake
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/tests/event_tests.rb

@@ -18,19 +18,32 @@ class EventTests < MiniTest::Unit::TestCase
     assert(events.count > 0)
   end
   
-  def test_recent_events_week_with_magnitude_of_two
-    events = Quake::Event.last_week(4)
-    events.each { assert(events[0].magnitude >= 4) }
+  def test_recent_events_week_with_min_magnitude_of_three
+    events = Quake::Event.last_week :min_magnitude => 3
+    events.each { assert(events[0].magnitude >= 3) }
   end
   
-  def test_recent_events_day_with_magnitude_of_two
-    events = Quake::Event.last_day(2)
+  def test_recent_events_day_with_min_magnitude_of_two
+    events = Quake::Event.last_day :min_magnitude => 2
     events.each { assert(events[0].magnitude >= 2) }
   end
   
-  def test_recent_events_hour_with_magnitude_of_two
-    events = Quake::Event.last_hour(1)
+  def test_recent_events_hour_with_min_magnitude_of_one
+    events = Quake::Event.last_hour :min_magnitude => 1
     events.each { assert(events[0].magnitude >= 1) }
   end
   
+  def test_recent_events_week_with_min_magnitude_of_three_max_magnitude_four
+    events = Quake::Event.last_week :min_magnitude => 3, :max_magnitude => 4
+    events.each do |event|
+      assert(event.magnitude >= 3)
+      assert(event.magnitude <= 4)
+    end
+  end
+  
+  def test_recent_events_hour_with_bogus_criteria
+    events = Quake::Event.last_hour :foo => 1
+    assert(events.count > 0)
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quake
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-17 00:00:00.000000000Z
+date: 2011-08-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70198107885880 !ruby/object:Gem::Requirement
+  requirement: &70213556338760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.7.15
   type: :runtime
   prerelease: false
-  version_requirements: *70198107885880
+  version_requirements: *70213556338760
 description: A library exposing the U.S. Geological Survey's real-time earthquake
   data
 email: