ohm-contrib 0.1.2 → 1.0.rc0

data/test/plugin.rb

@@ -0,0 +1,212 @@
+# encoding: utf-8
+
+require_relative "helper"
+
+class Comment < Ohm::Model
+  include Ohm::Timestamping
+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
+
+  list  :comments, Comment
+  after :save, :append_comment
+
+private
+  def before_save
+    self.title = title.gsub("<br>", " ")
+  end
+
+  def append_comment
+    comments.add(Comment.create)
+  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
+
+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")
+  assert_equal "1-foo-bar-baz", post.to_param
+
+  post = Post.create(title: "Décor")
+  assert_equal "2-decor", post.to_param
+end
+
+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 "scope" 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
+
+class User < Ohm::Model
+  include Ohm::SoftDelete
+
+  attribute :email
+  index :email
+end
+
+test "soft delete" do
+  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.deleted?
+  assert User[user.id] == user
+
+  user.restore
+
+  assert User.all.include?(user)
+  assert User.deleted.empty?
+
+  assert ! user.deleted?
+end
+
+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
+end
+
+test "typecast" do
+  p = Product.new(stock: "1")
+
+  assert_equal 1, p.stock
+  p.save
+
+  p = Product[p.id]
+  assert_equal 1, p.stock
+
+  time = Time.now.utc
+  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
+
+  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.today, p.date_released
+
+  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
+
+  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
+
+  p = Product.new(price: 0.001)
+
+  x = 0
+  1000.times { x += p.price }
+  assert_equal 1, x
+
+  p.save
+
+  p = Product[p.id]
+  assert_equal 0.001, p.price
+
+  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)
+  assert_equal true, p.published
+
+  p.save
+
+  p = Product[p.id]
+  assert_equal true, p.published
+end

data/test/{scope_test.rb → scope.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require File.expand_path("./helper", File.dirname(__FILE__))
+require_relative "helper"
 
 class Post < Ohm::Model
   set :comments, Comment
@@ -72,5 +72,4 @@ test "isolated from List" do
   assert_raise NoMethodError do
     video.comments.rejected
   end
-end
-
+end

data/test/slug.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+
+require_relative "helper"
+
+class Article < Ohm::Model
+  include Ohm::Slug
+  attribute :title
+
+  def to_s
+    title
+  end
+end
+
+test "to_param" do
+  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?'")
+
+  assert 1 == Article["1-a-very-unique-and-interesting-string"].id
+end

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

@@ -32,15 +32,15 @@ test "all excludes deleted records" do
   assert Person.all.empty?
 end
 
-test "find excludes deleted records" do
+test "find does not exclude deleted records" do
   person = Person.create(:name => "matz")
 
   assert Person.find(:name => "matz").first == person
 
   person.delete
 
-  assert Person.find(:name => "matz").empty?
-  assert Person.all.find(:name => "matz").empty?
+  assert Person.find(:name => "matz").include?(person)
+  assert Person.all.find(:name => "matz").include?(person)
 end
 
 test "find with many criteria excludes deleted records" do
@@ -69,4 +69,14 @@ test "Model[n] can be used to retrieve deleted records" do
 
   assert Person[person.id].deleted?
   assert Person[person.id].name == "matz"
+end
+
+test "restoring" do
+  person = Person.create(:name => "matz")
+  person.delete
+
+  assert Person.all.empty?
+
+  person.restore
+  assert Person.all.include?(person)
 end

data/test/{timestamping_test.rb → timestamping.rb}

@@ -15,8 +15,8 @@ test "on create" do
   person = Person.create
   person = Person[person.id]
 
-  assert NOW.to_s == person.created_at
-  assert NOW.to_s == person.updated_at
+  assert NOW == person.created_at
+  assert NOW == person.updated_at
 end
 
 test "on update" do
@@ -26,7 +26,6 @@ test "on update" do
   person.save
   person = Person[person.id]
 
-  assert NOW.to_s == person.created_at
-  assert Time.utc(2010, 5, 13).to_s == person.updated_at
-end
-
+  assert NOW == person.created_at
+  assert Time.utc(2010, 5, 13) == person.updated_at
+end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: ohm-contrib
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 1.0.rc0
+  prerelease: 4
 platform: ruby
 authors:
 - Cyril David
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
+date: 2011-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
-  requirement: &2164476460 !ruby/object:Gem::Requirement
+  requirement: &2164457940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164476460
+  version_requirements: *2164457940
 - !ruby/object:Gem::Dependency
   name: cutest
-  requirement: &2164475860 !ruby/object:Gem::Requirement
+  requirement: &2164457380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164475860
+  version_requirements: *2164457380
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2164474640 !ruby/object:Gem::Requirement
+  requirement: &2164472240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,21 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164474640
-- !ruby/object:Gem::Dependency
-  name: lunar
-  requirement: &2164474060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2164474060
+  version_requirements: *2164472240
 - !ruby/object:Gem::Dependency
   name: override
-  requirement: &2164473440 !ruby/object:Gem::Requirement
+  requirement: &2164471540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164473440
+  version_requirements: *2164471540
 description: Includes a couple of core functions such as callbacks, timestamping,
   typecasting and lots of generic validation routines.
 email: cyx.ucron@gmail.com
@@ -73,53 +62,27 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/ohm/contrib/active_model_extension.rb
-- lib/ohm/contrib/boundaries.rb
-- lib/ohm/contrib/callbacks.rb
-- lib/ohm/contrib/date_validations.rb
-- lib/ohm/contrib/extra_validations.rb
-- lib/ohm/contrib/fulltext_searching.rb
-- lib/ohm/contrib/length_validations.rb
-- lib/ohm/contrib/locking.rb
-- lib/ohm/contrib/number_validations.rb
-- lib/ohm/contrib/scope.rb
-- lib/ohm/contrib/slug.rb
-- lib/ohm/contrib/soft_delete.rb
-- lib/ohm/contrib/timestamping.rb
-- lib/ohm/contrib/typecast.rb
-- lib/ohm/contrib/web_validations.rb
-- lib/ohm/contrib.rb
-- README.markdown
 - LICENSE
-- Rakefile
-- test/activemodel_test.rb
-- test/boundaries_test.rb
-- test/callbacks_lint.rb
-- test/date_validations_test.rb
-- test/fixtures/ascii8bit.txt
-- test/fulltext_searching_test.rb
+- README.markdown
+- rakefile
+- lib/ohm/callbacks.rb
+- lib/ohm/contrib.rb
+- lib/ohm/datatypes.rb
+- lib/ohm/locking.rb
+- lib/ohm/plugin.rb
+- lib/ohm/scope.rb
+- lib/ohm/slug.rb
+- lib/ohm/softdelete.rb
+- lib/ohm/timestamping.rb
+- ohm-contrib.gemspec
 - test/helper.rb
-- test/instance_callbacks_test.rb
-- test/length_validations_test.rb
-- test/macro_callbacks_test.rb
-- test/membership_validation_test.rb
-- test/number_validations_test.rb
-- test/scope_test.rb
-- test/slug_test.rb
-- test/soft_delete_test.rb
-- test/timestamping_test.rb
-- test/typecast_array_test.rb
-- test/typecast_boolean_test.rb
-- test/typecast_date_test.rb
-- test/typecast_decimal_test.rb
-- test/typecast_existing_attribute_test.rb
-- test/typecast_float_test.rb
-- test/typecast_hash_test.rb
-- test/typecast_integer_test.rb
-- test/typecast_string_test.rb
-- test/typecast_time_test.rb
-- test/typecast_timezone_test.rb
-- test/web_validations_test.rb
+- test/instance_callbacks.rb
+- test/macro_callbacks.rb
+- test/plugin.rb
+- test/scope.rb
+- test/slug.rb
+- test/soft_delete.rb
+- test/timestamping.rb
 homepage: http://github.com/cyx/ohm-contrib
 licenses: []
 post_install_message: 
@@ -135,12 +98,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: ohm-contrib
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: A collection of decoupled drop-in modules for Ohm.

data/Rakefile

@@ -1,8 +0,0 @@
-require 'cutest'
-
-task :test do
-  $:.unshift('./lib', './test')
-
-  Cutest.run(Dir['./test/*_test.rb'])
-end
-

data/lib/ohm/contrib/active_model_extension.rb

@@ -1,87 +0,0 @@
-# encoding: UTF-8
-
-require "active_model"
-
-# Extension for ActiveModel compatibility
-#
-# @example
-#
-#   class Post < Ohm::Model
-#     include Ohm::ActiveModelExtension
-#   end
-module Ohm
-  module ActiveModelExtension
-    def self.included(model)
-      model.extend ActiveModel::Naming
-    end
-
-    def to_model
-      ActiveModelInterface.new(self)
-    end
-  end
-
-  class ActiveModelInterface
-    extend ActiveModel::Naming
-
-    def initialize(model)
-      @model = model
-    end
-
-    def to_model
-      self
-    end
-
-    def valid?
-      @model.valid?
-    end
-
-    def new_record?
-      @model.new?
-    end
-
-    def destroyed?
-      false
-    end
-
-    def to_key
-      [@model.id] if persisted?
-    end
-
-    def persisted?
-      ! new_record?
-    end
-
-    def to_param
-      if persisted?
-        @model.respond_to?(:to_param) ?
-          @model.to_param :
-          @model.id
-      end
-    end
-
-    def errors
-      Errors.new(@model.class.to_reference, @model.errors)
-    end
-
-    class Errors
-      def initialize(scope, errors)
-        @scope  = scope
-        @errors = Hash.new { |hash, key| hash[key] = [] }
-
-        errors.each do |key, value|
-          @errors[key] << value
-        end
-      end
-
-      def [](key)
-        @errors[key]
-      end
-
-      def full_messages
-        @errors.map do |key, value|
-          I18n::t("ohm.%s.%s.%s" % [@scope, key, value])
-        end
-      end
-    end
-  end
-end

data/lib/ohm/contrib/boundaries.rb

@@ -1,41 +0,0 @@
-module Ohm
-  # Dirt cheap ::first and ::last support.
-  #
-  # @example
-  #
-  #   class Post < Ohm::Model
-  #     include Ohm::Boundaries
-  #   end
-  #
-  #   post1 = Post.create
-  #   post2 = Post.create
-  #   post1 == Post.first
-  #   # => true
-  #
-  #   post2 == Post.last
-  #   # => true
-  module Boundaries
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def first(opts = {})
-        if opts.any?
-          find(opts).first
-        else
-          all.first(opts)
-        end
-      end
-
-      def last(opts = {})
-        if opts.any?
-          find(opts).first(:order => "DESC")
-        else
-          all.first(:order => "DESC")
-        end
-      end
-    end
-  end
-end
-

data/lib/ohm/contrib/date_validations.rb

@@ -1,23 +0,0 @@
-require 'date'
-
-module Ohm
-  module DateValidations
-    DATE_REGEX = /\A([0-9]{4})-([01]?[0-9])-([0123]?[0-9])\z/
-
-    def assert_date(att, error = [att, :not_date])
-      if assert_format att, DATE_REGEX, error
-        m = send(att).to_s.match(DATE_REGEX)
-        assert is_date_parseable?(m[1], m[2], m[3]), error
-      end
-    end
-
-  private
-    def is_date_parseable?(year, month, day)
-      Date.new(year.to_i, month.to_i, day.to_i)
-    rescue ArgumentError
-      return false
-    else
-      return true
-    end
-  end
-end

data/lib/ohm/contrib/extra_validations.rb

@@ -1,48 +0,0 @@
-module Ohm
-  # Includes Ohm::NumberValidations and Ohm::WebValidations.
-  #
-  # @example
-  #
-  #   class Post < Ohm::Model
-  #     include Ohm::ExtraValidations
-  #
-  #     attribute :price
-  #     attribute :state
-  #     attribute :slug
-  #     attribute :author_email
-  #     attribute :url
-  #     attribute :ipaddr
-  #     attribute :birthday
-  #
-  #     def validate
-  #       super
-  #
-  #       assert_decimal :price
-  #       assert_member  :state, ['published', 'unpublished']
-  #       assert_ipaddr  :ipaddr
-  #       assert_url     :url
-  #       assert_email   :author_email
-  #       assert_date    :birthday
-  #       assert_min_length :slug, 10
-  #       assert_max_length :slug, 25
-  #     end
-  #   end
-  #
-  #   post = Post.new
-  #   post.valid?
-  #   post.errors
-  #   # [[:price, :not_decimal], [:state, :not_member], [:ipaddr, :not_ipaddr],
-  #   #  [:url, :not_url], [:author_email, :not_email],[:slug, :too_short]]
-  module ExtraValidations
-    include NumberValidations
-    include WebValidations
-    include DateValidations
-    include LengthValidations
-
-  protected
-    def assert_member(att, set, error = [att, :not_member])
-      assert set.include?(send(att)), error
-    end
-  end
-end
-