ohm-contrib 0.1.0 → 0.1.1

data/lib/ohm/contrib.rb

@@ -1,6 +1,6 @@
 module Ohm
   module Contrib
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 
   autoload :ActiveModelExtension, "ohm/contrib/active_model_extension"
@@ -18,4 +18,4 @@ module Ohm
   autoload :Scope,                "ohm/contrib/scope"
   autoload :SoftDelete,           "ohm/contrib/soft_delete"
   autoload :FulltextSearching,    "ohm/contrib/fulltext_searching"
-end
+end

data/lib/ohm/contrib/active_model_extension.rb

@@ -11,18 +11,22 @@ require "active_model"
 #   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
 
-    extend ActiveModel::Naming
-
     def to_model
       self
     end
@@ -80,4 +84,4 @@ module Ohm
       end
     end
   end
-end
+end

data/lib/ohm/contrib/typecast.rb

@@ -29,8 +29,8 @@ module Ohm
   # * Boolean
   module Types
     def self.defined?(type)
-      @constants ||= constants.map(&:to_s)
-      @constants.include?(type.to_s)
+      @_constants ||= constants.map { |c| c.to_sym }
+      @_constants.include?(type.to_sym)
     end
 
     def self.[](type)
@@ -58,7 +58,7 @@ module Ohm
       end
 
       def self.delegate_to(klass, except = @@delegation_blacklist)
-        methods = klass.public_instance_methods.map(&:to_sym) - except
+        methods = klass.public_instance_methods.map { |e| e.to_sym } - except
         def_delegators :object, *methods
       end
 
@@ -340,9 +340,14 @@ module Ohm
         end
 
         attributes << name unless attributes.include?(name)
+        types[name] = type
       end
       alias :typecast :attribute
 
+      def types
+        @types ||= {}
+      end
+
     private
       def const_missing(name)
         if Ohm::Types.defined?(name)

data/test/activemodel_test.rb

@@ -23,3 +23,5 @@ class ActiveModelTest < Test::Unit::TestCase
     @model = Post.new
   end
 end
+
+

data/test/helper.rb

@@ -1,8 +1,10 @@
-require 'cutest'
-require 'redis'
-require 'ohm'
-require 'ohm/contrib'
-require 'override'
+$:.unshift(File.expand_path("../lib", File.dirname(__FILE__)))
+
+require "cutest"
+require "redis"
+require "ohm"
+require "ohm/contrib"
+require "override"
 
 Ohm.connect :host => "localhost", :port => 6379, :db => 1
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ohm-contrib
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
+  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors: 
 - Cyril David
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 +08:00
+date: 2011-02-09 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -51,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -64,8 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -77,8 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id005
@@ -153,21 +139,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: ohm-contrib
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 2
 summary: A collection of decoupled drop-in modules for Ohm.