change gemspec

Author: le0pard

.rvmrc

@@ -1 +1 @@
-rvm ruby-1.9.3-p194@mongodb_logger_gems --create
+rvm ruby-1.9.3-p286@mongodb_logger_gems --create

.travis.yml

@@ -15,7 +15,7 @@ branches:
   only:
     - master
     - development
-    - gem
+    - adapters
 #bundler_args: --path vendor/bundle
 matrix:
   allow_failures:

Gemfile

@@ -1,10 +1,4 @@
 source 'http://rubygems.org'
 
 # Specify your gem's dependencies in mongodb_logger.gemspec
-platforms :ruby do
-  gemspec(:name => "mongodb_logger")
-end
-
-platforms :jruby do
-  gemspec(:name => "mongodb_logger.java")
-end
+gemspec

Rakefile

@@ -1,12 +1,12 @@
 #!/usr/bin/env rake
+require 'rubygems'
+require 'bundler'
+
+Bundler.require
 require 'rake'
 require 'rake/testtask'
-begin
-  require 'cucumber/rake/task'
-rescue LoadError
-  $stderr.puts "Please install cucumber: `gem install cucumber`"
-  exit 1
-end
+require 'cucumber'
+require 'cucumber/rake/task'
 
 #require "bundler/gem_tasks"
 require 'bundler/gem_helper'

lib/mongodb_logger/adapters/base.rb

@@ -28,9 +28,9 @@ def reset_collection
       def collection_stats_hash(stats)
         {
           :is_capped => (stats["capped"] && ([1, true].include?(stats["capped"]))),
-          :count => stats["count"],
-          :size => stats["size"],
-          :storageSize => stats["storageSize"],
+          :count => stats["count"].to_i,
+          :size => stats["size"].to_f,
+          :storageSize => stats["storageSize"].to_f,
           :db_name => @configuration["database"],
           :collection => collection_name
         }

lib/mongodb_logger/server/view_helpers.rb

@@ -11,6 +11,10 @@ def pretty_hash(hash)
     end
   end
 
+  def percent_of_userd_memory(collection_stats)
+    ((collection_stats[:size] / collection_stats[:storageSize]) * 100).round
+  end
+  
   def string_from_log_message(message)
     message.is_a?(Array) ? message.join("\n") : message.to_s
   end

lib/mongodb_logger/server/views/layout.erb

@@ -32,12 +32,5 @@
 <!-- scripts -->
 <script src="<%= asset_path('mongodb_logger.js') %>" type="text/javascript"></script>
 
-<!-- charts -->
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-<script type="text/javascript">
-  google.load('visualization', '1', {'packages':['corechart']});
-  google.setOnLoadCallback(MongodbLoggerMain.init_analytic_charts);
-</script>
-
 </body>
 </html>

lib/mongodb_logger/server/views/shared/_collection_stats.erb

@@ -5,7 +5,7 @@
 <% if collection_stats[:is_capped] %>
   <div class="progress">
     <span class="size"><%=h number_to_human_size(collection_stats[:size]) %> of <%=h number_to_human_size(collection_stats[:storageSize]) %></span>
-    <div class="used" style="width: <%=((collection_stats[:size].to_f / collection_stats[:storageSize].to_f) * 100).round%>%"></div>
+    <div class="used" style="width: <%= percent_of_userd_memory(collection_stats) %>%"></div>
   </div> <!-- progress -->
 <% else %>
   <div class="warning"><p>You do not use capped collection for logs. 

mongodb_logger.gemspec

@@ -11,25 +11,22 @@ 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_runtime_dependency "rake",            ">= 0.9.0"
-  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"