couchbase-orm 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b68fe44cc7da799f2e87e010a86bbdc8110afae
-  data.tar.gz: 2261e2cbe3d2d7daac611f9aa167ffdad4683495
+  metadata.gz: 6180a380880e394f4d1708aa67048db9adcfb18a
+  data.tar.gz: 028684cab7ef06b41a5aecbfc56b29826fa85230
 SHA512:
-  metadata.gz: 52dd91e8aea71e0d3048486b4de9a7fa48ad6a5fe55e5e141c5037beb0b71764fab67ba22f6706372cf61b7a4a8c2d0dd3054a39d4d1c76c51a4b83f7bacea2d
-  data.tar.gz: dfaf5da9c871352fb05a75e3c670ca82f735641ffe0945943e609a519694c10881e7b62c2de04a62ff5202a918405f66bc08c20d89d1d4187a6f601067606416
+  metadata.gz: 1302271d05d4302ec5c5a27c4d408d2c746fc3074b999e38533e0d9f3bc6fdd423ae30be0f84b4c36012b593a41a504960b2000a95929c5d18591f6a7a60d131
+  data.tar.gz: 19f91c2fa122d7a212f2364c0b614af39b11ecba3ba5bcea1b361609fe88c265927a0c619bdd9ef13d24403fb78dfc803f3ea5bc37f52fe074d576ff98de4b16

data/lib/couchbase-orm/base.rb

@@ -20,7 +20,7 @@ module CouchbaseOrm
         include ::ActiveModel::Dirty
         include ::ActiveModel::Serializers::JSON
 
-        extend  ::ActiveModel::Callbacks
+        include ::ActiveModel::Validations
         include ::ActiveModel::Validations::Callbacks
         define_model_callbacks :initialize, :only => :after
         define_model_callbacks :create, :destroy, :save, :update
@@ -71,15 +71,19 @@ module CouchbaseOrm
                     name = name.to_sym
 
                     @attributes[name] = options
-                    next if self.instance_methods.include?(name)
 
-                    define_method(name) do
-                        read_attribute(name)
+                    unless self.instance_methods.include?(name)
+                        define_method(name) do
+                            read_attribute(name)
+                        end
                     end
 
-                    define_method(:"#{name}=") do |value|
-                        value = yield(value) if block_given?
-                        write_attribute(name, value)
+                    eq_meth = :"#{name}="
+                    unless self.instance_methods.include?(eq_meth)
+                        define_method(eq_meth) do |value|
+                            value = yield(value) if block_given?
+                            write_attribute(name, value)
+                        end
                     end
                 end
             end

data/lib/couchbase-orm/persistence.rb

@@ -187,7 +187,7 @@ module CouchbaseOrm
 
 
         def _update_record(with_cas: false, **options)
-            return false unless perform_validations(options)
+            return false unless perform_validations(:update, options)
             return true unless changed?
 
             run_callbacks :update do
@@ -211,7 +211,7 @@ module CouchbaseOrm
         end
 
         def _create_record(**options)
-            return false unless perform_validations(options)
+            return false unless perform_validations(:create, options)
 
             run_callbacks :create do
                 run_callbacks :save do
@@ -232,8 +232,8 @@ module CouchbaseOrm
             end
         end
 
-        def perform_validations(options = {})
-            return valid? if options[:validate] != false
+        def perform_validations(context, options = {})
+            return valid?(context) if options[:validate] != false
             true
         end
     end

data/lib/couchbase-orm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
 module CouchbaseOrm
-    VERSION = '0.0.6'
+    VERSION = '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-orm
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Stephen von Takach