ohm-contrib 2.0.0.alpha5 → 2.0.0.rc1

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ohm-contrib
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha5
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Cyril David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2014-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha5
+        version: 2.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha5
+        version: 2.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: iconv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: override
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gems
+- .gitignore
+- CHANGELOG.md
 - LICENSE
 - README.markdown
 - lib/ohm/callbacks.rb
@@ -70,17 +87,21 @@ files:
 - lib/ohm/softdelete.rb
 - lib/ohm/timestamps.rb
 - lib/ohm/versioned.rb
+- makefile
 - ohm-contrib.gemspec
+- test/callbacks.rb
+- test/contrib.rb
+- test/datatypes.rb
 - test/helper.rb
-- test/instance_callbacks.rb
-- test/plugin.rb
+- test/locking.rb
 - test/scope.rb
 - test/slug.rb
-- test/soft_delete.rb
+- test/softdelete.rb
 - test/timestamp.rb
 - test/versioned.rb
 homepage: http://github.com/cyx/ohm-contrib
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -97,9 +118,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: ohm-contrib
-rubygems_version: 2.0.3
+rubyforge_project: 
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 2
+specification_version: 4
 summary: A collection of decoupled drop-in modules for Ohm.
 test_files: []

data/test/instance_callbacks.rb

@@ -1,43 +0,0 @@
-# encoding: UTF-8
-
-require File.expand_path("../helper", __FILE__)
-
-class Post < Ohm::Model
-  include Ohm::Callbacks
-
-  attribute :body
-
-  def validate
-    super
-
-    assert_present :body
-  end
-
-  def did?(action)
-    instance_variable_get("@#{ action }")
-  end
-
-  def count(action)
-    instance_variable_get("@#{ action }")
-  end
-
-protected
-  def before_create()   incr(:do_before_create)   end
-  def after_create()    incr(:do_after_create)    end
-  def before_save()     incr(:do_before_save)     end
-  def after_save()      incr(:do_after_save)      end
-  def before_update()   incr(:do_before_update)   end
-  def after_update()    incr(:do_after_update)    end
-  def before_delete()   incr(:do_before_delete)   end
-  def after_delete()    incr(:do_after_delete)    end
-
-  def incr(action)
-    val = instance_variable_get("@#{ action }")
-    val ||= 0
-    val += 1
-
-    instance_variable_set("@#{ action }", val)
-  end
-end
-
-load File.expand_path('lint/callbacks.rb', File.dirname(__FILE__))

data/test/plugin.rb

