mongo_fe 0.1.0 → 0.1.1

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.1.1 (2012-07-18)
+
+* using agnostic-will_paginate
+* documents pagination; minor bug fix.
+
 ## 0.1.0 (2012-07-16)
 
 * Initial Release, code name: Simona

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    mongo_fe (0.1.0)
+    mongo_fe (0.1.1)
+      agnostic-will_paginate (>= 3.0.0)
       bson
       bson_ext
       chronic (~> 0.6.7)
@@ -15,7 +16,6 @@ PATH
       sinatra-contrib (~> 1.3.1)
       tilt (~> 1.3.0)
       vegas (~> 0.1.11)
-      will_paginate (>= 3.0.0)
       will_paginate-bootstrap
       yajl-ruby
 
@@ -26,6 +26,7 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.8)
+    agnostic-will_paginate (3.0.0)
     appraisal (0.4.1)
       bundler
       rake

data/README.md

@@ -2,11 +2,11 @@
 
 This is a simple Sinatra based web front-end that can be used for experimenting and learning MongoDB. The MongoFe gem can also be used for simple administrative tasks, managing collections and document basic operations such as: create new documents, delete existing ones, search by various criteria and document indexing.
 
-## Installation
+### Installation
 
     $ gem install mongo_fe
 
-## Credentials
+### Credentials
 
 Create a file in your home directory called: `.mongo_fe`
 
@@ -18,7 +18,7 @@ Examples:
 
     uri: mongodb://nemo:clownfish@ds02231897.mongolab.com:33897/Reef
     
-## Usage
+### Usage
 
 Verify first that you have access to a MongoDB instance. [See the install guides](http://www.mongodb.org/display/DOCS/Quickstart/), if need be. I used the [Homebrew](http://mxcl.github.com/homebrew/) package manager to install mongodb. If you have Homebrew, run the following commands:
 
@@ -42,7 +42,7 @@ To stop the server:
 
     $ mongofe -K
 
-## Screenshots
+### Screenshots
 
 In the mean time, I'd love for you to check out these screenshots to get a feel for MongoFe and see some of the administrative interfaces designed to make your day to day tasks easier.
 
@@ -58,7 +58,7 @@ In the mean time, I'd love for you to check out these screenshots to get a feel
 Have fun!
 
 
-## Contributing
+### Contributing
 
 * Fork it
 * Create your feature branch (``git checkout -b my-new-feature``)
@@ -67,6 +67,6 @@ Have fun!
 * Push to the branch (``git push origin my-new-feature``)
 * Create new Pull Request
 
-## License
+### License
 MIT License
     

data/lib/mongo_fe/controllers/collections_controller.rb

@@ -201,23 +201,7 @@ module MongoFe
 
         end
 
-        unless @collection.nil?
-          @page = params[:page].to_i || 1
-          @query= session[:query]
-
-          begin
-            @total, @documents = MongoFe::MongoDB::SearchDocuments.new(current_db, @collection).list(@query, @page, 10)
-            flash_search_results @query, @total
-          rescue => e
-            session[:query] = nil
-            @total, @documents = MongoFe::MongoDB::SearchDocuments.new(current_db, @collection).list(nil, 1, 10)
-
-            flash[:error] = "Resetting to find all. Cause: #{e.message}"
-          end
-
-        end
-
-        haml :'/collections/index'
+        redirect "/databases/#{current_db.name}/collections/#{@collection.name}"
       end
 
       put "/:collection_name/?" do

data/lib/mongo_fe/version.rb

@@ -2,5 +2,5 @@
 # http://semver.org/
 
 module MongoFe
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/mongo_fe/views/navbar.haml

@@ -6,6 +6,7 @@
         %span.icon-bar
         %span.icon-bar
       %a.brand{:href => '/'} MongoFE
+      .muted v #{MongoFe::VERSION}
       .nav-collapse
         %p.navbar-text.pull-right
           -if current_db?

data/mongo_fe.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "bson"
   gem.add_runtime_dependency "bson_ext"
   gem.add_runtime_dependency "json"
-  gem.add_runtime_dependency 'will_paginate', '>= 3.0.0'
+  gem.add_runtime_dependency 'agnostic-will_paginate', '>= 3.0.0'
   gem.add_runtime_dependency 'will_paginate-bootstrap'
   gem.add_runtime_dependency "sinatra", "~> 1.3.2"
   gem.add_runtime_dependency "sinatra-contrib", "~> 1.3.1"

data/spec/controllers/collections_controller_spec.rb

@@ -81,6 +81,7 @@ describe "Collections Controller" do
   describe "POST /databases/:db_name/collections/:collection_name/documents" do
     it "should insert a new document" do
       post "/databases/#{db_name}/collections/#{collection_name}/documents", {:json_doc_attributes => test_doc_json}
+      follow_redirect!
       last_response.body.should contain("added to: #{db_name}.#{collection_name}")
       # todo verify the Document insertion
     end
@@ -112,7 +113,7 @@ describe "Collections Controller" do
 
       follow_redirect!
       # "The index: '#{index_name}' was successfully created"
-      index.name = last_response.body[/index: '([^']+)/,1]
+      index.name = last_response.body[/index: '([^']+)/, 1]
       last_response.body.should contain("was successfully created")
     end
   end
@@ -134,7 +135,7 @@ describe "Collections Controller" do
       last_response.body.should contain("The index: '#{index.name}', was deleted successfully.")
 
       indexes = collection.index_information
-      indexes.should_not contain(index.name)      
+      indexes.should_not contain(index.name)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_fe
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -156,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: agnostic-will_paginate
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -457,7 +457,6 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .DS_Store
 - .gitignore
 - .rspec
 - CHANGES.md