mongodb_logger 0.4.2 → 0.5.0

data/features/step_definitions/rake_steps.rb

@@ -0,0 +1,10 @@
+Given /I've prepared the Rakefile/ do
+  rakefile = File.join(PROJECT_ROOT, 'features', 'support', 'rake', 'Rakefile')
+  target = File.join(TEMP_DIR, 'Rakefile')
+  FileUtils.cp(rakefile, target)
+end
+
+When /I run rake with (.+)/ do |command|
+  command = "rake #{command.gsub(' ','_')}"
+  step %{I run `#{command}`}
+end

data/features/support/aruba.rb

@@ -0,0 +1,5 @@
+Before do
+  @aruba_timeout_seconds = 30
+  @aruba_io_wait_seconds = 5
+  @dirs = ["tmp"]
+end

data/features/support/env.rb

@@ -1,15 +1,21 @@
 require 'active_support'
 require 'rspec'
+require 'aruba/cucumber'
 
 PROJECT_ROOT     = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
 TEMP_DIR         = File.join(PROJECT_ROOT, 'tmp').freeze
 LOCAL_RAILS_ROOT = File.join(TEMP_DIR, 'rails_root').freeze
-BUILT_GEM_ROOT   = File.join(TEMP_DIR, 'built_gems').freeze
-LOCAL_GEM_ROOT   = File.join(TEMP_DIR, 'local_gems').freeze
 
 Before do
-  FileUtils.mkdir_p(TEMP_DIR)
-  FileUtils.rm_rf(BUILT_GEM_ROOT)
   FileUtils.rm_rf(LOCAL_RAILS_ROOT)
-  FileUtils.mkdir_p(BUILT_GEM_ROOT)
+end
+
+When /^I reset Bundler environment variable$/ do
+  BUNDLE_ENV_VARS.each do |key|
+    ENV[key] = nil
+  end
+end
+
+def prepend_path(path)
+  ENV['PATH'] = path + ":" + ENV['PATH']
 end

data/features/support/rails.rb

@@ -1,98 +1,86 @@
+BUNDLE_ENV_VARS = %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE)
+ORIGINAL_BUNDLE_VARS = Hash[ENV.select{ |key,value| BUNDLE_ENV_VARS.include?(key) }]
+
+ENV['RAILS_ENV'] = 'test'
+
+Before do
+  ENV['BUNDLE_GEMFILE'] = File.join(Dir.pwd, ENV['BUNDLE_GEMFILE']) unless ENV['BUNDLE_GEMFILE'].start_with?(Dir.pwd)
+  @framework_version = nil
+end
+
+After do |s|
+  ORIGINAL_BUNDLE_VARS.each_pair do |key, value|
+    ENV[key] = value
+  end
+  Cucumber.wants_to_quit = true if s.failed?
+end
+
 module RailsHelpers
   def rails_root_exists?
     File.exists?(environment_path)
   end
-  
-  def environment_path
-    File.join(rails_root, 'config', 'environment.rb')
-  end
 
   def application_controller_filename
     controller_filename = File.join(rails_root, 'app', 'controllers', "application_controller.rb")
   end
 
+  def rails3?
+    rails_version =~ /^3/
+  end
+
   def rails_root
     LOCAL_RAILS_ROOT
   end
-  
-  def rails30?
-    rails_version =~ /^3.0/
-  end
-  
-  def rails31?
-    rails_version =~ /^3.1/
+
+  def rails_uses_rack?
+    rails3? || rails_version =~ /^2\.3/
   end
 
   def rails_version
     @rails_version ||= begin
-      rails_version = open(gemfile_path).read.match(/gem.*rails["'].*["'](.+)["']/)[1]
+      if ENV["RAILS_VERSION"]
+        ENV["RAILS_VERSION"]
+      elsif bundler_manages_gems?
+        rails_version = open(gemfile_path).read.match(/gem.*rails["'].*["'](.+)["']/)[1]
+      else
+        environment_file = File.join(rails_root, 'config', 'environment.rb')
+        rails_version = `grep RAILS_GEM_VERSION #{environment_file}`.match(/[\d.]+/)[0]
+      end
     end
   end
 
-  def gemfile_path
-    File.join(rails_root, 'Gemfile')
+  def bundler_manages_gems?
+    File.exists?(gemfile_path)
   end
 
-  def rakefile_path
-    File.join(rails_root, 'Rakefile')
-  end
-  
-  def routes_path
-    File.join(rails_root, 'config', 'routes.rb')
+  def gemfile_path
+    gemfile = File.join(rails_root, 'Gemfile')
   end
-  
-  def logs_path
-    File.join(rails_root, 'log')
+
+  def rails_manages_gems?
+    rails_version =~ /^2\.[123]/
   end
 
-  def bundle_gem(gem_name, version = nil)
-    File.open(gemfile_path, 'a') do |file|
-      gem = "gem '#{gem_name}'"
-      gem += ", '#{version}'" if version
-      file.puts(gem)
-    end
+  def rails_supports_initializers?
+    rails3? || rails_version =~ /^2\./
   end
