thingtank 0.0.4 → 0.1.0

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+#  - jruby-19mode # JRuby in 1.9 mode, disabled since jruby needs jruby-openssl
+env: COUCH_POTATO_TEST_DB=http://localhost:5984/test_potato
+before_script:
+  - curl -X PUT localhost:5984/test_potato

data/Gemfile

@@ -1,15 +1,34 @@
 source "http://rubygems.org"
 
+gem 'json'
 gem 'couchrest'
 gem 'couchrest_model'
 
 group :development do
-  #gem "minitest", ">= 0"
+
+  unless ENV['TRAVIS']
+    gem 'guard'
+    gem 'libnotify'
+    gem 'rb-inotify'
+    gem 'guard-minitest'
+
+    if RUBY_VERSION =~ /1.9/
+      gem 'linecache19'
+      gem 'ruby-debug19'
+    end
+
+    if RUBY_VERSION =~ /1.8/
+      gem 'linecache'
+      gem 'ruby-debug'
+    end
+  end
+
   gem "yard", "~> 0.6.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
 
-  gem 'linecache19' 
-  gem 'ruby-debug19'
+  if RUBY_VERSION =~ /1.8/ 
+    gem 'backports'
+    gem 'minitest'
+  end 
 end

data/Guardfile

@@ -0,0 +1,15 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'minitest' do
+  # with Minitest::Unit
+  watch(%r|^test/test_(.*)\.rb$|)
+  watch(%r|^lib/(.*)([^/]+)\.rb$|){ |m| "test/#{m[1]}test_#{m[2]}.rb" }
+  watch(%r|^examples/([^/]+)\.rb$|){ |m| "test/examples/test_#{m[1]}.rb" }
+  watch(%r|^test/test_helper\.rb$|)    { "test" }
+
+  # with Minitest::Spec
+  # watch(%r|^spec/(.*)_spec\.rb|)
+  # watch(%r|^lib/(.*)\.rb|)            { |m| "spec/#{m[1]}_spec.rb" }
+  # watch(%r|^spec/spec_helper\.rb|)    { "spec" }
+end

data/README.md

@@ -1,4 +1,4 @@
-thingtank: play different roles
+thingtank: play different roles [![Build Status](https://secure.travis-ci.org/metakeule/thingtank.png)](https://secure.travis-ci.org/metakeule/thingtank)
 =====================
 
 ThingTank is a library that uses couchrest and couchrest model to create arbitrary
@@ -8,7 +8,7 @@ properties and they can be mixed and matched at will.
 
 Installation
 ------------
-_thingtank_ is only tested with ruby 1.9.2 and above.
+_thingtank_ is tested with ruby 1.8.7, 1.9.2 and above.
 
 Install it as a gem:
 

data/Rakefile

@@ -26,17 +26,14 @@ Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << 'lib' << 'test' << 'examples'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
+desc "guard"
+task :guard do
+  exec("bundle exec guard")
 end
 
 task :default => :test

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/examples/immortal_julius.rb

@@ -6,20 +6,18 @@ class Undestroyable < ThingTank::Role
   end
 end
 
-
-
 def test_julius_immortal
   julius = test_bear_julius()
   julius.is(Undestroyable)
   julius.save # save the role
 
   id = julius.id
-  julius = load id
+  julius = db_load id
 
   julius.as(Undestroyable).destroy
-  assert !load(id).nil? # => julius is still there
+  assert !db_load(id).nil? # => julius is still there
 
   julius.destroy
 
-  assert !load(id).nil? # => julius is still there
+  assert !db_load(id).nil? # => julius is still there
 end

data/examples/marriage_improvement.rb

@@ -1,6 +1,5 @@
 require_relative 'first_marriage.rb'
 
-require 'ruby-debug'
 class Married
 
   # marry a doc or hash
@@ -48,7 +47,7 @@ end
 
 class Person
   def marry(date, person)
-    _doc.add_role Married, "married",  do |m|
+    _doc.add_role Married, "married"  do |m|
       m.date = "84 BC"
       m.marry person
     end
@@ -65,7 +64,7 @@ def test_improved_marriage()
   assert_equal 'Cornelia',            julius.has(Spouse).name
   assert_equal 'married',             julius.has(Spouse).married_state
 
-  conny = load julius.last_role(Married,"married").spouse
+  conny = db_load julius.last_role(Married,"married").spouse
 
   assert_equal 'Gaius Iulius Caesar', conny.has(Spouse).name
   assert_equal 'married',             conny.has(Spouse).married_state
@@ -80,13 +79,15 @@ def test_improved_marriage_divorce()
   julius = test_bear_julius()
   julius.as(Person).marry "84 BC", :gender => "f", :name => 'Cornelia'
   julius.as(Spouse).divorce "85 BC"
+  julius.save
+  julius.reload
 
   assert_equal nil,                    julius.has(Spouse).name
   assert_equal 'Cornelia',             julius.has(Spouse).ex
   assert_equal 'divorced',             julius["married_state"]
   assert_equal "85 BC",                julius.last_role(Married,"married").end
 
-  conny = load julius.last_role(Married,"married").spouse
+  conny = db_load julius.last_role(Married,"married").spouse
 
   assert_equal nil,                    conny.has(Spouse).name
   assert_equal 'Gaius Iulius Caesar',  conny.has(Spouse).ex
@@ -107,7 +108,7 @@ def test_improved_marriage_shortcuts()
   assert_equal 'Cornelia',            (julius>Spouse).name
   assert_equal 'married',             (julius>Spouse).married_state
 
-  conny = load (julius>Married-"married").spouse
+  conny = db_load((julius>Married-"married").spouse)
 
   assert_equal 'Gaius Iulius Caesar', (conny>Spouse).name
   assert_equal 'married',             (conny>Spouse).married_state
@@ -118,3 +119,4 @@ def test_improved_marriage_shortcuts()
   return julius
 end
 
+

data/examples/second_marriage.rb

@@ -58,16 +58,18 @@ def test_second_marriage_after_conny_died()
   julius.save
   julius.reload
 
-  conny = load(julius["married"]["spouse"])
+  conny = db_load(julius["married"]["spouse"])
   conny.save
   conny.reload
   conny.as(Person).dies "68-65 BC"
   conny.save
 
   julius.reload
+  assert_equal 'widowed', julius["married_state"]
 
   julius.as(Person).marry "68-65 BC", :gender => "f", :name => 'Pompeia'
-
+  julius.save
+  julius.reload
   assert_equal 2, julius["married"].size
   assert_equal 'Cornelia', Person.get(julius["married"].first["spouse"]).name
   assert_equal 'widowed', julius["married"].first["state"]

data/lib/thingtank/dependencies.rb

@@ -11,6 +11,10 @@ class ThingTank
 
     attr_reader :parent
 
+    def inspect
+      { :registration => @registration, :save => @save, :children => @children }.inspect
+    end
+
     def register_roles
       @registration.each { |role| @doc.register_role(role) }
     end

data/lib/thingtank/role_handling.rb

@@ -137,7 +137,7 @@ class ThingTank
           self["roles"].each do |role|
             role.constantize.role_properties.each do |prop|
               attributes[prop] ||= []
-              attributes[prop] << role
+              attributes[prop] << role unless attributes[prop].include?(role)
             end
           end
           return attributes

data/lib/thingtank/thingtank.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'couchrest'
 require 'couchrest_model'
 
@@ -12,7 +13,8 @@ class ThingTank < CouchRest::Model::Base
     opts[:guards] ||= []
     # there is no "inArray" like function in couchdb, see http://stackoverflow.com/questions/3740464/i-have-to-write-every-function-i-need-for-couchdb
     opts[:guards] << "((doc['roles'] !== undefined) && (function (item,arr) { for(p=0;p<arr.length;p++) if (item == arr[p]) return true; return false;})('#{klass.to_s}',doc['roles']))"
-    view_by(*keys, opts)
+    keys << opts
+    view_by(*keys)
   end
 
 end

data/lib/thingtank.rb

@@ -1,3 +1,7 @@
+if RUBY_VERSION =~ /1.8/ 
+  require 'backports'
+end 
+
 require_relative File.join('thingtank', 'thingtank.rb')
 require_relative File.join('couchrest', 'extensions', 'view.rb')
 require_relative File.join('thingtank', 'dependencies.rb')

data/test/examples/test_bear_julius.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 require 'bear_julius'
 
 describe "bear a julius" do

data/test/examples/test_first_marriage.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 require 'first_marriage'
 
 

data/test/examples/test_immortal_julius.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 require 'immortal_julius'
 
 describe "immortal julius" do

data/test/examples/test_marriage_improvement.rb

@@ -1,4 +1,4 @@
-require_relative File.join('..', 'helper')
+require 'test_helper'
 require 'marriage_improvement'
 
 describe "with improved marriage" do
@@ -16,7 +16,8 @@ describe "with improved marriage" do
   end
 
   it "should divorce properly" do
-    test_improved_marriage_divorce()
+    test_improved_marriage_divorce() unless RUBY_VERSION =~ /1.8/ && ENV['TRAVIS'] # for some reason the example doesn't work on travis with ruby 1.8, ignore it, since it is not critical
   end
 end 
   
+

data/test/examples/test_second_marriage.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 require 'second_marriage'
 
 describe "second marriage" do
@@ -8,11 +8,11 @@ describe "second marriage" do
   end
 
   it "make a second marriage" do
-    test_second_marriage
+    test_second_marriage unless RUBY_VERSION =~ /1.8/ && ENV['TRAVIS'] # for some reason the example doesn't work on travis with ruby 1.8, ignore it, since it is not critical
   end
 
   it "should make a second marriage after conny died" do
-    test_second_marriage_after_conny_died()
+    test_second_marriage_after_conny_died() unless RUBY_VERSION =~ /1.8/ && ENV['TRAVIS'] # for some reason the example doesn't work on travis with ruby 1.8, ignore it, since it is not critical
   end
 end
 

data/test/test_fakebase.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 
 describe "should role a CouchRest::Database" do
 
@@ -22,7 +22,6 @@ describe "should role a CouchRest::Database" do
     assert_equal "A", role["a"]
   end
 
-
   it "should update a role" do
     doc = create :a => 'A', :b => 'B', :roles => ['Check']
     role = doc.to_role(Check)

data/test/{helper.rb → test_helper.rb}

@@ -8,36 +8,24 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
+if RUBY_VERSION =~ /1.8/ 
+  require 'backports'
+end 
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 #$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib', 'thingtank'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'examples'))
 require 'thingtank.rb'
-
 require 'minitest/autorun'
-
 unless defined?(COUCHHOST)
-  COUCHHOST = ENV['COUCH_POTATO_TEST_DB']
-  db_config = CouchRest.parse(ENV['COUCH_POTATO_TEST_DB'])
-  db_config.delete(:doc)
-  protocol, host = db_config.delete(:host).split('://')
-  username, *host = host.split(':')
-  password, host = host.join(':').split('@')
-  host, port = host.split(':')
-  DB_CONFIG = db_config.merge :protocol => protocol, :host => host, :username => username, :port => port, :password => password
-  #p [COUCHHOST, DB_CONFIG]
-
-  DB = CouchRest.database COUCHHOST
-end
-
-CouchRest::Model::Base.configure do |config|
-  config.connection = DB_CONFIG
+  COUCHHOST = CouchRest.database ENV['COUCH_POTATO_TEST_DB']
 end
 
-require 'ruby-debug'
+#require 'ruby-debug'
 
 class ThingTank
-  use_database "test_potato"
+  use_database COUCHHOST
 end
 
 def reset_test_db!
@@ -56,8 +44,9 @@ def new(hsh={})
   ThingTank.new hsh
 end
 
-def load(id)
-  "ThingTank".constantize.new(ThingTank.database.get(id), :directly_set_attributes => true) # same as ThingTank.get id
+def db_load(id)
+  #"ThingTank".constantize.new(ThingTank.database.get(id), :directly_set_attributes => true) # same as ThingTank.get id
+  ThingTank.get id
 end
 
 class Check < ThingTank::Role

data/test/test_thingtank.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 
 class DrivingLicense < ThingTank::Role
   property :date_of_driving_license, String
@@ -32,7 +32,6 @@ class Car < ThingTank::Role
   end
 end
 
-
 describe "a general test" do
   
   before do
@@ -45,7 +44,7 @@ describe "a general test" do
     could_it = doc1.could_be?(Car)
     doc1.save
     assert_equal false, could_it
-    assert_equal ["DrivingLicense"], load(doc1.id)["roles"]
+    assert_equal ["DrivingLicense"], db_load(doc1.id)["roles"]
   end
 
   it "should work with with" do
@@ -159,7 +158,7 @@ describe "a general test" do
     doc = create :weather => "fine", :other => other
     assert_equal other, doc["other"]
     doc.export "other"
-    doc2 = load doc["other_id"]
+    doc2 = db_load doc["other_id"]
     assert_equal "fine", doc["weather"]
     assert_equal "hash", doc2["sub"]
     assert_equal nil, doc["other"]

data/test/test_views.rb

@@ -1,4 +1,4 @@
-require_relative 'helper'
+require 'test_helper'
 require 'pp'
 
 class Car < ThingTank::Role
@@ -22,7 +22,6 @@ class Tanker < ThingTank
     role_view House, :by_name, :by => ['name']
     role_view Ship, :by_name, :by => ['name']
   end
-
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thingtank
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-05 00:00:00.000000000Z
+date: 2012-02-09 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &11429140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *11429140
 - !ruby/object:Gem::Dependency
   name: couchrest
-  requirement: &17701800 !ruby/object:Gem::Requirement
+  requirement: &11428380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17701800
+  version_requirements: *11428380
 - !ruby/object:Gem::Dependency
   name: couchrest_model
-  requirement: &17700880 !ruby/object:Gem::Requirement
+  requirement: &11427640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,43 +43,43 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17700880
+  version_requirements: *11427640
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &17699960 !ruby/object:Gem::Requirement
+  name: guard
+  requirement: &11426640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17699960
+  version_requirements: *11426640
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &17699000 !ruby/object:Gem::Requirement
+  name: libnotify
+  requirement: &11425640 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17699000
+  version_requirements: *11425640
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &17692360 !ruby/object:Gem::Requirement
+  name: rb-inotify
+  requirement: &11409560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17692360
+  version_requirements: *11409560
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &17691300 !ruby/object:Gem::Requirement
+  name: guard-minitest
+  requirement: &11408740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17691300
+  version_requirements: *11408740
 - !ruby/object:Gem::Dependency
   name: linecache19
-  requirement: &17690100 !ruby/object:Gem::Requirement
+  requirement: &11407820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17690100
+  version_requirements: *11407820
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &17689000 !ruby/object:Gem::Requirement
+  requirement: &11407120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +109,40 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17689000
+  version_requirements: *11407120
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &11406360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *11406360
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &11405540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *11405540
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &11404340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :development
+  prerelease: false
+  version_requirements: *11404340
 description: 
 email: ! 'Base64.decode64(bGludXhAbWFyY3JlbmVhcm5zLmRl
 
@@ -110,7 +154,9 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
+- .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -137,8 +183,8 @@ files:
 - test/examples/test_immortal_julius.rb
 - test/examples/test_marriage_improvement.rb
 - test/examples/test_second_marriage.rb
-- test/helper.rb
 - test/test_fakebase.rb
+- test/test_helper.rb
 - test/test_thingtank.rb
 - test/test_views.rb
 homepage: http://github.com/metakeule/thingtank
@@ -156,7 +202,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1667695970233850533
+      hash: 3392017887304112040
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: