mongo_adaptor 0.0.17 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32d24e8595ab068f45ad10271e3a49cc659bdfe2
-  data.tar.gz: 267ab227bc343562e7a65856863b0a03913eb995
+  metadata.gz: 2a962c576b77d36bb59564fa73d92d4edf380cc6
+  data.tar.gz: 982bfeab74870bf4738560fd955fc8e200d8a934
 SHA512:
-  metadata.gz: 11c3dfa2fc3f05088185b8bed02fa2064de84bb020394cf3e786bbdf547c44ab99e4b4d1e8b32f3708b5990194f78b7f268a08c4683d7a4f4bb3dd21a8168eb3
-  data.tar.gz: e3a746c3db2d424859461c718247aaf2cbd1b08564daf922b9a8420f04fa82ea82c9b44a900a90c5d23a1b7ead76da1a9759d3bd579c378a598d3933d5e09837
+  metadata.gz: 274fbce2383d1ad46b5b4adacee9fecdb22f5aeff66799b784725f6ad6e4ae9689edff12dd78bb3fe0418a79021454a087fc788f18219f65c6acfbbdfda2fcc8
+  data.tar.gz: b94804b5b46e3c7619075fe7dddb4d0a607a307d29eba1c64c8abafde606de7800e2dc577e16987ece343150517abd32b3032bc4f6147cf2e0ec3304b1dfc0d1

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.1.2
-  - 2.1.1
+  - 2.3.3
+  - 2.1.5
   - 2.0.0
   - 1.9.3
   - 1.9.2
@@ -11,3 +11,6 @@ rvm:
   - 1.8.7
   - ree
 services: mongodb
+matrix:
+  allow_failures:
+    - rvm: rbx-2

data/Gemfile

@@ -2,7 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mongo_adaptor.gemspec
 gemspec
-
-platform :rbx do
-  gem 'rubysl'
-end

data/lib/mongo_adaptor.rb

@@ -19,15 +19,15 @@ class MongoAdaptor
   end
 
   def insert model
-    @collection.insert process(model), safe_mode
+    @collection.insert_one process(model), safe_mode
   end
 
   def upsert model, query = { "_id" => model.id }
-    @collection.update query, set(process(model)), safe_mode.merge(upsert_mode true)
+    @collection.update_one query, set(process(model)), safe_mode.merge(upsert_mode true)
   end
 
   def update model, query = { "_id" => model.id }
-    @collection.update query, set(process(model)), safe_mode.merge(upsert_mode false)
+    @collection.update_one query, set(process(model)), safe_mode.merge(upsert_mode false)
   end
 
   def execute query_or_model, command, options = {}
@@ -36,30 +36,31 @@ class MongoAdaptor
     else
       query = { "_id" => query_or_model.id }
     end
-    @collection.update query, command, safe_mode.merge(upsert_mode false).merge(options)
+    @collection.update_one query, command, safe_mode.merge(upsert_mode false).merge(options)
   end
 
   def fetch selector = {}, opts = {}
-    @collection.find_one selector, { :fields => fields, :transformer => builder }.merge(opts)
+    build(@collection.find(selector, { :fields => fields }.merge(opts)).first)
   end
 
   def remove selector = {}, opts = {}
-    @collection.remove selector, opts
+    @collection.delete_many selector, opts
   end
 
   def find selector = {}, opts = {}
-    @collection.find selector, { :fields => fields, :transformer => builder }.merge(opts)
+    @collection.find(selector, { :fields => fields }.merge(opts)).map do |model|
+      build model
+    end
   end
 
   private
 
-    def builder
-      proc do |result|
-        @klass.new.tap do |model|
-          model[:id] = result.delete('_id') if model.respond_to?(:id)
-          result.each do |field,value|
-            model[field] = value if fields.include?(field.to_s)
-          end
+    def build result
+      return unless result
+      @klass.new.tap do |model|
+        model[:id] = result.delete('_id') if model.respond_to?(:id)
+        result.each do |field,value|
+          model[field] = value if fields.include?(field.to_s)
         end
       end
     end

data/lib/mongo_adaptor/version.rb

@@ -1,3 +1,3 @@
 class MongoAdaptor
-  VERSION = "0.0.17"
+  VERSION = "1.0.0"
 end

data/mongo_adaptor.gemspec

@@ -15,10 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = MongoAdaptor::VERSION
 
-  gem.add_dependency 'mongo'
-  gem.add_dependency 'mongo-configure'
+  gem.add_dependency 'mongo', '~> 2.4'
+  gem.add_dependency 'mongo-configure', '~> 2.0.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rspec-its'
 end

data/spec/mongo_adaptor_spec.rb

@@ -1,9 +1,12 @@
-require 'rspec/its'
 require 'mongo_adaptor'
 
 describe 'adapting structs into mongo' do
-  before { Mongo::Configure.from_database 'mongo_adaptor_test' }
-  after  { Mongo::Configure.current.load.collections.select { |c| c.name !~ /^system\./ }.each &:remove }
+  before do
+    Mongo::Logger.level = :info
+    Mongo::Configure.from_database 'mongo_adaptor_test'
+  end
+
+  after  { Mongo::Configure.current.load.collections.select { |c| c.name !~ /^system\./ }.each &:delete_many }
 
   describe 'db setup' do
     it 'uses the configured database' do
@@ -29,7 +32,7 @@ describe 'adapting structs into mongo' do
 
       shared_examples_for 'creates a document' do
         it 'changes the number of items in the collection' do
-          expect { subject }.to change { collection.size }.by(1)
+          expect { subject }.to change { collection.count }.by(1)
         end
         it 'generates an _id, ignoring any set key' do
           subject
@@ -69,7 +72,7 @@ describe 'adapting structs into mongo' do
 
     describe 'with an existing model' do
       let(:model) { klass.new 'Test Model','Some Data',['Some Other Members'] }
-      let(:id)    { collection.insert({ :name => 'My Model', :other => 'Some Value', :members => ['Some Members'] },{ :w => 1 }) }
+      let(:id)    { collection.insert_one({ :name => 'My Model', :other => 'Some Value', :members => ['Some Members'] },{ :w => 1 }).inserted_id }
 
       before do
         model.id = id
@@ -79,10 +82,10 @@ describe 'adapting structs into mongo' do
         let(:data)  { collection.find({}).to_a[-1] }
 
         it 'doesnt change the number of items in the collection' do
-          expect { subject }.to change { collection.size }.by(0)
+          expect { subject }.to change { collection.count }.by(0)
         end
         it 'doesnt change the id' do
-          expect { subject }.to_not change { collection.find_one['_id'] }
+          expect { subject }.to_not change { collection.find.first['_id'] }
         end
         it 'sets my fields and values' do
           subject
@@ -105,16 +108,16 @@ describe 'adapting structs into mongo' do
 
       describe 'to update it with a custom operation' do
         let(:data)  { collection.find({}).to_a[-1] }
-        subject { adaptor.execute model, "$push" => { "members" => "Some Other Members" } }
+        let(:operation) { adaptor.execute model, "$push" => { "members" => "Some Other Members" } }
 
         it 'doesnt change the number of items in the collection' do
-          expect { subject }.to change { collection.size }.by(0)
+          expect { operation }.to change { collection.count }.by(0)
         end
         it 'doesnt change the id' do
-          expect { subject }.to_not change { collection.find_one['_id'] }
+          expect { operation }.to_not change { collection.find.first['_id'] }
         end
         it 'executes my command' do
-          subject
+          operation
           expect(data['members']).to eq ['Some Members','Some Other Members']
         end
         it 'also can execute my command by query' do
@@ -124,12 +127,17 @@ describe 'adapting structs into mongo' do
       end
 
       describe 'to fetch it' do
-        subject { adaptor.fetch({ :_id => id }) }
-        it            { is_expected.to be_a klass }
-        its(:id)      { should == id }
-        its(:name)    { should == 'My Model' }
-        its(:other)   { should == 'Some Value' }
-        its(:members) { should == ['Some Members'] }
+        let(:result) { adaptor.fetch({ :_id => id }) }
+
+        it "returns a class" do
+          expect(result).to be_a klass
+        end
+        specify "the classes fields are set correctly" do
+          expect(result.id).to      eq id
+          expect(result.name).to    eq 'My Model'
+          expect(result.other).to   eq 'Some Value'
+          expect(result.members).to eq ['Some Members']
+        end
       end
 
       describe 'to remove it' do
@@ -143,21 +151,23 @@ describe 'adapting structs into mongo' do
     describe 'finding multiples' do
       before do
         3.times do |i|
-          collection.insert({ :name => 'My Model', :other => i },{ :w => 1 })
+          collection.insert_one({ :name => 'My Model', :other => i },{ :w => 1 })
         end
         3.times do |i|
-          collection.insert({ :name => 'Other Model', :other => i },{ :w => 1 })
+          collection.insert_one({ :name => 'Other Model', :other => i },{ :w => 1 })
         end
       end
 
-      subject { adaptor.find({ :name => 'My Model' }) }
+      let(:result) { adaptor.find({ :name => 'My Model' }) }
 
-      its(:count) { should == 3 }
+      it 'returns 3 models' do
+        expect(result.count).to eq 3
+      end
       it 'translates all to klass' do
-        expect(subject.all? { |k| k.is_a? klass }).to be true
+        expect(result.all? { |k| k.is_a? klass }).to be true
       end
       it 'gets them all' do
-        expect(subject.map(&:other)).to eq [0,1,2]
+        expect(result.map(&:other)).to eq [0,1,2]
       end
       it 'will pass along options' do
         expect { adaptor.find({ :name => 'My Model' },{ :fields => { }}) }.to_not raise_error

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mongo_adaptor
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 1.0.0
 platform: ruby
 authors:
 - Jon Rowe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-18 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: mongo-configure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A simple mongo handler. Translates Structs into Mongo and back.
 email:
 - hello@jonrowe.co.uk
@@ -116,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A simple mongo handler. Translates Structs into Mongo and back.