Merge branch 'master' of github.com:couchrest/couchrest_model

This commit is contained in:
Sam Lown 2010-07-07 13:01:16 +02:00
commit 876e270966
2 changed files with 9 additions and 5 deletions

View file

@ -30,6 +30,7 @@ begin
gemspec.add_dependency("mime-types", ">= 1.15") gemspec.add_dependency("mime-types", ">= 1.15")
gemspec.add_dependency("activesupport", ">= 2.3.5") gemspec.add_dependency("activesupport", ">= 2.3.5")
gemspec.add_dependency("activemodel", ">= 3.0.0.beta4") gemspec.add_dependency("activemodel", ">= 3.0.0.beta4")
gemspec.add_dependency("tzinfo", ">= 0.3.22")
gemspec.version = CouchRest::Model::VERSION gemspec.version = CouchRest::Model::VERSION
gemspec.date = "2008-11-22" gemspec.date = "2008-11-22"
gemspec.require_path = "lib" gemspec.require_path = "lib"

View file

@ -1,12 +1,13 @@
gem 'couchrest', ">= 1.0.0.beta"
# require File.join(File.dirname(__FILE__), "couchrest", "extended_document")
gem 'couchrest'
require 'couchrest' require 'couchrest'
gem "tzinfo", ">= 0.3.22"
gem "activesupport", ">= 2.3.5"
require 'active_support/core_ext' require 'active_support/core_ext'
require 'active_support/json' require 'active_support/json'
gem "activemodel", ">= 3.0.0.beta4"
require 'active_model' require 'active_model'
require "active_model/callbacks" require "active_model/callbacks"
require "active_model/conversion" require "active_model/conversion"
@ -17,6 +18,8 @@ require "active_model/serialization"
require "active_model/translation" require "active_model/translation"
require "active_model/validator" require "active_model/validator"
require "active_model/validations" require "active_model/validations"
gem "mime-types", ">= 1.15"
require 'mime/types' require 'mime/types'
require "enumerator" require "enumerator"
require "time" require "time"