mongomodel 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d006082bc3f5bf2357182fecea49893a06e5994
-  data.tar.gz: d53384261c1968e770c65c4eb4e8faa32ade2c22
+  metadata.gz: 0ecf9f958c03a225872acdf72dca43ff7d6fc52d
+  data.tar.gz: fcca66094d1b48857a28792c12364d49ae057593
 SHA512:
-  metadata.gz: e97ed321bde11ad2f30311b4e80a8ea853894e720673d2634142b3e29e1f5088286185169d95fa9bd233aab9637a1d28f69c1b3bd9ef726f69d3b5f6f089a2ff
-  data.tar.gz: b787c2bdaa482398da09028b9093ac4514bc596a446a115d58879ab103fd8c116a078415ba0c85022bd9ca14638421a5dfd4ac4844a42d65b1e4bd59d5e9b1c1
+  metadata.gz: a6a69c5fddc9745f8db566ad2931ee0f5069e8047f0ca834eb08c3bb6ac8d1f4201f21ca3f3f5de0267efc86a054330a2586d23adb0a63dbf01b8ed8bf60424f
+  data.tar.gz: bfefd11ce4643a8990c315aba9faa422cedbc026b1179e6cc7d4e2c4b69682139b1cb58ba0dd025ec38bf52bcc6d1cc7d043b3164483ae3a903cc17582d35885

data/.travis.yml

@@ -4,7 +4,6 @@ services:
   - mongodb
 
 rvm:
-  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0
@@ -17,15 +16,3 @@ gemfile:
   - gemfiles/rails-4-observers.gemfile
   - gemfiles/mongo_mapper.gemfile
   - gemfiles/mongoid.gemfile
-
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails-4.0.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails-4.1.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails-4-observers.gemfile
-    - rvm: 1.8.7
-      gemfile: gemfiles/mongoid.gemfile
-      

data/README.md

@@ -18,8 +18,8 @@ For performance, you should probably also install the BSON C extensions:
     gem install bson_ext
 
 
-Using with Rails 3
-==================
+Using with Rails
+================
 
 Add MongoModel to your Gemfile (and run `bundle install`):
 
@@ -38,13 +38,9 @@ Generating an embedded document:
     rails generate model Chapter title:string body:string -E
 
 
-Sample Usage
+Sample Model
 ============
 
-    require 'mongomodel'
-    
-    MongoModel.configuration = { 'host' => 'localhost', 'database' => 'mydb' }
-    
     class Article < MongoModel::Document
       property :title, String, :default => 'Untitled'
       property :body, String
@@ -59,4 +55,33 @@ Sample Usage
       
       scope :published, where(:published_at.ne => nil)
     end
-    
+    
+
+Configuration
+=============
+
+MongoModel can be configured similarly to ActiveRecord by creating/editing `config/mongomodel.yml`. The most basic configuration might look like:
+
+```yaml
+development:
+  database: mymongodbname
+  host: localhost
+  port: 27017
+```
+
+The config file also supports specifying the username, password, pool_size, password and replicas. Running `rails generate mongo_model:config DATABASENAME` will generate a basic config file for you.
+
+Using Replica Sets
+------------------
+
+When working with replica sets, replace the host/port configuration with an array of replicas (`host:port`):
+
+```yaml
+production:
+  database: database_name
+  replicas:
+    - some.host.com:27017
+    - another.host.com:27017
+  username: username
+  password: password
+```

data/lib/mongomodel.rb

@@ -49,6 +49,7 @@ module MongoModel
   autoload :Scope,            'mongomodel/support/scope'
   autoload :Types,            'mongomodel/support/types'
   autoload :Configuration,    'mongomodel/support/configuration'
+  autoload :URIConfiguration, 'mongomodel/support/configuration'
   autoload :DynamicFinder,    'mongomodel/support/dynamic_finder'
   autoload :InstrumentedCollection, 'mongomodel/support/instrumented_collection'
   
@@ -104,7 +105,12 @@ module MongoModel
   
   def self.configuration=(config)
     @_database = nil
-    @_configuration = Configuration.new(config)
+    @_configuration = case config
+      when Hash
+        Configuration.new(config)
+      when String
+        URIConfiguration.new(config)
+      end
   end
   
   def self.database

data/lib/mongomodel/support/configuration.rb

@@ -3,8 +3,18 @@ require 'active_support/core_ext/hash/except'
 
 module MongoModel
   class Configuration
+    DEFAULTS = {
+      'host'         => 'localhost',
+      'port'         => 27017,
+      'database'     => 'mongomodel-default',
+      'pool_size'    => 5,
+      'pool_timeout' => 5
+    }
+
+    attr_reader :options
+
     def initialize(options)
-      set_options!(options)
+      @options = DEFAULTS.merge(options).stringify_keys
     end
     
     def host
@@ -54,42 +64,38 @@ module MongoModel
       options.except('host', 'port', 'database', 'username', 'password', 'replicas').symbolize_keys
     end
     
-    def options
-      @options ||= {}
-    end
-    
-    def set_options!(options)
-      case options
-      when Hash
-        @options = DEFAULTS.merge(options).stringify_keys
-      when String
-        set_options!(parse(options))
-      end
-    end
-    
-    DEFAULTS = {
-      'host'         => 'localhost',
-      'port'         => 27017,
-      'database'     => 'mongomodel-default',
-      'pool_size'    => 5,
-      'pool_timeout' => 5
-    }
-    
     def self.defaults
       new({})
     end
-  
-  private
-    def parse(str)
-      uri = URI.parse(str)
-      
-      {
-        'host'     => uri.host,
-        'port'     => uri.port,
-        'database' => uri.path.gsub(/^\//, ''),
-        'username' => uri.user,
-        'password' => uri.password
-      }
+  end
+
+  class URIConfiguration
+    def initialize(uri)
+      @uri = uri
+    end
+
+    def host
+      parser.host
+    end
+
+    def port
+      parser.port
+    end
+
+    def database
+      parser.connection_options[:db_name]
+    end
+
+    def establish_connection
+      @database = connection.db
+    end
+
+    def connection
+      @connection ||= parser.connection({})
+    end
+
+    def parser
+      @parser ||= Mongo::URIParser.new(@uri)
     end
   end
 end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongomodel
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -301,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: mongomodel
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: MongoDB ORM for Ruby/Rails