RubyGems - mongo_browser - Versions diffs - 0.2.0.rc2 → 0.2.5 - Mend

mongo_browser 0.2.0.rc2 → 0.2.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (141) hide show

data/.gitignore +3 -1
data/.rspec +1 -1
data/.travis.yml +6 -1
data/CHANGELOG.md +15 -0
data/{grunt.js → Gruntfile.js} +10 -8
data/Procfile +1 -0
data/README.md +44 -2
data/Rakefile +1 -12
data/app/assets/images/ajax-loader.gif +0 -0
data/app/assets/javascripts/app/controllers/{breadcrumbs.js.coffee → breadcrumbs_controller.js.coffee} +4 -7
data/app/assets/javascripts/app/controllers/collections/index_controller.js.coffee +38 -0
data/app/assets/javascripts/app/controllers/collections/stats_controller.js.coffee +17 -0
data/app/assets/javascripts/app/controllers/{databases.js.coffee → databases/index_controller.js.coffee} +11 -15
data/app/assets/javascripts/app/controllers/databases/stats_controller.js.coffee +15 -0
data/app/assets/javascripts/app/controllers/documents/index_controller.js.coffee +54 -0
data/app/assets/javascripts/app/controllers/documents/show_controller.js.coffee +38 -0
data/app/assets/javascripts/app/controllers/main_controller.js.coffee +15 -0
data/app/assets/javascripts/app/controllers/servers/show_controller.js.coffee +17 -0
data/app/assets/javascripts/app/directives.js.coffee +23 -0
data/app/assets/javascripts/app/filters.js.coffee +14 -1
data/app/assets/javascripts/app/modules/alerts.js.coffee +58 -0
data/app/assets/javascripts/app/modules/pager.js.coffee +2 -2
data/app/assets/javascripts/app/modules/spinner.js.coffee +29 -0
data/app/assets/javascripts/app/modules/table_filter.js.coffee +4 -4
data/app/assets/javascripts/app/resources.js.coffee +14 -8
data/app/assets/javascripts/app/services.js.coffee +11 -33
data/app/assets/javascripts/application.js.coffee +62 -34
data/app/assets/javascripts/application.test.js.coffee +5 -0
data/app/assets/javascripts/compiled_templates.js.coffee +1 -0
data/app/assets/javascripts/vendor.js.coffee +0 -1
data/app/assets/stylesheets/application.css.scss +36 -18
data/{public/index.html → app/views/index.erb} +8 -8
data/bin/mongo_browser +2 -13
data/config.ru +3 -1
data/lib/mongo_browser.rb +1 -0
data/lib/mongo_browser/api.rb +11 -0
data/lib/mongo_browser/api/collections.rb +34 -0
data/lib/mongo_browser/api/databases.rb +32 -0
data/lib/mongo_browser/api/documents.rb +37 -0
data/lib/mongo_browser/api/mongo.rb +41 -0
data/lib/mongo_browser/application.rb +8 -174
data/lib/mongo_browser/application/development.rb +32 -0
data/lib/mongo_browser/cli.rb +48 -0
data/lib/mongo_browser/entities.rb +43 -0
data/lib/mongo_browser/models/collection.rb +7 -12
data/lib/mongo_browser/models/document.rb +5 -1
data/lib/mongo_browser/models/pager.rb +22 -9
data/lib/mongo_browser/version.rb +1 -1
data/mongo_browser.gemspec +22 -15
data/package.json +30 -0
data/public/ng/templates/alerts.html +6 -0
data/public/ng/templates/collections/index.html +39 -0
data/public/ng/templates/collections/stats.html +18 -0
data/public/ng/templates/databases/index.html +35 -0
data/public/ng/templates/databases/stats.html +18 -0
data/public/ng/templates/documents/index.html +40 -0
data/public/ng/templates/documents/show.html +17 -0
data/{app/assets → public/ng}/templates/pager.html +0 -0
data/{app/assets/templates/server_info.html → public/ng/templates/server/show.html} +1 -1
data/{app/assets → public/ng}/templates/table_filter.html +0 -0
data/script/ci_all +5 -1
data/script/ci_e2e +5 -2
data/script/ci_javascripts +1 -1
data/script/ci_rspec +1 -1
data/spec/javascripts/app/controllers/{breadcrumbs_spec.js.coffee → breadcrumbs_controller_spec.js.coffee} +1 -1
data/spec/javascripts/app/controllers/collections/index_controller_spec.js.coffee +95 -0
data/spec/javascripts/app/controllers/collections/stats_controller_spec.js.coffee +34 -0
data/spec/javascripts/app/controllers/databases/index_controller_spec.js.coffee +93 -0
data/spec/javascripts/app/controllers/databases/stats_controller_spec.js.coffee +30 -0
data/spec/javascripts/app/controllers/documents/index_controller_spec.js.coffee +108 -0
data/spec/javascripts/app/controllers/documents/show_controller_spec.js.coffee +94 -0
data/spec/javascripts/app/controllers/{main_spec.js.coffee → main_controller_spec.js.coffee} +2 -2
data/spec/javascripts/app/controllers/{server_info_spec.js.coffee → server/show_controller_spec.js.coffee} +5 -6
data/spec/javascripts/app/directives_spec.js.coffee +108 -24
data/spec/javascripts/app/filters_spec.js.coffee +31 -5
data/spec/javascripts/app/modules/alerts_spec.js.coffee +138 -0
data/spec/javascripts/app/modules/dialogs_spec.js.coffee +1 -2
data/spec/javascripts/app/modules/pager_spec.js.coffee +0 -1
data/spec/javascripts/app/modules/spinner_spec.js.coffee +65 -0
data/spec/javascripts/app/modules/table_filter_spec.js.coffee +9 -9
data/spec/javascripts/app/resources_spec.js.coffee +99 -0
data/spec/javascripts/app/services_spec.js.coffee +31 -71
data/spec/javascripts/config/{testacular-e2e.conf.js → karma-e2e.conf.js} +1 -1
data/spec/javascripts/config/{testacular.conf.js → karma.conf.js} +2 -3
data/spec/javascripts/e2e/collection_stats_scenario.js.coffee +12 -0
data/spec/javascripts/e2e/collections_scenario.js.coffee +59 -20
data/spec/javascripts/e2e/database_stats_scenario.js.coffee +11 -0
data/spec/javascripts/e2e/databases_scenario.js.coffee +37 -36
data/spec/javascripts/e2e/document_show_scenario.js.coffee +31 -0
data/spec/javascripts/e2e/documents_pagination_scenario.js.coffee +33 -0
data/spec/javascripts/e2e/documents_scenario.js.coffee +43 -4
data/spec/javascripts/e2e/server_info_scenario.js.coffee +8 -2
data/spec/javascripts/helpers/mocks.js.coffee +2 -0
data/spec/javascripts/helpers_e2e/dsl.js.coffee +20 -0
data/spec/javascripts/lib/angular-mocks.js +64 -16
data/spec/javascripts/lib/angular-scenario.js +724 -561
data/spec/javascripts/runner.html +5 -5
data/spec/lib/api/collections_spec.rb +62 -0
data/spec/lib/api/databases_spec.rb +58 -0
data/spec/lib/api/documents_spec.rb +135 -0
data/spec/lib/api/mongo_spec.rb +27 -0
data/spec/lib/cli_spec.rb +19 -0
data/spec/lib/entities_spec.rb +39 -0
data/spec/lib/models/collection_spec.rb +16 -10
data/spec/lib/models/database_spec.rb +4 -4
data/spec/lib/models/document_spec.rb +5 -5
data/spec/lib/models/pager_spec.rb +20 -11
data/spec/spec_helper.rb +7 -15
data/spec/support/api_example_group.rb +45 -0
data/spec/support/fixtures.rb +10 -6
data/spec/support/matchers/expose.rb +18 -0
data/vendor/assets/javascripts/angular/angular-bootstrap.js +1 -1
data/vendor/assets/javascripts/angular/angular-resource.js +78 -56
data/vendor/assets/javascripts/angular/angular-sanitize.js +3 -1
data/vendor/assets/javascripts/angular/angular.js +720 -404
metadata +323 -183
data/app/assets/javascripts/app.js.coffee +0 -8
data/app/assets/javascripts/app/controllers.js.coffee +0 -2
data/app/assets/javascripts/app/controllers/alerts.js.coffee +0 -12
data/app/assets/javascripts/app/controllers/collections.js.coffee +0 -40
data/app/assets/javascripts/app/controllers/documents.js.coffee +0 -49
data/app/assets/javascripts/app/controllers/main.js.coffee +0 -10
data/app/assets/javascripts/app/controllers/server_info.js.coffee +0 -14
data/app/assets/javascripts/templates.js.coffee +0 -1
data/app/assets/javascripts/templates/.gitkeep +0 -0
data/app/assets/templates/collections.html +0 -53
data/app/assets/templates/databases.html +0 -32
data/app/assets/templates/documents.html +0 -45
data/config-e2e.ru +0 -20
data/spec/features/collections_list_spec.rb +0 -64
data/spec/features/documents_list_spec.rb +0 -139
data/spec/features/server_info_spec.rb +0 -23
data/spec/javascripts/app/controllers/alerts_spec.js.coffee +0 -36
data/spec/javascripts/app/controllers/collections_spec.js.coffee +0 -78
data/spec/javascripts/app/controllers/databases_spec.js.coffee +0 -55
data/spec/javascripts/app/controllers/documents_spec.js.coffee +0 -62
data/spec/javascripts/helpers_e2e/app_element.js.coffee +0 -6
data/spec/support/feature_example_group.rb +0 -53
data/spec/support/matchers/have_flash_message.rb +0 -16
data/spec/support/mongod.rb +0 -91
data/spec/support/mongodb.conf +0 -47

data/{public/index.html → app/views/index.erb} RENAMED

@@ -4,11 +4,11 @@
     <title>Mongo Browser</title>
     <link href="/assets/application.css" rel="stylesheet" media="screen">
   </head>
-  <body ng-controller="main">
+  <body ng-controller="main" ng-cloak>
     <div class="navbar navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container">
-          <a class="brand" href="/">MongoBrowser</a>
+          <a class="brand" href="/">Mongo Browser</a>
           <div class="nav-collapse collapse">
             <ul ng-controller="breadcrumbs" class="nav breadcrumbs">
               <li ng-show="showDatabase()">
@@ -23,18 +23,15 @@
             <ul class="nav pull-right">
               <li><a href="/server_info">Server Info</a></li>
               <li><a>v. {{appVersion}}</a></li>
+              <li ng-show="showEnvironment()"><a>env {{environment}}</a></li>
+              <spinner></spinner>
             </ul>
           </div>
         </div>
       </div>
     </div>
-    <aside ng-controller="alerts" id="alerts">
-      <div ng-repeat="message in alertMessages" class="alert alert-{{message.type}}">
-        <button ng-click="disposeAlert(message.id)" type="button" class="close">×</button>
-        <strong>{{message.type}}</strong> <span>{{message.text}}</span>
-      </div>
-    </aside>
+    <alerts></alerts>
     <section class="container fluid">
       <section ng-view></section>
@@ -43,5 +40,8 @@
     <!--<link type="text/css" rel="stylesheet" href="//fonts.googleapis.com/css?family=Rokkitt:400,700|Source+Code+Pro">-->
     <script src="/assets/vendor.js"></script>
     <script src="/assets/application.js"></script>
+    <% if settings.test? %>
+      <script src="/assets/application.test.js"></script>
+    <% end %>
   </body>
 </html>

data/bin/mongo_browser CHANGED

@@ -1,16 +1,5 @@
 #!/usr/bin/env ruby
-require "vegas"
-require "mongo_browser"
+require "mongo_browser/cli"
-Vegas::Runner.new(MongoBrowser::Application, "mongo_browser") do |runner, opts, app|
-  opts.on("--mongodb-port PORT", "Specify mongodb port") do |port|
-    runner.logger.info "Using mongodb port #{port}"
-    MongoBrowser.mongodb_port = port.to_i
-  end
-  opts.on("--mongodb-host HOST", "Specify mongodb host") do |host|
-    runner.logger.info "Using mongodb host #{host}"
-    MongoBrowser.mongodb_host = host.to_i
-  end
-end
+MongoBrowser::CLI.start(ARGV)

data/config.ru CHANGED

@@ -1,4 +1,6 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
 require "mongo_browser"
-run MongoBrowser::Application
+run Rack::URLMap.new \
+    "/" => MongoBrowser::Application.new,
+    "/api" => MongoBrowser::API::Mongo.new

data/lib/mongo_browser.rb CHANGED

@@ -28,3 +28,4 @@ require "mongo_browser/models/collection"
 require "mongo_browser/models/document"
 require "mongo_browser/application"
+require "mongo_browser/api"

data/lib/mongo_browser/api.rb ADDED

@@ -0,0 +1,11 @@
+require "grape"
+require "grape-entity"
+require "mongo_browser/entities"
+require "mongo_browser/api/documents"
+require "mongo_browser/api/collections"
+require "mongo_browser/api/databases"
+require "mongo_browser/api/mongo"
+module MongoBrowser::API
+end

data/lib/mongo_browser/api/collections.rb ADDED

@@ -0,0 +1,34 @@
+module MongoBrowser::API
+  class Collections < Grape::API
+    desc "Get a list of all collections for the given database"
+    get do
+      database = server.database(params[:db_name])
+      collections = database.collections
+      present collections, with: MongoBrowser::Entities::Collection
+    end
+    params do
+      requires :collection_name, type: String, desc: "Collection name"
+    end
+    segment "/:collection_name" do
+      desc "Get stats for a collection with the given name"
+      get "/stats" do
+        collection = server.database(params[:db_name]).collection(params[:collection_name])
+        collection.stats
+      end
+      desc "Drop a collection with the given name"
+      delete do
+        collection = server.database(params[:db_name]).collection(params[:collection_name])
+        collection.drop!
+        { success: true }
+      end
+      resources :documents do
+        mount MongoBrowser::API::Documents
+      end
+    end
+  end
+end

data/lib/mongo_browser/api/databases.rb ADDED

@@ -0,0 +1,32 @@
+module MongoBrowser::API
+  class Databases < Grape::API
+    desc "Get a list of all databases for the current server"
+    get do
+      present server.databases, with: MongoBrowser::Entities::Database
+    end
+    params do
+      requires :db_name, type: String, desc: "Database name"
+    end
+    segment "/:db_name" do
+      desc "Deletes a database with the given name"
+      delete do
+        database = server.database(params[:db_name])
+        database.drop!
+        { success: true }
+      end
+      desc "Get stats for the given database"
+      get "/stats" do
+        database = server.database(params[:db_name])
+        database.stats
+      end
+      resources :collections do
+        mount MongoBrowser::API::Collections
+      end
+    end
+  end
+end

data/lib/mongo_browser/api/documents.rb ADDED

@@ -0,0 +1,37 @@
+module MongoBrowser::API
+  class Documents < Grape::API
+    desc "Get a list of paginated documents"
+    params do
+      optional :page, type: Integer, desc: "Page number"
+    end
+    get do
+      collection = server.database(params[:db_name]).collection(params[:collection_name])
+      documents = collection.documents_with_pagination(params[:page])
+      present documents, with: MongoBrowser::Entities::PagedDocuments
+    end
+    params do
+      requires :id, type: String, desc: "Document id"
+    end
+    segment "/:id" do
+      desc "Get a document"
+      get do
+        collection = server.database(params[:db_name]).collection(params[:collection_name])
+        document = collection.find(params[:id])
+        error!("Document not found", 404) if document.nil?
+        present document, with: MongoBrowser::Entities::Document
+      end
+      desc "Deletes a document with the given id"
+      delete do
+        collection = server.database(params[:db_name]).collection(params[:collection_name])
+        document = collection.find(params[:id])
+        collection.remove!(document)
+        { success: true }
+      end
+    end
+  end
+end

data/lib/mongo_browser/api/mongo.rb ADDED

@@ -0,0 +1,41 @@
+module MongoBrowser::API
+  class Mongo < Grape::API
+    format :json
+    rescue_from :all, backtrace: true
+    before do
+      method = env["REQUEST_METHOD"]
+      path = env["PATH_INFO"]
+      logger.info "[api] #{method} #{path}"
+    end
+    helpers do
+      def server
+        @server ||= MongoBrowser::Models::Server.current
+      end
+      def logger
+        Grape::API.logger
+      end
+    end
+    resource :databases do
+      mount MongoBrowser::API::Databases
+    end
+    desc "Returns info about the server"
+    get "/server_info" do
+      server.info
+    end
+    desc "Returns application version"
+    get "/version" do
+      {
+          version: MongoBrowser::VERSION,
+          environment: ENV["RACK_ENV"]
+      }
+    end
+  end
+end

data/lib/mongo_browser/application.rb CHANGED

@@ -1,6 +1,6 @@
 require "sinatra"
 require "sinatra/reloader"
-require "sinatra/respond_with"
+require "sinatra/json"
 require "sprockets"
 require "sass"
@@ -10,189 +10,23 @@ require "mongo_browser/middleware/sprockets_sinatra"
 module MongoBrowser
   class Application < Sinatra::Base
-    include Models
-    configure :development do
-      register Sinatra::Reloader
-    end
-    enable :sessions
+    set :logging, true
     set :root, File.join(File.dirname(__FILE__), "../../app")
-    set :public_folder, File.join(settings.root, "../public")
-    set :method_override, true
-    register Sinatra::RespondWith
+    set :public_folder, Proc.new { File.join(root, "../public") }
     use Middleware::SprocketsSinatra, :root => File.join(settings.root, "..")
-    if settings.test?
-      require File.join(settings.root, "../spec/support/fixtures")
+    if settings.development? or settings.test?
       require "mongo_browser/middleware/sprockets_specs"
       use Middleware::SprocketsSpecs, :root => File.join(settings.root, "..")
-      get "/jasmine" do
-        File.read(File.join(settings.root, "../spec/javascripts/runner.html"))
-      end
-      # Execute e2e runner
-      get "/e2e" do
-        File.read(File.join(settings.root, "../spec/javascripts/runner_e2e.html"))
-      end
-      # Load database fixtures
-      get "/e2e/load_fixtures" do
-        Fixtures.instance.load!
-        respond_to do |format|
-          format.json { true }
-        end
-      end
-    end
-    # Loads given template from assets/templates directory
-    get "/ng/templates/:name.html" do |template_name|
-      send_file File.join(settings.root, "assets/templates/#{template_name}.html")
+      require "mongo_browser/application/development"
+      register Development
     end
     # Welcome page
-    # All routes without `/api` prefix
-    get /^(?!\/api).+/ do
-      File.read(File.join(settings.public_folder, "index.html"))
-    end
-    # Databases list
-    get "/api/databases.json" do
-      databases = server.databases.map do |db|
-        {
-            id:    db.id,
-            name:  db.name,
-            size:  db.size,
-            count: db.count
-        }
-      end
-      respond_to do |format|
-        format.json { databases.to_json }
-      end
-    end
-    # Delete a database
-    delete "/api/databases.json" do
-      database = server.database(params[:id])
-      database.drop!
-      respond_to do |format|
-        format.json { true }
-      end
-    end
-    # Database stats
-    get "/api/databases/:db_name/stats.json" do |db_name|
-      database = server.database(db_name)
-      respond_to do |format|
-        format.json { database.stats.to_json }
-      end
-    end
-    # Collections list
-    get "/api/databases/:db_name/collections.json" do |db_name|
-      database = server.database(db_name)
-      collections = database.collections.map do |collection|
-        {
-            dbName: collection.db_name,
-            name:   collection.name,
-            size:   collection.size
-        }
-      end
-      respond_to do |format|
-        format.json { collections.to_json }
-      end
-    end
-    # Delete a collection
-    delete "/api/databases/:db_name/collections.json" do |db_name|
-      success = begin
-        collection = server.database(db_name).collection(params[:id])
-        collection.drop!
-        true
-      rescue Mongo::OperationFailure => e
-        false
-      end
-      respond_to do |format|
-        format.json { success }
-      end
-    end
-    # Collection stats
-    get "/api/databases/:db_name/collections/:collection_name/stats.json" do |db_name, collection_name|
-      collection = server.database(db_name).collection(collection_name)
-      respond_to do |format|
-        format.json { collection.stats.to_json }
-      end
-    end
-    # Documents list
-    get "/api/databases/:db_name/collections/:collection_name/documents.json" do |db_name, collection_name|
-      collection = server.database(db_name).collection(collection_name)
-      documents, pagination = collection.documents_with_pagination(params[:page])
-      documents.map! do |doc|
-        {
-            id: doc.id.to_s,
-            data: doc.data
-        }
-      end
-      respond_to do |format|
-        format.json do
-          {
-              documents:  documents,
-              size:       pagination.size,
-              page:       pagination.current_page,
-              totalPages: pagination.total_pages
-          }.to_json
-        end
-      end
-    end
-    # Delete a document
-    delete "/api/databases/:db_name/collections/:collection_name/documents.json" do |db_name, collection_name|
-      collection = server.database(db_name).collection(collection_name)
-      document = collection.find(params[:id])
-      collection.remove!(document)
-      respond_to do |format|
-        format.json { true }
-      end
-    end
-    get "/api/server_info.json" do
-      server_info = server.info
-      respond_to do |format|
-        format.json { server_info.to_json }
-      end
-    end
-    get "/api/version.json" do
-      respond_to do |format|
-        format.json do
-          { version: MongoBrowser::VERSION }.to_json
-        end
-      end
-    end
-    private
-    def server
-      @server ||= Server.current
+    get "/*" do
+      erb :index
     end
   end
 end

data/lib/mongo_browser/application/development.rb ADDED

@@ -0,0 +1,32 @@
+class MongoBrowser::Application
+  module Development
+    def self.registered(app)
+      app.helpers Sinatra::JSON
+      app.register Sinatra::Reloader
+      app.set :spec_root, File.join(app.settings.root, "../spec")
+      # Execute jasmine runner
+      app.get "/jasmine" do
+        File.read(File.join(app.settings.spec_root, "javascripts/runner.html"))
+      end
+      # Execute e2e runner
+      app.get "/e2e" do
+        File.read(File.join(app.settings.spec_root, "javascripts/runner_e2e.html"))
+      end
+      # Load database fixtures
+      app.get "/e2e/load_fixtures" do
+        require File.join(app.settings.spec_root, "support/fixtures")
+        fixtures = Fixtures.instance
+        fixtures.load!
+        fixtures.load_documents!
+        json success: true
+      end
+    end
+  end
+end