couchbase-model 0.4.1 → 0.4.3

data/HISTORY.markdown

@@ -1,3 +1,14 @@
+## 0.4.3 / 2012-10-17
+
+* Make #to_param aware about keys
+
+## 0.4.2 / 2012-10-17
+
+* Update CAS value after mutation
+* Added ability to pass options to mutators. Thanks to @kierangraham
+* Always try to include Rails stuff into model
+* Use key if id is nil (makes sense for some view results)
+
 ## 0.4.1 / 2012-09-26
 
 * Put support notes in README

data/lib/couchbase-model.rb

@@ -20,10 +20,4 @@ require 'couchbase/model'
 # If we are using Rails then we will include the Couchbase railtie.
 if defined?(Rails)
   require "couchbase/railtie"
-
-  class Couchbase::Model
-    extend ActiveModel::Naming
-    include ActiveModel::Conversion
-    include ActiveModel::Validations
-  end
 end

data/lib/couchbase/model.rb

@@ -460,10 +460,16 @@ module Couchbase
     # @example Create the instance of the Post model
     #   p = Post.new(:title => 'Hello world', :draft => true)
     #   p.create
-    def create
+    def create(options = {})
       @id ||= Couchbase::Model::UUID.generator.next(1, model.thread_storage[:uuid_algorithm])
       value = @_raw ? @_raw : attributes_with_values
-      model.bucket.add(@id, value, model.defaults)
+      unless @meta
+        @meta = {}
+        if @meta.respond_to?(:with_indifferent_access)
+          @meta = @meta.with_indifferent_access
+        end
+      end
+      @meta['cas'] = model.bucket.add(@id, value, model.defaults.merge(options))
       self
     end
 
@@ -471,20 +477,32 @@ module Couchbase
     #
     # @since 0.0.1
     #
-    # @param [Bignum] cas CAS value
+    # @param [Hash] options options for operation, see
+    #   {{Couchbase::Bucket#set}}
     # @return [Couchbase::Model] The saved object
     #
     # @example Update the Post model
     #   p = Post.find('hello-world')
     #   p.draft = false
     #   p.save
-    def save(cas = nil)
+    #
+    # @example Use CAS value for optimistic lock
+    #   p = Post.find('hello-world')
+    #   p.draft = false
+    #   p.save('cas' => p.meta['cas'])
+    def save(options = {})
       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.defaults.merge(:cas => cas))
+      unless @meta
+        @meta = {}
+        if @meta.respond_to?(:with_indifferent_access)
+          @meta = @meta.with_indifferent_access
+        end
+      end
+      @meta['cas'] = model.bucket.replace(@id, value, model.defaults.merge(options))
       self
     end
 
@@ -494,11 +512,12 @@ module Couchbase
     #
     # @param [Hash] attrs Attribute value pairs to use for the updated
     #               version
-    # @param [Bignum] cas CAS value
+    # @param [Hash] options options for operation, see
+    #   {{Couchbase::Bucket#set}}
     # @return [Couchbase::Model] The updated object
-    def update(attrs, cas = nil)
+    def update(attrs, options = {})
       update_attributes(attrs)
-      save(cas)
+      save(options)
     end
 
     # Delete this object from the bucket
@@ -507,16 +526,18 @@ module Couchbase
     #
     # @note This method will reset +id+ attribute
     #
-    # @param [Bignum] cas CAS value
+    # @param [Hash] options options for operation, see
+    #   {{Couchbase::Bucket#delete}}
     # @return [Couchbase::Model] Returns a reference of itself.
     #
     # @example Delete the Post model
     #   p = Post.find('hello-world')
     #   p.delete
-    def delete(cas = nil)
+    def delete(options = {})
       raise Couchbase::Error::MissingId, "missing id attribute" unless @id
-      model.bucket.delete(@id)
+      model.bucket.delete(@id, options)
       @id = nil
+      @meta = nil
       self
     end
 
@@ -713,6 +734,10 @@ module Couchbase
 
     if defined?(::Rails)
       extend ActiveModel::Callbacks
+      extend ActiveModel::Naming
+      include ActiveModel::Conversion
+      include ActiveModel::Validations
+
       define_model_callbacks :create, :update, :delete, :save
       [:save, :create, :update, :delete].each do |meth|
         class_eval <<-EOC
@@ -726,6 +751,18 @@ module Couchbase
       end
     end
 
+    # Redefine (if exists) #to_key to use #key if #id is missing
+    def to_key
+      keys = [id || key]
+      keys.empty? ? nil : keys
+    end
+
+    def to_param
+      keys = to_key
+      if keys && !keys.empty?
+        keys.join("-")
+      end
+    end
   end
 
 end

data/lib/couchbase/model/version.rb

@@ -19,7 +19,7 @@ module Couchbase
 
   class Model
 
-    VERSION = "0.4.1"
+    VERSION = "0.4.3"
 
   end
 

data/test/test_model.rb

@@ -171,4 +171,14 @@ class TestModel < MiniTest::Unit::TestCase
     assert_equal "Anheuser-Busch", assoc.name
   end
 
+  def test_to_key
+    assert_equal ["the-id"], Post.new(:id => "the-id").to_key
+    assert_equal ["the-key"], Post.new(:key => "the-key").to_key
+  end
+
+  def test_to_param
+    assert_equal "the-id", Post.new(:id => "the-id").to_param
+    assert_equal "the-key", Post.new(:key => ["the", "key"]).to_param
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-model
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchbase
@@ -167,4 +167,8 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Declarative interface to Couchbase
-test_files: []
+test_files:
+- test/setup.rb
+- test/test_model.rb
+- test/test_uuid.rb
+has_rdoc: