mongoid_monkey 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35ce26c7c1fa842774c1c8724d3060e63d14bcc3
-  data.tar.gz: 73b16e660f5088a4ef8f7a07b0ad37a1731ead1c
+  metadata.gz: 56af6b17c89f409a9fa4995c2bcdf09bead1960b
+  data.tar.gz: f62b1170ba699b56cbd3eb9ea08019b447fbb176
 SHA512:
-  metadata.gz: 1b98576cffc2d498853d06b1dbffaef9a5ea53d5c184c6884e7fe146261a5da5cea89a90b2d633d0d7d0264edea9cfd1b3d2a49bcf63a2fa34319e1e045cad55
-  data.tar.gz: f07e78cc1905d110a4042dac8f8f15448dc5d8d39dd7412c1ad1f8a693c59d5f39e12ffebe449a0da7030651fad95500308bd156970f5fec3e07b4846b6fc38b
+  metadata.gz: e78fc8da08082c3fd0b123614ee7c296d0aebf133523ebe5acf088ec9f9fb84951bac88a867dfa9fcc4af90b51e8d9138ce86094ce58f097ed3a708db41fe8de
+  data.tar.gz: cc43215fe1cf22059156da5a002ebac8815aeeaf4997f8a053d48dcf1ceac97df04def42acdd666081ca33eecd4488594b6c5c58e6ac8df0f7af1401075a642e

data/README.md

@@ -1,4 +1,4 @@
-# Mongoid Monkey
+# Mongoid Monkey [![Build Status](https://travis-ci.org/johnnyshields/mongoid_monkey.svg?branch=master)](https://travis-ci.org/johnnyshields/mongoid_monkey)
 
 ### Monkey Patches for Mongoid
 
@@ -29,8 +29,8 @@ If you would only like some of the patches, please copy and paste the code to yo
 | --- | --- | --- | --- | --- |
 | `atomic.rb` | Backport syntax change of atomic query methods. | ● | | |
 | `big_decimal.rb` | Fixes buggy BigDecimal behavior. | ● | ● | ● |
+| `db_commands.rb` | Use MongoDB 3.0+ command syntax; required for WiredTiger. | ● | ● | |
 | `instrument.rb` | Backport instrumentation change to Moped 1. | ● | | |
-| `list_collections.rb` | Fetch collections via `listCollections` command; required for WiredTiger. | ● | ● | |
 | `reorder.rb` | Backport `Criteria#reorder` method. | ● | | |
 
 ### License

data/lib/mongoid_monkey.rb

@@ -11,5 +11,5 @@ end
 
 if defined?(Moped)
   require 'patches/instrument' if Moped::VERSION =~ /\A1\./
-  require 'patches/list_collections'
+  require 'patches/db_commands'
 end

data/lib/patches/db_commands.rb

@@ -0,0 +1,45 @@
+# Use MongoDB 3.0+ syntax for a few database-level commands.
+# Required to use Moped (Mongoid 3/4) with WiredTiger:
+# - listCollections
+# - listIndexes
+# - createIndexes
+
+module Moped
+  class Database
+
+    def collection_names
+      namespaces = command(listCollections: 1, filter: { name: { "$not" => /system\.|\$/ } })
+      namespaces["cursor"]["firstBatch"].map do |doc|
+        doc["name"]
+      end
+    end
+  end
+end
+
+module Moped
+  class Indexes
+
+    def [](key)
+      result = database.command(listIndexes: collection_name)
+      result["cursor"]["firstBatch"].detect do |index|
+        (index['name'] == key) || (index['key'] == normalize_keys(key))
+      end
+    end
+
+    def create(key, options = {})
+      spec = options.merge(ns: namespace, key: key)
+      spec[:name] ||= key.to_a.join("_")
+      database.command(createIndexes: collection_name, indexes: [spec])
+    end
+
+    protected
+
+    def normalize_keys(spec)
+      return false if spec.is_a?(String)
+      spec.reduce({}) do |transformed, (key, value)|
+        transformed[key.to_s] = value
+        transformed
+      end
+    end
+  end
+end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module MongoidMonkey
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/spec_helper.rb

@@ -1,12 +1,13 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$database_name = 'mongoid_monkey_test'
 
 require 'mongoid'
 require 'mongoid_monkey'
 require 'rspec'
 
 Mongoid.configure do |config|
-  config.connect_to 'mongoid_monkey_test'
+  config.connect_to $database_name
 end
 
 Mongoid.logger.level = Logger::INFO

data/spec/unit/db_commands_spec.rb

@@ -0,0 +1,135 @@
+require "spec_helper"
+
+if defined?(Moped)
+
+  describe Moped::Database do
+
+    describe "#collection_names" do
+
+      let(:session) do
+        Moped::Session.new([ "127.0.0.1:27017" ], database: $database_name)
+      end
+
+      let(:database) do
+        described_class.new(session, $database_name)
+      end
+
+      let(:collection_names) do
+        database.collection_names
+      end
+
+      before do
+        session.drop
+        names.map do |name|
+          session.command(create: name)
+        end
+      end
+
+      context "when name doesn't include system" do
+
+        let(:names) do
+          %w[ users comments ]
+        end
+
+        it "returns the name of all non system collections" do
+          expect(collection_names.sort).to eq([ "comments", "users" ])
+        end
+      end
+
+      context "when name includes system not at the beginning" do
+
+        let(:names) do
+          %w[ users comments_system_fu ]
+        end
+
+        it "returns the name of all non system collections" do
+          expect(collection_names.sort).to eq([ "comments_system_fu", "users" ])
+        end
+      end
+
+      context "when name includes system at the beginning" do
+
+        let(:names) do
+          %w[ users system_comments_fu ]
+        end
+
+        it "returns the name of all non system collections" do
+          expect(collection_names.sort).to eq([ "system_comments_fu", "users" ])
+        end
+      end
+    end
+  end
+
+  describe Moped::Indexes do
+
+    let(:session) do
+      Moped::Session.new %w[127.0.0.1:27017], database: $database_name
+    end
+
+    let(:indexes) do
+      session[:users].indexes
+    end
+
+    before do
+      begin
+        indexes.drop
+      rescue Exception
+      end
+    end
+
+    describe "#create" do
+
+      context "when called without extra options" do
+
+        it "creates an index with no options" do
+          indexes.create name: 1
+          indexes[name: 1].should_not eq nil
+        end
+      end
+
+      context "when called with extra options" do
+
+        it "creates an index with the extra options" do
+          indexes.create({name: 1}, {unique: true})
+          index = indexes[name: 1]
+          index["unique"].should eq true
+        end
+      end
+
+      context "when there is existent data" do
+
+        before do
+          3.times { session[:users].insert(name: 'John') }
+        end
+
+        it "raises an error" do
+          expect {
+            indexes.create({name: 1}, {unique: true})
+          }.to raise_error(Moped::Errors::OperationFailure)
+        end
+      end
+    end
+
+    describe "#drop" do
+
+      context "when provided a key" do
+
+        it "drops the index" do
+          indexes.create name: 1
+          indexes.drop(name: 1).should eq true
+        end
+      end
+
+      context "when not provided a key" do
+
+        it "drops all indexes" do
+          indexes.create name: 1
+          indexes.create age: 1
+          indexes.drop
+          indexes[name: 1].should eq nil
+          indexes[age: 1].should eq nil
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_monkey
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - johnnyshields
@@ -65,8 +65,8 @@ files:
 - lib/mongoid_monkey.rb
 - lib/patches/atomic.rb
 - lib/patches/big_decimal.rb
+- lib/patches/db_commands.rb
 - lib/patches/instrument.rb
-- lib/patches/list_collections.rb
 - lib/patches/reorder.rb
 - lib/version.rb
 - spec/config/mongodb-mmapv1.conf
@@ -77,8 +77,8 @@ files:
 - spec/spec_helper.rb
 - spec/unit/atomic_spec.rb
 - spec/unit/big_decimal_spec.rb
+- spec/unit/db_commands_spec.rb
 - spec/unit/instrument_spec.rb
-- spec/unit/list_collections_spec.rb
 - spec/unit/reorder_spec.rb
 homepage: https://github.com/johnnyshields/mongoid_monkey
 licenses:
@@ -113,7 +113,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/atomic_spec.rb
 - spec/unit/big_decimal_spec.rb
+- spec/unit/db_commands_spec.rb
 - spec/unit/instrument_spec.rb
-- spec/unit/list_collections_spec.rb
 - spec/unit/reorder_spec.rb
 has_rdoc: 

data/lib/patches/list_collections.rb

@@ -1,14 +0,0 @@
-# Get collection_names via for MongoDB 3.0+ listCollections command.
-# Required to use Moped (Mongoid 3/4) with WiredTiger.
-
-module Moped
-  class Database
-
-    def collection_names
-      namespaces = Collection.new(self, "$cmd").find(listCollections: 1, filter: { name: { "$not" => /system\.|\$/ } }).first
-      namespaces["cursor"]["firstBatch"].map do |doc|
-        doc["name"]
-      end
-    end
-  end
-end

data/spec/unit/list_collections_spec.rb

@@ -1,62 +0,0 @@
-require "spec_helper"
-
-if defined?(Moped)
-
-  describe Moped::Database do
-
-    describe "#collection_names" do
-
-      let(:session) do
-        Moped::Session.new([ "127.0.0.1:27017" ], database: "moped_test")
-      end
-
-      let(:database) do
-        described_class.new(session, :moped_test)
-      end
-
-      let(:collection_names) do
-        database.collection_names
-      end
-
-      before do
-        session.drop
-        names.map do |name|
-          session.command(create: name)
-        end
-      end
-
-      context "when name doesn't include system" do
-
-        let(:names) do
-          %w[ users comments ]
-        end
-
-        it "returns the name of all non system collections" do
-          expect(collection_names.sort).to eq([ "comments", "users" ])
-        end
-      end
-
-      context "when name includes system not at the beginning" do
-
-        let(:names) do
-          %w[ users comments_system_fu ]
-        end
-
-        it "returns the name of all non system collections" do
-          expect(collection_names.sort).to eq([ "comments_system_fu", "users" ])
-        end
-      end
-
-      context "when name includes system at the beginning" do
-
-        let(:names) do
-          %w[ users system_comments_fu ]
-        end
-
-        it "returns the name of all non system collections" do
-          expect(collection_names.sort).to eq([ "system_comments_fu", "users" ])
-        end
-      end
-    end
-  end
-end