octopus 0.0.5 → 0.0.6

data/Rakefile

@@ -14,6 +14,7 @@ begin
     gem.add_dependency "dm-sqlite-adapter", ">= 1.0.0"
     gem.add_dependency "sinatra", ">= 1.0.0"
     gem.add_dependency "thin", ">= 1.2.5"
+    gem.add_dependency "em-http-request"
     gem.add_dependency "rack-flash", ">= 0.1.1"
     gem.add_dependency "rack", ">= 1.0.1"
     gem.add_development_dependency "shoulda", ">= 2.10.2"

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/init.rb

@@ -8,6 +8,7 @@ require 'eventmachine'
 require 'rack-flash'
 require 'dm-validations'
 require 'dm-sqlite-adapter'
+require 'em-http-request'
 
 
 # Extensions to Sinatra

data/lib/octopus/grabbers/generic_http.rb

@@ -20,17 +20,19 @@ module Grabbers
     def check_expired_resources
       net_resources = ::NetResource.expired
       net_resources.each do |resource|
-        uri = URI.parse(resource.url)
-        conn = HttpClient2.connect uri.host, uri.port
+        http = EM::HttpRequest.new(resource.url).get
 
-        req = conn.get(uri.path)
-        req.callback{ |response|
+        http.callback{ |response|
           resource.set_next_update
           if resource_changed?(resource, response)
             notify_subscribers(resource)
             update_changed_resource(resource, response)
           end
         }
+        http.errback {|response|
+          # Do something here, maybe setting the resource
+          # to be not checked anymore.
+        }
       end
     end
 
@@ -50,7 +52,7 @@ module Grabbers
     #
     def resource_changed?(resource, response)
       changed = false
-      if response.content.hash != resource.last_modified_hash
+      if response.hash != resource.last_modified_hash
         changed = true
       end
     end
@@ -62,9 +64,9 @@ module Grabbers
     # time.
     #
     def update_changed_resource(resource, response)
-      resource.last_modified_hash = response.content.hash
+      resource.last_modified_hash = response.hash
       resource.last_updated = Time.now
-      resource.body = response.content
+      resource.body = response
       resource.save
     end
 

data/octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{octopus}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dave@boomer"]
-  s.date = %q{2010-11-09}
+  s.date = %q{2010-11-12}
   s.default_executable = %q{octopus}
   s.description = %q{Grabs stuff off the net and notifies interested subscribers.}
   s.email = %q{dave.hrycyszyn@headlondon.com}
@@ -84,6 +84,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<dm-sqlite-adapter>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<thin>, [">= 1.2.5"])
+      s.add_runtime_dependency(%q<em-http-request>, [">= 0"])
       s.add_runtime_dependency(%q<rack-flash>, [">= 0.1.1"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
@@ -94,6 +95,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dm-sqlite-adapter>, [">= 1.0.0"])
       s.add_dependency(%q<sinatra>, [">= 1.0.0"])
       s.add_dependency(%q<thin>, [">= 1.2.5"])
+      s.add_dependency(%q<em-http-request>, [">= 0"])
       s.add_dependency(%q<rack-flash>, [">= 0.1.1"])
       s.add_dependency(%q<rack>, [">= 1.0.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.2"])
@@ -105,6 +107,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dm-sqlite-adapter>, [">= 1.0.0"])
     s.add_dependency(%q<sinatra>, [">= 1.0.0"])
     s.add_dependency(%q<thin>, [">= 1.2.5"])
+    s.add_dependency(%q<em-http-request>, [">= 0"])
     s.add_dependency(%q<rack-flash>, [">= 0.1.1"])
     s.add_dependency(%q<rack>, [">= 1.0.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.2"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: octopus
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - dave@boomer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +00:00
+date: 2010-11-12 00:00:00 +00:00
 default_executable: octopus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,9 +83,23 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rack-flash
+  name: em-http-request
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rack-flash
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +111,11 @@ dependencies:
         - 1
         version: 0.1.1
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,11 +127,11 @@ dependencies:
         - 1
         version: 1.0.1
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,11 +143,11 @@ dependencies:
         - 2
         version: 2.10.2
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -145,11 +159,11 @@ dependencies:
         - 2
         version: 0.5.2
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: machinist
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -161,7 +175,7 @@ dependencies:
         - 3
         version: 1.0.3
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 description: Grabs stuff off the net and notifies interested subscribers.
 email: dave.hrycyszyn@headlondon.com
 executables: