ohm-contrib 1.0.0.rc2 → 1.0.0.rc3

data/lib/ohm/contrib.rb

@@ -1,11 +1,11 @@
-require_relative "callbacks"
-require_relative "datatypes"
-require_relative "locking"
-require_relative "scope"
-require_relative "slug"
-require_relative "softdelete"
-require_relative "timestamps"
-require_relative "versioned"
+require File.expand_path("../callbacks", __FILE__)
+require File.expand_path("../datatypes", __FILE__)
+require File.expand_path("../locking", __FILE__)
+require File.expand_path("../scope", __FILE__)
+require File.expand_path("../slug", __FILE__)
+require File.expand_path("../softdelete", __FILE__)
+require File.expand_path("../timestamps", __FILE__)
+require File.expand_path("../versioned", __FILE__)
 
 module Ohm
   module Contrib

data/lib/ohm/scope.rb

@@ -1,7 +1,7 @@
 module Ohm
   module Scope
     def self.included(model)
-      unless model.const_defined?(:DefinedScopes, false)
+      unless model.const_defined?(:DefinedScopes)
         model.const_set(:DefinedScopes, Module.new)
       end
 

data/lib/ohm/slug.rb

@@ -13,7 +13,7 @@ module Ohm
     def slug(str = to_s)
       ret = transcode(str)
       ret.gsub!("'", "")
-      ret.gsub!(/\p{^Alnum}/u, " ")
+      ret.gsub!(/[^0-9A-Za-z]/u, " ")
       ret.strip!
       ret.gsub!(/\s+/, "-")
       ret.downcase
@@ -40,4 +40,4 @@ module Ohm
       "#{ id }-#{ slug }"
     end
   end
-end
+end

data/lib/ohm/timestamps.rb

@@ -1,4 +1,4 @@
-require_relative "datatypes"
+require File.expand_path("../datatypes", __FILE__)
 
 module Ohm
   # Provides created_at / updated_at timestamps.

data/ohm-contrib.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm-contrib"
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0.rc3"
   s.summary = %{A collection of decoupled drop-in modules for Ohm.}
   s.description = %{Includes a couple of core functions such as callbacks, timestamping, typecasting and lots of generic validation routines.}
   s.author = "Cyril David"
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "ohm-contrib"
 
   s.has_rdoc = false
-  s.add_dependency "ohm", "1.0.0.rc1"
+  s.add_dependency "ohm", "1.0.0.rc2"
 
   s.add_development_dependency "cutest"
   s.add_development_dependency "redis"

data/test/instance_callbacks.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require_relative "helper"
+require File.expand_path("../helper", __FILE__)
 
 class Post < Ohm::Model
   include Ohm::Callbacks
@@ -40,4 +40,4 @@ protected
   end
 end
 
-load File.expand_path('lint/callbacks.rb', File.dirname(__FILE__))
+load File.expand_path('lint/callbacks.rb', File.dirname(__FILE__))

data/test/plugin.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require_relative "helper"
+require File.expand_path("../helper", __FILE__)
 
 class Comment < Ohm::Model
   include Ohm::Timestamps
@@ -39,7 +39,7 @@ private
 end
 
 test "class-level, instance level callbacks" do
-  a = Article.create(title: "Foo<br>Bar")
+  a = Article.create(:title => "Foo<br>Bar")
 
   assert_equal "Foo Bar", a.title
   assert_equal 1, a.comments.size
@@ -56,10 +56,10 @@ class Post < Ohm::Model
 end
 
 test "slugging" do
-  post = Post.create(title: "Foo Bar Baz")
+  post = Post.create(:title => "Foo Bar Baz")
   assert_equal "1-foo-bar-baz", post.to_param
 
-  post = Post.create(title: "Décor")
+  post = Post.create(:title => "Décor")
   assert_equal "2-decor", post.to_param
 end
 
@@ -74,22 +74,22 @@ class Order < Ohm::Model
 
   scope do
     def paid
-      find(state: "paid")
+      find(:state => "paid")
     end
 
     def deleted
-      find(deleted: 1)
+      find(:deleted => 1)
     end
   end
 end
 
 test "scope" do
-  paid = Order.create(state: "paid", deleted: nil)
+  paid = Order.create(:state => "paid", :deleted => nil)
 
   assert Order.all.paid.include?(paid)
   assert_equal 0, Order.all.paid.deleted.size
 
-  paid.update(deleted: 1)
+  paid.update(:deleted => 1)
   assert Order.all.paid.deleted.include?(paid)
 end
 
@@ -101,12 +101,12 @@ class User < Ohm::Model
 end
 
 test "soft delete" do
-  user = User.create(email: "a@a.com")
+  user = User.create(:email => "a@a.com")
   user.delete
 
   assert User.all.empty?
   assert User.deleted.include?(user)
-  assert User.find(email: "a@a.com").include?(user)
+  assert User.find(:email => "a@a.com").include?(user)
 
   assert user.deleted?
   assert User[user.id] == user
@@ -134,7 +134,7 @@ class Product < Ohm::Model
 end
 
 test "datatypes" do
-  p = Product.new(stock: "1")
+  p = Product.new(:stock => "1")
 
   assert_equal 1, p.stock
   p.save
@@ -143,7 +143,7 @@ test "datatypes" do
   assert_equal 1, p.stock
 
   time = Time.now.utc
-  p = Product.new(bought_at: time)
+  p = Product.new(:bought_at => time)
   assert p.bought_at.kind_of?(Time)
 
   p.save
@@ -152,11 +152,11 @@ test "datatypes" do
   assert p.bought_at.kind_of?(Time)
   assert_equal time, p.bought_at
 
-  p = Product.new(date_released: Date.today)
+  p = Product.new(:date_released => Date.today)
 
   assert p.date_released.kind_of?(Date)
 
-  p = Product.new(date_released: "2011-11-22")
+  p = Product.new(:date_released => "2011-11-22")
   assert p.date_released.kind_of?(Date)
 
   p.save
@@ -166,7 +166,7 @@ test "datatypes" do
 
   sizes = { "XS" => 1, "S" => 2, "L" => 3 }
 
-  p = Product.new(sizes: sizes)
+  p = Product.new(:sizes => sizes)
   assert p.sizes.kind_of?(Hash)
   p.save
 
@@ -174,7 +174,7 @@ test "datatypes" do
   assert_equal sizes, p.sizes
 
   stores = ["walmart", "marshalls", "jcpenny"]
-  p = Product.new(stores: stores)
+  p = Product.new(:stores => stores)
   assert p.stores.kind_of?(Array)
 
   p.save
@@ -182,7 +182,7 @@ test "datatypes" do
   p = Product[p.id]
   assert_equal stores, p.stores
 
-  p = Product.new(price: 0.001)
+  p = Product.new(:price => 0.001)
 
   x = 0
   1000.times { x += p.price }
@@ -193,14 +193,14 @@ test "datatypes" do
   p = Product[p.id]
   assert_equal 0.001, p.price
 
-  p = Product.new(rating: 4.5)
+  p = Product.new(:rating => 4.5)
   assert p.rating.kind_of?(Float)
 
   p.save
   p = Product[p.id]
   assert_equal 4.5, p.rating
 
-  p = Product.new(published: 1)
+  p = Product.new(:published => 1)
   assert_equal true, p.published
 
   p.save

data/test/scope.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require_relative "helper"
+require File.expand_path("../helper", __FILE__)
 
 class Post < Ohm::Model
   set :comments, :Comment

data/test/slug.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require_relative "helper"
+require File.expand_path("../helper", __FILE__)
 
 class Article < Ohm::Model
   include Ohm::Slug
@@ -12,13 +12,13 @@ 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
 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 1 == Article["1-a-very-unique-and-interesting-string"].id
-end
+end

data/test/versioned.rb

@@ -1,4 +1,4 @@
-require_relative "helper"
+require File.expand_path("../helper", __FILE__)
 
 class Article < Ohm::Model
   include Ohm::Versioned
@@ -8,17 +8,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({})
 
   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" }
+  expected = { :title => "Bar Baz", :_version => "1", :content => "Lorem ipsum" }
 
   assert_equal expected, ex.attributes
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm-contrib
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
-  requirement: &70287509765700 !ruby/object:Gem::Requirement
+  requirement: &2152132380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc1
+        version: 1.0.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70287509765700
+  version_requirements: *2152132380
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &70287509764720 !ruby/object:Gem::Requirement
+  requirement: &2152154260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287509764720
+  version_requirements: *2152154260
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70287509763280 !ruby/object:Gem::Requirement
+  requirement: &2152153580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287509763280
+  version_requirements: *2152153580
 - !ruby/object:Gem::Dependency
   name: override
-  requirement: &70287509762640 !ruby/object:Gem::Requirement
+  requirement: &2152152620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287509762640
+  version_requirements: *2152152620
 description: Includes a couple of core functions such as callbacks, timestamping,
   typecasting and lots of generic validation routines.
 email: cyx.ucron@gmail.com