mediator 0.2.0 → 0.3.0

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/lib/mediator/parser.rb

@@ -76,7 +76,7 @@ class Mediator
     def sub subj, data, options, &block
       return if empty? data, options or subj.nil?
 
-      Mediator[subj, mediator].parse data
+      Mediator[subj, context: mediator].parse data
       block[subj] if block
 
       subj

data/lib/mediator/registry.rb

@@ -25,25 +25,53 @@ class Mediator
     #     Mediator.for B.new  #  => A
     #
     # Mediators are searched in reverse insertion order.
+    #
+    # Options:
+    #   context  - passed to new context
+    #   registry - optional registry map to use instead of default
+
+    def for subject, opts = {}
+      context = opts[:context]
+
+      reg = registry(opts[:registry] || context)
 
-    def for subject, context = nil
-      map.keys.reverse.each do |criteria|
-        return map[criteria].new subject, context if criteria === subject
+      reg.keys.reverse.each do |criteria|
+        return reg[criteria].new subject, context if criteria === subject
       end
 
       raise Error, "Can't find a Mediator for #{subject.inspect}."
     end
 
-    # Sugar for `for`.
+    # Returns a mediator registry. If no arg is passed the default registry
+    # is returned. Keys can be either a symbol or a Mediator instance or class
+
+    def registry key = nil
 
-    def [] subject, context = nil
-      self.for subject, context
+      # If key exists then see if we've got an entry already and if
+      # not force the key to be a symbol, i.e. :default, :accounting, etc.
+      
+      if key
+        return registries[key.class] if registries.key?(key.class)
+        return registries[key] if registries.key?(key)
+        key = :default unless key.is_a?(Symbol)
+      end
+      
+      key ||= :default
+      registries[key] ||= {}
     end
 
-    # A map from subject class or block to Mediator subclass.
+    # Sugar for `for`.
+
+    def [] subject, opts = {}
+      self.for subject, opts
+    end
 
-    def map
-      @@map ||= {}
+    # Stores a map of all the different registries.
+    #  - keys are registry symbols, i.e. :default, :account, or mediators
+    #  - values are a simple map
+    
+    def registries
+      @@registries ||= Hash.new
     end
 
     # Sugar for creating and registering a Mediator subclass.
@@ -58,17 +86,25 @@ class Mediator
     # `subject` can take a block instead. When the mediator for a
     # subject is discovered with `Mediator.for` the given block will be
     # passed the subject and can return `true` or `false`.
+    # Can take an optional hash specifying what to register the mediator with.
 
     def register mklass, *subjects, &block
+      opts = subjects.last.is_a?(Hash) ? subjects.pop : {}
+      reg_map = registry opts[:registry]
+
       if block_given?
         unless subjects.empty?
           raise ArgumentError, "Can't provide both a subject and a block."
         end
 
-        map[block] = mklass
+        reg_map[block] = mklass
+        registries[mklass] = reg_map
       end
 
-      subjects.each { |k| map[k] = mklass }
+      subjects.each do |k|
+        reg_map[k] = mklass
+        registries[mklass] = reg_map
+      end
 
       mklass
     end

data/lib/mediator/renderer.rb

@@ -74,7 +74,7 @@ class Mediator
     private
 
     def sub value, options, &block
-      rendered = Mediator[value, mediator].render
+      rendered = Mediator[value, context: mediator].render
       block ? block[rendered] : rendered
     end
 

data/mediator.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- test/*`.split "\n"
   gem.name          = "mediator"
   gem.require_paths = ["lib"]
-  gem.version       = "0.2.0"
+  gem.version       = "0.3.0"
 
   gem.required_ruby_version = ">= 1.9.2"
 end

data/test/mediator_parser_test.rb

@@ -5,7 +5,7 @@ require "ostruct"
 
 describe Mediator::Parser do
   before do
-    Mediator.map.clear
+    Mediator.registries.clear
 
     @subject  = OpenStruct.new
     @mediator = Mediator.new @subject

data/test/mediator_renderer_test.rb

@@ -5,7 +5,7 @@ require "ostruct"
 
 describe Mediator::Renderer do
   before do
-    Mediator.map.clear
+    Mediator.registries.clear
   end
 
   it "has data" do

data/test/mediator_test.rb

@@ -4,7 +4,7 @@ require "ostruct"
 
 describe Mediator do
   before do
-    Mediator.map.clear
+    Mediator.registries.clear
   end
 
   describe "initialization" do
@@ -266,22 +266,22 @@ describe Mediator do
       c = Class.new Mediator
       Mediator.register c, Symbol
 
-      assert_equal c, Mediator.map[Symbol]
+      assert_equal c, Mediator.registry[Symbol]
     end
 
     it "can register multiple classes" do
       c = Class.new Mediator
       Mediator.register c, String, Symbol
 
-      assert_equal c, Mediator.map[String]
-      assert_equal c, Mediator.map[Symbol]
+      assert_equal c, Mediator.registry[String]
+      assert_equal c, Mediator.registry[Symbol]
     end
 
     it "can register with a block" do
       c = Class.new Mediator
       Mediator.register(c) { |s| Symbol === s }
 
-      b = Mediator.map.keys.first
+      b = Mediator.registry.keys.first
       refute_nil b
 
       assert b[:foo]
@@ -298,9 +298,22 @@ describe Mediator do
       assert_equal "Can't provide both a subject and a block.", ex.message
     end
 
+    it "allows for alternate registry" do
+      c = Class.new Mediator
+      assert_equal c, Mediator.register(c, String, registry: :monkeys )
+
+      r = c.registries[:monkeys]
+      refute_nil r
+
+      assert_equal c, r[String]
+      assert_equal r, c.registry(c)
+      assert_equal r, c.registries[c]
+    end
+
     it "returns the registered thing" do
       c = Class.new Mediator
       assert_equal c, Mediator.register(c, String)
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-12 00:00:00.000000000Z
+date: 2012-07-05 00:00:00.000000000Z
 dependencies: []
 description: A go-between for models.
 email: