astrotrain 0.5.0 → 0.5.1

data/README

@@ -42,6 +42,6 @@ It's far from perfect, but definitely usable.
 TODO
 ====
 
-Gem package - I realize the load paths could be simplified a bunch, so a gem package will come soon.
 Docs
-bounced emails
+bounced emails (i've been rolling with http://github.com/whatcould/bounce-email for now)
+Mail gem, TMail is old school

data/Rakefile

@@ -19,7 +19,8 @@ begin
     gem.add_runtime_dependency "dm-validations", dm_ver # Validation framework
     gem.add_development_dependency "context"
     gem.add_development_dependency "rr"
-    gem.add_development_dependency "sinatra"
+    gem.add_development_dependency "sinatra", "~> 1.0.0"
+    gem.add_development_dependency "rack-test"
     gem.add_development_dependency "xmppr4-simple"
   end
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/astrotrain.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{astrotrain}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["technoweenie"]
-  s.date = %q{2010-01-16}
+  s.date = %q{2010-03-31}
   s.email = %q{technoweenie@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -78,7 +78,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/entp/astrotrain}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{email => http post}
   s.test_files = [
     "test/api_test.rb",
@@ -103,7 +103,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<dm-validations>, ["= 0.9.11"])
       s.add_development_dependency(%q<context>, [">= 0"])
       s.add_development_dependency(%q<rr>, [">= 0"])
-      s.add_development_dependency(%q<sinatra>, [">= 0"])
+      s.add_development_dependency(%q<sinatra>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
       s.add_development_dependency(%q<xmppr4-simple>, [">= 0"])
     else
       s.add_dependency(%q<addressable>, ["= 2.0.2"])
@@ -115,7 +116,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<dm-validations>, ["= 0.9.11"])
       s.add_dependency(%q<context>, [">= 0"])
       s.add_dependency(%q<rr>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<sinatra>, ["~> 1.0.0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<xmppr4-simple>, [">= 0"])
     end
   else
@@ -128,7 +130,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<dm-validations>, ["= 0.9.11"])
     s.add_dependency(%q<context>, [">= 0"])
     s.add_dependency(%q<rr>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<sinatra>, ["~> 1.0.0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<xmppr4-simple>, [">= 0"])
   end
 end

data/test/api_test.rb

@@ -7,22 +7,26 @@ class Astrotrain::ApiTest < Astrotrain::ApiTestCase
   end
 
   it "counts queue" do
-    assert_equal '2', get("/queue_size").body
+    get '/queue_size'
+    assert_equal '2', last_response.body
   end
 
   it "lists queue files" do
-    files = get("/queue").body.split("\n")
+    get '/queue'
+    files = last_response.body.split("\n")
     assert_equal 2, files.size
     assert files.include?(File.basename(@filename1))
     assert files.include?(File.basename(@filename2))
   end
 
   it "reads queue file" do
-    assert_equal 'boo!', get("/queue/#{File.basename(@filename1)}").body
+    get "/queue/#{File.basename(@filename1)}"
+    assert_equal 'boo!', last_response.body
   end
 
   it "does not read missing file" do
-    assert_equal "\"etc/passwd\" was not found.", get("/queue//etc/passwd").body
+    get "/queue//etc/passwd"
+    assert_equal "\"etc/passwd\" was not found.", last_response.body
   end
 end
 

data/test/test_helper.rb

@@ -6,16 +6,11 @@ require "context"
 require 'rr'
 require 'astrotrain'
 require 'astrotrain/api'
-require 'sinatra/test'
+require 'rack/test'
 
 module Astrotrain
   load File.dirname(__FILE__) do
-    DataMapper.setup(:default, {
-      :adapter  => "mysql",
-      :database => "astrotrain_test",
-      :username => "root",
-      :host     => "localhost"
-    })
+    DataMapper.setup(:default, 'sqlite3::memory:')
   end
 
   LoggedMail.auto_migrate!
@@ -46,7 +41,11 @@ module Astrotrain
   end
 
   class ApiTestCase < TestCase
-    include Sinatra::Test
+    def app
+      Sinatra::Application
+    end
+
+    include Rack::Test::Methods
   end
 end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: astrotrain
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - technoweenie
@@ -9,119 +14,170 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 -08:00
+date: 2010-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 2
         version: 2.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: tmail
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 3
+        - 1
         version: 1.2.3.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 11
         version: 0.9.11
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: dm-aggregates
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 11
         version: 0.9.11
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: dm-timestamps
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 11
         version: 0.9.11
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: dm-types
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 11
         version: 0.9.11
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: dm-validations
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 11
         version: 0.9.11
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: context
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rr
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: sinatra
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: xmppr4-simple
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id012
 description: 
 email: technoweenie@gmail.com
 executables: []
@@ -203,18 +259,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: email => http post