mordor 0.2.20 → 0.3.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 180551390281de15f455fca31a7d989da1347024f79b207032e27bbc05cfef62
+  data.tar.gz: 68939c6cbff96d3f00ad86eb0763fb236239df59e34a2c6d88cc2465598184dd
+SHA512:
+  metadata.gz: dbed0a87024d1ae6c3a3fac6eb7275882dd1810be8d52b5e15ba53ef29fc4957a90289bc324688ae89e877e29c1c977685d08febef55bd997f560bb1f611d7af
+  data.tar.gz: 75672c34cce2e9e02053459632832495a972d6f2fc706d1daf3522a29a9191b2c7b624f1d8d30fc1f1e5f661570c038ed8f4349240eb4abb7531efe636344d47

data/.circleci/config.yml

@@ -0,0 +1,79 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/ruby:2.6.5
+      - image: mongo:3.2
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            mkdir /tmp/test-results
+            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | \
+              circleci tests split --split-by=timings)"
+            bundle exec rspec \
+              --format progress \
+              --format RspecJunitFormatter \
+              --out /tmp/test-results/rspec.xml \
+              --format progress \
+              $TEST_FILES
+      # collect reports
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results
+
+    environment:
+      TZ: CET
+
+  rubygems_release:
+    docker: 
+      - image: circleci/ruby:2.6.5
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      - run:
+          name: release to RubyGems
+          command: |
+            bundle exec rake gem:release
+
+workflows:
+  version: 2
+  CircleCI:
+    jobs:
+      - build:
+          filters:
+            branches:
+              only: /.*/
+
+      - ruby_gems:
+          filters:
+            branches:
+              only: master
+
+

data/.gitignore

@@ -1,3 +1,5 @@
 pkg/*
 .rvmrc
+.ruby-*
 Gemfile.lock
+.bundle

data/CHANGES.md

@@ -0,0 +1,9 @@
+0.3.0
+-----------
+- Adds connection pool support
+- Sets explicit mongo gem dependency to version < 2.0
+- Deprecates support for MRI 1.8.7, 1.9.2 and JRuby 1.8
+
+0.2.20
+-----------
+- First stable release

data/Gemfile

@@ -1,17 +1,3 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source "https://rubygems.org"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-gem "rake"
-gem "extlib"
-gem "mongo"
-gem "bson_ext", :platforms => :ruby
-gem "json"
-
-group :test do
-  gem "rspec", "~> 2.0"
-  gem "rack-test"
-end
+gemspec

data/Guardfile

@@ -0,0 +1,39 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+## Guard internally checks for changes in the Guardfile and exits.
+## If you want Guard to automatically start up again, run guard in a
+## shell loop, e.g.:
+##
+##  $ while bundle exec guard; do echo "Restarting Guard..."; done
+##
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/jwkoelewijn/mordor.png?branch=master)](http://travis-ci.org/jwkoelewijn/mordor)
+[![CircleCI](https://circleci.com/gh/nedap/mordor/tree/master.svg?style=svg)](https://circleci.com/gh/nedap/mordor/tree/master)
 
 ## Introduction
 Small library to add DataMapper style resources for MongoDB.

data/Rakefile

@@ -3,7 +3,14 @@ require "bundler"
 
 Bundler.setup
 
-load('tasks/github-gem.rake')
+module TempFixForRakeLastComment
+  def last_comment
+    last_description
+  end 
+end
+Rake::Application.send :include, TempFixForRakeLastComment
+
+load('./tasks/github-gem.rake')
 
 task :default  => :spec
 

data/ext/mkrf_conf.rb

@@ -0,0 +1,21 @@
+require 'rubygems/dependency_installer'
+
+gdi = Gem::DependencyInstaller.new
+
+begin
+  if RUBY_PLATFORM == 'java'
+    puts "Not installing bson_ext gem, because we're running on JRuby"
+  else
+    puts "Installing bson_ext"
+    gdi.install "bson_ext"
+  end
+rescue => e
+  warn "#{$0}: #{e}"
+
+  exit!
+end
+
+# Write fake Rakefile for rake since Makefile isn't used
+File.open(File.join(File.dirname(__FILE__), 'Rakefile'), 'w') do |f|
+  f.write("task :default" + $/)
+end

data/lib/mordor/config.rb

@@ -18,11 +18,17 @@ module Mordor
       #
       # :api: publicdef use
       def use
-        @configuration ||= {}
+        @configuration ||= defaults
         yield @configuration
         nil
       end
 
+      # Resets the configuration to its default state
+      #
+      def reset
+        setup
+      end
+
       # Retrieve the value of a config entry.
       #
       # ==== Parameters
@@ -59,7 +65,10 @@ module Mordor
         @defaults ||= {
           :hostname => 'localhost',
           :port     => 27017,
-          :database => 'development'
+          :database => 'development',
+          :pool_size => nil,
+          :pool_timeout => nil,
+          :rs_refresh_mode => :sync,
         }
       end
 

data/lib/mordor/resource.rb

@@ -172,15 +172,12 @@ module Mordor
 
       def database
         unless @db
-          if (hosts = Mordor::Config[:hostname].split(",").map{|h| h.strip}).size > 1
-            options = {:refresh_mode => :sync}
-            options[:rs_name] = Mordor::Config[:replica_set] if Mordor::Config[:replica_set]
-            connection = Mongo::MongoReplicaSetClient.new(hosts, options)
+          if connecting_to_replica_set?
+            client = new_replica_set_client
           else
-            connection = Mongo::Connection.new(Mordor::Config[:hostname], Mordor::Config[:port])
+            client = new_mongo_connection
           end
-          @db = connection.db(Mordor::Config[:database])
-          @db.authenticate(Mordor::Config[:username], Mordor::Config[:password]) if Mordor::Config[:username]
+          @db = database_connection(client)
         end
 
         @db
@@ -238,7 +235,6 @@ module Mordor
         if options[:index]
           @indices    << name unless @indices.include?(name)
           @index_types[name] = options[:index_type] ? options[:index_type] : Mongo::DESCENDING
-          ensure_index(name)
         end
 
         if options[:timestamp]
@@ -265,7 +261,8 @@ module Mordor
         EOS
       end
 
-      private
+    private
+
       def perform_collection_find(query, options = {})
         ensure_indices
         collection.find(query, options)
@@ -318,6 +315,70 @@ module Mordor
       def day_to_query(day)
         date_range_to_query( day_to_range(day) )
       end
+
+      # Connection setup
+
+      def new_mongo_connection
+        Mongo::Connection.new(*mongo_connection_args)
+      end
+
+      def new_replica_set_client
+        Mongo::MongoReplicaSetClient.new(*replica_set_client_args)
+      end
+
+      def database_connection(client)
+        client.db(Mordor::Config[:database]).tap do |db|
+          db.authenticate(*authentication_args) if authentication_args.any?
+        end
+      end
+
+      # Connection arguments
+
+      def mongo_connection_args
+        args = [ Mordor::Config[:hostname], Mordor::Config[:port] ]
+        args << connection_pool_options if connection_pool_options.any?
+        args
+      end
+
+      def replica_set_client_args
+        [ replica_set_host_list, replica_set_options ]
+      end
+
+      def authentication_args
+        args = []
+        if user_name = Mordor::Config[:username]
+          args << user_name
+          args << Mordor::Config[:password] if Mordor::Config[:password]
+        end
+        args
+      end
+
+      # Connection options
+
+      def connection_pool_options
+        @connection_pool_options ||= Hash.new.tap do |hash|
+          hash[:pool_size]    = Mordor::Config[:pool_size]    if Mordor::Config[:pool_size]
+          hash[:pool_timeout] = Mordor::Config[:pool_timeout] if Mordor::Config[:pool_timeout]
+        end
+      end
+
+      def replica_set_options
+        @replica_set_options ||= connection_pool_options.tap do |hash|
+          hash[:refresh_mode] = Mordor::Config[:rs_refresh_mode]
+          hash[:rs_name]      = Mordor::Config[:replica_set] if Mordor::Config[:replica_set]
+        end
+      end
+
+      # Replica set helpers
+
+      def replica_set_host_list
+        @replica_set_hosts ||= Mordor::Config[:hostname].split(',').map(&:strip).compact
+      end
+
+      def connecting_to_replica_set?
+        replica_set_host_list.size > 1
+      end
+
     end
   end
 end

data/lib/mordor/version.rb

@@ -1,3 +1,3 @@
 module Mordor
-  VERSION = "0.0.1"
+  VERSION = "0.3.4"
 end

data/mordor.gemspec

@@ -1,32 +1,40 @@
+require './lib/mordor/version'
+
 Gem::Specification.new do |s|
-  s.name    = "mordor"
-  
+  s.name    = 'mordor'
+
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "0.2.20"
-  s.date    = "2013-06-10"
+  s.version = "0.3.5"
+  s.date    = "2020-07-28"
 
-  s.summary     = "mordor"
+  s.summary     = 'mordor'
   s.description = <<-eos
     Small gem to add MongoDB Resources, resources have attributes that translate into document fields. When an attribute is declared, finders for the attribute are added to the Resource automatically
   eos
 
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 2.0')
-  s.add_development_dependency('json')
+  s.authors  = ['Jan-Willem Koelewijn', 'Dirkjan Bussink']
+  s.email    = ['janwillem.koelewijn@nedap.com', 'dirkjan.bussink@nedap.com']
+  s.homepage = 'http://github.com/jwkoelewijn/mordor/'
+
+  s.add_runtime_dependency 'extlib'
+  s.add_runtime_dependency 'json', '~> 2.3.0'
+  s.add_runtime_dependency 'mongo', '< 2.0.0'
 
-  s.add_development_dependency('extlib')
-  s.add_development_dependency('mongo')
+  s.add_development_dependency 'rack-test'
+  s.add_development_dependency 'guard-rspec'
+  s.add_development_dependency 'rake', '~> 12.3.3'
+  s.add_development_dependency 'rspec', '~> 2.0', '< 2.99'
+  s.add_development_dependency 'rspec_junit_formatter'
 
-  s.add_runtime_dependency('extlib')
-  s.add_runtime_dependency('mongo')
-  s.add_runtime_dependency('json')
+  s.extensions << 'ext/mkrf_conf.rb'
 
-  s.authors  = ['Jan-Willem Koelewijn', 'Dirkjan Bussink']
-  s.email    = ['janwillem.koelewijn@nedap.com', 'dirkjan.bussink@nedap.com']
-  s.homepage = 'http://www.nedap.com'
+  if defined? JRUBY_VERSION
+    s.platform = 'java'
+  else
+    s.add_runtime_dependency('bson_ext')
+  end
 
   # 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 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)
+  s.files = %w(.circleci/config.yml .gitignore CHANGES.md Gemfile Guardfile LICENSE README.md Rakefile ext/mkrf_conf.rb 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

@@ -19,7 +19,7 @@ describe "with respect to collections" 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
+        res.save.should be true
       end
     end
 
@@ -40,7 +40,7 @@ describe "with respect to collections" 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
+        res.save.should be true
       end
     end
 
@@ -78,7 +78,7 @@ describe "with respect to collections" 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
+        res.save.should be true
       end
     end
 

data/spec/mordor/connection_spec.rb

@@ -7,15 +7,17 @@ describe "connecting to mongo" do
     end
   end
 
-  it "should have a mongo database " do
-    TestResource.database.should be_instance_of(Mongo::DB)
-  end
+  describe 'database connection' do
+    it "should have a mongo database " do
+      TestResource.database.should be_instance_of(Mongo::DB)
+    end
 
-  it "should select the correct database" do
-    database_name = "any_database_name"
-    Mordor::Config.use { |config| config[:database] = database_name }
+    it "should select the correct database" do
+      database_name = "any_database_name"
+      Mordor::Config.use { |config| config[:database] = database_name }
 
-    TestResource.database.name.should == database_name
+      TestResource.database.name.should == database_name
+    end
   end
 
   describe "when credentials are provided" do
@@ -27,8 +29,8 @@ describe "connecting to mongo" do
         config[:password] = credentials[:password]
       end
 
-      @mock_db = mock("db")
-      Mongo::Connection.stub(:new).and_return(mock("connection", :db => @mock_db))
+      @mock_db = double("db")
+      Mongo::Connection.stub(:new).and_return(double("connection", :db => @mock_db))
     end
 
     it "should authenticate with username and password" do
@@ -39,58 +41,103 @@ describe "connecting to mongo" do
 
   describe "the Mongo database connection" do
     before :each do
-      @mock_connection = mock("connection", :db => mock("db"))
+      @mock_connection = double("connection", :db => double("db"))
+    end
+
+    after :each do
+      TestResource.database
     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)
+    end
 
-      TestResource.database
+    describe 'setting connection pool options' do
+      it 'supports setting pool size' do
+        Mordor::Config.use { |config| config[:pool_size] = 7 }
+        Mongo::Connection.should_receive(:new).with('localhost', 27017, pool_size: 7).and_return(@mock_connection)
+      end
+
+      it 'supports setting pool timeout' do
+        Mordor::Config.use { |config| config[:pool_timeout] = 8 }
+        Mongo::Connection.should_receive(:new).with('localhost', 27017, pool_timeout: 8).and_return(@mock_connection)
+      end
+
+      it 'supports setting both' do
+        Mordor::Config.use { |config|
+          config[:pool_size] = 9
+          config[:pool_timeout] = 10
+        }
+        Mongo::Connection.should_receive(:new).with('localhost', 27017, pool_size: 9, pool_timeout: 10).and_return(@mock_connection)
+      end
     end
   end
 
   describe "replica sets" do
     before :each do
-      @mock_connection = mock("connection", :db => mock("db"))
+      @mock_connection = double("connection", :db => double("db"))
+      Mordor::Config.use { |config| config[:hostname] = host_string }
     end
 
-    it "creates a mongo replica set client when multiple hosts are provided" do
-      hosts = "localhost:27017, localhost:27018  "
-      hosts_array = hosts.split(",").map{ |h| h.strip }
+    after :each do
+      TestResource.database
+    end
 
-      Mordor::Config.use { |config| config[:hostname] = hosts }
+    let(:host_string){ 'localhost:27017, localhost:27018  ' }
+    let(:hosts_array){ host_string.split(',').map(&:strip)  }
+    let(:replica_set_string){ 'sample replica set' }
 
+    it "creates a mongo replica set client when multiple hosts are provided" do
       Mongo::MongoReplicaSetClient.should_receive(:new).with(hosts_array, anything).and_return(@mock_connection)
-
-      TestResource.database
     end
 
     it "creates a mongo replica set client with the correct replica set name if given" do
-      hosts = "localhost:27017, localhost:27018  "
-      replica_set = "sample replica set"
-
       Mordor::Config.use do |config|
-        config[:hostname] = hosts
-        config[:replica_set] = replica_set
+        config[:replica_set] = replica_set_string
       end
-
-      options = {:rs_name => replica_set, :refresh_mode => :sync}
+      options = {:rs_name => replica_set_string, :refresh_mode => :sync}
 
       Mongo::MongoReplicaSetClient.should_receive(:new).with(anything, options).and_return(@mock_connection)
+    end
 
-      TestResource.database
+    describe 'setting connection pool options' do
+      it 'supports setting pool size' do
+        Mordor::Config.use do |config|
+          config[:pool_size] = 1
+        end
+        options = {:pool_size => 1, :refresh_mode => :sync}
+
+        Mongo::MongoReplicaSetClient.should_receive(:new).with(anything, options).and_return(@mock_connection)
+      end
+
+      it 'supports setting pool timeout' do
+        Mordor::Config.use do |config|
+          config[:pool_timeout] = 1
+        end
+
+        options = {:pool_timeout => 1, :refresh_mode => :sync}
+        Mongo::MongoReplicaSetClient.should_receive(:new).with(anything, options).and_return(@mock_connection)
+      end
+
+      it 'supports setting both' do
+        Mordor::Config.use do |config|
+          config[:pool_size] = 5
+          config[:pool_timeout] = 1
+          config[:replica_set] = replica_set_string
+        end
+        options = {:pool_size => 5, :pool_timeout => 1, :refresh_mode => :sync, :rs_name => replica_set_string}
+
+        Mongo::MongoReplicaSetClient.should_receive(:new).with(anything, options).and_return(@mock_connection)
+      end
     end
+
   end
 end

data/spec/mordor/resource_spec.rb

@@ -95,7 +95,7 @@ describe "with respect to resources" do
 
     it "should correctly replace BigDecimals" do
       options = {
-        "option" => BigDecimal.new("1.00")
+        "option" => BigDecimal("1.00")
       }
       result = TestResource.new.replace_params(options)
       result.each do |k,v|
@@ -249,12 +249,12 @@ describe "with respect to resources" do
       TestResource.ensure_count.should == 2  # For each index
     end
 
-    it "should call ensure index for each index attribute on creation" do
+    it "should not call ensure index for each index attribute on file eval" do
       TestResource2.class_eval do
         attribute :test_attribute, :index => true
       end
 
-      TestResource2.ensure_count.should == 1
+      TestResource2.ensure_count.should == 0
     end
   end
 

data/spec/spec_helper.rb

@@ -15,13 +15,7 @@ RSpec.configure do |config|
 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
+  Mordor::Config.reset
 end
 
 def drop_db_collections
@@ -45,5 +39,3 @@ end
 def test_class_names
   [:TestResource, :TestResource2, :TestTimedResource]
 end
-
-

data/tasks/github-gem.rake

@@ -135,7 +135,7 @@ module GithubGem
 
         desc "Release a new version of the gem using the VERSION environment variable"
         task(:release => release_tasks) { release_task }
-        
+
         namespace(:release) do
           desc "Release the next version of the gem, by incrementing the last version segment by 1"
           task(:next => [:next_version] + release_tasks) { release_task }
@@ -161,7 +161,7 @@ module GithubGem
         task(:next_patch_version)  { next_version_task(:patch) }
         task(:next_minor_version) { next_version_task(:minor) }
         task(:next_major_version) { next_version_task(:major) }
-        
+
         desc "Updates the gem release tasks with the latest version on Github"
         task(:update_tasks) { update_tasks_task }
       end
@@ -182,11 +182,11 @@ module GithubGem
     def build_task
       sh "gem build -q #{gemspec_file}"
       Dir.mkdir('pkg') unless File.exist?('pkg')
-      sh "mv #{gemspec.name}-#{gemspec.version}.gem pkg/#{gemspec.name}-#{gemspec.version}.gem"
+      sh "mv #{gem_package_filename}.gem pkg/#{gem_package_filename}.gem"
     end
 
     def newest_version
-      `#{git} tag`.split("\n").map { |tag| tag.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
+      `#{git} tag`.split("\n").map { |tag| tag.split('mordor-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
     end
 
     def next_version(increment = nil)
@@ -198,11 +198,11 @@ module GithubGem
         when :major then 0
         else next_version.length - 1
       end
-      
+
       next_version[increment_index] ||= 0
       next_version[increment_index] = next_version[increment_index].succ
       ((increment_index + 1)...next_version.length).each { |i| next_version[i] = 0 }
-      
+
       Gem::Version.new(next_version.join('.'))
     end
 
@@ -258,7 +258,7 @@ module GithubGem
 
     # Adds a tag for the released version
     def tag_version_task
-      sh git, 'tag', '-a', "#{gemspec.name}-#{gemspec.version}", '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
+      sh git, 'tag', '-a', "v#{gemspec.version}", '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
     end
 
     # Pushes the changes and tag to github
@@ -267,7 +267,7 @@ module GithubGem
     end
 
     def gemcutter_release_task
-      sh "gem", 'push', "pkg/#{gemspec.name}-#{gemspec.version}.gem"
+      sh "gem", 'push', "pkg/#{gem_package_filename}.gem"
     end
 
     # Gem release task.
@@ -289,6 +289,14 @@ module GithubGem
       FileList[test_pattern].any?
     end
 
+    def gem_package_filename
+      "#{gemspec.name}-#{gemspec.version}#{platform_suffix}"
+    end
+
+    def platform_suffix
+      "-#{gemspec.platform}" unless gemspec.platform == 'ruby'
+    end
+
     # Loads the gemspec file
     def load_gemspec!
       @gemspec = eval(File.read(@gemspec_file))
@@ -334,7 +342,7 @@ module GithubGem
 
         # Reload the gemspec so the changes are incorporated
         load_gemspec!
-        
+
         # Also mark the Gemfile.lock file as changed because of the new version.
         modified_files << 'Gemfile.lock' if File.exist?(File.join(root_dir, 'Gemfile.lock'))
       end
@@ -344,7 +352,7 @@ module GithubGem
     def update_tasks_task
       require 'net/https'
       require 'uri'
-      
+
       uri = URI.parse('https://raw.github.com/wvanbergen/github-gem/master/tasks/github-gem.rake')
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true

metadata

@@ -1,154 +1,168 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mordor
-version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 20
-  version: 0.2.20
+version: !ruby/object:Gem::Version
+  version: 0.3.5
 platform: ruby
-authors: 
+authors:
 - Jan-Willem Koelewijn
 - Dirkjan Bussink
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2013-06-10 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+date: 2020-07-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: extlib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: extlib
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: mongo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: mongo
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 12.3.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.99'
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  name: extlib
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  type: :runtime
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  name: mongo
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.99'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: json
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id008
-description: "    Small gem to add MongoDB Resources, resources have attributes that translate into document fields. When an attribute is declared, finders for the attribute are added to the Resource automatically\n"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "    Small gem to add MongoDB Resources, resources have attributes that
+  translate into document fields. When an attribute is declared, finders for the attribute
+  are added to the Resource automatically\n"
+email:
 - janwillem.koelewijn@nedap.com
 - dirkjan.bussink@nedap.com
 executables: []
-
-extensions: []
-
+extensions:
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".circleci/config.yml"
+- ".gitignore"
+- CHANGES.md
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- ext/mkrf_conf.rb
 - lib/mordor.rb
 - lib/mordor/collection.rb
 - lib/mordor/config.rb
@@ -161,39 +175,26 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/github-gem.rake
-has_rdoc: true
-homepage: http://www.nedap.com
+homepage: http://github.com/jwkoelewijn/mordor/
 licenses: []
-
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.5.2
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.8
+signing_key:
+specification_version: 4
 summary: mordor
 test_files: []
-

data/.travis.yml

@@ -1,21 +0,0 @@
-language: ruby
-
-jdk:
-  - oraclejdk7
-
-services:
-  - mongodb
-
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-
-matrix:
-  allow_failures:
-    - rvm: rbx-19mode
-    - rvm: rbx-18mode