Skip to content
This repository
Browse code

Merge pull request #178 from rafalchmiel/master

Fix inconsistent quotes and refactor an if statement
  • Loading branch information...
commit fc65be60a2f58f6928df5fe1c21c6f65cd699818 2 parents f929659 + 8e54aa2
Sam Lown authored February 14, 2014

Showing 1 changed file with 12 additions and 14 deletions. Show diff stats Hide diff stats

  1. 26  lib/couchrest_model.rb
26  lib/couchrest_model.rb
... ...
@@ -1,4 +1,4 @@
1  
-require 'active_model'
  1
+require "active_model"
2 2
 require "active_model/callbacks"
3 3
 require "active_model/conversion"
4 4
 require "active_model/errors"
@@ -9,22 +9,22 @@
9 9
 require "active_model/validations"
10 10
 require "active_model/dirty"
11 11
 
12  
-require 'active_support/core_ext'
13  
-require 'active_support/json'
  12
+require "active_support/core_ext"
  13
+require "active_support/json"
14 14
 
15  
-require 'mime/types'
  15
+require "mime/types"
16 16
 require "enumerator"
17 17
 require "time"
18  
-require 'digest/md5'
  18
+require "digest/md5"
19 19
 
20  
-require 'bigdecimal' # used in typecast
21  
-require 'bigdecimal/util' # used in typecast
  20
+require "bigdecimal" # used in typecast
  21
+require "bigdecimal/util" # used in typecast
22 22
 
23  
-require 'couchrest'
  23
+require "couchrest"
24 24
 
25  
-require 'couchrest/model'
26  
-require 'couchrest/model/errors'
27  
-require 'couchrest/model/translation'
  25
+require "couchrest/model"
  26
+require "couchrest/model/errors"
  27
+require "couchrest/model/translation"
28 28
 require "couchrest/model/persistence"
29 29
 require "couchrest/model/typecast"
30 30
 require "couchrest/model/casted_by"
@@ -62,6 +62,4 @@
62 62
 require "couchrest/model/utils/migrate.rb"
63 63
 
64 64
 # Add rails support *after* everything has loaded
65  
-if defined?(Rails)
66  
-  require "couchrest/railtie"
67  
-end
  65
+require "couchrest/railtie" if defined?(Rails)

0 notes on commit fc65be6

Please sign in to comment.
Something went wrong with that request. Please try again.