modern_times 0.2.10 → 0.2.11

data/VERSION

@@ -1 +1 @@
-0.2.10
+0.2.11

data/lib/modern_times/marshal_strategy.rb

@@ -27,23 +27,42 @@ require 'modern_times/marshal_strategy/yaml'
 
 module ModernTimes
   module MarshalStrategy
-    def self.find(marshal_option)
-      if marshal_option.nil?
+    @options = {
+        :ruby   => Ruby,
+        :string => String,
+        :json   => JSON,
+        :bson   => BSON,
+        :yaml   => YAML,
+    }
+
+    def self.find(marshaler)
+      if marshaler.nil?
         return Ruby
-      elsif marshal_option.kind_of? Symbol
-        return case marshal_option
-                 when :ruby   then Ruby
-                 when :string then String
-                 when :json   then JSON
-                 when :bson   then BSON
-                 when :yaml   then YAML
-                 else raise "Invalid marshal strategy: #{marshal_option}"
-               end
-      elsif marshal_option.respond_to?(:marshal_type)
-        return marshal_option
-      else
-        raise "Invalid marshal strategy: #{marshal_option}"
+      elsif marshaler.kind_of? Symbol
+        val = @options[marshaler]
+        return val if val
+      elsif valid?(marshaler)
+        return marshaler
+      end
+      raise "Invalid marshal strategy: #{marshaler}"
+    end
+
+    # Allow user-defined marshal strategies
+    def self.register(hash)
+      hash.each do |key, marshaler|
+        raise "Invalid marshal strategy: #{marshaler}" unless valid?(marshaler)
+        @options[key] = marshaler
       end
     end
+
+    def self.unregister(sym)
+      @options.delete(sym)
+    end
+
+    def self.valid?(marshaler)
+      return marshaler.respond_to?(:marshal_type) &&
+          marshaler.respond_to?(:marshal) &&
+          marshaler.respond_to?(:unmarshal)
+    end
   end
 end

data/test/marshal_strategy_test.rb

@@ -12,28 +12,48 @@ class Klass
   end
 end
 
+module SpockMarshalStrategy
+  def self.marshal_type
+    :text
+  end
+
+  # Change days to hours
+  def self.marshal(i)
+    (i.to_i * 24).to_s
+  end
+
+  # Change days to hours
+  def self.unmarshal(str)
+    str.to_i / 24
+  end
+end
+
 class MarshalStrategyTest < Test::Unit::TestCase
   context '' do
     setup do
-      @bson   = Object.new
-      @json   = Object.new
-      @ruby   = Object.new
-      @string = Object.new
-      @bson.extend   ModernTimes::MarshalStrategy::BSON
-      @json.extend   ModernTimes::MarshalStrategy::JSON
-      @ruby.extend   ModernTimes::MarshalStrategy::Ruby
-      @string.extend ModernTimes::MarshalStrategy::String
+      ModernTimes::MarshalStrategy.register(:spock => SpockMarshalStrategy)
+
+      @bson   = ModernTimes::MarshalStrategy.find(:bson)
+      @json   = ModernTimes::MarshalStrategy.find(:json)
+      @ruby   = ModernTimes::MarshalStrategy.find(:ruby)
+      @string = ModernTimes::MarshalStrategy.find(:string)
+      @yaml   = ModernTimes::MarshalStrategy.find(:string)
+      @spock  = ModernTimes::MarshalStrategy.find(:spock)
+      @spock2 = ModernTimes::MarshalStrategy.find(SpockMarshalStrategy)
     end
 
     should 'marshal and unmarshal correctly' do
       hash = {'foo' => 42, 'bar' => 'zulu'}
       str  = 'abcdef1234'
       obj  = Klass.new('hello')
+      i    = 6
       assert_equal hash, @bson.unmarshal(@bson.marshal(hash))
       assert_equal hash, @json.unmarshal(@json.marshal(hash))
       assert_equal hash, @ruby.unmarshal(@ruby.marshal(hash))
       assert_equal str,  @string.unmarshal(@string.marshal(str))
       assert_equal obj.hello,  @ruby.unmarshal(@ruby.marshal(obj)).hello
+      assert_equal i, @spock.unmarshal(@spock.marshal(i))
+      assert_equal i, @spock2.unmarshal(@spock2.marshal(i))
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: modern_times
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors: 
   - Brad Pardee