sablon 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9bed4d04a0e610c47abed3aa044222d37c7f716
-  data.tar.gz: 0942a8f508bc8198b41d4bee926e0fbf7e4a4ec3
+  metadata.gz: f09a55daf98da6c52eb49e49e19291cdea0d1b11
+  data.tar.gz: 2234c60fb99580f059f4f93ec46009b1b9af3727
 SHA512:
-  metadata.gz: 5cd8914ff55c1178b946fcb9704759d579816d332e2da8b69b7a0da9d6792bfc9489c9cd1d05cd3c48a37ca5dc9f3d7e3dcbeeed04bdda6308dd4e0defed3d5d
-  data.tar.gz: 04ae3adf13a090fdc4adca34d1b038281cc5468444217f4fcccdaf3e651c170a7eaab25742ef5d003a4e4e1a0c7d13dda651d2e51555aec4ee2e6b6f6e822741
+  metadata.gz: e3bfbb49b514729e964717b14797c9af60a491e21f0abed165460c9c9f9987ad4da9040795369b0bd7ba8a1a299eaf279100c2c57135d3c91191b47bce9b65ec
+  data.tar.gz: d88dd5dea55a11d726025b23709c112d979bd119df1524195f7f728c8eb5f64174b89a1ab96d6d9fa4b1d6bd85d634a536b7a477583c78de976386cbce02a637

data/README.md

@@ -55,6 +55,11 @@ NOTE: The dot operator can also be used to perform a hash lookup.
 This means that it's not possible to call methods on a hash instance.
 Sablon will always try to make a lookup instead.
 
+This works for chained method calls and nested hash lookup as well:
+
+```
+«=buyer.address.street»
+```
 
 #### Conditionals
 

data/lib/sablon/operations.rb

@@ -52,24 +52,29 @@ module Sablon
       end
     end
 
-    class LookupOrMethodCall < Struct.new(:receiver_expr, :method)
+    class LookupOrMethodCall < Struct.new(:receiver_expr, :expression)
       def evaluate(context)
-        receiver = receiver_expr.evaluate(context)
-        case receiver
-        when Hash; receiver[method]
-        else; receiver.public_send method
+        if receiver = receiver_expr.evaluate(context)
+          expression.split(".").inject(receiver) do |local, m|
+            case local
+            when Hash
+              local[m]
+            else
+              local.public_send m if local.respond_to?(m)
+            end
+          end
         end
       end
 
       def inspect
-        "«#{receiver_expr.name}.#{method}»"
+        "«#{receiver_expr.name}.#{expression}»"
       end
     end
 
     def self.parse(expression)
       if expression.include?(".")
         parts = expression.split(".")
-        LookupOrMethodCall.new(Variable.new(parts.first), parts.last)
+        LookupOrMethodCall.new(Variable.new(parts.shift), parts.join("."))
       else
         Variable.new(expression)
       end

data/lib/sablon/version.rb

@@ -1,3 +1,3 @@
 module Sablon
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/expression_test.rb

@@ -7,7 +7,7 @@ end
 class VariableExpressionTest < Sablon::TestCase
   def test_lookup_the_variable_in_the_context
     expr = Sablon::Expression.parse("first_name")
-    assert_equal "Jane", expr.evaluate({"first_name" => "Jane", "last_name" => "Doe"})
+    assert_equal "Jane", expr.evaluate("first_name" => "Jane", "last_name" => "Doe")
   end
 
   def test_inspect
@@ -20,24 +20,49 @@ class LookupOrMethodCallTest < Sablon::TestCase
   def test_calls_method_on_object
     user = OpenStruct.new(first_name: "Jack")
     expr = Sablon::Expression.parse("user.first_name")
-    assert_equal "Jack", expr.evaluate({"user" => user})
+    assert_equal "Jack", expr.evaluate("user" => user)
   end
 
   def test_calls_perform_lookup_on_hash_with_string_keys
     user = {"first_name" => "Jack"}
     expr = Sablon::Expression.parse("user.first_name")
-    assert_equal "Jack", expr.evaluate({"user" => user})
+    assert_equal "Jack", expr.evaluate("user" => user)
   end
 
   def test_calls_perform_lookup_on_hash_with_symbol_keys
     skip
     user = {first_name: "Jack"}
     expr = Sablon::Expression.parse("user.first_name")
-    assert_equal "Jack", expr.evaluate({"user" => user})
+    assert_equal "Jack", expr.evaluate("user" => user)
   end
 
   def test_inspect
     expr = Sablon::Expression.parse("user.first_name")
     assert_equal "«user.first_name»", expr.inspect
   end
+
+  def test_calls_chained_methods
+    user = OpenStruct.new(first_name: "Jack", address: OpenStruct.new(line_1: "55A"))
+    expr = Sablon::Expression.parse("user.address.line_1")
+    assert_equal "55A", expr.evaluate("user" => user)
+  end
+
+  def test_nested_hash_lookup
+    user = {"address" => {"line_1" => "55A"}}
+    expr = Sablon::Expression.parse("user.address.line_1")
+    assert_equal "55A", expr.evaluate("user" => user)
+  end
+
+  def test_mix_hash_lookup_and_method_calls
+    user = OpenStruct.new(address: {"country" => OpenStruct.new(name: "Switzerland")})
+    expr = Sablon::Expression.parse("user.address.country.name")
+    assert_equal "Switzerland", expr.evaluate("user" => user)
+  end
+
+  def test_missing_receiver
+    user = OpenStruct.new(first_name: "Jack")
+    expr = Sablon::Expression.parse("user.address.line_1")
+    assert_equal nil, expr.evaluate("user" => user)
+    assert_equal nil, expr.evaluate({})
+  end
 end

data/test/fixtures/shopping_list_context.json

@@ -1,5 +1,11 @@
 {
   "title": "Shopping List",
+  "details": {
+    "author": {
+      "first_name": "John",
+      "last_name": "Doe"
+    }
+  },
   "items": [
     {"name": "Milk", "amount": "1L"},
     {"name": "Sugar", "amount": "1kg"},

data/test/sablon_test.rb

@@ -12,7 +12,7 @@ class SablonTest < Sablon::TestCase
 
   def test_generate_document_from_template
     template = Sablon.template(@base_path + "fixtures/sablon_template.docx")
-    person = OpenStruct.new "first_name" => "Ronald", "last_name" => "Anderson"
+    person = OpenStruct.new "first_name" => "Ronald", "last_name" => "Anderson", "address" => {"street" => "Panda Bay 4A"}
     item = Struct.new(:index, :label, :rating)
     position = Struct.new(:duration, :label, :description)
     language = Struct.new(:name, :skill)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sablon
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri