locomotivecms_steam 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7df606052bd99feb2e413424aee474abc2c38de
-  data.tar.gz: e2f3eacbb044cf3920178315a475d2c8e0fe0a9d
+  metadata.gz: a09d7e73bc37c30f64b170c09a38a6761db8788f
+  data.tar.gz: 6611a2cd44128874452e1172ad77a1b38e128134
 SHA512:
-  metadata.gz: 0652e4cdc58c66a22ba3e018265f85114ca14e41bb75429ce91e8ee95dc96cdfbbefba72707c53f701df9c5a99b7104fc38afe6ac063b79e86ebbf5b82c41a44
-  data.tar.gz: 00fa87eb476049549c909406eaff59e4759e415fb87868a60d54c4a3181e1cef8a3bcb351d53719559d840b0eee2c809a732b7e3a7d0ab34cdaee2860235bd8b
+  metadata.gz: b759d95e386dd121a7936bb4715ec5fe8d308af8854c4408ff16d0a878dfcc31d50e45e0a16d6847a3360a83d528ddfbc479dbd74ca8f606bb63381f20cc8657
+  data.tar.gz: 9e51a4924b1f934f08dbd5dd3fc503ef1c18454e753a742009890bbe2abae6e231f8c60ddd39a75bb253f3a136e69976ad48f4ca7ae1fbda3d0aaa654e5aeb12

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.0.0.rc3)
+    locomotivecms_steam (1.0.0.rc4)
       RedCloth (~> 4.2.9)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
@@ -15,7 +15,9 @@ PATH
       mime-types (~> 2.6.1)
       mimetype-fu (~> 0.1.2)
       moneta (~> 0.8.0)
+      mongo (~> 2.1.2)
       morphine (~> 0.1.1)
+      origin (~> 2.1.1)
       rack-cache (~> 1.2)
       rack-rewrite (~> 1.5.1)
       rack_csrf (~> 2.5.0)
@@ -36,7 +38,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.8)
     attr_extras (4.4.0)
-    bson (3.1.0)
+    bson (3.2.6)
     byebug (4.0.5)
       columnize (= 0.9.0)
     chronic (0.10.2)
@@ -63,7 +65,6 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    connection_pool (2.2.0)
     coveralls (0.8.1)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
@@ -121,10 +122,8 @@ GEM
     mini_portile (0.6.2)
     minitest (5.8.2)
     moneta (0.8.0)
-    moped (2.0.6)
+    mongo (2.1.2)
       bson (~> 3.0)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
     morphine (0.1.1)
     multi_json (1.11.1)
     multi_xml (0.5.5)
@@ -133,7 +132,6 @@ GEM
       mini_portile (~> 0.6.0)
     nokogumbo (1.4.1)
       nokogiri
-    optionable (0.2.0)
     origin (2.1.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -226,8 +224,6 @@ DEPENDENCIES
   json_spec (~> 1.1.4)
   locomotivecms_steam!
   memory_profiler
-  moped (~> 2.0.6)
-  origin (~> 2.1.1)
   pry-byebug (~> 3.1.0)
   puma
   rack-mini-profiler

data/lib/locomotive/steam/adapters/mongodb.rb

@@ -1,4 +1,4 @@
-require 'moped'
+require 'mongo'
 require 'origin'
 
 require_relative 'mongodb/origin'
@@ -82,13 +82,12 @@ module Locomotive::Steam
     end
 
     def session
-      Thread.current[:moped_session] ||= if uri
-        Moped::Session.connect(uri)
+      Thread.current[:mongo_session] ||= if uri
+        Mongo::Client.new(uri)
       else
-        Moped::Session.new([*hosts]).tap do |session|
-          session.use database
-          session.login(username, password) if username && password
-        end
+        client = Mongo::Client.new([*hosts], database: database)
+        client = client.with(user: username, password: password) if username && password
+        client
       end
     end
 

data/lib/locomotive/steam/adapters/mongodb/command.rb

@@ -15,13 +15,13 @@ module Locomotive::Steam
 
           serialized_entity = @mapper.serialize(entity)
 
-          @collection.insert(serialized_entity)
+          @collection.insert_one(serialized_entity)
 
           entity
         end
 
         def delete(entity)
-          @collection.find(_id: entity._id).remove if entity._id
+          @collection.find(_id: entity._id).delete_one if entity._id
         end
 
       end

data/lib/locomotive/steam/adapters/mongodb/query.rb

@@ -47,12 +47,13 @@ module Locomotive::Steam
           _query = to_origin
           selector, fields, sort = _query.selector, _query.options[:fields], _query.options[:sort]
 
-          collection.find(selector).tap do |results|
-            results.sort(sort)      if sort
-            results.select(fields)  if fields
-            results.skip(@skip)     if @skip
-            results.limit(@limit)   if @limit
-          end
+          results = collection.find(selector)
+          results = results.sort(sort)          if sort
+          results = results.projection(fields)  if fields
+          results = results.skip(@skip)         if @skip
+          results = results.limit(@limit)       if @limit
+
+          results
         end
 
         def to_origin

data/lib/locomotive/steam/server.rb

@@ -13,7 +13,7 @@ require 'dragonfly/middleware'
 require_relative 'middlewares'
 
 if ENV['PROFILER']
-  require 'moped'
+  require 'mongo'
   require 'rack-mini-profiler'
 end
 

data/lib/locomotive/steam/version.rb

@@ -3,6 +3,6 @@
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive
   module Steam
-    VERSION = '1.0.0.rc3'
+    VERSION = '1.0.0.rc4'
   end
 end

data/locomotivecms_steam.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler',    '~> 1.7'
   spec.add_development_dependency 'rake',       '~> 10.4.2'
 
-  spec.add_development_dependency 'moped',      '~> 2.0.6'
-  spec.add_development_dependency 'origin',     '~> 2.1.1'
+  spec.add_dependency 'mongo',                  '~> 2.1.2'
+  spec.add_dependency 'origin',                 '~> 2.1.1'
 
   spec.add_dependency 'sanitize',               '~> 4.0.0'
   spec.add_dependency 'morphine',               '~> 0.1.1'

data/spec/integration/repositories/page_repository_spec.rb

@@ -5,11 +5,6 @@ require_relative '../../../lib/locomotive/steam/adapters/mongodb.rb'
 
 describe Locomotive::Steam::PageRepository do
 
-  # before(:all) do
-  #   Moped.logger = Logger.new($stdout)
-  #   Moped.logger.level = Logger::DEBUG
-  # end
-
   shared_examples_for 'a repository' do
 
     let(:site)        { Locomotive::Steam::Site.new(_id: site_id, locales: %w(en fr nb)) }

data/spec/support.rb

@@ -6,3 +6,4 @@ require_relative 'support/examples/matching_locale'
 require_relative 'support/examples/locale_file'
 require_relative 'support/time'
 require_relative 'support/pry'
+require_relative 'support/mongo'

data/spec/support/mongo.rb

@@ -0,0 +1,3 @@
+require 'mongo'
+
+Mongo::Logger.logger.level = Logger::INFO # DEBUG # INFO

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms_steam
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,19 +42,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 10.4.2
 - !ruby/object:Gem::Dependency
-  name: moped
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.6
-  type: :development
+        version: 2.1.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: origin
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.1
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -675,6 +675,7 @@ files:
 - spec/support/helpers.rb
 - spec/support/liquid.rb
 - spec/support/matchers/hash.rb
+- spec/support/mongo.rb
 - spec/support/pry.rb
 - spec/support/time.rb
 - spec/unit/adapters/filesystem/simple_cache_store_spec.rb
@@ -915,6 +916,7 @@ test_files:
 - spec/support/helpers.rb
 - spec/support/liquid.rb
 - spec/support/matchers/hash.rb
+- spec/support/mongo.rb
 - spec/support/pry.rb
 - spec/support/time.rb
 - spec/unit/adapters/filesystem/simple_cache_store_spec.rb