mediator 0.1.1 → 0.2.0

data/lib/mediator/parser.rb

@@ -17,7 +17,7 @@ class Mediator
 
     def has? name, options = nil
       selector = (options && options[:from]) || name
-      (options && options.has_key?(:value)) || data.has_key?(selector) || data.has_key?(selector.to_s)
+      (options && options.has_key?(:value))  || mediator.data_has?(data,selector)
     end
 
     def id name, options = {}

data/lib/mediator/renderer.rb

@@ -17,7 +17,7 @@ class Mediator
 
     def has? name, options = nil
       selector = (options && options[:from]) || name
-      (options && options.has_key?(:value)) || mediator.subject.respond_to?(selector) || mediator.subject.respond_to?(selector.to_s)
+      (options && options.has_key?(:value))  || mediator.subject_has?(selector)
     end
 
     def id name, options = {}
@@ -42,8 +42,6 @@ class Mediator
         name = name[0..-2].intern
       end
 
-      return unless has? name, options
-
       value = get name, options
       return if empty? value, options
 

data/lib/mediator.rb

@@ -137,17 +137,26 @@ class Mediator
     Mediator::Renderer.new self
   end
 
+  # True if subject can construct a value for name
+
+  def subject_has? name
+    subject.respond_to?(name) || subject.respond_to?(name.to_s)
+  end
+
+  # True if data can return a value for name
+  
+  def data_has? data, name
+    data.has_key?(name) || data.has_key?(name.to_s)
+  end
+
   # Gets the `name` property from `subject`. The default
   # implementation calls the `name` method if it exists.
 
   def get name
     value = subject.send name if subject.respond_to? name
-    
-    return value unless value.nil?
-
-    value ||= construct name
+    value = construct name    if value.nil?
 
-    getting name, value if value
+    getting name, value       unless value.nil?
   end
 
   # Called when getting `name` from `subject`. Can be used to

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.1.1"
+  gem.version       = "0.2.0"
 
   gem.required_ruby_version = ">= 1.9.2"
 end

data/test/mediator_renderer_test.rb

@@ -221,7 +221,7 @@ describe Mediator::Renderer do
       assert_equal Hash.new, d
     end
 
-    it "optionally allows empty values when defined" do
+    it "optionally allows empty values" do
       c = Class.new Mediator do
         def render! r
           r.key :foo, empty: true
@@ -229,7 +229,6 @@ describe Mediator::Renderer do
       end
 
       s = OpenStruct.new
-      s.foo = nil
       m = c.new s
       d = m.render
       e = { foo: nil }
@@ -237,21 +236,6 @@ describe Mediator::Renderer do
       assert_equal e, d
     end
 
-    it "ditches empty values when not defined in any case" do
-      c = Class.new Mediator do
-        def render! r
-          r.key :foo, empty: true
-        end
-      end
-
-      s = OpenStruct.new
-      m = c.new s
-      d = m.render
-      e = { }
-
-      assert_equal e, d
-    end
-
     it "optionally maps names" do
       c = Class.new Mediator do
         def render! r
@@ -294,6 +278,28 @@ describe Mediator::Renderer do
 
       assert_equal "bar", d[:foo]      
     end
+
+    it "can define its own access to data" do
+      c = Class.new Mediator do
+        def construct name
+          subject[name]
+        end
+
+        def subject_has? name
+          !!subject[name]
+        end
+
+        def render! r
+          r.key :foo
+        end
+      end
+
+      s = { :foo => "bar" }
+      m = c.new s
+      d = m.render
+
+      assert_equal "bar", d[:foo]
+    end
   end
 
   describe "one" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: