octopus 0.0.1 → 0.0.2

data/Rakefile

@@ -10,15 +10,15 @@ begin
     gem.email = "dave.hrycyszyn@headlondon.com"
     gem.homepage = "http://github.com/futurechimp/octopus"
     gem.authors = ["dave@boomer"]
-    gem.add_dependency "datamapper", ">= 0.10.1"
-    gem.add_dependency "do_sqlite3", ">= 0.10.0"
-    gem.add_dependency "sinatra", ">= 0.9.4"
+    gem.add_dependency "data_mapper", ">= 1.0.0"
+    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 "rack-flash", ">= 0.1.1"
     gem.add_dependency "rack", ">= 1.0.1"
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 2.10.2"
+    gem.add_development_dependency "shoulda", ">= 2.10.2"
     gem.add_development_dependency "rack-test", ">= 0.5.2"
-    gem.add_development_dependency "notahat-machinist", ">= 1.0.3"
+    gem.add_development_dependency "machinist", ">= 1.0.3"
     # 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.0.1
+0.0.2

data/lib/init.rb

@@ -2,11 +2,12 @@
 #
 require 'rubygems'
 require 'sinatra'
-require 'datamapper'
+require 'data_mapper'
 require 'ruby-debug'
 require 'eventmachine'
 require 'rack-flash'
 require 'dm-validations'
+require 'dm-sqlite-adapter'
 
 
 # Extensions to Sinatra
@@ -40,6 +41,9 @@ end
 configure :production, :test, :development do
   NetResource.auto_migrate! unless NetResource.storage_exists?
   Subscription.auto_migrate! unless Subscription.storage_exists?
+end
+
+configure :production, :development do
   DataMapper.auto_upgrade!
 end
 

data/lib/octopus/grabbers/generic_http.rb

@@ -7,8 +7,6 @@ module Grabbers
     # starts grabbing expired resources and checking them.
     #
     def initialize
-      @@currently_encoding = false
-      puts "Initializing generic http grabber..."
       EM.add_periodic_timer(5) {
         check_expired_resources
       }

data/lib/octopus/models/subscription.rb

@@ -5,17 +5,20 @@ class Subscription
   include DataMapper::Resource
 
   # Properties
+  #
   property :id,         Serial
   property :url,        String,  :required => true, :length => (1..254)
   property :created_at, DateTime
   property :updated_at, DateTime
 
   # Associations
+  #
   belongs_to :net_resource
 
   # Validations
+  #
   validates_with_method :validate_url
-  validates_present :net_resource
+  validates_presence_of :net_resource
 
   # Checks that the url property is formatted correctly.
   #

data/octopus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{octopus}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["dave@boomer"]
-  s.date = %q{2010-05-13}
+  s.date = %q{2010-08-13}
   s.default_executable = %q{octopus}
   s.description = %q{Grabs stuff off the net and notifies interested subscribers.}
   s.email = %q{dave.hrycyszyn@headlondon.com}
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
      "octopus.gemspec",
      "test/helper.rb",
      "test/support/blueprints.rb",
+     "test/test_generic_http_grabber.rb",
      "test/test_net_resource.rb",
      "test/test_octopus.rb",
      "test/test_subscription.rb"
@@ -66,11 +67,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{An experimental octopus implementation.}
   s.test_files = [
-    "test/support/blueprints.rb",
-     "test/test_subscription.rb",
-     "test/test_net_resource.rb",
+    "test/test_net_resource.rb",
      "test/test_octopus.rb",
-     "test/helper.rb"
+     "test/support/blueprints.rb",
+     "test/helper.rb",
+     "test/test_generic_http_grabber.rb",
+     "test/test_subscription.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -78,36 +80,36 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<datamapper>, [">= 0.10.1"])
-      s.add_runtime_dependency(%q<do_sqlite3>, [">= 0.10.0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
+      s.add_runtime_dependency(%q<data_mapper>, [">= 1.0.0"])
+      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<rack-flash>, [">= 0.1.1"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0.1"])
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 2.10.2"])
+      s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_development_dependency(%q<rack-test>, [">= 0.5.2"])
-      s.add_development_dependency(%q<notahat-machinist>, [">= 1.0.3"])
+      s.add_development_dependency(%q<machinist>, [">= 1.0.3"])
     else
-      s.add_dependency(%q<datamapper>, [">= 0.10.1"])
-      s.add_dependency(%q<do_sqlite3>, [">= 0.10.0"])
-      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+      s.add_dependency(%q<data_mapper>, [">= 1.0.0"])
+      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<rack-flash>, [">= 0.1.1"])
       s.add_dependency(%q<rack>, [">= 1.0.1"])
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10.2"])
+      s.add_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_dependency(%q<rack-test>, [">= 0.5.2"])
-      s.add_dependency(%q<notahat-machinist>, [">= 1.0.3"])
+      s.add_dependency(%q<machinist>, [">= 1.0.3"])
     end
   else
-    s.add_dependency(%q<datamapper>, [">= 0.10.1"])
-    s.add_dependency(%q<do_sqlite3>, [">= 0.10.0"])
-    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+    s.add_dependency(%q<data_mapper>, [">= 1.0.0"])
+    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<rack-flash>, [">= 0.1.1"])
     s.add_dependency(%q<rack>, [">= 1.0.1"])
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 2.10.2"])
+    s.add_dependency(%q<shoulda>, [">= 2.10.2"])
     s.add_dependency(%q<rack-test>, [">= 0.5.2"])
-    s.add_dependency(%q<notahat-machinist>, [">= 1.0.3"])
+    s.add_dependency(%q<machinist>, [">= 1.0.3"])
   end
 end
 

data/test/test_generic_http_grabber.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/helper'
+
+class GenericHttpGrabberTest <  Test::Unit::TestCase
+
+  context "The GenericHttpGrabber" do
+  end
+
+end
+

data/test/test_net_resource.rb

@@ -55,7 +55,6 @@ class NetResourceTest <  Test::Unit::TestCase
   end
 
   context "The NetResource class" do
-
     should "have an 'expired' named scope" do
       # First, set all existing resources to expire tomorrow and give them a
       # next_update time of 20 seconds.

data/test/test_octopus.rb

@@ -108,40 +108,67 @@ class OctopusTest <  Test::Unit::TestCase
     end
   end
 
-  def test_new_or_edit_for_new_resource
-    post '/new_or_edit', {:net_resource => {
-      :url => "http://news.bbc.co.uk/foo/bar/#{DateTime.now.to_s}/blah.rss"
-      }}, basic_auth_creds
-    follow_redirect!
-    assert_equal "http://example.org/new", last_request.url
-  end
+  context "on POST to new_or_edit" do
+    context "for a new NetResource" do
+      setup do
+        post '/new_or_edit', {:net_resource => {
+          :url => "http://news.bbc.co.uk/foo/bar/#{DateTime.now.to_s}/blah.rss"
+          }}, basic_auth_creds
+        follow_redirect!
+      end
+      should "go to :new action" do
+        assert_equal "http://example.org/new", last_request.url
+      end
+    end
 
-  def test_new_or_edit_for_existing_resource
-    NetResource.make
-    post '/new_or_edit', {:net_resource => {
-      :url => NetResource.first.url
-      }}, basic_auth_creds
-    follow_redirect!
-    assert_equal "http://example.org/edit/#{NetResource.first.id}", last_request.url
-  end
+    context "for an existing NetResource" do
+      setup do
+        NetResource.make
+        post '/new_or_edit', {:net_resource => {
+          :url => NetResource.first.url
+          }}, basic_auth_creds
+        follow_redirect!
+      end
+      should "go to :show action" do
+        assert_equal "http://example.org/edit/#{NetResource.first.id}", last_request.url
+      end
 
-  def test_update
-    n = NetResource.make
-    put "/update/#{n.id}", {:id => n.id, :net_resource => {:update_period => 666}}, basic_auth_creds
-    follow_redirect!
-    assert_equal "http://example.org/", last_request.url
-    assert_equal NetResource.first.update_period, 666
+    end
   end
 
-  def test_bad_update_redisplays
-    NetResource.make
-    NetResource.first.update(:update_period => 60)
-    put "/update/#{NetResource.first.id}", {:net_resource => {:update_period => 10}}, basic_auth_creds
-    assert last_response.ok?
-    assert_equal "http://example.org/update/#{NetResource.first.id}", last_request.url
-    assert_equal NetResource.first.update_period, 60
+  context "on PUT to update" do
+    context "with good params" do
+      setup do
+        n = NetResource.make
+        put "/update/#{n.id}", {:id => n.id, :net_resource => {:update_period => 666}}, basic_auth_creds
+        follow_redirect!
+        should "display /" do
+          assert_equal "http://example.org/", last_request.url
+        end
+        should "set the NetResource's update period" do
+          assert_equal NetResource.first.update_period, 666
+        end
+      end
+    end
+    context "with bad params" do
+      setup do
+        NetResource.make
+        NetResource.first.update(:update_period => 60)
+        put "/update/#{NetResource.first.id}", {:net_resource => {:update_period => 10}}, basic_auth_creds
+      end
+      should "succeed" do
+        assert last_response.ok?
+      end
+      should "redisplay" do
+        assert_equal "http://example.org/update/#{NetResource.first.id}", last_request.url
+      end
+      should "not set the update period" do
+        assert_equal NetResource.first.update_period, 60
+      end
+    end
   end
 
+
   private
 
   def clear_database

data/test/test_subscription.rb

@@ -5,8 +5,11 @@ class SubscriptionTest <  Test::Unit::TestCase
   context "A Subscription instance" do
 
     setup do
-      @resource = ::NetResource.new(:url => "http://example.org/foo.rss", :update_period => 25)
-      @resource.subscriptions << Subscription.new(:url => "http://example2.org/callback")
+      @resource = ::NetResource.new(
+        :url => "http://example.org/foo.rss",
+        :update_period => 25)
+      @resource.subscriptions << Subscription.new(
+        :url => "http://example2.org/callback")
       @subscription = ::Subscription.new
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - dave@boomer
@@ -14,35 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 +01:00
+date: 2010-08-13 00:00:00 +01:00
 default_executable: octopus
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: datamapper
+  name: data_mapper
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        - 10
         - 1
-        version: 0.10.1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: do_sqlite3
+  name: dm-sqlite-adapter
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 10
         - 0
-        version: 0.10.0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -53,10 +53,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 0
         - 0
-        - 9
-        - 4
-        version: 0.9.4
+        version: 1.0.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -102,7 +102,7 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  name: shoulda
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
@@ -130,7 +130,7 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: notahat-machinist
+  name: machinist
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
@@ -190,6 +190,7 @@ files:
 - octopus.gemspec
 - test/helper.rb
 - test/support/blueprints.rb
+- test/test_generic_http_grabber.rb
 - test/test_net_resource.rb
 - test/test_octopus.rb
 - test/test_subscription.rb
@@ -224,8 +225,9 @@ signing_key:
 specification_version: 3
 summary: An experimental octopus implementation.
 test_files: 
-- test/support/blueprints.rb
-- test/test_subscription.rb
 - test/test_net_resource.rb
 - test/test_octopus.rb
+- test/support/blueprints.rb
 - test/helper.rb
+- test/test_generic_http_grabber.rb
+- test/test_subscription.rb