logman 0.0.2 → 0.1.0.alpha

data/README.md

@@ -1,40 +1,85 @@
 # Logman
 
-Logman is Web Console/API for gathering logs from various sources and analyzing them. Logs are saved to mongo database.
+Logman is Web Console/API for gathering logs from various sources and analyzing them. 
+Logs are saved to mongo database.
+
+![](https://dl.dropboxusercontent.com/u/39131387/logman-c.png)
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'logman'
+    gem 'logman', :git=>'git://github.com/saicoder/logman.git'
 
 And then execute:
 
     $ bundle
 
-Or install it yourself as:
-
-    $ gem install logman
+Version of logman at Rubygems.org currently don't have dependencies defined, so best way to install it is over git
 
 ## Usage
 
+Create databse configuration file `database.yaml` with mongo connection settings:
+
+```yaml
+development:
+  sessions:
+    default:
+      database: logman
+      hosts:
+        - localhost:27017
+
+production: #connection for Heroku and MongoHQ
+  sessions:
+    default:
+      uri: <%= ENV['MONGOHQ_URL'] %>
+      options:
+        skip_version_check: true
+        safe: true
+```
+
 Create rackup file `config.ru` with content:
 
 ```ruby
 require 'logman'
 
-Logman.configure do |config|
-  config.database_uri = 'mongodb://localhost/logman'
-  
-  config.log_writer = Logman::LogWriter
-  config.web_console = Logman::WebConsole
-end
+Logman.configure
 
 run Logman::Server
-
 ```
 
-Execute `rackup -p 3000` 
+Execute `rackup config.ru` command 
+
+## How to use it
+
+Open console in web browser and create your account then create Bucket for your server or web app.  
+Bucket is space for writing logs. Every bucket is basically mongo collection.   
+To send logs to bucket you need bucket token. 
+
+If you want to capture logs from Rails application you can use [Rails Logman](https://github.com/saicoder/logman_rails) gem.
+
+To send logs manually make POST request to `http://logman_host:port/api/write?key=bucket_token` with JSON message in format:
+
+```javascript
+{
+	
+ 	log_type: 1, 					//type of log: 1-error, 2-success, 3-warning,4-info
+ 	message: 'Err...', 				//log message
+ 	
+ 	//Optional parameters
+ 	data: {						//additional data
+ 		innerException: {message:'...'}    
+ 	},
+ 	datetime: '1-1-2013 10:00', 			//time when error occurred on server
+ 	data_type: '.net exception', 			//not used for now, but indicates 'data' field format
+ 	
+ 	sources: [{ 					//Name and IP of machine that generated an error, 
+ 		name: 'my server',			//if logman Proxy is used, it will append his hostname and ip
+ 		ip_address: '234.124.156.123'
+ 	}]
+}
+
+```
 
 ## Contributing
 
@@ -43,3 +88,5 @@ Execute `rackup -p 3000`
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+

data/config.ru

@@ -1,9 +1,6 @@
 require 'logman'
 
-Logman.configure do |config|
-  config.database_uri = 'mongodb://localhost/logman'
-  config.log_writer = Logman::LogWriter
-  config.web_console = Logman::WebConsole
-end
+Logman.configure
+ 
 
 run Logman::Server

data/database.yaml

@@ -0,0 +1,14 @@
+development:
+  sessions:
+    default:
+      database: logman
+      hosts:
+        - localhost:27017
+
+production: #connection for Heroku and MongoHQ
+  sessions:
+    default:
+      uri: <%= ENV['MONGOHQ_URL'] %>
+      options:
+        skip_version_check: true
+        safe: true

data/lib/console/auth.rb

@@ -1,5 +1,5 @@
 
-module Logman
+class Logman
   class Auth < ConsoleBase
     get '/login' do
       erb :login, locals:{ :invalid=> false, :register=> (User.count==0) }
@@ -20,8 +20,8 @@ module Logman
       end       
       
       #login routine       
-      user = User.find_by_email(params[:email])
-     
+      user = User.where(:email=>params[:email]).first
+      
       if user.nil? || user.authenticate(params[:password]).blank?
         erb :login, locals:{ :invalid=> true, :register=>false }
       else

data/lib/console/base.rb

@@ -1,8 +1,8 @@
-module Logman
+class Logman
   class ConsoleBase < Sinatra::Base
     before do
       # session[:user_id] = '52e7ffa1adf1744071000001'
-      @user = User.find(session[:user_id])
+      @user = User.find(session[:user_id]) if session[:user_id]
     end
      
      register do

data/lib/console/bucket_api.rb

@@ -1,4 +1,4 @@
-module Logman
+class Logman
   class BucketAPI < ConsoleBase
     
     get '/api/buckets',:auth=>:user do

data/lib/console/lib/query_builder.rb

@@ -0,0 +1,51 @@
+
+
+# Sample query
+# created_at > 5, type="some type"
+class Logman
+  class QueryBuilder
+      attr_accessor :con
+      
+      def initialize(con)
+        @con = con
+      end
+      
+      
+      def execute(param)
+        str = URI.decode(param)
+        obj = JSON.parse(str)
+        
+        obj.each do |q|
+          build_concern(q)  
+        end
+        
+        @con
+      end
+      
+      private
+      
+      def build_concern(q)
+        return if q['property'].blank? || q['operator'].blank?
+        q['property'] = '_id' if q['property'] == 'id' 
+        
+        
+        @con = @con.where(q['property'].to_sym => q['value']) if q['operator'] == '='
+        @con = @con.where(q['property'].to_sym => Regexp.compile(".*#{q['value']}.*")) if q['operator'] == '~'
+        
+        
+        operator_map = {
+          '<'=> "$lt",
+          '<='=> "$lte",
+          '>'=> "$gt",
+          '>='=> "$gte"
+        }
+        
+        oper = operator_map[q['operator']]
+        if oper
+          @con = @con.selector[q['property']] = {oper => q['value']}
+        end
+        
+      end
+      
+  end
+end

data/lib/console/log_api.rb

@@ -1,4 +1,4 @@
-module Logman
+class Logman
   class LogAPI < ConsoleBase
     
     get '/api/buckets/:id/logs',:auth=>:user do
@@ -8,20 +8,25 @@ module Logman
         status 404
       else
         page = params[:page] || 1
-         
-        pagination={
-          :order    => :created_at.desc,
-          :per_page => params[:per_page] || 10, 
-          :page     => page
-        }
+        per_page = params[:per_page] || 10 
         
+        page = page.to_i
+        per_page = per_page.to_i
        
-        data = bucket.logs.paginate(pagination)
+        data = bucket.logs.order_by(:_id.desc)
+        
+        query = QueryBuilder.new(data)
+        data = query.execute(params[:query])
+        
+        
+        #paginate 
+        total_count = data.count      
+        data = data.skip((page-1)*per_page).take(per_page)
         
         res ={
           :page => page,
           :items => data,
-          :total_items => bucket.logs.count,
+          :total_items => total_count,
         }
         
         json res

data/lib/console/static/app/bucket/add_edit.html

@@ -7,7 +7,7 @@
 	 <form role="form" ng-submit="saveCreate()">
 	  <div class="form-group">
 	    <label for="exampleInputEmail1">Bucket Name</label>
-	    <input type="text" required ng-model="bucket.name" class="form-control" placeholder="Bucket name">
+	    <input ng-readonly="bucket.id" type="text" required ng-model="bucket.name" class="form-control" placeholder="Bucket name">
 	  </div>
 	  
 	  <div class="form-group">
@@ -32,7 +32,7 @@
 	  </div>
 	  
 	  <button type="submit" class="btn btn-default">Save</button>
-	  <button type="button" ng-click="destroyBucket()" class="btn btn-danger">Destroy</button>
+	  <button ng-show="bucket.id!=null" type="button" ng-click="destroyBucket()" class="btn btn-danger">Destroy</button>
 	</form>
    </div>
  </div>

data/lib/console/static/app/bucket/bucket.js

@@ -84,10 +84,26 @@ var BucketAddEditCtl = function($scope, $bucket, $routeParams, $user,$location){
 
 var LogsCtl = function($scope, $resource, $routeParams,$bucket,$modal){
 	$scope.bucket = $bucket.Bucket.get({id: $routeParams.id});
+	$scope.criterias = [{}]
 	
+	$scope.removeCriteria = function(c){
+		var i = $scope.criterias.indexOf(c);
+		if(i>-1) $scope.criterias.splice(i,1);
+	}
+	
+
 	$scope.loadLogs = function(page){
-		// var page = ($scope.logs)? $scope.logs.page : 1;
-		$scope.logs = $resource('/api/buckets/:bucket_id/logs').get({bucket_id: $routeParams.id, page: page});
+		if(page)$scope.active_page = page;
+		else page = $scope.active_page;
+		
+		var queryData = JSON.stringify($scope.criterias)
+		queryData = encodeURIComponent(queryData);
+		
+		$scope.logs = $resource('/api/buckets/:bucket_id/logs').get({
+			bucket_id: $routeParams.id, 
+			page: page, 
+			query:queryData
+		});	
 	}
 	
 	

data/lib/console/static/app/bucket/logs.html

@@ -1,6 +1,43 @@
 <div ng-controller="LogsCtl">
-	<h3> <i class="fa fa-list"></i> {{bucket.name}}</h3>
+	<h3> 
+		<i class="fa fa-list"></i> {{bucket.name}}
+		<button type="button" ng-click="query_view=!query_view" class="btn btn-default pull-right">
+			<i class="fa fa-filter"></i> Query
+		</button>
+	</h3>
 	<hr>
+	
+	<div ng-show="query_view" class="panel panel-info">
+		<div class="panel-body">
+			
+			<div class="row criteria-item" ng-repeat="c in criterias">
+				<div class="col-lg-4">
+					<input type="text" ng-model="c.property" placeholder="property" class="form-control"/>
+				</div>
+				<div class="col-lg-1">
+					<select class="form-control" ng-model="c.operator">
+						<option value="=">=</option>
+						<option value=">">&gt;</option>
+						<option value="<">&lt;</option>
+						<option value=">=">&gt;=</option>
+						<option value="<=">&lt;=</option>
+						<option value="~">~ contains</option>
+					</select>
+				</div>
+				<div class="col-lg-5">
+					<input type="text" ng-model="c.value" placeholder="value" class="form-control"/>
+				</div>
+				<div class="col-lg-1">
+					<button ng-click="removeCriteria(c)" class="btn btn-danger"> <i class="fa fa-minus"></i> </button>
+				</div>
+			</div>
+			
+			<br>	
+			<button ng-click="criterias.push({})" class="btn btn-default"> <i class="fa fa-plus"></i></button>
+			<button ng-click="loadLogs()" class="btn btn-info"> <i class="fa fa-bolt"></i> Execute </button>
+				
+		</div>
+	</div>
 		
 	<blockquote class="log-entry log-entry-type{{l.log_type}}" ng-repeat="l in logs.items">
 		<div class="row" ng-click="show(l)">
@@ -19,5 +56,5 @@
 	  <p><a href="#/api_guide" class="btn btn-primary btn-lg" role="button">Learn more</a></p>
 	</div>
 	
-	<pagination ng-show="logs.items.length != 0" total-items="logs.total_items" on-select-page="loadLogs(page)" page="logs.page" class="pagination-sm"></pagination>
+	<pagination max-size="15" boundary-links="true" ng-show="logs.items.length != 0" total-items="logs.total_items" on-select-page="loadLogs(page)" page="logs.page" class="pagination-sm"></pagination>
 </div>

data/lib/console/static/css/logman.css

@@ -57,3 +57,12 @@
 .log-detail p:last-child {
   margin-bottom: 0;
 }
+.criteria-item{
+	margin-top: 4px;
+	margin-bottom: 4px;
+}
+
+
+
+
+

data/lib/console/user_api.rb

@@ -1,4 +1,4 @@
-module Logman
+class Logman
   class UserAPI < ConsoleBase
     
     get '/api/users',:auth=>:user do

data/lib/console/web_console.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/user_api'
 require File.dirname(__FILE__) + '/bucket_api'
 require File.dirname(__FILE__) + '/log_api'
 
-module Logman
+class Logman
   class WebConsole < ConsoleBase
       set :public_folder, File.dirname(__FILE__) + '/static'
       set :views, File.dirname(__FILE__) + '/views'

data/lib/logman.rb

@@ -1,3 +1,19 @@
 require "logman/version"
+
+require 'mongoid'
+require 'sinatra'
+require "sinatra/json"
+
+# models
+require 'console/lib/query_builder'
+require 'models/user'
+require 'models/bucket'
+require 'models/log'
+
+# modules
+require 'modules/log_writer'
+require 'console/web_console'
+
+
 require "logman/system"
 

data/lib/logman/server.rb

@@ -1,7 +1,7 @@
 
 
 
-module Logman
+class Logman
    class Server < Sinatra::Base
      use Logman::Config.instance.log_writer if Logman::Config.instance.log_writer
      use Logman::Config.instance.web_console if Logman::Config.instance.web_console

data/lib/logman/system.rb

@@ -1,43 +1,27 @@
-require 'mongo_mapper'
-require 'sinatra'
-require "sinatra/json"
 
-require  File.dirname(__FILE__) +'/../modules/secure_password'
 
-# models
-require File.dirname(__FILE__) + '/../models/user'
-require File.dirname(__FILE__) + '/../models/bucket'
-require File.dirname(__FILE__) + '/../models/log'
-
-# modules
-require File.dirname(__FILE__) + '/../modules/log_writer'
-require File.dirname(__FILE__) + '/../console/web_console'
-
-module Logman
-  class Config
+class Logman
+  class Config < Hash
+    
       attr_accessor :log_writer
-      attr_accessor :web_console
       
-      def database_name
-        MongoMapper.database
-      end
-      
-      def database_name=(val)
-        MongoMapper.database = val
-      end
+      #logman as webconsole and api       
+      attr_accessor :web_console
+      attr_accessor :database_config
       
-      def database_connection
-        MongoMapper.connection
-      end
+      # logman as proxy      
+      attr_accessor :logman_endpoin
+      attr_accessor :write_token
+      attr_accessor :public_endpoint
       
-      def database_uri=(uri)
-        MongoMapper.connection = Mongo::Connection.from_uri(uri)
-        MongoMapper.database = MongoMapper.connection.db.name
+      def initialize
+        @log_writer = Logman::LogWriter
+        @web_console = Logman::WebConsole
+        
+        @database_config = './database.yaml' 
       end
       
-      attr_accessor :logman_endpoin
-    
-      
+        
       @@instance = nil
       def self.instance
         @@instance = Config.new if @@instance.nil?
@@ -45,8 +29,15 @@ module Logman
       end
   end
   
+  def self.env
+    en = ENV['RACK_ENV'] || 'production'
+    en.to_sym
+  end
+  
   def self.configure(&block)
-      block.call Logman::Config.instance
+      block.call Logman::Config.instance if block
+      
+      Mongoid.load!(Logman::Config.instance.database_config, Logman.env)
       
       require File.dirname(__FILE__) + '/../logman/server'
   end

data/lib/logman/version.rb

@@ -1,3 +1,3 @@
-module Logman
-  VERSION = "0.0.2"
+class Logman
+  VERSION = "0.1.0.alpha"
 end

data/lib/models/bucket.rb

@@ -1,38 +1,57 @@
 
-module Logman
+class Logman
   class Bucket
-    include MongoMapper::Document
-    set_collection_name 'logman_buckets'
+    include Mongoid::Document
+    store_in collection: 'logman_buckets'
     
-    attr_accessible :name, :user_ids
+    attr_protected :write_token
+    validates_presence_of :name
+    validates_format_of :name, with: /[A-Za-z0-9_]+/
     
-    key :name, String, :required=>true
-    key :write_token, String
-    key :user_ids, Array
+    field :name, type: String
+    field :write_token,type: String
+    field :user_ids, type: Array
     
-    many :users, :in => :user_ids, :class_name=>'Logman::User'
+    #collection specifications     
+    def self.set_bucket_collection(name)
+      Thread.current[:bucket_key] = name
+    end
     
-    many :logs, :class_name=>'Logman::Log'
+    def logs
+      Bucket.set_bucket_collection(self.bucket_key)
+      Log.all
+    end
+    #end
     
     def user_ids=(val)
-      val = val.map {|key| BSON::ObjectId(key) }
+      val = val.map {|key| Moped::BSON::ObjectId.from_string(key) }
       write_attribute(:user_ids, val)
     end
     
-    before_create :new_token
+    def users
+      User.where(:id.in => :user_ids)
+    end
+    
+    def bucket_key
+      key = self.name.gsub(' ','_').gsub('-','_')
+      "bucket_#{key.underscore}"
+    end
     
+    before_create :new_token
     def new_token
       self.write_token = generate_new_token
     end
     
-    
     def generate_new_token
       while true
         token = SecureRandom.hex
-        return token if Bucket.find_by_write_token(token).nil?
+        return token if Bucket.where(:write_token=> token).count == 0
       end
     end
 
-    
+    def serializable_hash(options={})
+      options[:methods] ||= [:id]
+      super(options)
+    end
   end
 end

data/lib/models/log.rb

@@ -1,41 +1,55 @@
-module Logman
+class Logman
   class Log
-    include MongoMapper::Document
-    belongs_to :bucket
-    attr_accessible :log_type, :data_type, :message, :data, :datetime,:sources
+    include Mongoid::Document
+    include Mongoid::Timestamps::Created
     
-    key :log_type, Integer, :required=>true  #1-error, 2-success, 3-warning, 4-info
-    key :data_type, String #application that generated log like syslog,
+    store_in collection: lambda { Thread.current[:bucket_key] }
+    
+    validates_presence_of :log_type, :message
+    
+    field :log_type, type: Integer  #1-error, 2-success, 3-warning, 4-info
+    field :data_type, type: String  #application that generated log like syslog,
+    field :message, type: String          #short string message
+    field :data, type: Hash 
+    field :datetime, type: Time
+    
+    embeds_many :sources, :class_name=>'Logman::Source'
     
-    key :message, String, :required=>true #short string message
-    key :data, Hash
     
-    key :datetime, Time
     
-    many :sources, :class_name=>'Logman::Source'
     
     def self.count_on_date(date)
-      begin
+      # begin
         # raise date.to_s
         start_time = Time.new(date.year, date.month, date.day, 0,0,0).utc
-        end_time   = Time.new(date.year, date.month, date.day+1, 0,0,0).utc
+        end_time   = start_time + 1.day
         
-        Log.where(:created_at => { :$gte => start_time }).where(:created_at => { :$lt  => end_time   }).count
-      rescue
-        0
-      end
+        count = 0
+        
+        Bucket.all.each do |b|
+          count += b.logs.between(created_at: start_time..end_time).count
+        end
+        count
+#         
+      # rescue
+        # 0
+      # end
     end
     
-    timestamps!
+    #to json     
+    def serializable_hash(options={})
+      options[:methods] ||= [:id]
+      super(options)
+    end
   end
   
   
   class Source
-    include MongoMapper::EmbeddedDocument
-    attr_accessible :name, :ip_address, :hop
+    include Mongoid::Document
+    embedded_in :log, :class_name=>'Logman::Log'
     
-    key :name, String
-    key :ip_address, String
-    key :hop, Integer, :default=>0
+    field :name, type: String
+    field :ip_address, type: String
+    field :hop, type: Integer
   end
 end

data/lib/models/user.rb

@@ -1,29 +1,36 @@
 
 
-module Logman
+class Logman
   class User
-    include MongoMapper::Document
+    include Mongoid::Document
+    include ActiveModel::SecurePassword
     
+    store_in collection: 'logman_users'
     
-    set_collection_name 'logman_users'
+    attr_accessible :email, :password, :name, :admin
     
-    attr_accessible :email, :name, :admin, :password
+    validates_presence_of :email, :name
+    validates_presence_of :password, :on=> :create
+    validates_uniqueness_of :email
+    validates_format_of :email, with: /.+\@.+\..+/
     
-    has_secure_password :validations=>false, :validations=>false
+    field :email, type: String
+    field :password_digest, type: String
+    field :name, type: String 
+    field :admin, type: Boolean
     
-    key :email, String, :required=>true, :unique=>true, :format=> /.+\@.+\..+/
-    key :password_digest, String #, :required=>true
-    key :name, String, :required=>true
-    key :admin, Boolean
+    has_secure_password
     
     # buckets that user have access     
     def buckets
-      return Bucket.where if self.admin
+      return Bucket.all if self.admin
       
       Bucket.where(:user_ids=> self.id)
     end
     
+    
     def serializable_hash(options={})
+      options[:methods] ||= [:id]
       options[:except] ||= [:password_digest]
       super(options)
     end

data/lib/modules/log_writer.rb

@@ -1,18 +1,19 @@
-module Logman
+class Logman
   
   class LogWriter < Sinatra::Base
     post '/api/write' do
       json = JSON.parse(request.body.read) 
-      bucket = Bucket.find_by_write_token(params[:key])
+      bucket = Bucket.where(:write_token=>params[:key]).first
+      
       if bucket.nil?
         status 401
         return 'Invalid token' 
       end
       
+      Bucket.set_bucket_collection bucket.bucket_key
+      
       log = Log.new(json)
       log.datetime = Time.now if log.datetime.blank?
-      log.bucket = bucket
-      
       
       if log.save
         return status 200

data/logman.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-
-  spec.add_development_dependency "sinatra"
-  spec.add_development_dependency "sinatra-contrib"
   spec.add_development_dependency "bson_ext"
-  spec.add_development_dependency "mongo_mapper"
-  spec.add_development_dependency "bcrypt-ruby", '~> 3.1.2'
+  
+  spec.add_runtime_dependency "sinatra", "~> 1.4.4"
+  spec.add_runtime_dependency "sinatra-contrib", "~> 1.4.2"
+  spec.add_runtime_dependency "mongoid", "~> 3.1.6"
+  spec.add_runtime_dependency "bcrypt-ruby", '~> 3.0.0'
 
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: logman
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.1.0.alpha
+  prerelease: 6
 platform: ruby
 authors:
 - Branko Krstic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: bson_ext
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,53 +60,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-contrib
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.4.4
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
-  name: bson_ext
+  name: sinatra-contrib
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.4.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
-  name: mongo_mapper
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 3.1.6
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.6
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -114,15 +114,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.2
-  type: :development
+        version: 3.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.2
+        version: 3.0.0
 description: Logman is Web Console/API for gathering logs from various sources and
   analyzing them. Logs are saved to mongo database.
 email:
@@ -137,9 +137,11 @@ files:
 - README.md
 - Rakefile
 - config.ru
+- database.yaml
 - lib/console/auth.rb
 - lib/console/base.rb
 - lib/console/bucket_api.rb
+- lib/console/lib/query_builder.rb
 - lib/console/log_api.rb
 - lib/console/static/app/api_guide/index.html
 - lib/console/static/app/bucket/add_edit.html
@@ -231,7 +233,6 @@ files:
 - lib/models/log.rb
 - lib/models/user.rb
 - lib/modules/log_writer.rb
-- lib/modules/secure_password.rb
 - logman.gemspec
 homepage: ''
 licenses:
@@ -249,9 +250,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/modules/secure_password.rb

@@ -1,122 +0,0 @@
-module MongoMapper  
-  module SecurePassword
-    class << self; attr_accessor :min_cost; end
-    self.min_cost = false
-
-    module ClassMethods
-      # Adds methods to set and authenticate against a BCrypt password.
-      # This mechanism requires you to have a password_digest attribute.
-      #
-      # Validations for presence of password on create, confirmation of password
-      # (using a +password_confirmation+ attribute) are automatically added. If
-      # you wish to turn off validations, pass <tt>validations: false</tt> as an
-      # argument. You can add more validations by hand if need be.
-      #
-      # If you don't need the confirmation validation, just don't set any
-      # value to the password_confirmation attribute and the the validation
-      # will not be triggered.
-      #
-      # You need to add bcrypt-ruby (~> 3.1.2) to Gemfile to use #has_secure_password:
-      #
-      #   gem 'bcrypt-ruby', '~> 3.1.2'
-      #
-      # Example using Active Record (which automatically includes ActiveModel::SecurePassword):
-      #
-      #   # Schema: User(name:string, password_digest:string)
-      #   class User < ActiveRecord::Base
-      #     has_secure_password
-      #   end
-      #
-      #   user = User.new(name: 'david', password: '', password_confirmation: 'nomatch')
-      #   user.save                                                       # => false, password required
-      #   user.password = 'mUc3m00RsqyRe'
-      #   user.save                                                       # => false, confirmation doesn't match
-      #   user.password_confirmation = 'mUc3m00RsqyRe'
-      #   user.save                                                       # => true
-      #   user.authenticate('notright')                                   # => false
-      #   user.authenticate('mUc3m00RsqyRe')                              # => user
-      #   User.find_by(name: 'david').try(:authenticate, 'notright')      # => false
-      #   User.find_by(name: 'david').try(:authenticate, 'mUc3m00RsqyRe') # => user
-      def has_secure_password(options = {})
-        # Load bcrypt-ruby only when has_secure_password is used.
-        # This is to avoid ActiveModel (and by extension the entire framework)
-        # being dependent on a binary library.
-        begin
-          gem 'bcrypt-ruby', '~> 3.1.2'
-          require 'bcrypt'
-        rescue LoadError
-          $stderr.puts "You don't have bcrypt-ruby installed in your application. Please add it to your Gemfile and run bundle install"
-          raise
-        end
-
-        attr_reader :password
-
-        include InstanceMethodsOnActivation
-
-        if options.fetch(:validations, true)
-          validates_confirmation_of :password, if: lambda { |m| m.password.present? }
-          validates_presence_of     :password, :on => :create
-          validates_presence_of     :password_confirmation, if: lambda { |m| m.password.present? }
-
-          before_create { raise "Password digest missing on new record" if password_digest.blank? }
-        end
-
-        if respond_to?(:attributes_protected_by_default)
-          def self.attributes_protected_by_default #:nodoc:
-            super + ['password_digest']
-          end
-        end
-      end
-    end
-
-    module InstanceMethodsOnActivation
-      # Returns +self+ if the password is correct, otherwise +false+.
-      #
-      #   class User < ActiveRecord::Base
-      #     has_secure_password validations: false
-      #   end
-      #
-      #   user = User.new(name: 'david', password: 'mUc3m00RsqyRe')
-      #   user.save
-      #   user.authenticate('notright')      # => false
-      #   user.authenticate('mUc3m00RsqyRe') # => user
-      def authenticate(unencrypted_password)
-        BCrypt::Password.new(password_digest) == unencrypted_password && self
-      end
-
-      # Encrypts the password into the +password_digest+ attribute, only if the
-      # new password is not blank.
-      #
-      #   class User < ActiveRecord::Base
-      #     has_secure_password validations: false
-      #   end
-      #
-      #   user = User.new
-      #   user.password = nil
-      #   user.password_digest # => nil
-      #   user.password = 'mUc3m00RsqyRe'
-      #   user.password_digest # => "$2a$10$4LEA7r4YmNHtvlAvHhsYAeZmk/xeUVtMTYqwIvYY76EW5GUqDiP4."
-      def password=(unencrypted_password)
-        unless unencrypted_password.blank?
-          @password = unencrypted_password
-          cost = MongoMapper::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost
-          self.password_digest = BCrypt::Password.create(unencrypted_password, cost: cost)
-        end
-      end
-
-      def password_confirmation=(unencrypted_password)
-        @password_confirmation = unencrypted_password
-      end
-    end
-  end
-  
-  module Document
-    extend MongoMapper::SecurePassword::ClassMethods
-    
-    def self.included(base)
-      base.send :extend, MongoMapper::SecurePassword::ClassMethods
-    end
-  end  
-end
-
-