couchpillow 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5528117c461394f549f525f4d587ba6353251934
-  data.tar.gz: d87079aab16ef5ebfedcf98371d747493d54e6f6
+  metadata.gz: d63d2c4df367a2e6437afd6fc0098a19cee672fc
+  data.tar.gz: 525b36cfe68b71d73154572cbc172a78d87dd98a
 SHA512:
-  metadata.gz: 660b03268c7185f55b5acc33f5acee91422a07e83c8bbd835cd299ee2a9749440a7fc3016171d446dbe96290627b10d951143f504faa09b92f29a8cf8cf6258a
-  data.tar.gz: 53fd3d0be6683e26edbaf8581adfca520048c1660bcac6c1ec74f692cfed4376c27be6dc3c5f719e4dae6faee7acb833e60f9f0e33d8dee363807d486446c846
+  metadata.gz: e4a0d12cb5ea95f34b04d1c007ba2a1a6d8b12ddc487f1d1a3f798adbf9b29fff6614ff67ada756e8dda58b769ca5a1bbe4c7da1bca4a7327465266d4ce0358a
+  data.tar.gz: 205392e541c91358338d3b617c21869ea3a41b1407353dcb430389bd1141ac0d6f8851b607426eaf14f0c80001671029e7d87f505c26d2f8a187295f775dbce6

data/README.markdown

@@ -1,13 +1,12 @@
 # CouchPillow
 
-Light and comfortable Document wrapper and integrity tool for Couchbase Server.
+Light and comfortable Document integrity tool for Couchbase Server.
 
 
 ## Why CouchPillow?
 
-Yet another ORM? Not quite. CouchPillow is a wrapper to Couchbase Documents
-and also an integrity tool to make sure that all current and existing documents
-can work nicely with the current code.
+CouchPillow is an integrity tool for Couchbase Documents to make sure that all
+current and existing documents can work nicely with the current code.
 
 CouchPillow separates itself from the database drivers, making it light and
 independent from the implementation.  Although it is initially designed to work

data/lib/couchpillow/document.rb

@@ -32,6 +32,7 @@ module CouchPillow
       raise TypeError if @data[:_type] && @data[:_type] != self.class._type
       @data[:_type] = self.class._type
       rename!
+      ensure_types!
     end
 
 
@@ -67,12 +68,14 @@ module CouchPillow
         super
     end
 
+
     def timestamp!
       @data[:updated_at] = Time.now.utc
     end
 
 
     # Save this document to the server
+    #
     def save!
       validate
       sort!
@@ -129,10 +132,35 @@ module CouchPillow
     end
 
 
+    def ensure_types!
+      self.class.type_keys.each do |k, t|
+        if value = @data[k] and !value.is_a?(t)
+          if t == Integer
+            @data[k] = Integer(value)
+          elsif t == Float
+            @data[k] = Float(value)
+          elsif t == String
+            @data[k] = String(value)
+          elsif t == Array
+            @data[k] = Array(value)
+          elsif t == Time
+            @data[k] = Time.parse(value)
+          end
+        end
+      end
+    end
+
+
+    # Get a Document given an id.
+    #
+    # @returns nil if Document is of a different type.
+    #
     def self.get id
       result = CouchPillow.db.get(id) and
+        type = result['_type'] and
+        type == self._type and
         new(result, id) or
-        result
+        nil
     end
 
 
@@ -168,6 +196,7 @@ module CouchPillow
     #
     def self.validate_type key, type
       validate key, "is not the correct type. Expected a #{type}", lambda { |v| v.is_a? type }
+      type_keys << [key, type]
     end
 
 
@@ -188,8 +217,13 @@ module CouchPillow
     end
 
 
+    def self.type_keys
+      @type_keys ||= []
+    end
+
+
     def self.validate_keys
-      @validate_key ||= []
+      @validate_keys ||= []
     end
 
 

data/lib/couchpillow/version.rb

@@ -1,5 +1,5 @@
 module CouchPillow
   GEM_NAME = "couchpillow"
   NAME = "CouchPillow"
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/test/test_document.rb

@@ -63,7 +63,7 @@ class TestDocument < Minitest::Test
 
   def test_validate_type
     d = Class.new(Document) do
-      validate_type     :abc, Hash
+      validate_type :abc, Hash
     end.new
 
     d.abc = "other type"
@@ -76,6 +76,94 @@ class TestDocument < Minitest::Test
   end
 
 
+  def test_validate_type_also_ensures_types_on_create_integer
+    klass = Class.new(Document) do
+      type "test"
+      validate_type :abc, Integer
+    end
+
+    CouchPillow.db.
+      expects(:get).
+      with('123').
+      returns( { '_type' => 'test', 'abc' => '100' } )
+
+    d = klass.get('123')
+    assert d
+    assert_equal 100, d.abc
+  end
+
+
+  def test_validate_type_also_ensures_types_on_create_string
+    klass = Class.new(Document) do
+      type "test"
+      validate_type :abc, String
+    end
+
+    CouchPillow.db.
+      expects(:get).
+      with('123').
+      returns( { '_type' => 'test', 'abc' => 100 } )
+
+    d = klass.get('123')
+    assert d
+    assert_equal '100', d.abc
+  end
+
+
+  def test_validate_type_also_ensures_types_on_create_float
+    klass = Class.new(Document) do
+      type "test"
+      validate_type :abc, Float
+    end
+
+    CouchPillow.db.
+      expects(:get).
+      with('123').
+      returns( { '_type' => 'test', 'abc' => '121.21' } )
+
+    d = klass.get('123')
+    assert d
+    assert_equal 121.21, d.abc
+  end
+
+
+  def test_validate_type_also_ensures_types_on_create_array
+    klass = Class.new(Document) do
+      type "test"
+      validate_type :abc, Array
+    end
+
+    CouchPillow.db.
+      expects(:get).
+      with('123').
+      returns( { '_type' => 'test', 'abc' => [1, 2, 3] } )
+
+    d = klass.get('123')
+    assert d
+    assert_equal [1, 2, 3], d.abc
+  end
+
+
+  def test_validate_type_also_ensures_types_on_create_time
+    klass = Class.new(Document) do
+      type "test"
+      validate_type :abc, Time
+    end
+
+    CouchPillow.db.
+      expects(:get).
+      with('123').
+      returns( { '_type' => 'test', 'abc' => "2014/07/04" } )
+
+    d = klass.get('123')
+    assert d
+    assert d.abc.is_a?(Time)
+    assert_equal 2014, d.abc.year
+    assert_equal 7, d.abc.month
+    assert_equal 4, d.abc.day
+  end
+
+
   def test_validate_custom
     d = Class.new(Document) do
       validate :xyz, "must be Numeric", lambda { |v| v.is_a? Numeric }
@@ -162,4 +250,19 @@ class TestDocument < Minitest::Test
     assert_equal nil, d
   end
 
+
+  def test_get_returns_a_document_of_a_different_type
+    klass = Class.new(Document) do
+      type 'test'
+    end
+
+    CouchPillow.db
+      .expects(:get)
+      .with('123')
+      .returns( { '_type' => 'something else', 'stuff' => 'data' } )
+
+    d = klass.get('123')
+    assert_equal nil, d
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchpillow
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Albert Tedja
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-19 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Document wrapper for Couchbase