@@ -1,299 +0,0 @@
-# encoding: utf-8
-
-require File.expand_path("../helper", __FILE__)
-require 'set'
-
-class Comment < Ohm::Model
-  include Ohm::Timestamps
-end
-
-test "timestamps are added during creation" do
-  e = Comment.new
-  e.save
-
-  assert e.created_at
-  assert e.updated_at
-end
-
-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
-
-class Article < Ohm::Model
-  include Ohm::Callbacks
-
-  attribute :title
-  set :comments, Comment
-
-private
-  def before_save
-    self.title = title.gsub("<br>", " ")
-  end
-
-  def after_save
-    redis.call("SADD", comments.key, Comment.create.id)
-  end
-end
-
-test "class-level, instance level callbacks" do
-  a = Article.create(:title => "Foo<br>Bar")
-
-  assert_equal "Foo Bar", a.title
-  assert_equal 1, a.comments.size
-end
-
-# slugging
-scope do
-  class Post < Ohm::Model
-    attribute :title
-
-    include Ohm::Slug
-
-    def to_s
-      title
-    end
-  end
-
-  test "slugging" do
-    post = Post.create(:title => "Foo Bar Baz 1.0")
-    assert_equal "1-foo-bar-baz-1-0", post.to_param
-
-    post = Post.create(:title => "Décor")
-    assert_equal "2-decor", post.to_param
-  end
-end
-
-# Ohm::Scope
-scope do
-  class Order < Ohm::Model
-    include Ohm::Scope
-
-    attribute :state
-    index :state
-
-    attribute :deleted
-    index :deleted
-
-    scope do
-      def paid
-        find(:state => "paid")
-      end
-
-      def deleted
-        find(:deleted => 1)
-      end
-    end
-  end
-
-  test "scoping" do
-    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)
-    assert Order.all.paid.deleted.include?(paid)
-  end
-end
-
-# soft delete
-scope do
-  class User < Ohm::Model
-    include Ohm::SoftDelete
-
-    attribute :email
-    index :email
-  end
-
-  setup do
-    user = User.create(:email => "a@a.com")
-    user.delete
-
-    user
-  end
-
-  test "removes from User.all" do |user|
-    assert User.all.empty?
-  end
-
-  test "adds to User.deleted" do |user|
-    assert User.deleted.include?(user)
-  end
-
-  test "doesn't remove from indices" do |user|
-    assert User.find(:email => "a@a.com").include?(user)
-  end
-
-  test "makes it deleted?" do |user|
-    assert user.deleted?
-  end
-
-  test "is still retrievable" do |user|
-    assert_equal user, User[user.id]
-  end
-
-  test "restore" do |user|
-    user.restore
-
-    assert User.all.include?(user)
-    assert User.deleted.empty?
-
-    assert ! user.deleted?
-  end
-end
-
-# datatypes
-scope do
-  class Product < Ohm::Model
-    include Ohm::DataTypes
-
-    attribute :name
-    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
-    p = Product.new(:stock => "1")
-
-    assert_equal 1, p.stock
-    p.save
-
-    p = Product[p.id]
-    assert_equal 1, p.stock
-  end
-
-  test "Type::Time" do
-    time = Time.utc(2011, 11, 22)
-    p = Product.new(:bought_at => time)
-    assert p.bought_at.kind_of?(Time)
-
-    p.save
-
-    p = Product[p.id]
-    assert p.bought_at.kind_of?(Time)
-    assert_equal time, p.bought_at
-
-    assert_equal "2011-11-22 00:00:00 UTC", p.get(:bought_at)
-    assert_equal "2011-11-22 00:00:00 UTC", p.bought_at.to_s
-  end
-
-  test "Type::Date" do
-    p = Product.new(:date_released => Date.today)
-
-    assert p.date_released.kind_of?(Date)
-
-    p = Product.new(:date_released => "2011-11-22")
-    assert p.date_released.kind_of?(Date)
-
-    p.save
-
-    p = Product[p.id]
-    assert_equal Date.new(2011, 11, 22), p.date_released
-    assert_equal "2011-11-22", p.get(:date_released)
-    assert_equal "2011-11-22", p.date_released.to_s
-  end
-
-  test "Type::Hash" do
-    sizes = { "XS" => 1, "S" => 2, "L" => 3 }
-
-    p = Product.new(:sizes => sizes)
-    assert p.sizes.kind_of?(Hash)
-    p.save
-
-    p = Product[p.id]
-    assert_equal sizes, p.sizes
-    assert_equal %Q[{"XS":1,"S":2,"L":3}], p.get(:sizes)
-    assert_equal %Q[{"XS":1,"S":2,"L":3}], p.sizes.to_s
-  end
-
-  test "Type::Array" do
-    stores = ["walmart", "marshalls", "jcpenny"]
-    p = Product.new(:stores => stores)
-    assert p.stores.kind_of?(Array)
-
-    p.save
-
-    p = Product[p.id]
-    assert_equal stores, p.stores
-    assert_equal %Q(["walmart","marshalls","jcpenny"]), p.get(:stores)
-    assert_equal %Q(["walmart","marshalls","jcpenny"]), p.stores.to_s
-  end
-
-  test "Type::Decimal" do
-    p = Product.new(:price => 0.001)
-
-    # This fails if 0.001 is a float.
-    x = 0
-    1000.times { x += p.price }
-    assert_equal 1, x
-
-    p.save
-
-    p = Product[p.id]
-    assert_equal 0.001, p.price
-    assert_equal "0.1E-2", p.get(:price)
-  end
-
-  test "Type::Float" do
-    p = Product.new(:rating => 4.5)
-    assert p.rating.kind_of?(Float)
-
-    p.save
-    p = Product[p.id]
-    assert_equal 4.5, p.rating
-    assert_equal "4.5", p.get(:rating)
-  end
-
-  test "Type::Boolean" do
-    p = Product.new(:published => 1)
-    assert_equal true, p.published
-
-    p.save
-
-    p = Product[p.id]
-    assert_equal true, p.published
-
-    p.published = false
-    p.save
-
-    p = Product[p.id]
-    assert_equal nil, p.get(:published)
-    assert_equal false, p.published
-  end
-
-  test "Type::Symbol" do
-    p = Product.new(:state => 'available')
-
-    assert_equal :available, p.state
-    p.save
-
-    p = Product[p.id]
-    assert_equal :available, p.state
-  end
-
-  test "Type::Set" do
-    comments = ::Set.new(["Good product", "Awesome!", "Great."])
-    p = Product.new(:comments => comments)
-    assert p.comments.kind_of?(::Set)
-
-    p.save
-
-    p = Product[p.id]
-
-    assert_equal comments, p.comments
-    assert_equal %Q(["Awesome!","Good product","Great."]), p.get(:comments)
-    assert_equal %Q(["Awesome!","Good product","Great."]), p.comments.to_s
-  end
-end