mordor 0.2.15 → 0.2.16

data/.travis.yml

@@ -3,6 +3,9 @@ language: ruby
 jdk:
   - oraclejdk7
 
+services:
+  - mongodb
+
 rvm:
   - 1.8.7
   - 1.9.2

data/Gemfile

@@ -8,7 +8,7 @@ source "http://rubygems.org"
 gem "rake"
 gem "extlib"
 gem "mongo"
-gem "bson"
+gem "bson_ext", :platforms => :ruby
 gem "json"
 
 group :test do

data/Gemfile.lock

@@ -1,30 +1,38 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    bson (1.6.4)
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    bson (1.8.0)
+      activesupport
+    bson_ext (1.8.0)
+      bson (~> 1.8.0)
     diff-lcs (1.1.3)
     extlib (0.9.15)
-    json (1.7.3)
-    mongo (1.6.4)
-      bson (~> 1.6.4)
+    i18n (0.6.1)
+    json (1.7.5)
+    mongo (1.8.0)
+      bson (~> 1.8.0)
+    multi_json (1.5.0)
     rack (1.4.1)
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
+    rspec-mocks (2.12.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bson
+  bson_ext
   extlib
   json
   mongo

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2012 J.W. Koelewijn
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/mordor.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'rational'
 require 'mongo'
 require 'extlib'
 require 'json'

data/lib/mordor/resource.rb

@@ -136,7 +136,7 @@ module Mordor
       end
 
       def collection
-        connection.collection(self.collection_name)
+        database.collection(self.collection_name)
       end
 
       def collection_name
@@ -155,12 +155,14 @@ module Mordor
         end
       end
 
-      def connection
-        unless @connection
-          @connection = Mongo::Connection.new(Mordor::Config[:hostname], Mordor::Config[:port])
-          @connection.autenticate(Mordor::Config[:username], Mordor::Config[:password]) if Mordor::Config[:username]
+      def database
+        unless @db
+          connection = Mongo::Connection.new(Mordor::Config[:hostname], Mordor::Config[:port])
+          @db = connection.db(Mordor::Config[:database])
+          @db.authenticate(Mordor::Config[:username], Mordor::Config[:password]) if Mordor::Config[:username]
         end
-        @connection.db(Mordor::Config[:database])
+
+        @db
       end
 
       def find_by_id(id)

data/mordor.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "mordor"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "0.2.15"
-  s.date    = "2012-06-21"
+  s.version = "0.2.16"
+  s.date    = "2012-12-17"
 
   s.summary     = "mordor"
   s.description = <<-eos
@@ -27,6 +27,6 @@ Gem::Specification.new do |s|
 
   # The files and test_files directives are set automatically by the release script.
   # Do not change them by hand, but make sure to add the files to the git repository.
-  s.files = %w(.gitignore .travis.yml Gemfile Gemfile.lock README.md Rakefile lib/mordor.rb lib/mordor/collection.rb lib/mordor/config.rb lib/mordor/resource.rb lib/mordor/version.rb mordor.gemspec spec/mordor/collection_spec.rb spec/mordor/connection_spec.rb spec/mordor/resource_spec.rb spec/spec.opts spec/spec_helper.rb tasks/github-gem.rake)
+  s.files = %w(.gitignore .travis.yml Gemfile Gemfile.lock LICENSE README.md Rakefile lib/mordor.rb lib/mordor/collection.rb lib/mordor/config.rb lib/mordor/resource.rb lib/mordor/version.rb mordor.gemspec spec/mordor/collection_spec.rb spec/mordor/connection_spec.rb spec/mordor/resource_spec.rb spec/spec.opts spec/spec_helper.rb tasks/github-gem.rake)
 end
 

data/spec/mordor/collection_spec.rb

@@ -1,18 +1,22 @@
 require File.join(File.dirname(__FILE__), '..', '/spec_helper.rb')
 
 describe "with respect to collections" do
-  class TestResource
-    include Mordor::Resource
+  before :each do
+    class TestResource
+      include Mordor::Resource
 
-    attribute :first,  :index => true
-    attribute :second, :index => true, :index_type => Mongo::ASCENDING
-    attribute :third,  :finder_method => :find_by_third_attribute
+      attribute :first,  :index => true
+      attribute :second, :index => true, :index_type => Mongo::ASCENDING
+      attribute :third,  :finder_method => :find_by_third_attribute
+    end
   end
 
-  describe "serialization" do
-    before :all do
-      clean_sheet
+  after :each do
+    drop_db_collections
+  end
 
+  describe "serialization" do
+    before :each do
       5.times do |index|
         res = TestResource.new(:first => "#{index}_first", :second => "#{index}_second", :third => "#{index}_third")
         res.save.should be_true
@@ -33,9 +37,7 @@ describe "with respect to collections" do
   end
 
   describe "converting to array" do
-    before :all do
-      clean_sheet
-
+    before :each do
       5.times do |index|
         res = TestResource.new(:first => "#{index}_first", :second => "#{index}_second", :third => "#{index}_third")
         res.save.should be_true
@@ -73,9 +75,7 @@ describe "with respect to collections" do
 
   describe "counting" do
 
-    before :all do
-      clean_sheet
-
+    before :each do
       5.times do |index|
         res = TestResource.new(:first => "#{index}_first", :second => "#{index}_second", :third => "#{index}_third")
         res.save.should be_true

data/spec/mordor/connection_spec.rb

@@ -1,26 +1,63 @@
 require File.join(File.dirname(__FILE__), '..', '/spec_helper.rb')
 
 describe "connecting to mongo" do
-
   before :each do
-    clean_sheet
+    class TestResource
+      include Mordor::Resource
+    end
   end
 
-  it "should have a connection to mongo" do
-    @connection.should be_instance_of(Mongo::Connection)
+  it "should have a mongo database " do
+    TestResource.database.should be_instance_of(Mongo::DB)
   end
 
   it "should select the correct database" do
-    @db.name.should == Mordor::Config[:database]
+    database_name = "any_database_name"
+    Mordor::Config.use { |config| config[:database] = database_name }
+
+    TestResource.database.name.should == database_name
   end
 
-  it "should be possible to change the configuration" do
-    old_db = Mordor::Config[:database]
-    Mordor::Config.use do |c|
-      c[:database] = 'some_other'
+  describe "when credentials are provided" do
+    let(:credentials) { {:username => "A username", :password => "A password"} }
+
+    before :each do
+      Mordor::Config.use do |config|
+        config[:username] = credentials[:username]
+        config[:password] = credentials[:password]
+      end
+
+      @mock_db = mock("db")
+      Mongo::Connection.stub(:new).and_return(mock("connection", :db => @mock_db))
     end
 
-    Mordor::Config[:database].should == 'some_other'
-    Mordor::Config[:database] = old_db
+    it "should authenticate with username and password" do
+      @mock_db.should_receive(:authenticate).with(credentials[:username], credentials[:password])
+      TestResource.database
+    end
+  end
+
+  describe "the Mongo database connection" do
+    before :each do
+      @mock_connection = mock("connection", :db => mock("db"))
+    end
+
+    it "should connect with specified host" do
+      host = "any host IP or reachable hostname"
+      Mordor::Config.use { |config| config[:hostname] = host }
+
+      Mongo::Connection.should_receive(:new).with(host, anything).and_return(@mock_connection)
+
+      TestResource.database
+    end
+
+    it "should connect on specified port" do
+      port = rand(10000)
+      Mordor::Config.use { |config| config[:port] = port }
+
+      Mongo::Connection.should_receive(:new).with(anything, port).and_return(@mock_connection)
+
+      TestResource.database
+    end
   end
 end

data/spec/mordor/resource_spec.rb

@@ -2,7 +2,6 @@ require File.join(File.dirname(__FILE__), '..', '/spec_helper.rb')
 
 describe "with respect to resources" do
   before :each do
-    Object.send(:remove_const, :TestResource) if Object.const_defined?(:TestResource)
     class TestResource
       include Mordor::Resource
 
@@ -21,6 +20,10 @@ describe "with respect to resources" do
     end
   end
 
+  after :each do
+    drop_db_collections
+  end
+
   it "should create accessor methods for all attributes" do
     ["first", "first=", "second", "second="].each{ |v| TestResource.public_instance_methods.map{|m| m.to_s}.should include(v) }
   end
@@ -71,10 +74,6 @@ describe "with respect to resources" do
   end
 
   context "with respect to replacing params" do
-    before :each do
-      clean_sheet
-    end
-
     it "should correctly substitute non-alphanumeric characters in keys with underscores" do
       options = {
         "o*p#t>i_o@n)s" => "test"
@@ -176,7 +175,7 @@ describe "with respect to resources" do
     end
 
     context "when ranges are changed to queries" do
-      before :all do
+      before :each do
         @range = TestResource.send(:day_to_range, DateTime.civil(2012, 1, 19))
         @query = TestResource.send(:date_range_to_query, @range)
       end
@@ -261,7 +260,6 @@ describe "with respect to resources" do
 
   context "with respect to creating" do
     before :each do
-      clean_sheet
       @resource = TestResource.create({:first => "first", :second => "second", :third => "third"})
     end
 
@@ -281,7 +279,6 @@ describe "with respect to resources" do
 
   context "with respect to destroying" do
     before :each do
-      clean_sheet
       @resource = TestResource.create({:first => "first", :second => "second", :third => "third"})
     end
 
@@ -309,10 +306,6 @@ describe "with respect to resources" do
   end
 
   context "with respect to saving and retrieving" do
-    before :each do
-      clean_sheet
-    end
-
     it "should correctly save resources" do
       resource = TestResource.new({:first => "first", :second => "second"})
       resource.save.should be_true
@@ -477,15 +470,13 @@ describe "with respect to resources" do
   end
 
   context "with respect to retrieving by day" do
-    class TestTimedResource
-      include Mordor::Resource
-
-      attribute :first
-      attribute :at
-    end
-
     before :each do
-      clean_sheet
+      class TestTimedResource
+        include Mordor::Resource
+
+        attribute :first
+        attribute :at
+      end
     end
 
     it "should be possible to retrieve a Resource by day" do
@@ -509,8 +500,8 @@ describe "with respect to resources" do
       TestResource.collection_name.should == "testresources"
     end
 
-    it "should correctly create a connection" do
-      TestResource.connection.should_not be_nil
+    it "should be connected to a database" do
+      TestResource.database.should_not be_nil
     end
   end
 
@@ -521,11 +512,8 @@ describe "with respect to resources" do
     end
 
     it "should return nil when an non existing id is queried" do
-      clean_sheet
       resource = TestResource.find_by_id('4eb8f3570e02e10cce000002')
       resource.should be_nil
     end
   end
-
-
 end

data/spec/spec_helper.rb

@@ -4,16 +4,46 @@ require 'mongo'
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'mordor'
 
-Mordor::Config[:database] = 'test'
+RSpec.configure do |config|
+  config.before :each do
+    reset_mordor_config
+  end
+
+  config.after :each do
+    remove_class_constants
+  end
+end
+
+def reset_mordor_config
+  Mordor::Config.use do |config|
+    config[:username] = nil
+    config[:password] = nil
+    config[:hostname] = '127.0.0.1'
+    config[:port] = 27017
+    config[:database] = 'test'
+  end
+end
 
-def clean_sheet
-  @connection ||= Mongo::Connection.new(Mordor::Config[:hostname], Mordor::Config[:port])
-  @db ||= @connection[Mordor::Config[:database]]
+def drop_db_collections
+  connection = Mongo::Connection.new(Mordor::Config[:hostname], Mordor::Config[:port])
+  db = connection[Mordor::Config[:database]]
 
-  ['TestResource', 'TestTimedResource'].each do |resource|
+  test_class_names.each do |resource|
     if Object.const_defined?(resource)
-      @db[Object.const_get(resource).collection_name].drop
+      db[Object.const_get(resource).collection_name].remove
+      db[Object.const_get(resource).collection_name].drop
     end
   end
 end
 
+def remove_class_constants
+  test_class_names.each do |resource_class|
+    Object.send(:remove_const, resource_class) if Object.const_defined?(resource_class)
+  end
+end
+
+def test_class_names
+  [:TestResource, :TestResource2, :TestTimedResource]
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mordor
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -156,6 +156,7 @@ files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - lib/mordor.rb
@@ -184,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -811110001220592058
+      hash: 3720048276768169463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -193,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: mordor