ohm-contrib 2.0.0.alpha5 → 2.0.0.rc1

data/test/contrib.rb

@@ -0,0 +1,13 @@
+require_relative "helper"
+require_relative "../lib/ohm/contrib"
+
+test "plugins" do
+  assert defined?(Ohm::Callbacks)
+  assert defined?(Ohm::DataTypes)
+  assert defined?(Ohm::Locking)
+  assert defined?(Ohm::Scope)
+  assert defined?(Ohm::Slug)
+  assert defined?(Ohm::SoftDelete)
+  assert defined?(Ohm::Timestamps)
+  assert defined?(Ohm::Versioned)
+end

data/test/datatypes.rb

@@ -0,0 +1,151 @@
+require_relative "helper"
+require_relative "../lib/ohm/datatypes"
+
+class Product < Ohm::Model
+  include Ohm::DataTypes
+
+  attribute :stock, Type::Integer
+  attribute :price, Type::Decimal
+  attribute :rating, Type::Float
+  attribute :bought_at, Type::Time
+  attribute :date_released, Type::Date
+  attribute :sizes, Type::Hash
+  attribute :stores, Type::Array
+  attribute :published, Type::Boolean
+  attribute :state, Type::Symbol
+  attribute :comments, Type::Set
+end
+
+test "Type::Integer" do
+  product = Product.new(stock: "1")
+
+  assert_equal 1, product.stock
+  product.save
+
+  product = Product[product.id]
+  assert_equal 1, product.stock
+end
+
+test "Type::Time" do
+  time = Time.utc(2011, 11, 22)
+  product = Product.new(bought_at: time)
+
+  assert product.bought_at.kind_of?(Time)
+  product.save
+
+  product = Product[product.id]
+  assert product.bought_at.kind_of?(Time)
+  assert_equal time, product.bought_at
+
+  assert_equal "2011-11-22 00:00:00 UTC", product.get(:bought_at)
+  assert_equal "2011-11-22 00:00:00 UTC", product.bought_at.to_s
+end
+
+test "Type::Date" do
+  product = Product.new(date_released: Date.today)
+
+  assert product.date_released.kind_of?(Date)
+
+  product = Product.new(date_released: "2011-11-22")
+  assert product.date_released.kind_of?(Date)
+
+  product.save
+
+  product = Product[product.id]
+  assert_equal Date.new(2011, 11, 22), product.date_released
+  assert_equal "2011-11-22", product.get(:date_released)
+  assert_equal "2011-11-22", product.date_released.to_s
+end
+
+test "Type::Hash" do
+  sizes = { "XS" => 1, "S" => 2, "L" => 3 }
+
+  product = Product.new(sizes: sizes)
+  assert product.sizes.kind_of?(Hash)
+  product.save
+
+  product = Product[product.id]
+  assert_equal sizes, product.sizes
+  assert_equal %Q[{"XS":1,"S":2,"L":3}], product.get(:sizes)
+  assert_equal %Q[{"XS":1,"S":2,"L":3}], product.sizes.to_s
+end
+
+test "Type::Array" do
+  stores = ["walmart", "marshalls", "jcpenny"]
+  product = Product.new(stores: stores)
+  assert product.stores.kind_of?(Array)
+
+  product.save
+
+  product = Product[product.id]
+  assert_equal stores, product.stores
+  assert_equal %Q(["walmart","marshalls","jcpenny"]), product.get(:stores)
+  assert_equal %Q(["walmart","marshalls","jcpenny"]), product.stores.to_s
+end
+
+test "Type::Decimal" do
+  product = Product.new(price: 0.001)
+
+  # This fails if 0.001 is a float.
+  x = 0
+  1000.times { x += product.price }
+  assert_equal 1, x
+
+  product.save
+
+  product = Product[product.id]
+  assert_equal 0.001, product.price
+  assert_equal "0.1E-2", product.get(:price)
+end
+
+test "Type::Float" do
+  product = Product.new(rating: 4.5)
+  assert product.rating.kind_of?(Float)
+
+  product.save
+  product = Product[product.id]
+  assert_equal 4.5, product.rating
+  assert_equal "4.5", product.get(:rating)
+end
+
+test "Type::Boolean" do
+  product = Product.new(published: 1)
+  assert_equal true, product.published
+
+  product.save
+
+  product = Product[product.id]
+  assert_equal "true", product.get(:published)
+  assert_equal true, product.published
+
+  product.published = false
+  product.save
+
+  product = Product[product.id]
+  assert_equal nil, product.get(:published)
+  assert_equal false, product.published
+end
+
+test "Type::Symbol" do
+  product = Product.new(state: 'available')
+
+  assert_equal :available, product.state
+  product.save
+
+  product = Product[product.id]
+  assert_equal :available, product.state
+end
+
+test "Type::Set" do
+  comments = ::Set.new(["Good product", "Awesome!", "Great."])
+  product = Product.new(comments: comments)
+  assert product.comments.kind_of?(::Set)
+
+  product.save
+
+  product = Product[product.id]
+
+  assert_equal comments, product.comments
+  assert_equal %Q(["Awesome!","Good product","Great."]), product.get(:comments)
+  assert_equal %Q(["Awesome!","Good product","Great."]), product.comments.to_s
+end

data/test/helper.rb

@@ -1,23 +1,8 @@
-$:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
-
 require "cutest"
-
-if ENV["SCRIPTED"]
-  require "ohm/scripted"
-else
-  require "ohm"
-end
-
-require "ohm/contrib"
-require "override"
-
-NOW = Time.utc(2010, 5, 12)
-
-include Override
+require "ohm"
 
 prepare do
   Ohm.flush
-  override(Time, :now => NOW)
 end
 
 def assert_nothing_raised(*exceptions)

data/test/locking.rb

@@ -0,0 +1,10 @@
+require_relative "helper"
+require_relative "../lib/ohm/locking"
+
+class Server < Ohm::Model
+  include Ohm::Locking
+end
+
+test "mutex method is added at instance and class level" do
+  assert Server.new.respond_to?(:mutex)
+end

data/test/scope.rb

@@ -1,6 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("../helper", __FILE__)
+require_relative "helper"
+require_relative "../lib/ohm/scope"
 
 class Post < Ohm::Model
   set :comments, :Comment
@@ -8,7 +7,7 @@ end
 
 module Finders
   def rejected
-    find(:status => "rejected")
+    find(status: "rejected")
   end
 end
 
@@ -20,7 +19,7 @@ class Comment < Ohm::Model
 
   scope do
     def approved
-      find(:status => "approved")
+      find(status: "approved")
     end
   end
 
@@ -33,8 +32,8 @@ end
 
 test "allows custom methods for the defined scopes" do
   post = Post.create
-  comment = Comment.create(:status => "approved")
-  Post.redis.call("SADD", post.comments.key, comment.id)
+  comment = Comment.create(status: "approved")
+  post.comments.add(comment)
 
   assert post.comments.approved.is_a?(Ohm::MultiSet)
   assert post.comments.approved.include?(comment)
@@ -42,17 +41,16 @@ end
 
 test "allows custom methods to be included from a module" do
   post = Post.create
-  comment = Comment.create(:status => "rejected")
-  Post.redis.call("SADD", post.comments.key, comment.id)
+  comment = Comment.create(status: "rejected")
+  post.comments.add(comment)
 
   assert post.comments.rejected.is_a?(Ohm::MultiSet)
   assert post.comments.rejected.include?(comment)
 end
 
 test "works with the main Comment.all collection as well" do
-  approved = Comment.create(:status => "approved")
-  rejected = Comment.create(:status => "rejected")
-
+  approved = Comment.create(status: "approved")
+  rejected = Comment.create(status: "rejected")
 
   assert Comment.all.approved.include?(approved)
   assert Comment.all.rejected.include?(rejected)

data/test/slug.rb

@@ -1,9 +1,9 @@
-# encoding: UTF-8
-
-require File.expand_path("../helper", __FILE__)
+require_relative "../lib/ohm/slug"
+require_relative "helper"
 
 class Article < Ohm::Model
   include Ohm::Slug
+
   attribute :title
 
   def to_s
@@ -12,13 +12,19 @@ class Article < Ohm::Model
 end
 
 test "to_param" do
-  article = Article.create(:title => "A very Unique and Interesting String?'")
+  article = Article.create(title: "A very Unique and Interesting String?'")
 
-  assert '1-a-very-unique-and-interesting-string' == article.to_param
+  assert_equal '1-a-very-unique-and-interesting-string', article.to_param
 end
 
 test "finding" do
-  article = Article.create(:title => "A very Unique and Interesting String?'")
+  article = Article.create(title: "A very Unique and Interesting String?'")
+
+  assert_equal 1, Article[article.to_param].id
+end
+
+test "transliterate non-ascii characters" do
+  article = Article.create(title: "Décor")
 
-  assert 1 == Article["1-a-very-unique-and-interesting-string"].id
+  assert_equal article.to_param, "1-decor"
 end

data/test/{soft_delete.rb → softdelete.rb}

@@ -1,6 +1,5 @@
-# encoding: UTF-8
-
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
+require_relative "../lib/ohm/softdelete"
 
 class Person < Ohm::Model
   include Ohm::SoftDelete
@@ -23,9 +22,9 @@ test "deleted?" do
 end
 
 test "all excludes deleted records" do
-  person = Person.create(:name => "matz")
+  person = Person.create(name: "matz")
 
-  assert Person.all.first == person
+  assert_equal person, Person.all.first
 
   person.delete
 
@@ -33,48 +32,44 @@ test "all excludes deleted records" do
 end
 
 test "find does not exclude deleted records" do
-  person = Person.create(:name => "matz")
+  person = Person.create(name: "matz")
 
-  assert Person.find(:name => "matz").first == person
+  assert_equal person, Person.find(name: "matz").first
 
   person.delete
 
-  assert Person.find(:name => "matz").include?(person)
+  assert Person.find(name: "matz").include?(person)
 end
 
 test "find with many criteria doesn't exclude deleted records" do
-  person = Person.create(:name => "matz", :age => 38)
+  person = Person.create(name: "matz", age: 38)
 
-  assert Person.find(:name => "matz", :age => 38).first == person
+  assert_equal person, Person.find(name: "matz", age: 38).first
 
   person.delete
 
-  assert Person.find(:name => "matz", :age => 38).include?(person)
+  assert Person.find(name: "matz", age: 38).include?(person)
 end
 
 test "exists? returns true for deleted records" do
-  person = Person.create(:name => "matz")
-
-  person.delete
+  person = Person.create(name: "matz").delete
 
   assert Person.exists?(person.id)
 end
 
 test "Model[n] can be used to retrieve deleted records" do
-  person = Person.create(:name => "matz")
-
-  person.delete
+  person = Person.create(name: "matz").delete
 
   assert Person[person.id].deleted?
-  assert Person[person.id].name == "matz"
+  assert_equal "matz", Person[person.id].name
 end
 
 test "restoring" do
-  person = Person.create(:name => "matz")
-  person.delete
+  person = Person.create(name: "matz").delete
 
   assert Person.all.empty?
 
   person.restore
+
   assert Person.all.include?(person)
 end

data/test/timestamp.rb

@@ -1,31 +1,40 @@
-# encoding: UTF-8
-
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
+require "override"
+require_relative "../lib/ohm/timestamps"
 
 class Person < Ohm::Model
   include Ohm::Timestamps
 end
 
+NOW = Time.utc(2010, 5, 12)
+
+include Override
+
+prepare do
+  override(Time, now: NOW)
+end
+
 test "a new? record" do
-  assert nil == Person.new.created_at
-  assert nil == Person.new.updated_at
+  assert_equal nil, Person.new.created_at
+  assert_equal nil, Person.new.updated_at
 end
 
 test "on create" do
   person = Person.create
   person = Person[person.id]
 
-  assert NOW == person.created_at
-  assert NOW == person.updated_at
+  assert_equal NOW, person.created_at
+  assert_equal NOW, person.updated_at
 end
 
 test "on update" do
   person = Person.create
 
-  override(Time, :now => Time.utc(2010, 5, 13))
+  override(Time, now: Time.utc(2010, 5, 13))
   person.save
+
   person = Person[person.id]
 
-  assert NOW == person.created_at
-  assert Time.utc(2010, 5, 13) == person.updated_at
+  assert_equal NOW, person.created_at
+  assert_equal Time.utc(2010, 5, 13), person.updated_at
 end

data/test/versioned.rb

@@ -1,4 +1,5 @@
-require File.expand_path("../helper", __FILE__)
+require_relative "helper"
+require_relative "../lib/ohm/versioned"
 
 class Article < Ohm::Model
   include Ohm::Versioned
@@ -8,17 +9,17 @@ class Article < Ohm::Model
 end
 
 test do
-  a1 = Article.create(:title => "Foo Bar", :content => "Lorem ipsum")
+  a1 = Article.create(title: "Foo Bar", content: "Lorem ipsum")
   a2 = Article[a1.id]
 
   a1.update({})
 
+  expected = { title: "Bar Baz", _version: "1", content: "Lorem ipsum" }
+
   begin
-    a2.update(:title => "Bar Baz")
+    a2.update(title: "Bar Baz")
   rescue Ohm::VersionConflict => ex
   end
 
-  expected = { :title => "Bar Baz", :_version => "1", :content => "Lorem ipsum" }
-
   assert_equal expected, ex.attributes
 end