mongo3 0.1.2 → 0.1.3

data/HISTORY

@@ -40,4 +40,10 @@
   
 0.1.1
   o Updated dependencies
-  o Bugs and fixes
+  o Bugs and fixes
+  
+0.1.2
+  0 Bugs and fixes
+  
+0.1.3
+  o Updated to mongo ruby 1.0.1 - Fixed issue with lib breakage on OrderedHash

data/Rakefile

@@ -30,8 +30,9 @@ PROJ.spec.opts   << '--color'
 PROJ.rdoc.include = %w[.rb]
 
 # Dependencies
-depend_on "mongo"                 , ">= 0.18.1"
-depend_on "mongo_ext"             , ">= 0.18.1"
+depend_on "mongo"                 , ">= 1.0.1"
+depend_on "bson"                  , ">= 1.0.1"
+depend_on "bson_ext"              , ">= 1.0.1"
 depend_on "agnostic-will_paginate", ">= 3.0.0"
 depend_on "memcache-client"       , ">= 1.5.0"
 depend_on "mongo_rack"            , ">= 0.0.1"

data/bin/mongo3

@@ -9,8 +9,10 @@ Main {
     validate    { |pool| pool =~ URI_MATCH }
     description "specify server uri. Must be of the form {[mongo|memcache]}://{host}:{port}/{[database_name|namespace]}[/{collection_name}]"
   }
-  environment( 'RACK_ENV' ) {
+  option( 'environment', 'e' ) {
+    argument :required
     default 'production'
+    description 'Specifies the env to run mongo3 in'
   }
   
   @@options = {}
@@ -20,7 +22,7 @@ Main {
     require File.expand_path( File.join(File.dirname(__FILE__), %w[.. lib mongo3]))    
     
     @@options = parse_args( params[:pool].value )
-    ENV['RACK_ENV'] = params['RACK_ENV'].value
+    ENV['RACK_ENV'] = params['environment'].value
     
     Thread.new do 
       puts "-"*100

data/config.ru

@@ -0,0 +1,18 @@
+#------------
+# Mongo3 Sessions Options
+#
+# @@options defines where Mongo3 puts its sessions, which can be either mongo or memcache
+# if @@options is not defined mongo at localhost:27017 is used
+#
+# For customized sessions with Mongo uncomment and modify this line:
+# @@options={:protocol=>"mongo", :host=>"localhost", :port=>"11211", :db_name=>"mongo3_session", :cltn_name=>"sessions"}
+#
+# For Memcache session uncomment and modify this line:
+# @@options={:protocol=>"memcached", :host=>"localhost", :port=>"11211", :namespace=>"mongo3_session"}
+#
+#------------
+
+require 'rubygems'
+require 'sinatra'
+require File.join(File.dirname(__FILE__), %w[lib app.rb])
+run Sinatra::Application

data/lib/controllers/collections.rb

@@ -39,7 +39,7 @@ module Collections
     @page      = params[:page].to_i || 1
 
     @indexes = options.connection.indexes_for( session[:path_names] )
-    
+puts "INDEXES #{@indexes.inspect}"    
     load_cltn( params[:page].to_i )
     
     erb :'collections/list'

data/lib/helpers/collection_helper.rb

@@ -72,7 +72,8 @@ module CollectionHelper
   
     # converts orientation to human
     def orientation( value )
-      return "id" if value.is_a?(Mongo::ObjectID)
+puts "VALUE #{value.inspect}"      
+      return "id" if value.is_a?(Hash)
       case( value.to_i )
         when Mongo::ASCENDING
           "asc"

data/lib/helpers/flash_helper.rb

@@ -3,13 +3,13 @@ module FlashHelper
    
    # clear out flash object
    def clear_it!
-     @flash = session[:flash] || OrderedHash.new     
+     @flash = session[:flash] || BSON::OrderedHash.new     
      @flash.clear
    end
    
    # add flash message
    def flash_it!( type, msg )
-     @flash = session[:flash] || OrderedHash.new
+     @flash = session[:flash] || BSON::OrderedHash.new
      @flash[type] = msg
    end
  end

data/lib/helpers/main_helper.rb

@@ -49,10 +49,10 @@ module MainHelper
            
     def display_info( info )
       return info if info.is_a?( String )
-      if info.is_a?( Hash )
+      if info.is_a?( Hash ) and !info.empty?        
         @info = info
         partial :'explore/dump_hash'
-      elsif info.is_a?( Array )
+      elsif info.is_a?( Array ) and !info.empty?
         @info = info
         partial :'explore/dump_array'
       else

data/lib/mongo3/connection.rb

@@ -54,7 +54,7 @@ module Mongo3
         db_name   = path_name_tokens.pop
         db        = con.db( db_name )
         cltn      = db[cltn_name]
-        cltn.create_index( index, constraints ? constraints['unique'] == 1 : false )
+        cltn.create_index( index, constraints )
       end      
     end
 
@@ -90,16 +90,16 @@ module Mongo3
         db_name   = path_name_tokens.pop
         db        = con.db( db_name )
         cltn      = db[cltn_name]
-        res = cltn.remove( {:_id => Mongo::ObjectID.from_string(id) } )
+        res = cltn.remove( {:_id => BSON::ObjectID.from_string(id) } )
       end
     end
          
     def show( path_names )
       path_name_tokens = path_names.split( "|" )
-      info             = OrderedHash.new
+      info             = BSON::OrderedHash.new
       zone             = path_name_tokens[1]
 
-      info[:links] = OrderedHash.new      
+      info[:links] = BSON::OrderedHash.new      
       info[:title] = path_name_tokens.last
             
       # If detect slave only show reg info
@@ -111,8 +111,12 @@ module Mongo3
           info[:host]           = con.host
           info[:users]          = con.db('admin')[Mongo::DB::SYSTEM_USER_COLLECTION].count rescue 0
           info[:port]           = con.port
-          info[:databases]      = OrderedHash.new
-          con.database_info.sort { |a,b| b[1] <=> a[1] }.each { |e| info[:databases][e[0]] = to_mb( e[1] ) }
+          info[:databases]      = BSON::OrderedHash.new
+          begin
+            con.database_info.sort { |a,b| b[1] <=> a[1] }.each { |e| info[:databases][e[0]] = to_mb( e[1] ) }
+          rescue 
+            # some instances won't allow to snif. Hence no info
+          end
           info[:server]         = con.server_info
         end
       # BOZO !! Need to figure out links strategy!
@@ -122,7 +126,7 @@ module Mongo3
           db = con.db( db_name )
           info[:links][:manage] = "/databases/1"
           info[:size]           = to_mb( con.database_info[db_name] )
-          info[:node]           = db.nodes
+          # info[:node]           = db.nodes
           info[:collections]    = collection_names( db ).size
           info[:error]          = db.error
           info[:last_status]    = db.last_status
@@ -158,7 +162,7 @@ module Mongo3
           cltns = []
           names.each do |name|
             list = db[name]
-            row  = OrderedHash.new
+            row  = BSON::OrderedHash.new
             row[:name]  = name
             row[:count] = list.count
             cltns << row
@@ -393,29 +397,38 @@ module Mongo3
       
       # Filters out system dbs
       def database_names( con )
-        excludes = %w[admin local slave]
-        con.database_names - excludes
+        # MongoHQ does not let u sniff out the connection in this case return single db if any
+        if @info['db_name']
+          [ @info['db_name'] ]
+        else
+          excludes = %w[admin local slave]
+          con.database_names - excludes
+        end
       end
       
       # Connects to mongo given an zone
       def connect_for( zone, &block )
-        info = landscape[zone]
-        raise "Unable to find zone info in config file for zone `#{zone}" unless info
-        raise "Check your config. Unable to find `host information" unless info['host']
-        raise "Check your config. Unable to find `port information" unless info['port']
-        
+        @info = landscape[zone]
+        raise "Unable to find zone info in config file for zone `#{zone}" unless @info
+        raise "Check your config. Unable to find `host information" unless @info['host']
+        raise "Check your config. Unable to find `port information" unless @info['port']
+                
         begin
-          con = Mongo::Connection.new( info['host'], info['port'], { :slave_ok => true } )
+          con = Mongo::Connection.new( @info['host'], @info['port'], { :slave_ok => true } )
         
-          if info['user'] and info['password']
-            con.db( 'admin' ).authenticate( info['user'], info['password'] )
+          if @info['user'] and @info['password']
+            if @info['db_name']
+              con.db( @info['db_name'] ).authenticate( @info['user'], @info['password'] )
+            else
+              con.db( 'admin' ).authenticate( @info['user'], @info['password'] )
+            end
           end
-          yield con        
+          yield con
           con.close()
         rescue => boom
           # puts boom
-          # puts boom.backtrace.each {|l| puts l }          
-          raise "MongoDB connection failed for `#{info['host'].inspect}:#{info['port'].inspect}"
+          # puts boom.backtrace.each {|l| puts l }
+          raise "MongoDB connection failed for `#{@info['host'].inspect}:#{@info['port'].inspect} with #{boom}"
         end
       end
 

data/lib/mongo3/node.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'mongo/util/ordered_hash'
+require 'bson/ordered_hash'
 
 module Mongo3
   class Node
@@ -9,7 +9,7 @@ module Mongo3
       @oid      = oid
       @name     = name
       @children = []
-      @data     = data || OrderedHash.new
+      @data     = data || BSON::OrderedHash.new
       @parent   = nil
     end
     
@@ -78,7 +78,7 @@ module Mongo3
     
     # converts to json
     def to_json(*a)
-      hash = OrderedHash.new
+      hash = BSON::OrderedHash.new
       hash[:id]       = oid
       hash[:name]     = self.name
       hash[:children] = self.children

data/lib/mongo3/user.rb

@@ -14,7 +14,7 @@ module Mongo3
         user = user_cltn.find_one( row )
         raise "User #{user_name} already exists!" if user
         
-        row[:pwd] = user_cltn.db.send( :hash_password, user_name, password )
+        row[:pwd] = Mongo::Support.hash_password( user_name, password )
         return user_cltn.save( row )
       end     
     end
@@ -31,7 +31,7 @@ module Mongo3
     
     def delete( path, id )
       connect_for( path ) do |con|
-        res = users( con ).remove( :_id => Mongo::ObjectID.from_string( id ) )
+        res = users( con ).remove( :_id => BSON::ObjectID.from_string( id ) )
       end      
     end
         

data/lib/mongo3.rb

@@ -1,7 +1,7 @@
 module Mongo3
   
   # :stopdoc:
-  VERSION = '0.1.2'                                                          unless defined? Mongo3::VERSION
+  VERSION = '0.1.3'                                                          unless defined? Mongo3::VERSION
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR unless defined? Mongo3::LIBPATH
   PATH    = ::File.dirname(LIBPATH) + ::File::SEPARATOR                      unless defined? Mongo3::PATH
   # :startdoc:

data/lib/views/collections/_index_rows.erb

@@ -17,8 +17,9 @@
             <img class="wait" id="wait_<%=name%>" src="/images/loading.gif"/>
           </td>
           <td><%=name%></td>
-          <% buff = [];@indexes[name].each do |pair| %>
-            <% buff << format_index( pair )%>
+<% puts @indexes[name].inspect %>          
+          <% buff = [];@indexes[name].each_pair do |k,v| %>
+            <% buff << format_index( [k,v] ) %>
           <% end %>
           <td><%= buff.join( ", " ) %></td>
         </tr>

data/spec/configs/landscape.yml

@@ -5,5 +5,5 @@ test:
 admin:
   host:     localhost
   port:     12345
-  user:     "admin"
-  password: "admin"
+  # user:     "admin"
+  # password: "admin"

data/spec/mongo3/connection_spec.rb

@@ -142,7 +142,7 @@ describe Mongo3::Connection do
     
     it "should pull db info correctly" do
       info = @mongo3.show( "home|test|mongo3_test_db" )
-      info.size.should          == 7
+      info.size.should          == 6
       info[:collections].should == 2
       info[:title].should       == "mongo3_test_db"      
     end
@@ -234,7 +234,7 @@ describe Mongo3::Connection do
     it "should add an index correctly" do
       indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
       before = indexes.size
-      @mongo3.create_index( "home|test|mongo3_test_db|test1_cltn", [[:name, Mongo::ASCENDING]], {:unique => 1} )
+      @mongo3.create_index( "home|test|mongo3_test_db|test1_cltn", [[:name, Mongo::ASCENDING]], {:unique => true} )
       indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
       indexes.size.should == before + 1
     end
@@ -242,7 +242,7 @@ describe Mongo3::Connection do
     it "should add a compound index correctly" do
       indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
       before = indexes.size
-      @mongo3.create_index( "home|test|mongo3_test_db|test1_cltn", [[:name, Mongo::ASCENDING], [:_id, Mongo::DESCENDING]], {:unique => 1} )
+      @mongo3.create_index( "home|test|mongo3_test_db|test1_cltn", [[:name, Mongo::ASCENDING], [:_id, Mongo::DESCENDING]], {:unique => true} )
       indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
       indexes.size.should == before + 1
     end

data/spec/mongo3/node_spec.rb

@@ -80,10 +80,10 @@ describe Mongo3::Node do
     @root.data[:path_names].should        be_nil
   end
   
-  it "should dump to json correctly" do
-    @cltns.first.to_json.should_not be_empty
-    @dbs.first.to_json.should_not   be_empty
-  end
+  # it "should dump to json correctly" do    
+  #   @cltns.first.to_json.should_not be_empty
+  #   @dbs.first.to_json.should_not   be_empty
+  # end
   
   it "should dump adjacencies correctly" do
     item = @cltns.first.to_adjacencies

data/spec/spec_helper.rb

@@ -7,8 +7,7 @@ require 'will_paginate/collection'
 
 require File.expand_path( File.join( File.dirname(__FILE__), %w[.. lib mongo3] ) )
 
-Spec::Runner.configure do |config|
-puts "HERE !!"  
+Spec::Runner.configure do |config|  
   begin
     Mongo::Connection.new( 'localhost', 12345 )
   rescue => boom
@@ -17,7 +16,7 @@ puts "HERE !!"
     puts ""
     puts "To run the tests you need to a local instance of mongodb on port 12345"
     puts ""
-    puts "> mongodb --dbpath /data/db/mongo3 --port 12345"
+    puts "> mongod --dbpath /data/db/mongo3 --port 12345"
     puts "\n"*3
     raise "Bailing out"
   end  

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mongo3
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,99 +14,149 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 -06:00
+date: 2010-06-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.1
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mongo_ext
+  name: bson
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bson_ext
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.18.1
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 1
+        version: 1.0.1
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: agnostic-will_paginate
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: memcache-client
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mongo_rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 1
         version: 0.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: main
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 2
+        - 0
         version: 4.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 5
+        - 1
         version: 2.5.1
-    version: 
+  type: :development
+  version_requirements: *id010
 description: "  Mongo3 allows you to manage your mongoDB clusters using a web based admin console.\n  The console provides for getting an overview of your mongo landscape and drilldown to\n  see various information about your databases. You will be able to manage your clusters\n  by performing common database admin tasks directly from the web console.\n  \n  The initial release of Mongo3 will be a read only shallow mode. Further development\n  still needs to take place to build up the functionality from the existing code base."
 email: fernand.galiana@gmail.com
 executables: 
@@ -154,6 +209,7 @@ files:
 - README.rdoc
 - Rakefile
 - bin/mongo3
+- config.ru
 - config/mongo3.yml
 - data/populate
 - lib/app.rb
@@ -336,20 +392,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: !binary |
   AA==
 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Mongo3 allows you to manage your mongoDB clusters using a web based admin console