Skip to content

Commit

Permalink
Merge branch 'master' of github.com:couchrest/couchrest_model
Browse files Browse the repository at this point in the history
  • Loading branch information
samlown committed Jul 4, 2014
2 parents d9ef7bd + 93f2388 commit 688b926
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
6 changes: 6 additions & 0 deletions README.md
Expand Up @@ -87,6 +87,12 @@ require 'rails/test_unit/railtie'

You'll then need to make sure any references to `config.active_record` are removed from your environment files.

or alternatively below command do the same work
```ruby
rails new <application-name> --skip-active-record
```
Now in the gem file just add [couchrest_model] and you are good to go.

## Generators

### Configuration
Expand Down
26 changes: 12 additions & 14 deletions lib/couchrest_model.rb
@@ -1,4 +1,4 @@
require 'active_model'
require "active_model"
require "active_model/callbacks"
require "active_model/conversion"
require "active_model/errors"
Expand All @@ -9,22 +9,22 @@
require "active_model/validations"
require "active_model/dirty"

require 'active_support/core_ext'
require 'active_support/json'
require "active_support/core_ext"
require "active_support/json"

require 'mime/types'
require "mime/types"
require "enumerator"
require "time"
require 'digest/md5'
require "digest/md5"

require 'bigdecimal' # used in typecast
require 'bigdecimal/util' # used in typecast
require "bigdecimal" # used in typecast
require "bigdecimal/util" # used in typecast

require 'couchrest'
require "couchrest"

require 'couchrest/model'
require 'couchrest/model/errors'
require 'couchrest/model/translation'
require "couchrest/model"
require "couchrest/model/errors"
require "couchrest/model/translation"
require "couchrest/model/persistence"
require "couchrest/model/typecast"
require "couchrest/model/casted_by"
Expand Down Expand Up @@ -62,6 +62,4 @@
require "couchrest/model/utils/migrate.rb"

# Add rails support *after* everything has loaded
if defined?(Rails)
require "couchrest/railtie"
end
require "couchrest/railtie" if defined?(Rails)

0 comments on commit 688b926

Please sign in to comment.