mediator 0.3.1 → 0.4.0

data/lib/mediator/parser.rb

@@ -10,14 +10,14 @@ class Mediator
       @mediator = mediator
     end
 
-    def get name, options = nil
-      selector = (options && options[:from]) || name
-      (options && options[:value]) || data[selector] || data[selector.to_s]
+    def get name, options = {}
+      selector = options[:from] || name
+      options[:value] || data[selector] || data[selector.to_s]
     end
 
-    def has? name, options = nil
-      selector = (options && options[:from]) || name
-      (options && options.has_key?(:value))  || mediator.data_has?(data,selector)
+    def has? name, options = {}
+      selector = options[:from] || name
+      options.has_key?(:value)  || mediator.data_has?(data,selector)
     end
 
     def id name, options = {}
@@ -36,7 +36,7 @@ class Mediator
       key id_name, options
     end
 
-    def key name, options = nil, &block
+    def key name, options = {}, &block
       if name[-1] == "?"
         name = name[0..-2].intern
       end
@@ -51,23 +51,32 @@ class Mediator
       mediator.set name, value unless empty? value, options
     end
 
-    def many name, options = nil, &block
-      data = get name, options
-      subj = (options && options[:subject]) || mediator.get(name)
+    def many name, options = {}, &block
+      options = {construct: true}.merge options
+
+      mediator.set name, [] unless options[:merge]
+
+      data = get(name, options) || []
+      subj = (options && options[:subject]) || mediator.get(name, options)
 
-      data.map { |d| sub subj[data.index d], d, options, &block }.
-        reject { |v| empty? v, options }
+      data.each do |d|
+        name = name[0..-2] if name[-1] == "s"
+        s = mediator.construct name
+        sub s, d, options, &block
+      end
     end
 
-    def one name, options = nil, &block
+    def one name, options = {}, &block
+      options = {construct: true}.merge options
+
       data = get name, options
-      subj = (options && options[:subject]) || mediator.get(name)
+      subj = options[:subject] || mediator.get(name, options)
 
       sub subj, data, options, &block
     end
 
-    def union name, options = nil, &block
-      (options ||= {}).merge! value: self.data
+    def union name, options = {}, &block
+      options = {value: self.data}.merge options
       one name, options, &block
     end
 

data/lib/mediator/renderer.rb

@@ -10,14 +10,15 @@ class Mediator
       @mediator = mediator
     end
 
-    def get name, options = nil
-      selector = (options && options[:from]) || name
-      (options && options[:value]) || mediator.get(selector)
+    def get name, options = {}
+      options = {construct: false}.merge options
+      selector = options[:from] || name
+      options[:value] || mediator.get(selector, options)
     end
 
-    def has? name, options = nil
-      selector = (options && options[:from]) || name
-      (options && options.has_key?(:value))  || mediator.subject_has?(selector)
+    def has? name, options = {}
+      selector = options[:from] || name
+      options.has_key?(:value)  || mediator.subject_has?(selector)
     end
 
     def id name, options = {}, &block
@@ -36,9 +37,9 @@ class Mediator
       key name, options, &block
     end
 
-    def key name, options = nil, &block
+    def key name, options = {}, &block
       if name[-1] == "?"
-        (options ||= {})[:from] = name
+        options[:from] = name
         name = name[0..-2].intern
       end
 
@@ -50,24 +51,24 @@ class Mediator
       data[name] = value unless empty? value, options
     end
 
-    def many name, options = nil, &block
+    def many name, options = {}, &block
       value = get name, options
       data[name] = value.map { |v| sub v, options, &block }.
         reject { |v| empty? v, options }
     end
 
-    def one name, options = nil, &block
+    def one name, options = {}, &block
       value = get name, options
       return if empty? value, options
  
       value = sub value, options, &block 
       return if empty? value, options
 
-      options && options[:merge] ? data.merge!(value) : data[name] = value
+      options[:merge] ? data.merge!(value) : data[name] = value
     end
 
-    def union name, options = nil, &block
-      (options ||= {}).merge! merge: true
+    def union name, options = {}, &block
+      options.merge! merge: true
       one name, options, &block
     end
 

data/lib/mediator.rb

@@ -152,9 +152,9 @@ class Mediator
   # Gets the `name` property from `subject`. The default
   # implementation calls the `name` method if it exists.
 
-  def get name
+  def get name, options = {}
     value = subject.send name if subject.respond_to? name
-    value = construct name    if value.nil?
+    value = construct name    if value.nil? and options[:construct]
 
     getting name, value       unless value.nil?
   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.3.1"
+  gem.version       = "0.4.0"
 
   gem.required_ruby_version = ">= 1.9.2"
 end

data/test/mediator_parser_test.rb

@@ -198,19 +198,32 @@ describe Mediator::Parser do
 
   describe "many" do
     before do
-      Many   = Class.new OpenStruct
-      Nested = Class.new OpenStruct 
+      Bar ||= Class.new OpenStruct
+      Foo ||= Class.new OpenStruct 
 
       Class.new Mediator do
-        accept Many
+        accept Bar
 
         def parse! p
-          p.many :nest
+          p.many :foos
+          p.many :merge_foos, merge: true
+        end
+
+        def construct name
+          # name is either foo, replace_foo, replace_foos or foos..
+          subject.foos         ||= []
+          subject.merge_foos ||= []
+
+          return subject.send(name) if subject.respond_to?(name)
+
+          foo = Foo.new
+          subject.send("#{name}s") << foo
+          foo
         end
       end
 
       Class.new Mediator do
-        accept Nested
+        accept Foo
 
         def parse! p
           p.key :baz
@@ -219,15 +232,38 @@ describe Mediator::Parser do
     end
 
     it "delegates to an array of nested mediator" do
-      s      = Many.new
-      s.nest = [ Nested.new, Nested.new ]
+      s  = Bar.new
+
+      m = Mediator[s]
+      d = { foos: [ { baz: "baz!" }, { baz: "blup?" } ] }
+
+      m.parse d
+
+      assert_equal d[:foos].map { |v| v[:baz] },  s.foos.map { |v| v.baz }
+    end
+
+    it "replaces all models by default" do
+      s  = Bar.new foos: [ Foo.new(baz: "bar") ]
+
+      assert_equal ["bar"], s.foos.map(&:baz)
+
+      m = Mediator[s]
+      d = { foos: [ { baz: "blup?" } ] }
+
+      m.parse d
+
+      assert_equal ["blup?"],  s.foos.map(&:baz)
+    end
+
+    it "adds new models if told to" do
+      s  = Bar.new merge_foos: [ Foo.new(baz: "bar") ]
 
       m = Mediator[s]
-      d = { nest: [ { baz: "baz!" }, { baz: "blup?" } ] }
+      d = { merge_foos: [ { baz: "blup?" } ] }
 
       m.parse d
 
-      assert_equal d[:nest].map { |v| v[:baz] },  s.nest.map { |v| v.baz }
+      assert_equal ["bar", "blup?"], s.merge_foos.map(&:baz)
     end
   end
 

data/test/mediator_renderer_test.rb

@@ -319,7 +319,7 @@ describe Mediator::Renderer do
         end
 
         def render! r
-          r.key :foo
+          r.key :foo, construct: true
         end
       end
 

data/test/mediator_test.rb

@@ -136,7 +136,7 @@ describe Mediator do
       assert_equal :bar, m.get(:foo)
     end
 
-    it "can construct missing values" do
+    it "can construct missing values if told to" do
       c = Class.new Mediator do
         def construct name
           "HELLO" if :foo == name
@@ -144,7 +144,7 @@ describe Mediator do
       end
 
       m = c.new OpenStruct.new
-      assert_equal "HELLO", m.get(:foo)
+      assert_equal "HELLO", m.get(:foo, construct: true)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediator
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies: []
 description: A go-between for models.
 email: