couchpillow 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cd317f3b612baf2716008f1bddcc02381a9eaad
-  data.tar.gz: f773b200f9f8f75f5620184d3d28fafef7b09036
+  metadata.gz: 2d7345235a3c65ff275b24df3e7c3a2633445460
+  data.tar.gz: 0fe1d51ac229b905db59d7c4b6099c813a4412c3
 SHA512:
-  metadata.gz: 66d608fe08195ca9e61b6005f31f5792f7126c259785a48f9db2a57f6714a43fd86a572d80a586ecdeef232efcb710828ede3735b99929e8009ae6be0e073310
-  data.tar.gz: 0ad341af2a487c15c0737eee339404ab0b268d93e60898a3558678a2a0cd3f369df36ec8595f47b93ad0b175c45fd8865bca1e80ea2bf6ef14c77e315673bd2c
+  metadata.gz: af5e607cf055c06484a7ee18f24e91a28de8afcf9d9b5fed6ef44cf210283487153d86b118ce72af27073116f4016e17ffd528a19d09afe0f3ac53ec135f5ba2
+  data.tar.gz: 5c3633aba46a77245abaaade884b9d83dc9ade01e836cdd8cd5c6c505091ff1a23e101e3777706ec2284d80346fffa3532c145646aed41b7a588231d325745da

data/lib/couchpillow/document.rb

@@ -52,7 +52,7 @@ module CouchPillow
 
       time = Time.now.utc
       @data[:_created_at] ||= time
-      @data[:_updated_at] = time
+      @data[:_updated_at] ||= time
 
       @cas = cas
 
@@ -259,19 +259,30 @@ module CouchPillow
     # If multiple ids are passed, returns an array.
     #
     def self.get *ids
-      results = ids.map do |id|
-        id = _sanitize_id(id)
+      results = []
+      if ids.length == 1
+        id = _sanitize_id(ids.first)
         tid = _is_type_prefixed? ? "#{_doc_type}::#{id}" : id
         result, _, cas = _default_db.get(tid, extended: true)
 
-        result and
-          type = result[:_type] || result["_type"] and
-          type == _doc_type and
-          new(result, id, cas) or
-          nil
+        results << create(result, id, cas)
+
+      elsif ids.length > 1
+        # Sanitize ids first
+        sanitized_ids = ids.map do |id|
+          id = _sanitize_id(id)
+          _is_type_prefixed? ? "#{_doc_type}::#{id}" : id
+        end
+
+        # Query the db
+        db_result = _default_db.get(*sanitized_ids, extended: true)
+        results = sanitized_ids.map do |k|
+          result, _, cas = db_result[k]
+          create(result, k, cas)
+        end
       end
 
-      results && results.size == 1 ? results.first : results
+      results.size == 1 ? results.first : results
     end
 
 
@@ -353,6 +364,15 @@ module CouchPillow
     end
 
 
+    def self.create result, id, cas
+      result and
+        type = result[:_type] || result["_type"] and
+        type == _doc_type and
+        new(result, id, cas) or
+        nil
+    end
+
+
     def self.event_listeners
       @event_listeners ||= {}
     end

data/lib/couchpillow/helper.rb

@@ -2,9 +2,28 @@ module CouchPillow
 
   def self.symbolize hash
     hash.inject({}) do |memo,(k,v)|
-      memo[k.to_sym] = v
+      memo[k.to_sym] = sanitize(v)
       memo
     end
   end
 
+
+  def self.sanitize value
+    sanitized = nil
+    if value.class == Hash
+      sanitized = {}
+      value.each do |k, v|
+        sanitized[k] = sanitize(v)
+      end
+    elsif value.class == Array
+      sanitized = []
+      value.each do |e|
+        sanitized << sanitize(e)
+      end
+    else
+      sanitized = value
+    end
+    sanitized
+  end
+
 end

data/lib/couchpillow/version.rb

@@ -1,5 +1,5 @@
 module CouchPillow
   GEM_NAME = "couchpillow"
   NAME = "CouchPillow"
-  VERSION = "0.4.8"
+  VERSION = "0.4.9"
 end

data/test/helper.rb

@@ -35,8 +35,27 @@ class FakeCouchbaseServer
   end
 
 
-  def get id, opts = {}
-    return [@storage[id], nil, @cas[id]] if opts[:extended] == true
-    @storage[id]
+  def get *args
+    opts = has_opts?(args) ? args.pop : {}
+    ids = args
+    if ids.length == 1
+      id = ids.first
+      opts[:extended] == true and
+        retval = [@storage[id], nil, @cas[id]] or
+        retval = @storage[id]
+    else
+      retval = ids.inject({}) do |memo, id|
+        opts[:extended] == true and
+          memo[id] = [@storage[id], nil, @cas[id]] or
+          memo[id] = @storage[id]
+        memo
+      end
+    end
+    retval
   end
+
+  def has_opts? args
+    args.any? { |v| v.is_a?(Hash) }
+  end
+
 end

data/test/test_document.rb

@@ -31,12 +31,28 @@ class TestDocument < Minitest::Test
   end
 
 
+  def test_updated_at_doesnt_get_updated_at_initialize
+    t = Time.parse("2008-06-21 13:30:00 UTC")
+    d = Document.new({"_updated_at" => t}, "1")
+    assert_equal t, d._updated_at
+  end
+
+
   def test_default_type
     d = Document.new({}, "1")
     assert_equal "couchpillow", d.doc_type
   end
 
 
+  def test_hash_with_proc_should_not_throw_error
+    hsh = Hash.new { |hash,key| hash[key.to_s] if Symbol === key }
+    hsh['foo'] = Hash.new { |hash,key| hash[key.to_s] if Symbol === key }
+    hsh['bar'] = 200
+    d = Document.new(hsh, "1")
+    d.save!
+  end
+
+
   def test_type_subclasses
     d = Class.new(Document) do
       type 'test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchpillow
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Albert Tedja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-18 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchbase