couchbase-model 0.5.0 → 0.5.1

data/HISTORY.markdown

@@ -1,3 +1,7 @@
+## 0.5.1 / 2012-11-29
+
+* Introduce save! and create! methods and raise RecordInvalid only from them
+
 ## 0.5.0 / 2012-11-21
 
 * Update template for map function

data/lib/couchbase/model.rb

@@ -430,11 +430,20 @@ module Couchbase
     # @since 0.0.1
     #
     # @param [Hash] args attribute-value pairs for the object
-    # @return [Couchbase::Model] an instance of the model
+    # @return [Couchbase::Model, false] an instance of the model
     def self.create(*args)
       new(*args).create
     end
 
+    # Creates an object just like {{Model.create} but raises an exception if
+    # the record is invalid.
+    #
+    # @since 0.5.1
+    # @raise [Couchbase::Error::RecordInvalid] if the instance is invalid
+    def self.create!(*args)
+      new(*args).create!
+    end
+
     # Constructor for all subclasses of Couchbase::Model
     #
     # @since 0.0.1
@@ -473,7 +482,7 @@ module Couchbase
     #
     # @since 0.0.1
     #
-    # @return [Couchbase::Model] newly created object
+    # @return [Couchbase::Model, false] newly created object
     #
     # @raise [Couchbase::Error::KeyExists] if model with the same +id+
     #   exists in the bucket
@@ -484,7 +493,7 @@ module Couchbase
     def create(options = {})
       @id ||= Couchbase::Model::UUID.generator.next(1, model.thread_storage[:uuid_algorithm])
       if respond_to?(:valid?) && !valid?
-        raise Couchbase::Error::RecordInvalid.new(self)
+        return false
       end
       options = model.defaults.merge(options)
       value = (options[:format] == :plain) ?  @raw : attributes_with_values
@@ -498,13 +507,25 @@ module Couchbase
       self
     end
 
+    # Creates an object just like {{Model#create} but raises an exception if
+    # the record is invalid.
+    #
+    # @since 0.5.1
+    #
+    # @raise [Couchbase::Error::RecordInvalid] if the instance is invalid
+    def create!(options = {})
+      create(options) || raise(Couchbase::Error::RecordInvalid.new(self))
+    end
+
     # Create or update this object based on the state of #new?.
     #
     # @since 0.0.1
     #
     # @param [Hash] options options for operation, see
     #   {{Couchbase::Bucket#set}}
-    # @return [Couchbase::Model] The saved object
+    #
+    # @return [Couchbase::Model, false] saved object or false if there
+    #   are validation errors
     #
     # @example Update the Post model
     #   p = Post.find('hello-world')
@@ -515,10 +536,11 @@ module Couchbase
     #   p = Post.find('hello-world')
     #   p.draft = false
     #   p.save('cas' => p.meta['cas'])
+    #
     def save(options = {})
       return create(options) unless @meta
       if respond_to?(:valid?) && !valid?
-        raise Couchbase::Error::RecordInvalid.new(self)
+        return false
       end
       options = model.defaults.merge(options)
       value = (options[:format] == :plain) ?  @raw : attributes_with_values
@@ -526,6 +548,16 @@ module Couchbase
       self
     end
 
+    # Creates an object just like {{Model#save} but raises an exception if
+    # the record is invalid.
+    #
+    # @since 0.5.1
+    #
+    # @raise [Couchbase::Error::RecordInvalid] if the instance is invalid
+    def save!(options = {})
+      save(options) || raise(Couchbase::Error::RecordInvalid.new(self))
+    end
+
     # Update this object, optionally accepting new attributes.
     #
     # @since 0.0.1

data/lib/couchbase/model/version.rb

@@ -19,7 +19,7 @@ module Couchbase
 
   class Model
 
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
 
   end
 

data/lib/couchbase/railtie.rb

@@ -50,7 +50,8 @@ module Rails #:nodoc:
       def self.rescue_responses
         {
           "Couchbase::Error::NotFound" => :not_found,
-          "Couchbase::Error::NotStored" => :unprocessable_entity
+          "Couchbase::Error::NotStored" => :unprocessable_entity,
+          "Couchbase::Error::RecordInvalid" => :unprocessable_entity
         }
       end
 

data/test/test_model.rb

@@ -225,11 +225,13 @@ class TestModel < MiniTest::Unit::TestCase
     post = ValidPost.create(:title => 'Hello, World!')
     assert post.valid?, "post with title should be valid"
     post.title = nil
+    refute post.save
     assert_raises(Couchbase::Error::RecordInvalid) do
-      post.save
+      post.save!
     end
+    refute ValidPost.create(:title => nil)
     assert_raises(Couchbase::Error::RecordInvalid) do
-      ValidPost.create(:title => nil)
+      ValidPost.create!(:title => nil)
     end
   end
 

metadata

@@ -1,121 +1,118 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: couchbase-model
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.5.1
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-21 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-11-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: couchbase
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: -168919795
-        segments: 
-        - 1
-        - 2
-        - 0
-        - dp
+      - !ruby/object:Gem::Version
         version: 1.2.0.dp
-  name: couchbase
-  version_requirements: *id001
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
+      - !ruby/object:Gem::Version
+        version: 1.2.0.dp
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
   name: minitest
-  version_requirements: *id003
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdiscount
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: yard
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: debugger
-  version_requirements: *id006
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ORM-like interface allows you to persist your models to Couchbase
 email: support@couchbase.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -146,41 +143,28 @@ files:
 - test/setup.rb
 - test/test_model.rb
 - test/test_uuid.rb
-has_rdoc: true
 homepage: https://github.com/couchbase/couchbase-ruby-model
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Declarative interface to Couchbase
-test_files: 
-- test/setup.rb
-- test/test_model.rb
-- test/test_uuid.rb
+test_files: []