mongodb_logger 0.3.3 → 0.4.0

data/lib/mongodb_logger/server/views/shared/_top_panel.erb

@@ -3,5 +3,5 @@
   <div class="unit-right">
     <% yield_content :right_top_panel %>
   </div> <!-- unit-right -->
-  <div id="ajax_loader"><img src="<%= asset_path 'spinner.gif' %>" alt="loading..."></div>
+  <div id="ajaxLoader"><img src="<%= asset_path 'spinner.gif' %>" alt="loading..."></div>
 </div> <!-- topline -->

data/lib/mongodb_logger/server/views/show_log.erb

@@ -2,7 +2,7 @@
 
 <div class="unit-right">
   <div class="pam">
-    <a href="<%=h url_path("overview") %>" data-pjax='#main_pjax' class="button small grey">Back</a>
+    <a href="<%=h url_path("overview") %>" data-pjax='#mainPjax' class="button small grey">Back</a>
   </div> <!-- pam -->            
 </div> <!-- unit-right -->
 <h1 class="pam">Log #<%=h @log['_id'] %></h1>
@@ -102,4 +102,14 @@
       </div> <!-- unit -->
     </li>
   <% end %>
+  <% unless @log['session'].blank? %>
+    <li class="outer pvs phm">
+      <div class="unit size1of5">
+        <span class="pale">Session:</span>
+      </div> <!-- unit -->
+      <div class="unit size4of5">
+        <pre><code><%= pretty_hash(@log['session']) %></code></pre>
+      </div> <!-- unit -->
+    </li>
+  <% end %>
 </ul>

data/lib/mongodb_logger/server_config.rb

@@ -1,76 +1,27 @@
-require 'mongo'
-require 'erb'
-require 'active_support'
-require 'active_support/core_ext'
+require 'mongodb_logger/logger'
 
-# TODO: Dry this class with logger class
 module MongodbLogger
   class ServerConfig
     
-    DEFAULT_COLLECTION_SIZE = 250.megabytes
-    
+    class ServerLogger < MongodbLogger::Logger
+      private
+      def resolve_config
+        config_file = ENV['MONGODBLOGGERCONFIG']
+        config = YAML.load(ERB.new(File.read(config_file)).result)
+        config = config['mongodb_logger'] if config && config.has_key?('mongodb_logger')
+        config
+      end
+    end
+   
     class << self
-      
       def set_config(config_path)
-        if File.file?(config_path)
-          config_file = File.new(config_path)
-          config = YAML.load(ERB.new(config_file.read).result)
-        else
-          raise "Config file not found"
-        end
-        
-        @db_configuration = {
-          'host' => 'localhost',
-          'port' => 27017}.merge(config)
-        @db_configuration["collection"] ||= "production_log"
-        @db = Mongo::Connection.new(@db_configuration['host'],
-                                    @db_configuration['port'],
-                                    :connect => true).db(@db_configuration['database'])
-
-        if @db_configuration['username'] && @db_configuration['password']
-          @authenticated = @db.authenticate(@db_configuration['username'],
-                                                          @db_configuration['password'])
-        end
-
-        set_collection
-      end
-      
-      def set_config_for_testing(config_path)
-        set_config(config_path)
-        create_collection unless @db.collection_names.include?(@db_configuration["collection"])
-        set_collection
-      end
-      
-      def create_collection
-        capsize = DEFAULT_COLLECTION_SIZE
-        capsize = @db_configuration['capsize'].to_i if @db_configuration['capsize']
-        @db.create_collection(@db_configuration["collection"],
-                                            {:capped => true, :size => capsize})
-      end
-       
-       
-      def set_collection
-        @collection = @db[@db_configuration["collection"]]
-      end
-      
-      def get_config
-        @db_configuration
-      end
-      
-      def authenticated?
-        @authenticated
-      end
-      
-      def collection_name
-        @db_configuration["collection"]
-      end
-      
-      def db
-        @db
+        ENV['MONGODBLOGGERCONFIG'] = config_path
+        @logger = ServerLogger.new(:path => "server.log")
+        @logger.mongo_adapter
       end
-      
-      def collection
-        @collection
+   
+      def mongo_adapter
+        @logger.mongo_adapter if @logger
       end
     end
   end

data/lib/mongodb_logger/version.rb

@@ -1,3 +1,3 @@
 module MongodbLogger
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/mongodb_logger.gemspec

@@ -11,27 +11,26 @@ Gem::Specification.new do |gem|
   gem.extra_rdoc_files  = [ "LICENSE", "README.md" ]
   gem.rdoc_options      = ["--charset=UTF-8"]
 
-  gem.add_development_dependency "jasmine",         ">= 1.0.0"
-  gem.add_development_dependency "rspec",           ">= 2.8.0"
-  gem.add_development_dependency "shoulda",         ">= 2.0.0"
-  gem.add_development_dependency "mocha",           ">= 0.10.0"
-  gem.add_development_dependency "cucumber",        ">= 1.1.2"
-  gem.add_development_dependency "capybara",        ">= 1.1.2"
-  gem.add_development_dependency "uglifier",        ">= 1.2.0"
-  gem.add_development_dependency "therubyracer",    ">= 0.9.9"
+  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "shoulda"
+  gem.add_development_dependency "mocha"
+  gem.add_development_dependency "cucumber"
+  gem.add_development_dependency "capybara"
+  gem.add_development_dependency "coffee-script"
+  gem.add_development_dependency "uglifier"
+  gem.add_development_dependency "jasmine"
+  # adapters
+  gem.add_development_dependency "mongo"
+  gem.add_development_dependency "moped"
   
-  gem.add_runtime_dependency "rake",            ">= 0.9.0"
-  gem.add_runtime_dependency "mongo",           ">= 1.6.1"
-  gem.add_runtime_dependency "bson_ext",        ">= 1.6.1"
-  gem.add_runtime_dependency "i18n",            ">= 0.4.1"
-  gem.add_runtime_dependency "json",            ">= 1.6.1"
-  gem.add_runtime_dependency "activesupport",   ">= 3.0.0"
-  gem.add_runtime_dependency "actionpack",      ">= 3.0.0"
-  gem.add_runtime_dependency "sprockets",       ">= 2.0.0"
-  gem.add_runtime_dependency "coffee-script",   ">= 2.2.0"
-  gem.add_runtime_dependency "sinatra",         ">= 1.2.0"
-  gem.add_runtime_dependency "erubis",          ">= 2.6.6"
-  gem.add_runtime_dependency "vegas",           ">= 0.1.2"
+  gem.add_dependency "rake",            ">= 0.9.0"
+  gem.add_dependency "json",            "~> 1.7.0"
+  gem.add_dependency "activesupport",   ">= 3.1.0"
+  gem.add_dependency "actionpack",      ">= 3.1.0"
+  gem.add_dependency "sprockets",       ">= 2.0.0"
+  gem.add_dependency "sinatra",         "~> 1.3.0"
+  gem.add_dependency "erubis",          "~> 2.7.0"
+  gem.add_dependency "vegas",           "~> 0.1.0"
 
   gem.rubyforge_project = "mongodb_logger"
 

data/spec/javascripts/MongodbLoggerMainSpec.js

@@ -4,9 +4,9 @@ describe("MongodbLoggerMain", function() {
     MongodbLoggerMain.init();
   });
   
-  describe("log_info_padding", function() {
+  describe("logInfoPadding", function() {
     it("should be 15", function() {
-      expect(MongodbLoggerMain.log_info_padding).toEqual(15);
+      expect(MongodbLoggerMain.logInfoPadding).toEqual(15);
     });
   });
   

data/spec/javascripts/support/jasmine.yml

@@ -11,11 +11,11 @@
 #   - dist/**/*.js
 #
 src_files:
-    - lib/mongodb_logger/server/public/javascripts/vendors/jquery-1.7.1.min.js
-    - lib/mongodb_logger/server/public/javascripts/vendors/jquery-ui-1.8.16.min.js
-    - lib/mongodb_logger/server/public/javascripts/vendors/jquery.pjax.min.js
-    - lib/mongodb_logger/server/public/javascripts/vendors/highlight.pack.js
-    - lib/mongodb_logger/server/public/javascripts/logs.js
+    - app/assets/javascripts/vendors/jquery-1.8.3.min.js
+    - app/assets/javascripts/vendors/jquery-ui-1.9.2.min.js
+    - app/assets/javascripts/vendors/jquery.pjax.min.js
+    - app/assets/javascripts/vendors/highlight.pack.js
+    - app/assets/javascripts/logs.js
 
 # stylesheets
 #

data/test/Gemfile_tests

@@ -5,4 +5,5 @@ gem "rspec",           ">= 2.8.0"
 gem "shoulda",         ">= 2.0.0"
 gem "mocha",           ">= 0.10.0"
 gem "cucumber",        "~> 1.1.2"
-gem "capybara",        "~> 1.1.2"
+gem "capybara",        "~> 1.1.2"
+gem "i18n"

data/test/config/samples/database.yml

@@ -6,4 +6,6 @@ test:
   mongodb_logger:
     database: system_log
     application_name: mongo_foo
-    safe_insert: true
+    write_options: 
+      w: 1
+      wtimeout: 200

data/test/config/samples/database_no_file_logging.yml

@@ -6,5 +6,7 @@ test:
   mongodb_logger:
     database: system_log
     application_name: mongo_foo
-    safe_insert: true
+    write_options: 
+      w: 1
+      wtimeout: 200
     disable_file_logging: true

data/test/shoulda_macros/log_macros.rb

@@ -1,7 +1,7 @@
 module LogMacros
   def should_contain_one_log_record
     should "contain a log record" do
-      assert_equal 1, @con[@mongodb_logger.mongo_collection_name].count
+      assert_equal 1, @collection.count
     end
   end
 

data/test/test.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
-BUNDLE_GEMFILE=test/Gemfile_tests bundle
-BUNDLE_GEMFILE=test/Gemfile_tests rake vendor_test_gems && \
-rake test && \
-rake cucumber:web && \
+bundle exec rake test && \
+bundle exec rake cucumber:web
+#bundle exec rake vendor_test_gems && \
+# && \
 #rake jasmine:ci && \
-rake cucumber:rails:all
+#rake cucumber:rails:all

data/test/test_helper.rb

@@ -1,13 +1,13 @@
-require 'test/unit'
+require 'rubygems'
+require 'bundler'
 
-begin
-  require 'shoulda'
-rescue LoadError
-  require 'rubygems'
-  require 'shoulda'
-end
+Bundler.require
+
+require 'test/unit'
+require "mocha"
+require 'mocha/api'
+require 'shoulda'
 
-require 'mocha'
 # mock rails class
 require 'pathname'
 require 'rails'
@@ -46,18 +46,18 @@ class Test::Unit::TestCase
     end
   end
 
-  def setup_for_config(source, dest=source)
+  def setup_for_config(source, dest = source)
     File.delete(File.join(CONFIG_DIR, DEFAULT_CONFIG))
     cp_config(source, dest)
     @mongodb_logger.send(:configure)
   end
 
-  def cp_config(source, dest=source)
+  def cp_config(source, dest = source)
     FileUtils.cp(File.join(SAMPLE_CONFIG_DIR, source),  File.join(CONFIG_DIR, dest))
   end
 
   def teardown_for_config(file)
-    File.delete(File.join(CONFIG_DIR, file))
+    File.delete(File.join(CONFIG_DIR, file)) if File.exists?(File.join(CONFIG_DIR, file))
   end
 
   def log_metadata(options)
@@ -71,20 +71,28 @@ class Test::Unit::TestCase
   end
 
   def common_setup
-    @con = @mongodb_logger.mongo_connection
-    @collection = @con[@mongodb_logger.mongo_collection_name]
+    @mongo_adapter = @mongodb_logger.mongo_adapter
+    @con = @mongo_adapter.connection
+    @collection = @mongo_adapter.collection
+  end
+  
+  def reset_collection
+    if @mongo_adapter && @collection
+      @collection.drop
+      @mongo_adapter.create_collection
+    end
   end
 
-  def create_user
+  def create_mongo_user
     db_conf = @mongodb_logger.db_configuration
     @user = db_conf['username']
-    mongo_connection = Mongo::Connection.new(db_conf['host'],
+    @mongo_connection = ::Mongo::Connection.new(db_conf['host'],
                                              db_conf['port']).db(db_conf['database'])
-    mongo_connection.add_user(@user, db_conf['password'])
+    @mongo_connection.add_user(@user, db_conf['password'])
   end
 
-  def remove_user
-    @mongodb_logger.mongo_connection.remove_user(@user)
+  def remove_mongo_user
+    @mongo_connection.remove_user(@user)
   end
 
 end

data/test/unit/mongodb_logger_test.rb

@@ -54,9 +54,8 @@ class MongodbLogger::LoggerTest < Test::Unit::TestCase
 
         should "connect with the url" do
           @mongodb_logger.send(:connect)
-          assert @mongodb_logger.authenticated?
-          assert_equal "system_log", @mongodb_logger.mongo_connection.name
-          assert_equal ["localhost", 27017], @mongodb_logger.mongo_connection.connection.primary
+          assert @mongodb_logger.mongo_adapter.authenticated?
+          assert_equal "system_log", @mongodb_logger.mongo_adapter.configuration['database']
         end
       end
 
@@ -64,45 +63,46 @@ class MongodbLogger::LoggerTest < Test::Unit::TestCase
       context "upon connecting with authentication settings" do
         setup do
           setup_for_config(DEFAULT_CONFIG_WITH_AUTH, DEFAULT_CONFIG)
-          create_user
+          create_mongo_user
         end
 
         should "authenticate with the credentials in the configuration" do
           @mongodb_logger.send(:connect)
-          assert @mongodb_logger.authenticated?
+          assert @mongodb_logger.mongo_adapter.authenticated?
         end
 
         teardown do
           # config will be deleted by outer teardown
-          remove_user
+          remove_mongo_user
         end
       end
-
+=begin
       context "after configuration" do
         setup do
           @mongodb_logger.send(:configure)
+          @mongo_adapter = @mongodb_logger.mongo_adapter
         end
 
         should "set the default host, port, and capsize if not configured" do
-          assert_equal 'localhost', @mongodb_logger.db_configuration['host']
-          assert_equal 27017, @mongodb_logger.db_configuration['port']
-          assert_equal MongodbLogger::Logger::DEFAULT_COLLECTION_SIZE, @mongodb_logger.db_configuration['capsize']
+          assert_equal 'localhost', @mongo_adapter.configuration['host']
+          assert_equal 27017, @mongo_adapter.configuration['port']
+          assert_equal MongodbLogger::Logger::DEFAULT_COLLECTION_SIZE, @mongo_adapter.configuration['capsize']
         end
 
         should "set the mongo collection name depending on the Rails environment" do
-          assert_equal "#{Rails.env}_log", @mongodb_logger.mongo_collection_name
+          assert_equal "#{Rails.env}_log", @mongo_adapter.collection_name
         end
 
         should "set the application name when specified in the config file" do
-          assert_equal "mongo_foo", @mongodb_logger.instance_variable_get(:@application_name)
+          assert_equal "mongo_foo", @mongo_adapter.configuration['application_name']
         end
 
         should "set safe insert when specified in the config file" do
-          assert @mongodb_logger.instance_variable_get(:@safe_insert)
+          assert @mongo_adapter.configuration['safe_insert']
         end
 
         should "use the database name in the config file" do
-          assert_equal "system_log", @mongodb_logger.db_configuration['database']
+          assert_equal "system_log", @mongo_adapter.configuration['database']
         end
 
         context "upon connecting to an empty database" do
@@ -132,13 +132,14 @@ class MongodbLogger::LoggerTest < Test::Unit::TestCase
           end
         end
       end
+=end
     end
 
     context "after instantiation" do
       setup do
         @mongodb_logger = MongodbLogger::Logger.new
         common_setup
-        @mongodb_logger.reset_collection
+        reset_collection
       end
 
       context "upon insertion of a log record when active record is not used" do
@@ -150,7 +151,7 @@ class MongodbLogger::LoggerTest < Test::Unit::TestCase
         should_contain_one_log_record
 
         should "allow recreation of the capped collection to remove all records" do
-          @mongodb_logger.reset_collection
+          reset_collection
           assert_equal 0, @collection.count
         end
       end
@@ -207,7 +208,7 @@ class MongodbLogger::LoggerTest < Test::Unit::TestCase
         end
         @mongodb_logger = MongodbLogger::Logger.new
         common_setup
-        @mongodb_logger.reset_collection
+        reset_collection
       end
       
       should "should not call callback function on log" do
@@ -227,7 +228,7 @@ class MongodbLogger::LoggerTest < Test::Unit::TestCase
       setup do
         @mongodb_logger = MongodbLogger::Logger.new(:level => MongodbLogger::Logger::INFO)
         common_setup
-        @mongodb_logger.reset_collection
+        reset_collection
         log("INFO")
       end
 
@@ -287,13 +288,13 @@ class MongodbLogger::LoggerTest < Test::Unit::TestCase
       FileUtils.cp(file_path,  File.join(CONFIG_DIR, DEFAULT_CONFIG))
       @mongodb_logger = MongodbLogger::Logger.new
       common_setup
-      @mongodb_logger.reset_collection
+      reset_collection
 
       @file_config = YAML.load(ERB.new(File.new(file_path).read).result)[Rails.env]['mongodb_logger']
     end
 
     should "changed collection name" do
-      assert_equal @file_config['collection'], @mongodb_logger.mongo_collection_name
+      assert_equal @file_config['collection'], @collection.name
       assert_equal "#{@file_config['database']}.#{@file_config['collection']}", @collection.stats()['ns']
     end