ohm-contrib 0.0.17 → 0.0.18

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/lib/ohm/contrib/callbacks.rb

@@ -66,8 +66,8 @@ module Ohm
       #
       # @param [Symbol] method the method type, `:validate`, `:create`, or `:save`
       # @param [Symbol] callback the name of the method to execute
-      # @return [Array<callback>, nil] the callback wrapped in an array or nil
-      #   if the callback exists
+      # @return [Array] the callback in an array if added e.g. [:timestamp]
+      # @return [nil] if the callback already exists
       def before(method, callback)
         unless callbacks[:before][method].include? callback
           callbacks[:before][method] << callback
@@ -97,8 +97,8 @@ module Ohm
       #
       # @param [Symbol] method the method type, `:validate`, `:create`, or `:save`
       # @param [Symbol] callback the name of the method to execute
-      # @return [Array<callback>, nil] the callback in an array or nil if the
-      #   callback exists
+      # @return [Array] the callback in an array if added e.g. [:timestamp]
+      # @return [nil] if the callback already exists
       def after(method, callback)
         unless callbacks[:after][method].include? callback
           callbacks[:after][method] << callback

data/lib/ohm/contrib/typecast.rb

@@ -1,7 +1,6 @@
 require 'bigdecimal'
 require 'time'
 require 'date'
-require 'forwardable'
 
 module Ohm
   # Provides all the primitive types. The following are included:
@@ -13,6 +12,15 @@ module Ohm
   # * Date
   # * Time
   module Types
+    def self.defined?(type)
+      @constants ||= constants.map(&:to_s)
+      @constants.include?(type.to_s)
+    end
+
+    def self.[](type)
+      const_get(type.to_s.split('::').last)
+    end
+
     class Primitive < BasicObject
       def initialize(value)
         @raw = value
@@ -69,15 +77,6 @@ module Ohm
     end
 
     class Time < Primitive
-      class << self
-        extend Forwardable
-        def_delegators :Time,
-          :_load, :apply_offset, :at, :gm, :httpdate, :json_create, :local,
-          :make_time, :mktime, :month_days, :now, :parse, :rfc2822,
-          :strptime, :utc, :w3cdtf, :xmlschema, :yaml_new, :zone_offset,
-          :zone_utc?
-      end
-
     protected
       def object
         ::Time.parse(@raw)
@@ -85,15 +84,6 @@ module Ohm
     end
 
     class Date < Primitive
-      class << self
-        extend Forwardable
-        def_delegators :Date,
-          :_parse, :_strptime, :civil, :commercial, :gregorian_leap?, :jd,
-          :json_create, :julian_leap?, :now, :nth_kday, :ordinal, :parse, :s3e,
-          :strptime, :today, :valid_civil?, :valid_commercial?, :valid_jd?,
-          :valid_ordinal?, :weeknum
-      end
-
     protected
       def object
         ::Date.parse(@raw)
@@ -153,17 +143,49 @@ module Ohm
   #   item.posted.strftime('%m/%d/%Y')
   #   # => works!!!
   module Typecast
-    include Types
-
     def self.included(base)
       base.extend ClassMethods
     end
 
     module ClassMethods
-      def attribute(name, type = Ohm::Types::String)
+      # Defines a typecasted attribute.
+      #
+      # @example
+      #   
+      #   class User < Ohm::Model
+      #     include Ohm::Typecast
+      #
+      #     attribute :birthday, Date
+      #     attribute :last_login, Time
+      #     attribute :age, Integer
+      #     attribute :spending, Decimal
+      #     attribute :score, Float
+      #   end
+      #
+      #   user = User.new(:birthday => "2000-01-01")
+      #   user.birthday.month == 1
+      #   # => true
+      #
+      #   user.birthday.year == 2000
+      #   # => true
+      #
+      #   user.birthday.day == 1
+      #   # => true
+      #
+      #   user = User.new(:age => 20)
+      #   user.age - 1 == 19
+      #   => true
+      # 
+      # @param [Symbol] name the name of the attribute to define.
+      # @param [Class] type (defaults to Ohm::Types::String) a class defined in 
+      #                Ohm::Types. You may define custom types in Ohm::Types if
+      #                you need to.
+      # @return [Array] the array of attributes already defined.
+      # @return [nil] if the attribute is already defined.
+      def attribute(name, type = Ohm::Types::String, klass = Ohm::Types[type])
         define_method(name) do
           value = read_local(name)
-          value && type.new(value)
+          value && klass.new(value)
         end
 
         define_method(:"#{name}=") do |value|
@@ -172,6 +194,15 @@ module Ohm
 
         attributes << name unless attributes.include?(name)
       end
+
+    private
+      def const_missing(name)
+        if Ohm::Types.defined?(name)
+          Ohm::Types[name]
+        else
+          super
+        end
+      end
     end
   end
-end
+end

data/lib/ohm/contrib.rb

@@ -1,6 +1,6 @@
 module Ohm
   module Contrib
-    VERSION = '0.0.17'
+    VERSION = '0.0.18'
   end
 
   autoload :Boundaries,        "ohm/contrib/boundaries"

data/ohm-contrib.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ohm-contrib}
-  s.version = "0.0.17"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David"]
-  s.date = %q{2010-05-25}
+  s.date = %q{2010-05-26}
   s.description = %q{Highly decoupled drop-in functionality for Ohm models}
   s.email = %q{cyx.ucron@gmail.com}
   s.extra_rdoc_files = [

data/test/test_ohm_typecast.rb

@@ -205,28 +205,17 @@ class TestOhmTypecast < Test::Unit::TestCase
         Time.now
       end
 
-      def time
-        Time
+      def new_time
+        Time.new
       end
     end
 
     test "still able to access top level Time" do
-      post = Post.new
-      assert_equal post.now.to_s, Time.now.to_s
+      assert_equal Post.new.now.to_s, Time.now.to_s
     end
 
-    test "responds to all ::Time class methods" do
-      post = Post.new
-      methods = [
-        :_load, :apply_offset, :at, :gm, :httpdate, :json_create, :local,
-        :make_time, :mktime, :month_days, :new, :now, :parse, :rfc2822,
-        :strptime, :utc, :w3cdtf, :xmlschema, :yaml_new, :zone_offset,
-        :zone_utc?
-      ]
-
-      methods.each do |m|
-        assert_respond_to post.time, m
-      end
+    test "should be able to use Time.new inside the class" do
+      assert_equal Post.new.new_time.to_s, Time.new.to_s
     end
 
     test "handles nil case correctly" do
@@ -277,6 +266,10 @@ class TestOhmTypecast < Test::Unit::TestCase
         Date
       end
 
+      def may_5
+        Date.new(2010, 05, 05)
+      end
+
       def base_today
         Date.today
       end
@@ -286,18 +279,8 @@ class TestOhmTypecast < Test::Unit::TestCase
       assert_equal Date.today, Post.new.base_today
     end
 
-    test "responds to all the class methods" do
-      post = Post.new
-
-      methods = [
-        :_parse, :_strptime, :civil, :commercial, :gregorian_leap?, :jd,
-        :json_create, :julian_leap?, :now, :nth_kday, :ordinal, :parse, :s3e,
-        :strptime, :today, :valid_civil?, :valid_commercial?, :valid_jd?,
-        :valid_ordinal?, :weeknum
-      ]
-      methods.each do |m|
-        assert_respond_to post.date, m
-      end
+    test "allows instantiation of dates" do
+      assert_equal Date.new(2010, 05, 05), Post.new.may_5
     end
 
     test "handles nil case correctly" do
@@ -335,4 +318,4 @@ class TestOhmTypecast < Test::Unit::TestCase
       assert_equal Date.today, Post.new.today
     end
   end
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 17
-  version: 0.0.17
+  - 18
+  version: 0.0.18
 platform: ruby
 authors: 
 - Cyril David
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-25 00:00:00 +08:00
+date: 2010-05-26 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency