couchbase-model 0.3.0 → 0.3.1

data/HISTORY.markdown

@@ -1,3 +1,7 @@
+## 0.3.1 / 2012-09-22
+
+* Allow to specify default storage options
+
 ## 0.3.0 / 2012-09-22
 
 * Implement belongs_to asscociation

data/lib/couchbase/model.rb

@@ -163,6 +163,14 @@ module Couchbase
       end
     end
 
+    def self.defaults(options = nil)
+      if options
+        @_defaults = options
+      else
+        @_defaults || {}
+      end
+    end
+
     # Ensure that design document is up to date.
     #
     # @since 0.1.0
@@ -224,7 +232,7 @@ module Couchbase
       end
 
       doc['views'].delete_if {|_, v| v.empty? }
-      doc.delete('spatial') if doc['spatial'].empty?
+      doc.delete('spatial') if doc['spatial'] && doc['spatial'].empty?
       doc['signature'] = digest.to_s
       doc['timestamp'] = mtime
       if doc['signature'] != thread_storage[:signature] && doc['timestamp'] > thread_storage[:timestamp].to_i
@@ -406,23 +414,28 @@ module Couchbase
     #
     # @param [Hash] attrs attribute-value pairs
     def initialize(attrs = {})
-      if attrs.respond_to?(:with_indifferent_access)
-        attrs = attrs.with_indifferent_access
-      end
-      @id = attrs.delete(:id)
-      @key = attrs.delete(:key)
-      @value = attrs.delete(:value)
-      @doc = attrs.delete(:doc)
-      @meta = attrs.delete(:meta)
-      @_attributes = ::Hash.new do |h, k|
-        default = self.class.attributes[k]
-        h[k] = if default.respond_to?(:call)
-                 default.call
-               else
-                 default
-               end
+      case attrs
+      when Hash, HashWithIndifferentAccess
+        if attrs.respond_to?(:with_indifferent_access)
+          attrs = attrs.with_indifferent_access
+        end
+        @id = attrs.delete(:id)
+        @key = attrs.delete(:key)
+        @value = attrs.delete(:value)
+        @doc = attrs.delete(:doc)
+        @meta = attrs.delete(:meta)
+        @_attributes = ::Hash.new do |h, k|
+          default = self.class.attributes[k]
+          h[k] = if default.respond_to?(:call)
+                  default.call
+                else
+                  default
+                end
+        end
+        update_attributes(@doc || attrs)
+      else
+        @_raw = attrs
       end
-      update_attributes(@doc || attrs)
     end
 
     # Create this model and assign new id if necessary
@@ -439,7 +452,8 @@ module Couchbase
     #   p.create
     def create
       @id ||= Couchbase::Model::UUID.generator.next(1, model.thread_storage[:uuid_algorithm])
-      model.bucket.add(@id, attributes_with_values)
+      value = @_raw ? @_raw : attributes_with_values
+      model.bucket.add(@id, value, model.defaults)
       self
     end
 
@@ -456,7 +470,8 @@ module Couchbase
     #   p.save
     def save(cas = nil)
       return create if new?
-      model.bucket.replace(@id, attributes_with_values, :cas => cas)
+      value = @_raw ? @_raw : attributes_with_values
+      model.bucket.replace(@id, value, model.default.merge(:cas => cas))
       self
     end
 

data/lib/couchbase/model/version.rb

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

metadata

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