couchbase-model 0.3.1 → 0.4.0

data/HISTORY.markdown

@@ -1,3 +1,8 @@
+## 0.4.0 / 2012-09-25
+
+* Add validation hooks for Rails application
+* Check meta presence as more robust indicator of key presence
+
 ## 0.3.1 / 2012-09-22
 
 * Allow to specify default storage options

data/lib/couchbase-model.rb

@@ -24,5 +24,6 @@ if defined?(Rails)
   class Couchbase::Model
     extend ActiveModel::Naming
     include ActiveModel::Conversion
+    include ActiveModel::Validations
   end
 end

data/lib/couchbase/model.rb

@@ -37,6 +37,15 @@ module Couchbase
   # @since 0.0.1
   class Error::MissingId < Error::Base; end
 
+  # @since 0.4.0
+  class Error::RecordInvalid < Error::Base
+    attr_reader :record
+    def initialize(record)
+      @record = record
+      super(@record.errors.full_messages.join(", "))
+    end
+  end
+
   # Declarative layer for Couchbase gem
   #
   # @since 0.0.1
@@ -414,6 +423,7 @@ module Couchbase
     #
     # @param [Hash] attrs attribute-value pairs
     def initialize(attrs = {})
+      @errors = ::ActiveModel::Errors.new(self) if defined?(::ActiveModel)
       case attrs
       when Hash, HashWithIndifferentAccess
         if attrs.respond_to?(:with_indifferent_access)
@@ -469,7 +479,10 @@ module Couchbase
     #   p.draft = false
     #   p.save
     def save(cas = nil)
-      return create if new?
+      if respond_to?(:valid?) && !valid?
+        raise Couchbase::Error::RecordInvalid.new(self)
+      end
+      return create unless meta
       value = @_raw ? @_raw : attributes_with_values
       model.bucket.replace(@id, value, model.default.merge(:cas => cas))
       self

data/lib/couchbase/model/version.rb

@@ -19,7 +19,7 @@ module Couchbase
 
   class Model
 
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-model
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-23 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchbase