Merge branch 'master' of git://github.com/tapajos/couchrest_model

Conflicts:
	Rakefile
	couchrest_model.gemspec
	history.txt
	lib/couchrest_model.rb
	spec/couchrest/attribute_protection_spec.rb

lib/couchrest/model.rb

@@ -3,7 +3,7 @@ module CouchRest
 
   module Model
 
-    VERSION = "1.0.0.beta7"
+    VERSION = "1.0.0.beta8"
 
   end
 

lib/couchrest/model/attribute_protection.rb

@@ -54,7 +54,7 @@ module CouchRest
 
         attributes.reject! do |property_name, property_value|
           protected_names.include?(property_name.to_s)
-        end
+        end if attributes
 
         attributes || {}
       end

lib/couchrest/railtie.rb

@@ -0,0 +1,12 @@
+require "rails"
+require "active_model/railtie"
+
+module CouchrestModel
+  # = Active Record Railtie
+  class Railtie < Rails::Railtie
+    config.generators.orm :couchrest
+    config.generators.test_framework  :test_unit, :fixture => false
+  end
+  
+end
+