mongo_request_logger 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10ab543ab4fed5e432099b38ce6c32bc3e745aa0
-  data.tar.gz: b202b63d0c93bd20baea08a806f3325bdd1114c6
+  metadata.gz: d80368aaa66825e64d487fda42dfc49971405c93
+  data.tar.gz: ce9c93717c84a69b8146e5a453f70532a59ce85b
 SHA512:
-  metadata.gz: a7a24b97466f0803cd2ff95a180ff122fbc82bd646e39c381f65e7ecf15bfdac68a328b2f9ac029bb496c415d4d3ae0a391674a0c4a0de1c501aada5529bdeeb
-  data.tar.gz: 1f591f39c0926808a0f1308fda972968e54798a24226bc6b1a7901e33eba9dc13f90a5725d7fcf34d4da29562744a1abadfdb5f110e115e911b82282d8efb497
+  metadata.gz: ca4cd287d1f02f26ceb3f643915316e4c8de84968122c193fca25274330f4059b5f51e8e6a8838ee9df199fd26b1d1fc89d6590584f789eb7b7dfe69573daa92
+  data.tar.gz: 06addefe92b727a9594303885a80565b3bdc116bf3869e0cc13fce10469233ac371a2674a19f3b2106a08cd339439e146177ed21b2713294d5d7d6fc3e510081

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+## 0.7.0
+
+*Backwards incompatible!*
+
+* Deprecate Mongoid 4 support in favour of Mongoid 5
+
 ## 0.6.0
 
 *Backwards incompatible!*
 
-* Replace Moped with the official Mongo Ruby Driver, while retaining support for the mongoid configuration file.
+* Replace Moped with the official Mongo Ruby Driver, while retaining support for the Mongoid 4 configuration file.
 
 ## 0.5.0
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'mongo', '~> 2.0'
-gem 'mongoid', '~> 4.0'
+gem 'mongo', '~> 2.2'
+gem 'mongoid', '~> 5.1'
 gem 'rspec'
 gem 'sinatra', '~> 1.4.0'
 

data/README.md

@@ -6,7 +6,7 @@ Log requests in a structured format to MongoDB.
 
 Add this line to your application's Gemfile:
 
-    gem 'mongoid', '~> 4.0'
+    gem 'mongoid', '~> 5.1'
     gem 'mongo_request_logger'
 
 ## Usage with Rails 4
@@ -17,7 +17,7 @@ Add a `logger` session to your Mongoid config, `config/mongoid.yml`. An addition
 Example:
 
     development:
-      sessions:
+      clients:
         logger:
           database: your_log_db
           hosts:
@@ -25,8 +25,10 @@ Example:
             - host2:27017
             - host3:27017
           options:
-            safe: false
-            consistency: eventual
+            write:
+              w: 0
+            read:
+              mode: :secondary
             capsize: 1000 # MB
 
 Routes for log viewer

data/gemfiles/rails4.2.gemfile

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'mongo', '~> 2.0'
-gem 'moped', '~> 2.0'
-gem 'mongoid', '~> 4.0'
+gem 'mongo', '~> 2.2'
+gem 'mongoid', '~> 5.1'
 gem 'rspec'
 gem 'rails', '~> 4.2'
 gem 'sinatra', '~> 1.3.2'

data/gemfiles/sinatra1.4.gemfile

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'mongo', '~> 2.0'
-gem 'moped', '~> 2.0'
-gem 'mongoid', '~> 4.0'
+gem 'mongo', '~> 2.2'
+gem 'mongoid', '~> 5.1'
 gem 'rspec'
 gem 'sinatra', '~> 1.4.0'
 

data/lib/mongo_request_logger.rb

@@ -12,7 +12,6 @@ require 'mongoid'
 
 require 'mongo'
 require_relative './mongo_request_logger/adapters/mongo.rb'
-require_relative './mongo_request_logger/mongoid_config.rb'
 
 
 module MongoRequestLogger
@@ -27,9 +26,9 @@ module MongoRequestLogger
 
     environment = ENV['RACK_ENV'] || ENV['RAILS_ENV']
 
-    session = MongoidConfig.clients[:logger]
+    session = Mongoid.client(:logger)
     if session
-      log_config = MongoidConfig.clients.config[:logger][:options].with_indifferent_access
+      log_config = Mongoid.clients[:logger][:options].with_indifferent_access
 
       fallback_log = options[:fallback_log] || log_config['fallback_log'] || "log/#{environment}.log"
 

data/lib/mongo_request_logger/version.rb

@@ -1,3 +1,3 @@
 module MongoRequestLogger
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/spec/dummy/config/mongoid.yml

@@ -1,5 +1,5 @@
 test:
-  sessions:
+  clients:
     default:
       database: request_logger_test_dummy
       hosts:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo_request_logger
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Embark Mobile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -384,7 +384,6 @@ files:
 - lib/mongo_request_logger/logged_job.rb
 - lib/mongo_request_logger/logger.rb
 - lib/mongo_request_logger/logger_extensions.rb
-- lib/mongo_request_logger/mongoid_config.rb
 - lib/mongo_request_logger/rack.rb
 - lib/mongo_request_logger/railtie.rb
 - lib/mongo_request_logger/search_terms.rb
@@ -399,11 +398,6 @@ files:
 - spec/rails_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
-- spec/testapp/app.rb
-- spec/testapp/config.ru
-- spec/testapp/config/logger.yml
-- spec/testapp/log/.gitignore
-- spec/testapp/log/.gitkeep
 - views/index.erb
 homepage: ''
 licenses: []
@@ -437,8 +431,3 @@ test_files:
 - spec/rails_spec.rb
 - spec/shared_examples.rb
 - spec/spec_helper.rb
-- spec/testapp/app.rb
-- spec/testapp/config.ru
-- spec/testapp/config/logger.yml
-- spec/testapp/log/.gitignore
-- spec/testapp/log/.gitkeep

data/lib/mongo_request_logger/mongoid_config.rb

@@ -1,95 +0,0 @@
-module MongoRequestLogger
-  # Directly parse the mongoig.yml config and present accessors similar to Mongoid 5.
-  # TODO: to be replaced by the Mongoid 5 default behaviour
-  module MongoidConfig
-    def self.clients
-      @clients ||= ClientMap.new
-    end
-
-    class ClientMap
-      attr_reader :config
-
-      def initialize
-        @clients = HashWithIndifferentAccess.new
-        config_file = Rails.root.join("config", "mongoid.yml")
-        @config = Environment.load_yaml(config_file).with_indifferent_access
-        @config = @config[:sessions]
-        @config = @config.with_indifferent_access
-      end
-
-      def [] key
-        config = @config[key]
-        raise Mongoid::Errors::NoSessionConfig.new(key) unless config
-        @clients[key] ||= ClientFactory.create(config)
-      end
-    end
-
-    class ClientFactory
-      def self.create configuration
-        raise unless configuration
-        if configuration[:uri]
-          Mongo::Client.new(configuration[:uri], options(configuration))
-        else
-          opts = options(configuration).merge(database: configuration[:database])
-          opts = opts.merge(credentials(configuration))
-          Mongo::Client.new(configuration[:hosts], opts)
-        end
-      end
-
-      private
-
-      def self.options(configuration)
-        config = configuration.dup
-        options = config.delete(:options) || {}
-        options.reject{ |k, v| k == :hosts }.to_hash.symbolize_keys!
-      end
-
-      def self.credentials(configuration)
-        details = {}
-        details[:user] = configuration[:username] unless configuration[:username].nil?
-        details[:password] = configuration[:password] unless configuration[:password].nil?
-        details
-      end
-    end
-    
-    class NoEnvironment < RuntimeError; end
-    # Encapsulates logic for getting environment information.
-    module Environment
-      extend self
-
-      # Get the name of the environment that we are running under. This first
-      # looks for Rails, then Sinatra, then a RACK_ENV environment variable,
-      # and if none of those are found raises an error.
-      #
-      # @example Get the env name.
-      #   Environment.env_name
-      #
-      # @raise [ Errors::NoEnvironment ] If no environment was set.
-      #
-      # @return [ String ] The name of the current environment.
-      #
-      # @since 2.3.0
-      def env_name
-        return Rails.env if defined?(Rails) && Rails.respond_to?(:env)
-        return Sinatra::Base.environment.to_s if defined?(Sinatra)
-        ENV["RACK_ENV"] || ENV["MONGOID_ENV"] || raise(NoEnvironment.new)
-      end
-
-      # Load the yaml from the provided path and return the settings for the
-      # current environment.
-      #
-      # @example Load the yaml.
-      #   Environment.load_yaml("/work/mongoid.yml")
-      #
-      # @param [ String ] path The location of the file.
-      #
-      # @return [ Hash ] The settings.
-      #
-      # @since 2.3.0
-      def load_yaml(path, environment = nil)
-        env = environment ? environment.to_s : env_name
-        YAML.load(ERB.new(File.new(path).read).result)[env]
-      end
-    end
-  end
-end

data/spec/testapp/app.rb

@@ -1,14 +0,0 @@
-require 'sinatra/base'
-
-class SinatraApp < Sinatra::Base
-  # This prevents Sinatra from using the default logger.
-  set :logging, nil
-
-  get '/' do
-    puts logger.class.name
-    logger.debug 'Logging from Sinatra!'
-
-    "Log test on Sinatra #{Sinatra::VERSION}"
-  end
-end
-

data/spec/testapp/config.ru

@@ -1,21 +0,0 @@
-require 'rack/builder'
-require 'mongo_request_logger'
-require './app'
-require 'rack/cascade'
-
-app = Rack::Builder.new do
-  use Rack::Session::Cookie, secret: 'phungah1Geik8Eeth4Eezoh0aj1naeV2oiroh4EZe6Ulei1ohdooxae8cu0amake'
-
-  MongoRequestLogger.configure(File.join(File.dirname(__FILE__), 'config/logger.yml'))
-  use MongoRequestLogger::Rack
-
-  map "/log" do
-    run MongoRequestLogger::Viewer.new
-  end
-
-  map "/" do
-    run SinatraApp.new
-  end
-end
-
-run app

data/spec/testapp/config/logger.yml

@@ -1,6 +0,0 @@
-test:
-  host: localhost
-  database: request_logger_test
-  username: request_logger_test
-  password: test_password
-  capsize: 1024

data/spec/testapp/log/.gitignore

@@ -1 +0,0 @@
-*.log