ohm-contrib 1.1.0 → 1.2

data/lib/ohm/datatypes.rb

@@ -2,6 +2,7 @@ require "bigdecimal"
 require "date"
 require "json"
 require "time"
+require "set"
 
 module Ohm
   module DataTypes
@@ -9,12 +10,14 @@ module Ohm
       Integer   = lambda { |x| x.to_i }
       Decimal   = lambda { |x| BigDecimal(x.to_s) }
       Float     = lambda { |x| x.to_f }
+      Symbol    = lambda { |x| x.to_sym }
       Boolean   = lambda { |x| Ohm::DataTypes.bool(x) }
       Time      = lambda { |t| t && (t.kind_of?(::Time) ? t : ::Time.parse(t)) }
       Date      = lambda { |d| d && (d.kind_of?(::Date) ? d : ::Date.parse(d)) }
       Timestamp = lambda { |t| t && UnixTime.at(t.to_i) }
       Hash      = lambda { |h| h && SerializedHash[h.kind_of?(::Hash) ? h : JSON(h)] }
       Array     = lambda { |a| a && SerializedArray.new(a.kind_of?(::Array) ? a : JSON(a)) }
+      Set       = lambda { |s| s && SerializedSet.new(s.kind_of?(::Set) ? s : JSON(s)) }
     end
 
     def self.bool(val)
@@ -43,5 +46,11 @@ module Ohm
         JSON.dump(self)
       end
     end
+
+    class SerializedSet < ::Set
+      def to_s
+        JSON.dump(to_a.sort)
+      end
+    end
   end
 end

data/lib/ohm/scope.rb

@@ -14,16 +14,36 @@ module Ohm
         self::DefinedScopes.send(:include, scope) if scope
       end
     end
+  end
 
-    module OverloadedSet
-      def initialize(*args)
-        super
+  # In Ohm v1.2, the Set and MultiSet initialize methods
+  # are defined on themselves. Hence the trick of doing a
+  # module OverloadedSet with an initialize method doesn't
+  # work anymore.
+  #
+  # The simplest way to solve that as of now is to duplicate
+  # and extend the #initialize method for each of these.
+  #
+  # Granted it's not the _ideal_ way, the drawbacks are
+  # outweighed by the simplicity and performance of this
+  # approach versus other monkey-patching techniques.
+  class Set
+    def initialize(key, namespace, model)
+      @key = key
+      @namespace = namespace
+      @model = model
 
-        extend model::DefinedScopes if defined?(model::DefinedScopes)
-      end
+      extend model::DefinedScopes if defined?(model::DefinedScopes)
     end
   end
 
-  Set.send :include, Scope::OverloadedSet
-  MultiSet.send :include, Scope::OverloadedSet
+  class MultiSet
+    def initialize(namespace, model, command)
+      @namespace = namespace
+      @model = model
+      @command = command
+
+      extend model::DefinedScopes if defined?(model::DefinedScopes)
+    end
+  end
 end

data/ohm-contrib.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ohm-contrib"
-  s.version = "1.1.0"
+  s.version = "1.2"
   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"
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = "ohm-contrib"
 
-  s.add_dependency "ohm", "~> 1.1"
+  s.add_dependency "ohm", "~> 1.2"
 
   s.add_development_dependency "cutest"
   s.add_development_dependency "redis"

data/test/plugin.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require File.expand_path("../helper", __FILE__)
+require 'set'
 
 class Comment < Ohm::Model
   include Ohm::Timestamps
@@ -159,6 +160,8 @@ scope do
     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
@@ -269,4 +272,28 @@ scope do
     assert_equal "false", p.key.hget(: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.key.hget(:comments)
+    assert_equal %Q(["Awesome!","Good product","Great."]), p.comments.to_s
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ohm-contrib
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: '1.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ohm
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement