thingtank 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/examples/first_marriage.rb

@@ -23,13 +23,14 @@ class Spouse < ThingTank::Character
   property :married_state
 
   validate :spouse_should_be_married
+  validates :married, :character => Married # doc must have "married" character
   
   def married
     self["married"]
   end
 
   def spouse_should_be_married
-    married["spouse"] == self["_id"]
+    married && married["spouse"] == self["_id"]
   end
 
   def name

data/lib/thingtank/character.rb

@@ -4,11 +4,36 @@ class ThingTank
 
   class Character < CouchRest::Model::Base
 
-    include ThingTank::ForceUpdate
     include ThingTank::SharedMethods
 
+    property :update_me
+
+    before_validation do |character|
+      couchrest_attribute_will_change!('update_me') # or update_me_will_change! will also do
+      character.changed_to_character_hash. each do |k,v|
+        if v.is_a?(ThingTank)
+          if v.id
+            self[k] = v.to_sym
+          else
+            self[k] = v.to_character_hash(true)
+          end
+        # only do this for [ThingTank.new, ThingTank.new]
+        # all of them either having an id or not (just the first entry is checked)
+        elsif v && v.is_a?(Array) && !v.empty? && v.first.is_a?(ThingTank)
+          if v.first.id
+            self[k] = v.collect do |tt|
+              tt.to_sym
+            end  
+          else
+            self[k] = v.collect do |tt|
+              tt.to_character_hash(true)
+            end
+          end
+        end
+      end
+    end
+
     class << self
-      
       # we need this hack with after_inherited and defined or active record is going wild, see: http://stackoverflow.com/questions/790626/ruby-can-i-have-something-like-classinherited-thats-triggered-only-after-the
       # 'I'm trying to add behavior to activerecord models, but I need all the model customizations to go through before I mess with it. I'm trying to add behavior to activerecord models, but I need all the model customizations to go through before I mess with it. '
       # exactly my case
@@ -99,10 +124,15 @@ class ThingTank
     # use to_doc to put characters changes back to the doc without saving the doc
     def to_doc
       if changed?
+        valid = valid?
         changed_to_character_hash().each do |k,v|
           _character_doc[k] = v
         end
-        @changed_attributes.clear if @changed_attributes
+        if valid
+          @changed_attributes.clear if @changed_attributes
+        else
+          _doc.errors.add self.class.to_s, self.errors.messages
+        end
       end
     end
 
@@ -143,5 +173,4 @@ class ThingTank
       _character_doc.add_character(klass, key, &code)
     end
   end
-
 end

data/lib/thingtank/instance_methods.rb

@@ -15,6 +15,19 @@ class ThingTank
           @dependencies
         end
 
+        def to_sym
+          if id = self.id
+            "!##{id}"
+          else
+            nil
+          end
+        end
+
+        # it is not possible for whatever reason to overwrite valid?, check it out!
+        #def valid?
+        #  invalid_characters.empty? && self.errors.messages.empty?
+        #end
+
         # we don't do this. there is no proper way to update all given characters
         # one must not rely on a character properties after the doc has been manipulated
         # use Character#reload to get the latest from the doc object to the character and Character#reload! to reload the doc from the database and reload the character then

data/lib/thingtank/validators.rb

@@ -72,3 +72,31 @@ class CharacterValidator < ActiveModel::EachValidator
   end
 
 end
+
+
+class DocumentValidator < ActiveModel::EachValidator
+  def validate_single_doc(record, attribute, value, options)
+    if options[:inline]
+      return record.errors.add attribute, "#{value.inspect} should be an inlined doc that is converted to a hash" unless value.is_a? Hash
+      record.errors.add attribute, character.errors.messages unless ThingTank.new(value).valid?
+    else
+      match = (value =~ /^\!\#(.+)$/)
+      doc_id = $1
+      return record.errors.add attribute, "#{value.inspect} does not begin with !# and is therefor no doc id" unless match      
+      record.errors.add attribute, "doc with id #{doc_id} does not exist" unless record._doc.class.get(doc_id)
+    end
+  end
+
+  def validate_each(record, attribute, values)
+    case values
+    when NilClass
+      return nil
+    when Array
+      values.each do |value|
+        validate_single_doc(record, attribute, value, options)
+      end
+    else
+      validate_single_doc(record, attribute, values, options)
+    end
+  end
+end

data/test/test_validators.rb

@@ -15,11 +15,16 @@ class TestA < ThingTank::Character
   property :prop2
   property :foo1
   property :foo2
+  property :doc
+  property :inline_doc
 
   validates :prop1, :class => Array
   validates :prop2, :character => TestB
   validates :foo1, :class => [Integer, String]
   validates :foo2, :character => [TestB, TestC]
+
+  validates :doc, :document => true
+  validates :inline_doc, :document => {:inline => true}
 end
 
 describe "a classvalidator" do
@@ -114,4 +119,120 @@ describe "a charactervalidator and an array of values" do
     end
     assert_equal false, doc.as(TestA).valid?
   end
+end
+
+describe "a doc validator" do
+  it "should validate a doc id" do
+    doc1 = ThingTank.create :a => 'b'
+    doc1.save
+    doc2 = ThingTank.create
+    doc2.add_character TestA do |c|
+      c.doc = doc1.to_sym
+    end
+    assert_equal true, doc2.as(TestA).valid?
+
+    doc3 = ThingTank.create
+    doc3.add_character TestA do |c|
+      c.doc = doc1.id
+    end
+    assert_equal false, doc3.as(TestA).valid?
+
+    doc4 = ThingTank.create
+    doc4.add_character TestA do |c|
+      c.doc = "!#3" + doc1.id
+    end
+    assert_equal false, doc4.as(TestA).valid?
+
+    doc5 = ThingTank.create
+    doc5.add_character TestA do |c|
+      c.doc = doc1
+    end
+    assert_equal true, doc5.as(TestA).valid?
+  end
+
+  it "should validate an inline doc" do
+    doc1 = ThingTank.new :a => 'b'
+
+    doc2 = ThingTank.create
+    doc2.add_character TestA do |c|
+      c.inline_doc = doc1.to_character_hash(true)
+    end
+    assert_equal true, doc2.as(TestA).valid?
+
+    doc3 = ThingTank.create
+    doc3.add_character TestA do |c|
+      c.inline_doc = doc1
+    end
+
+    character = doc3.as(TestA)
+    assert_equal true, doc3.as(TestA).valid?
+
+    doc4 = ThingTank.create
+    doc4.add_character TestA do |c|
+      c.inline_doc = "test"
+    end
+
+    character = doc4.as(TestA)
+    assert_equal false, doc4.as(TestA).valid?
+  end
+
+
+  it "should validate multiple doc ids" do
+    doc0 = ThingTank.create :a => 'b'
+    doc0.save
+    doc1 = ThingTank.create :c => 'd'
+    doc1.save
+    doc2 = ThingTank.create
+    doc2.add_character TestA do |c|
+      c.doc = [doc1.to_sym, doc0.to_sym]
+    end
+    assert_equal true, doc2.as(TestA).valid?
+
+    doc3 = ThingTank.create
+    doc3.add_character TestA do |c|
+      c.doc = [doc1.id, doc0.to_sym]
+    end
+    assert_equal false, doc3.as(TestA).valid?
+
+    doc4 = ThingTank.create
+    doc4.add_character TestA do |c|
+      c.doc = ["!#3" + doc1.id, doc0.to_sym]
+    end
+    assert_equal false, doc4.as(TestA).valid?
+
+    doc5 = ThingTank.create
+    doc5.add_character TestA do |c|
+      c.doc = [doc1, doc0]
+    end
+    assert_equal true, doc5.as(TestA).valid?
+  end
+
+  it "should validate an multiple inline doc" do
+    doc0 = ThingTank.new :a => 'b'
+    doc1 = ThingTank.new :c => 'd'
+
+    doc2 = ThingTank.create
+    doc2.add_character TestA do |c|
+      c.inline_doc = [doc1.to_character_hash(true), doc0.to_character_hash(true)]
+    end
+    assert_equal true, doc2.as(TestA).valid?
+
+    doc3 = ThingTank.create
+    doc3.add_character TestA do |c|
+      c.inline_doc = [doc1, doc0]
+    end
+
+    character = doc3.as(TestA)
+    assert_equal true, doc3.as(TestA).valid?
+
+    doc4 = ThingTank.create
+    doc4.add_character TestA do |c|
+      c.inline_doc = ["test", doc1]
+    end
+
+    character = doc4.as(TestA)
+    assert_equal false, doc4.as(TestA).valid?
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thingtank
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &25566040 !ruby/object:Gem::Requirement
+  requirement: &9750780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25566040
+  version_requirements: *9750780
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &25565060 !ruby/object:Gem::Requirement
+  requirement: &9749340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25565060
+  version_requirements: *9749340
 - !ruby/object:Gem::Dependency
   name: couchrest_model
-  requirement: &25564240 !ruby/object:Gem::Requirement
+  requirement: &9748700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25564240
+  version_requirements: *9748700
 - !ruby/object:Gem::Dependency
   name: defined
-  requirement: &25563260 !ruby/object:Gem::Requirement
+  requirement: &9747760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25563260
+  version_requirements: *9747760
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &25562380 !ruby/object:Gem::Requirement
+  requirement: &9717160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25562380
+  version_requirements: *9717160
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &25542460 !ruby/object:Gem::Requirement
+  requirement: &9716460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25542460
+  version_requirements: *9716460
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &25541360 !ruby/object:Gem::Requirement
+  requirement: &9715280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25541360
+  version_requirements: *9715280
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &25540140 !ruby/object:Gem::Requirement
+  requirement: &9714000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25540140
+  version_requirements: *9714000
 - !ruby/object:Gem::Dependency
   name: linecache19
-  requirement: &25539220 !ruby/object:Gem::Requirement
+  requirement: &9713360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25539220
+  version_requirements: *9713360
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &25538420 !ruby/object:Gem::Requirement
+  requirement: &9712280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25538420
+  version_requirements: *9712280
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &25537540 !ruby/object:Gem::Requirement
+  requirement: &9711120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *25537540
+  version_requirements: *9711120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &25536680 !ruby/object:Gem::Requirement
+  requirement: &9710160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *25536680
+  version_requirements: *9710160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &25535920 !ruby/object:Gem::Requirement
+  requirement: &9703260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *25535920
+  version_requirements: *9703260
 description: 
 email: ! 'Base64.decode64(bGludXhAbWFyY3JlbmVhcm5zLmRl
 
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2137838232803990585
+      hash: 2476284335551452114
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: