lib/couchrest/model/properties.rb in couchrest_model-1.1.0.beta4 vs lib/couchrest/model/properties.rb in couchrest_model-1.1.0.beta5

- old
+ new

@@ -138,10 +138,10 @@ module ClassMethods def property(name, *options, &block) - raise "Invalid property definition, '#{name}' already used for CouchRest Model type field" if name.to_s == model_type_key.to_s + raise "Invalid property definition, '#{name}' already used for CouchRest Model type field" if name.to_s == model_type_key.to_s && CouchRest::Model::Base >= self opts = { } type = options.shift if type.class != Hash opts[:type] = type opts.merge!(options.shift || {})