-  
-  def require_thread
-    content = File.read(rakefile_path)
-    content = "require 'thread'\n#{content}"
-    File.open(rakefile_path, 'wb') { |file| file.write(content) }
+
+  def rails_finds_generators_in_gems?
+    rails3? || rails_version =~ /^2\./
   end
-  
-  def add_routes
-    content = File.read(routes_path)
-    flag = Regexp.escape("Application.routes.draw do\n")
-    order_routes = <<STR
-resources :order do
-  collection do
-    post :test_post
+
+  def version_string
+    ENV['RAILS_VERSION'] || `tail -n 1 SUPPORTED_RAILS_VERSIONS` # use latest version if ENV["RAILS_VERSION"] is undefined
   end
-end
-STR
-    content.gsub!(/#{flag}/m, '\0 ' + order_routes)
-    File.open(routes_path, 'wb') { |file| file.write(content) }
+
+  def environment_path
+    File.join(rails_root, 'config', 'environment.rb')
   end
-  
-  def copy_tests
-    FileUtils.cp(
-      File.join(PROJECT_ROOT, 'test', 'rails', 'app', 'controllers', 'order_controller.rb'), 
-      File.join(rails_root, 'app', 'controllers', 'order_controller.rb')
-    )
-    FileUtils.cp(
-      File.join(PROJECT_ROOT, 'test', 'config', 'samples', 'database.yml'), 
-      File.join(rails_root, 'config', 'database.yml')
-    )
-    FileUtils.cp(
-      File.join(PROJECT_ROOT, 'test', 'rails', 'test', 'test_helper.rb'), 
-      File.join(rails_root, 'test', 'test_helper.rb')
-    )
-    FileUtils.cp(
-      File.join(PROJECT_ROOT, 'test', 'rails', 'test', 'functional', 'order_controller_test.rb'), 
-      File.join(rails_root, 'test', 'functional', 'order_controller_test.rb')
-    )
-    FileUtils.chmod 0777, logs_path
+
+  def rakefile_path
+    File.join(rails_root, 'Rakefile')
   end
-  
+
 end
 
-World(RailsHelpers)
+World(RailsHelpers)

data/gemfiles/rails31.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.1.11"
+gem "mongodb_logger", :path=>"../"
+
+gemspec :path=>"../"

data/gemfiles/rails32.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 3.2.12"
+gem "mongodb_logger", :path=>"../"
+
+gemspec :path=>"../"

data/lib/mongodb_logger.rb

@@ -4,6 +4,7 @@ require 'mongodb_logger/config'
 require 'mongodb_logger/logger'
 require 'mongodb_logger/railtie' if defined?(Rails::Railtie)
 require 'mongodb_logger/engine' if defined?(Rails::Engine)
+require 'mongodb_logger/rack_middleware'
 require 'mongodb_logger/version'
 
 module MongodbLogger
@@ -11,7 +12,13 @@ module MongodbLogger
     extend Config
     
     def self.included(base)
-      base.class_eval { around_filter :enable_mongodb_logger }
+      base.class_eval do
+        begin
+          around_action :enable_mongodb_logger
+        rescue
+          around_filter :enable_mongodb_logger
+        end
+      end
     end
 
     def enable_mongodb_logger
@@ -36,11 +43,11 @@ module MongodbLogger
       }) { yield }
     end
     # session keys can be with dots. It is invalid keys for BSON
-    def mongo_fix_session_keys(session)
+    def mongo_fix_session_keys(session = {})
       new_session = {}
       session.each do |i, j|
         new_session[i.gsub(/\./i, "|")] = j.inspect
-      end
+      end if session
       new_session
     end
   end

data/lib/mongodb_logger/adapters/base.rb

@@ -18,13 +18,17 @@ module MongodbLogger
         @collection = @connection[@configuration['collection']]
       end
 
+      def rename_collection_command(admin_session, to, drop_target = false)
+        admin_session.command({ renameCollection: "#{@configuration['database']}.#{collection_name}", to: "#{@configuration['database']}.#{to}", dropTarget: drop_target })
+      end
+
       def reset_collection
         if @connection && @collection
           @collection.drop
           create_collection
         end
       end
-      
+
       def collection_stats_hash(stats)
         {
           :is_capped => (stats["capped"] && ([1, true].include?(stats["capped"]))),

data/lib/mongodb_logger/adapters/mongo.rb

@@ -1,7 +1,7 @@
 module MongodbLogger
   module Adapers
     class Mongo < Base
-      
+
       def initialize(options = {})
         @authenticated = false
         @configuration = options
@@ -19,29 +19,33 @@ module MongodbLogger
           end
         end
       end
-      
+
       def create_collection
         @connection.create_collection(collection_name,
           {:capped => true, :size => @configuration['capsize'].to_i})
       end
-      
+
       def insert_log_record(record, options = {})
         @collection.insert(record, options[:write_options])
       end
-      
+
       def collection_stats
         collection_stats_hash(@collection.stats)
       end
-      
+
+      def rename_collection(to, drop_target = false)
+        rename_collection_command(mongo_connection_object.db("admin"), to, drop_target)
+      end
+
       # filter
       def filter_by_conditions(filter)
         @collection.find(filter.get_mongo_conditions).sort('$natural', -1).limit(filter.get_mongo_limit)
       end
-      
+
       def find_by_id(id)
         @collection.find_one(::BSON::ObjectId(id))
       end
-      
+
       def tail_log_from_params(params = {})
         logs = []
         last_id = nil
@@ -56,19 +60,19 @@ module MongodbLogger
           log = @collection.find_one({}, {:sort => ['$natural', -1]})
           log_last_id = log["_id"].to_s unless log.blank?
         end
-        { 
-          :log_last_id => log_last_id, 
+        {
+          :log_last_id => log_last_id,
           :time => Time.now.strftime("%F %T"),
           :logs => logs
         }
       end
-      
+
       def calculate_mapreduce(map, reduce, params = {})
         @collection.map_reduce(map, reduce, {:query => params[:conditions], :sort => ['$natural', -1], :out => {:inline => true}, :raw => true}).find()
       end
-      
+
       private
-      
+
       def mongo_connection_object
         if @configuration['hosts']
           conn = ::Mongo::ReplSetConnection.new(*(@configuration['hosts'] <<
@@ -85,7 +89,7 @@ module MongodbLogger
         @connection_type = conn.class
         conn
       end
-      
+
     end
   end
 end

data/lib/mongodb_logger/adapters/moped.rb

@@ -1,7 +1,7 @@
 module MongodbLogger
   module Adapers
     class Moped < Base
-      
+
       def initialize(options = {})
         @configuration = options
         if @configuration['url']
@@ -20,11 +20,11 @@ module MongodbLogger
           end
         end
       end
-      
+
       def create_collection
         @connection.command(create: collection_name, capped: true, size:  @configuration['capsize'].to_i)
       end
-      
+
       def insert_log_record(record, options = {})
         record[:_id] = ::Moped::BSON::ObjectId.new
         @connection.with(safe: options[:write_options])[collection_name].insert(record)
@@ -33,16 +33,22 @@ module MongodbLogger
       def collection_stats
         collection_stats_hash(@connection.command(collStats: collection_name))
       end
-      
+
+      def rename_collection(to, drop_target = false)
+        @connection.with(database: "admin", consistency: :strong) do |session|
+          rename_collection_command(session, to, drop_target)
+        end
+      end
+
       # filter
       def filter_by_conditions(filter)
         @collection.find(filter.get_mongo_conditions).sort('$natural' => -1).limit(filter.get_mongo_limit)
       end
-      
+
       def find_by_id(id)
         @collection.find("_id" => ::Moped::BSON::ObjectId.from_string(id)).first
       end
-      
+
       def tail_log_from_params(params = {})
         logs = []
         last_id = nil
@@ -57,13 +63,13 @@ module MongodbLogger
           log = @collection.find.sort('$natural' => -1).first
           log_last_id = log["_id"].to_s unless log.blank?
         end
-        { 
-          :log_last_id => log_last_id, 
+        {
+          :log_last_id => log_last_id,
           :time => Time.now.strftime("%F %T"),
           :logs => logs
         }
       end
-      
+
       def calculate_mapreduce(map, reduce, params = {})
         @connection.command(
           mapreduce: collection_name,
@@ -76,7 +82,7 @@ module MongodbLogger
       end
 
       private
-      
+
       def mongo_connection_object
         if @configuration['hosts']
           conn = ::Moped::Session.new(@configuration['hosts'].map{|(host,port)| "#{host}:#{port}"}, :timeout => 6)
@@ -89,7 +95,7 @@ module MongodbLogger
         @connection_type = conn.class
         conn
       end
-      
+
     end
   end
 end

data/lib/mongodb_logger/capistrano.rb

@@ -3,6 +3,8 @@ Capistrano::Configuration.instance.load do
   _cset :mongodb_logger_assets_role, [:app]
   _cset :mongodb_logger_assets_dir, "public/assets"
 
+  _cset :mongodb_logger_db_role, [:app]
+
   namespace :mongodb_logger do
 
     desc <<-DESC
@@ -12,5 +14,11 @@ Capistrano::Configuration.instance.load do
       run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} #{mongodb_logger_asset_env} mongodb_logger:assets:compile[#{mongodb_logger_assets_dir}]"
     end
 
+    desc <<-DESC
+      Run collection migrate rake task.
+    DESC
+    task :migrate, :roles => mongodb_logger_db_role, :except => { :no_release => true } do
+      run "cd #{latest_release} && #{rake} RAILS_ENV=#{rails_env} mongodb_logger:migrate"
+    end
   end
 end