couchbase-orm 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc28632e30fe3d518b6fb10fe892a9a51fae2229
-  data.tar.gz: c794c256004e9550f88dd2e760df80d0e35ad6b6
+  metadata.gz: f69d88d6820ca854f9650369e01b4ccb7c431a22
+  data.tar.gz: c80410e6473d97aee26722c763286bd0a322e9ea
 SHA512:
-  metadata.gz: 8cfd1a37baac0d5ff3045165d6a723b1d91814fe20790511e1a242839917de1b04de3806af038f2bcb34ea90445bfd73d0869bea2b0eb77ab12cf326b7f722dc
-  data.tar.gz: eaa78cf644bb41f50b4e465931308174394589c89ca46b6569e485d7311a17ee27c6a4a42071fa1bd499a4a09ffaec9e7c37913af9fd2e3f8707af441d3f189c
+  metadata.gz: 5e157bc072a22300558ef1b6bca1ed2033a4c74e8651b78c09306d43687081b0e3560199c10ab185b8b35ae4fca46056a067ddcbf79af09eacdd2d036f225dce
+  data.tar.gz: 3543a615ad4e0f117139ec75658e714f119e15aef615859fa9a5dd161edc90a54d7ba99606cc29b15d39872a79a31a7f3fdcea41527cfc374abb864aaa3f7ab8

data/lib/couchbase-orm/base.rb

@@ -128,9 +128,9 @@ module CouchbaseOrm
             self.class.attributes.each do |key, options|
                 default = options[:default]
                 if default.respond_to?(:call)
-                    @__attributes__[key] = default.call
+                    write_attribute key, default.call
                 else
-                    @__attributes__[key] = default
+                    write_attribute key, default
                 end
             end
 

data/lib/couchbase-orm/utilities/ensure_unique.rb

@@ -2,11 +2,11 @@ module CouchbaseOrm
     module EnsureUnique
         private
 
-        def ensure_unique(attrs, name = nil, &processor)
+        def ensure_unique(attrs, name = nil, presence: true, &processor)
             # index uses a special bucket key to allow record lookups based on
             # the values of attrs. ensure_unique adds a simple lookup using
             # one of the added methods to identify duplicate
-            name = index(attrs, name, &processor)
+            name = index(attrs, name, presence: presence, &processor)
 
             validate do |record|
                 unless record.send("#{name}_unique?")

data/lib/couchbase-orm/utilities/index.rb

@@ -2,7 +2,7 @@ module CouchbaseOrm
     module Index
         private
 
-        def index(attrs, name = nil, &processor)
+        def index(attrs, name = nil, presence: true, &processor)
             attrs = Array(attrs).flatten
             name ||= attrs.map(&:to_s).join('_')
 
@@ -67,9 +67,11 @@ module CouchbaseOrm
             # validations
             #----------------
             # ensure each component of the unique key is present
-            attrs.each do |attr|
-                validates attr, presence: true
-                define_attribute_methods attr
+            if presence
+                attrs.each do |attr|
+                    validates attr, presence: true
+                    define_attribute_methods attr
+                end
             end
 
             define_method("#{name}_unique?") do
@@ -97,7 +99,10 @@ module CouchbaseOrm
             after_save do |record|
                 original_key = instance_variable_get(original_bucket_key_var)
                 record.class.bucket.delete(original_key, quiet: true) if original_key
-                record.class.bucket.set(record.send(bucket_key_method), record.id, plain: true)
+
+                unless presence == false && attrs.length == 1 && record[attrs[0]].nil?
+                    record.class.bucket.set(record.send(bucket_key_method), record.id, plain: true)
+                end
                 instance_variable_set(original_bucket_key_var, nil)
             end
 

data/lib/couchbase-orm/version.rb

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

data/lib/couchbase-orm/views.rb

@@ -32,9 +32,9 @@ module CouchbaseOrm
                 method_opts[:reduce] = reduce if reduce
 
                 unless method_opts.has_key? :map
-                    emit_key = emit_key || :id
+                    emit_key = emit_key || :created_at
 
-                    if emit_key != :id && self.attributes[emit_key][:type].to_s == 'Array'
+                    if emit_key != :created_at && self.attributes[emit_key][:type].to_s == 'Array'
                         method_opts[:map] = <<-EMAP
 function(doc) {
     var i;

data/spec/index_spec.rb

@@ -4,8 +4,9 @@ require File.expand_path("../support", __FILE__)
 
 
 class IndexTest < CouchbaseOrm::Base
-    attribute :email
-    ensure_unique :email
+    attribute :email, type: String
+    attribute :name,  type: String, default: :joe
+    ensure_unique :email, presence: false
 end
 
 class EnumTest < CouchbaseOrm::Base
@@ -14,6 +15,11 @@ end
 
 
 describe CouchbaseOrm::Index do
+    after :each do
+        IndexTest.bucket.delete('index_testemail-joe@aca.com')
+        IndexTest.bucket.delete('index_testemail-')
+    end
+
     it "should prevent models being created if they should have unique keys" do
         joe = IndexTest.create!(email: 'joe@aca.com')
         expect { IndexTest.create!(email: 'joe@aca.com') }.to raise_error(CouchbaseOrm::Error::RecordInvalid)
@@ -54,6 +60,22 @@ describe CouchbaseOrm::Index do
         again.destroy
     end
 
+    it "should work with nil values" do
+        joe = IndexTest.create!
+        expect(IndexTest.find_by_email(nil)).to eq(nil)
+
+        joe.email = 'joe@aca.com'
+        joe.save!
+        expect(IndexTest.find_by_email('joe@aca.com')).to eq(joe)
+
+        joe.email = nil
+        joe.save!
+        expect(IndexTest.find_by_email('joe@aca.com')).to eq(nil)
+        expect(IndexTest.find_by_email(nil)).to eq(nil)
+
+        joe.destroy
+    end
+
     it "should work with enumerators" do
         # Test symbol
         enum = EnumTest.create!(visibility: :public)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-orm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-08 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libcouchbase