thingtank 0.3.3 → 0.3.5

data/README.md

@@ -92,10 +92,11 @@ when he is adult, he wants to marry. now things are getting a bit more complicat
 we want easy access to the name of the spouse
 
     class Spouse < ThingTank::Character
-      property :married    # doc must have "married" property (should be of class married, we don't check this at the moment)
+      property :married    
       property :married_state
 
       validate :spouse_should_be_married
+      validates :married, :character => Married # doc must have "married" character
       
       def married
         self["married"] # contains a Married character

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.5

data/lib/thingtank/character.rb

@@ -35,7 +35,7 @@ class ThingTank
 
       def character_properties
         if superclass.respond_to? :character_properties
-          (superclass.character_properties || []).concat(@character_properties || [])
+          (superclass.character_properties || []).concat(@character_properties || []).uniq
         else
           @character_properties
         end

data/lib/thingtank/validators.rb

@@ -0,0 +1,74 @@
+class ClassValidator < ActiveModel::EachValidator
+  def validate_single_class(record, attribute, values, options)
+    if options[:in] # validates :hosting_account, :class => [Hash, String]
+      valid = false
+      options[:in].each do |klass|
+        if values.is_a?(klass)
+          valid = true
+        end
+      end
+      unless valid
+        record.errors.add attribute, "invalid class is #{values.class.to_s}, should be one of #{options[:in].join(', ')}"
+      end
+    else # validates :hosting_account, :class => Hash
+      unless values.is_a?(options[:with])
+        record.errors.add attribute, "invalid class is #{values.class.to_s}, should be #{options[:with]}"
+      end
+    end
+  end
+
+
+  def validate_each(record, attribute, values)
+    case values
+    when NilClass
+      return nil
+    when Array
+      if options[:with] && options[:with] == Array
+        validate_single_class(record, attribute, values, options)
+      else
+        values.each do |value|
+          validate_single_class(record, attribute, value, options)
+        end
+      end
+    else
+      validate_single_class(record, attribute, values, options)
+    end
+  end
+end
+
+
+class CharacterValidator < ActiveModel::EachValidator
+  def validate_single_character(record, attribute, values, options)
+    if options[:in] # validates :hosting_account, :character => [HostingAccount, ...]
+      valid = false
+      options[:in].each do |character|
+        character = character.new(values)
+        if character.valid?
+          valid = true
+        end
+      end
+      unless valid
+        record.errors.add attribute, "invalid character is #{values.inspect}, should be one of #{options[:in].join(', ')}"
+      end
+    else
+      character = options[:with].new(values)
+      unless character.valid?
+        record.errors.add attribute, character.errors.messages
+      end
+    end
+  end
+
+  def validate_each(record, attribute, values)
+    case values
+    when NilClass
+      return nil
+    when Array
+      values.each do |value|
+        validate_single_character(record, attribute, value, options)
+      end
+    else
+      validate_single_character(record, attribute, values, options)
+    end
+  end
+
+end

data/lib/thingtank.rb

@@ -19,6 +19,7 @@ require_relative File.join('thingtank', 'shared_methods.rb')
 require_relative File.join('thingtank', 'instance_methods.rb')
 require_relative File.join('thingtank', 'shortcuts.rb')
 require_relative File.join('thingtank', 'character_handling.rb')
+require_relative File.join('thingtank', 'validators.rb')
 require_relative File.join('thingtank', 'character.rb')
 require_relative File.join('thingtank', 'fakebase.rb')
 

data/test/test_thingtank.rb

@@ -42,6 +42,14 @@ describe "a general test" do
     reset_test_db!    
   end
 
+  it "shoud save under a special id" do
+    doc = create :_id => ".config/projectname", :a => 'b'
+    doc.save
+    doc = db_load ".config/projectname"
+    assert_equal ".config/projectname", doc.id
+    assert_equal "b", doc["a"]
+  end
+
   it "should inherit the properties" do
     doc = create
     doc.add_character CarSub do |c|
@@ -50,8 +58,14 @@ describe "a general test" do
     end
     doc.save
     doc.reload
-    assert_equal ["color", "model"], Car.character_properties.sort
-    assert_equal ["additional", "color", "model"], CarSub.character_properties.sort
+    car_props = Car.character_properties.uniq
+    car_props.delete "name"
+    car_props.delete "project"
+    car_sub_props = CarSub.character_properties.uniq
+    car_sub_props.delete "name"
+    car_sub_props.delete "project"
+    assert_equal ["color", "model"], car_props.sort
+    assert_equal ["additional", "color", "model"], car_sub_props.sort
     assert_equal false, doc.as(CarSub).valid?
     assert_equal 'green', doc.as(CarSub).color
   end

data/test/test_validators.rb

@@ -0,0 +1,117 @@
+require 'test_helper'
+
+class TestC < ThingTank::Character
+  property :propC
+  validates_presence_of :propC
+end
+
+class TestB < ThingTank::Character
+  property :propB
+  validates_presence_of :propB
+end
+
+class TestA < ThingTank::Character
+  property :prop1
+  property :prop2
+  property :foo1
+  property :foo2
+
+  validates :prop1, :class => Array
+  validates :prop2, :character => TestB
+  validates :foo1, :class => [Integer, String]
+  validates :foo2, :character => [TestB, TestC]
+end
+
+describe "a classvalidator" do
+  it "should validate correctly single class" do
+    assert_equal true, TestA.new(:prop1 => ["Something"]).valid?
+    assert_equal false, TestA.new(:prop1 => "Something").valid?
+  end
+
+  it "should validate correctly multiple classes" do
+    assert_equal true, TestA.new(:foo1 => "Something").valid?
+    assert_equal true, TestA.new(:foo1 => 5).valid?
+    assert_equal false, TestA.new(:foo1 => {:hi => "ho"}).valid?
+  end
+end
+
+describe "a charactervalidator" do
+  it "should validate correctly single valid character" do
+    doc = ThingTank.create
+    doc.add_character TestA do |c|
+      c.prop2 = {:propB => "bla"}
+    end
+    assert_equal true, doc.valid?
+  end
+
+  it "should validate correctly single invalid character" do
+    doc = ThingTank.create
+    doc.add_character TestA do |c|
+      c.prop2 = {:prop5 => "bla"}
+    end
+    assert_equal false, doc.as(TestA).valid?
+  end
+
+  it "should validate correctly multiple valid characters" do
+    doc = ThingTank.create
+    doc.add_character TestA do |c|
+      c.foo2 = {:propB => "bla"}
+    end
+    assert_equal true, doc.as(TestA).valid?
+
+    doc2 = ThingTank.create
+    doc2.add_character TestA do |c|
+      c.foo2 = {:propC => "bla"}
+    end
+    assert_equal true, doc2.as(TestA).valid?
+  end
+
+  it "should validate correctly multiple invalid characters" do
+    doc = ThingTank.create
+    doc.add_character TestA do |c|
+      c.foo2 = {:prop5 => "bla"}
+    end
+    assert_equal false, doc.as(TestA).valid?
+  end
+end
+
+
+describe "a charactervalidator and an array of values" do
+  it "should validate correctly single valid character" do
+    doc = ThingTank.create
+    doc.add_character TestA do |c|
+      c.prop2 = [{:propB => "bla"}, {:propB => "blub"}]
+    end
+    assert_equal true, doc.valid?
+  end
+
+  it "should validate correctly single invalid character" do
+    doc = ThingTank.create
+    doc.add_character TestA do |c|
+      c.prop2 = [{:prop5 => "bla"}, {:propB => "bla"}]
+    end
+    assert_equal false, doc.as(TestA).valid?
+  end
+
+  it "should validate correctly multiple valid characters" do
+    doc = ThingTank.create
+    doc.add_character TestA do |c|
+      c.foo2 = [{:propB => "bla"}, {:propB => "blubb"}]
+    end
+    assert_equal true, doc.as(TestA).valid?
+
+    doc2 = ThingTank.create
+    doc2.add_character TestA do |c|
+      c.foo2 = [{:propC => "bla"}, {:propC => "bla"}]
+    end
+    assert_equal true, doc2.as(TestA).valid?
+  end
+
+  it "should validate correctly multiple invalid characters" do
+    doc = ThingTank.create
+    doc.add_character TestA do |c|
+      c.foo2 = [{:prop5 => "bla"}, {:propB => "bla"}]
+    end
+    assert_equal false, doc.as(TestA).valid?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thingtank
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &11805880 !ruby/object:Gem::Requirement
+  requirement: &25566040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11805880
+  version_requirements: *25566040
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &11804860 !ruby/object:Gem::Requirement
+  requirement: &25565060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11804860
+  version_requirements: *25565060
 - !ruby/object:Gem::Dependency
   name: couchrest_model
-  requirement: &11777420 !ruby/object:Gem::Requirement
+  requirement: &25564240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11777420
+  version_requirements: *25564240
 - !ruby/object:Gem::Dependency
   name: defined
-  requirement: &11776640 !ruby/object:Gem::Requirement
+  requirement: &25563260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11776640
+  version_requirements: *25563260
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &11775540 !ruby/object:Gem::Requirement
+  requirement: &25562380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11775540
+  version_requirements: *25562380
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &11773820 !ruby/object:Gem::Requirement
+  requirement: &25542460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11773820
+  version_requirements: *25542460
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &11770240 !ruby/object:Gem::Requirement
+  requirement: &25541360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11770240
+  version_requirements: *25541360
 - !ruby/object:Gem::Dependency
   name: guard-minitest
-  requirement: &11744560 !ruby/object:Gem::Requirement
+  requirement: &25540140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11744560
+  version_requirements: *25540140
 - !ruby/object:Gem::Dependency
   name: linecache19
-  requirement: &11743740 !ruby/object:Gem::Requirement
+  requirement: &25539220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11743740
+  version_requirements: *25539220
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &11743100 !ruby/object:Gem::Requirement
+  requirement: &25538420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11743100
+  version_requirements: *25538420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &11742460 !ruby/object:Gem::Requirement
+  requirement: &25537540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *11742460
+  version_requirements: *25537540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &11741460 !ruby/object:Gem::Requirement
+  requirement: &25536680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *11741460
+  version_requirements: *25536680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &11740740 !ruby/object:Gem::Requirement
+  requirement: &25535920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *11740740
+  version_requirements: *25535920
 description: 
 email: ! 'Base64.decode64(bGludXhAbWFyY3JlbmVhcm5zLmRl
 
@@ -190,6 +190,7 @@ files:
 - lib/thingtank/shared_methods.rb
 - lib/thingtank/shortcuts.rb
 - lib/thingtank/thingtank.rb
+- lib/thingtank/validators.rb
 - test/examples/test_bear_julius.rb
 - test/examples/test_first_marriage.rb
 - test/examples/test_immortal_julius.rb
@@ -199,6 +200,7 @@ files:
 - test/test_helper.rb
 - test/test_lists.rb
 - test/test_thingtank.rb
+- test/test_validators.rb
 - test/test_views.rb
 homepage: http://github.com/metakeule/thingtank
 licenses:
@@ -215,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3630717306101485163
+      hash: -2137838232803990585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: