sinatra-mongo 0.0.2 → 0.1.0

data/Rakefile

@@ -10,8 +10,9 @@ begin
     gem.email = "josh@technicalpickles.com"
     gem.homepage = "http://github.com/technicalpickles/sinatra-mongo"
     gem.authors = ["Joshua Nichols"]
-    gem.version = "0.0.2"
+    gem.version = "0.1.0"
     gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rack-test", ">= 0.5.3"
     gem.add_dependency "mongo"
     gem.add_dependency 'sinatra',    '>= 0.9.4'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/lib/sinatra/mongo.rb

@@ -1,4 +1,4 @@
-require 'sinatra'
+require 'sinatra/base'
 require 'mongo'
 
 module Sinatra
@@ -16,21 +16,24 @@ module Sinatra
     end
 
     def mongo
-      url = URI(mongo_url)
-      connection = Mongo::Connection.new(url.host, url.port)
-      @mongo ||= begin
-                   mongo = connection.db(url.path[1..-1])
-                   if url.user && url.password
-                     mongo.authenticate(url.user, url.password)
-                   end
-                   mongo
-                 end
+      synchronize do
+        @mongo ||= (
+          url = URI(mongo_url)
+          connection = Mongo::Connection.new(url.host, url.port)
+          mongo = connection.db(url.path[1..-1], mongo_settings)
+          if url.user && url.password
+            mongo.authenticate(url.user, url.password)
+          end
+          mongo
+        )
+      end
     end
 
     protected
 
     def self.registered(app)
       app.set :mongo_url, ENV['MONGO_URL'] || 'mongo://127.0.0.1:27017/default'
+      app.set :mongo_settings, Hash.new
       app.helpers MongoHelper
     end
 

data/sinatra-mongo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-mongo}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joshua Nichols"]
-  s.date = %q{2009-12-10}
+  s.date = %q{2010-05-06}
   s.description = %q{= sinatra-mongo
 
 Extends Sinatra with an extension method for dealing with monogodb using the ruby driver.
@@ -63,28 +63,40 @@ Copyright (c) 2009 Joshua Nichols. See LICENSE for details.
   s.email = %q{josh@technicalpickles.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "lib/sinatra/mongo.rb",
-     "sinatra-mongo.gemspec",
-     "spec/sinatra-mongo_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".gitignore",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "lib/sinatra/mongo.rb",
+    "sinatra-mongo.gemspec",
+    "spec/fixtures/classic_app.rb",
+    "spec/fixtures/modular_app.rb",
+    "spec/sinatra-mongo_classic_style_spec.rb",
+    "spec/sinatra-mongo_modular_style_spec.rb",
+    "spec/sinatra-mongo_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/support/rack_test.rb",
+    "spec/support/shared_examples.rb"
   ]
   s.homepage = %q{http://github.com/technicalpickles/sinatra-mongo}
   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{A light extension to sinatra for using mongo}
   s.test_files = [
+    "spec/fixtures/classic_app.rb",
+    "spec/fixtures/modular_app.rb",
+    "spec/sinatra-mongo_classic_style_spec.rb",
+    "spec/sinatra-mongo_modular_style_spec.rb",
     "spec/sinatra-mongo_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/support/rack_test.rb",
+    "spec/support/shared_examples.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -93,15 +105,18 @@ Copyright (c) 2009 Joshua Nichols. See LICENSE for details.
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rack-test>, [">= 0.5.3"])
       s.add_runtime_dependency(%q<mongo>, [">= 0"])
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rack-test>, [">= 0.5.3"])
       s.add_dependency(%q<mongo>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0.9.4"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rack-test>, [">= 0.5.3"])
     s.add_dependency(%q<mongo>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0.9.4"])
   end

data/spec/fixtures/classic_app.rb

@@ -0,0 +1,8 @@
+require 'sinatra'
+require 'sinatra/mongo'
+
+set :mongo, 'mongo://localhost:27017/sinatra-mongo-test'
+
+get '/' do
+  mongo['test_collection'].find_one.inspect
+end

data/spec/fixtures/modular_app.rb

@@ -0,0 +1,13 @@
+require 'sinatra/base'
+require 'sinatra/mongo'
+
+class ModularApp < Sinatra::Base
+  register Sinatra::MongoExtension
+
+  set :mongo, 'mongo://localhost:27017/sinatra-mongo-test'
+
+  get '/' do
+    mongo['test_collection'].find_one.inspect
+  end
+end
+

data/spec/sinatra-mongo_classic_style_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'fixtures/classic_app'
+
+describe 'a classic style sinatra app' do
+  include Rack::Test::Methods
+
+  def app
+    Sinatra::Application
+  end
+
+  it_should_behave_like 'all sinatra-mongo test apps'
+
+end

data/spec/sinatra-mongo_modular_style_spec.rb

@@ -0,0 +1,13 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'fixtures/modular_app'
+
+describe 'a modular style sinatra app' do
+  include Rack::Test::Methods
+
+  def app
+    ModularApp
+  end
+
+  it_should_behave_like 'all sinatra-mongo test apps'
+
+end

data/spec/sinatra-mongo_spec.rb

@@ -1,7 +1,78 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "SinatraMongo" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe "Sinatra::MongoExtension" do
+  before(:each) do
+    @app = Sinatra.new
+    @app.register Sinatra::MongoExtension
+  end
+
+  describe '#mongo' do
+    it 'creates and returns a Mongo::DB instance' do
+      @app.mongo.should be_kind_of(Mongo::DB)
+    end
+
+    it 'defaults to a db on localhost called default' do
+      @app.mongo.connection.host.should == '127.0.0.1'
+      @app.mongo.connection.port.should == 27017
+      @app.mongo.name.should            == 'default'
+    end
+
+    context 'mongo_url is set' do
+      before(:each) do
+        @mongo_url = 'mongo://127.0.0.1:27017/test'
+        @app.mongo  = @mongo_url
+      end
+
+      it 'creates the Mongo::DB instance with the supplied uri' do
+        @app.mongo.connection.host.should == '127.0.0.1'
+        @app.mongo.connection.port.should == 27017
+        @app.mongo.name.should            == 'test'
+      end
+    end
+  end
+
+  describe '#mongo=' do
+    before(:each) do
+      @mongo_uri  = 'mongo://127.0.0.1:27017/test'
+      @mongo      = mock('mongo')
+      @app.stub!(:mongo).and_return(@mongo)
+    end
+
+    it 'sets the mongo_url environment variable' do
+      @app.mongo = @mongo_uri
+      @app.mongo_url.should == @mongo_uri
+    end
+
+    it 'calls the #mongo method' do
+      @app.should_receive(:mongo)
+      @app.mongo = @mongo_uri
+    end
+  end
+end
+
+describe 'registration of the extension' do
+  before(:each) do
+    @app = Sinatra.new
+  end
+
+  it 'sets the mongo_url variable' do
+    @app.register(Sinatra::MongoExtension)
+    @app.mongo_url.should == 'mongo://127.0.0.1:27017/default'
+  end
+
+  context "ENV['MONGO_URL'] is set" do
+    before(:each) do
+      @mongo_url        = 'mongo://127.0.0.1:27017/via_mongo_url_env'
+      ENV['MONGO_URL']  = @mongo_url
+      @app.register(Sinatra::MongoExtension)
+    end
+    it 'sets the mongo_url variable to the value of the env variable' do
+      @app.mongo_url.should == @mongo_url
+    end
+  end
+
+  it 'calls helpers with MongoHelper' do
+    @app.should_receive(:helpers).with(Sinatra::MongoHelper)
+    @app.register(Sinatra::MongoExtension)
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,12 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'sinatra-mongo'
+require 'sinatra/mongo'
 require 'spec'
 require 'spec/autorun'
 
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
+
 Spec::Runner.configure do |config|
-  
 end

data/spec/support/rack_test.rb

@@ -0,0 +1 @@
+require 'rack/test'

data/spec/support/shared_examples.rb

@@ -0,0 +1,17 @@
+shared_examples_for 'all sinatra-mongo test apps' do
+  describe 'GET /' do
+    before(:each) do
+      3.times { |i| mongo['test_collection'].insert({'x' => i }) }
+    end
+
+    after(:each) do
+      mongo['test_collection'].remove
+    end
+
+    it 'fetches and shows the first element in test_collection' do
+      get '/' do |response|
+        response.body.should match('"x"=>0')
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-mongo
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Joshua Nichols
@@ -9,39 +14,63 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 -05:00
+date: 2010-05-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack-test
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 3
+        version: 0.5.3
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongo
-  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
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  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
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id004
 description: |
   = sinatra-mongo
   
@@ -109,9 +138,15 @@ files:
 - Rakefile
 - lib/sinatra/mongo.rb
 - sinatra-mongo.gemspec
+- spec/fixtures/classic_app.rb
+- spec/fixtures/modular_app.rb
+- spec/sinatra-mongo_classic_style_spec.rb
+- spec/sinatra-mongo_modular_style_spec.rb
 - spec/sinatra-mongo_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/support/rack_test.rb
+- spec/support/shared_examples.rb
 has_rdoc: true
 homepage: http://github.com/technicalpickles/sinatra-mongo
 licenses: []
@@ -125,21 +160,29 @@ 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: A light extension to sinatra for using mongo
 test_files: 
+- spec/fixtures/classic_app.rb
+- spec/fixtures/modular_app.rb
+- spec/sinatra-mongo_classic_style_spec.rb
+- spec/sinatra-mongo_modular_style_spec.rb
 - spec/sinatra-mongo_spec.rb
 - spec/spec_helper.rb
+- spec/support/rack_test.rb
+- spec/support/shared_examples.rb