slim 0.7.4 → 0.8.0

data/lib/slim.rb

@@ -11,4 +11,4 @@ require 'slim/compiler'
 require 'slim/engine'
 require 'slim/template'
 require 'slim/version'
-
+require 'slim/wrapper'

data/lib/slim/sections.rb

@@ -5,12 +5,12 @@ module Slim
   class Sections < Filter
     set_default_options :dictionary => 'self',
                         :sections => false,
-                        :dictionary_access => :symbol # :symbol, :string
+                        :dictionary_access => :wrapped # :symbol, :string, :wrapped
 
     def initialize(opts = {})
       super
-      unless [:string, :symbol].include?(@options[:dictionary_access])
-        raise "Invalid dictionary access #{@options[:dictionary_access].inspect}"
+      unless [:string, :symbol, :wrapped].include?(options[:dictionary_access])
+        raise "Invalid dictionary access #{options[:dictionary_access].inspect}"
       end
     end
 
@@ -18,7 +18,7 @@ module Slim
       if options[:sections]
         # Store the dictionary in the _slimdict variable
         [:multi,
-         [:block, "_slimdict = #{@options[:dictionary]}"],
+         [:block, "_slimdict = #{dictionary}"],
          super]
       else
         exp
@@ -69,11 +69,20 @@ module Slim
 
     def access(name)
       case options[:dictionary_access]
-      when :symbol
-        "_slimdict[#{name.to_sym.inspect}]"
       when :string
         "_slimdict[#{name.to_s.inspect}]"
+      else
+        "_slimdict[#{name.to_sym.inspect}]"
+      end
+    end
+
+    def dictionary
+      if options[:dictionary_access] == :wrapped
+        "Slim::Wrapper.new(#{options[:dictionary]})"
+      else
+        options[:dictionary]
       end
     end
+
   end
 end

data/lib/slim/version.rb

@@ -1,3 +1,3 @@
 module Slim
-  VERSION = '0.7.4'
+  VERSION = '0.8.0'
 end

data/lib/slim/wrapper.rb

@@ -0,0 +1,62 @@
+module Slim
+  # For logic-less mode, objects can be encased in the Wrapper class.
+  #
+  # For Rails, this allows us to use the environment provided for rendering
+  # a view including the instance variables, view helper and application helper
+  # methods.
+  class Wrapper
+    attr_reader :value, :parent
+
+    def initialize(value, parent = nil)
+      @value, @parent = value, parent
+    end
+
+    # To find the reference, first check for standard method
+    # access by using respond_to?.
+    #
+    # If not found, check to see if the value is a hash and if the
+    # the name is a key on the hash.
+    #
+    # Not a hash, or not a key on the hash, then check to see if there
+    # is an instance variable with the name.
+    #
+    # If the instance variable doesn't exist and there is a parent object,
+    # go through the same steps on the parent object.  This is useful when
+    # you are iterating over objects.
+    def [](name)
+      if value.respond_to?(name)
+        wrap value.send(name)
+      elsif value.respond_to?(:has_key?) && value.has_key?(name.to_sym)
+        wrap value[name]
+      elsif value.instance_variable_defined?("@#{name}")
+        wrap value.instance_variable_get("@#{name}")
+      elsif parent
+        parent[name]
+      end
+    end
+
+    # Empty objects must appear empty for inverted sections
+    def empty?
+      value.respond_to?(:empty) && value.empty?
+    end
+
+    # Used for output
+    def to_s
+      value.to_s
+    end
+
+    private
+
+    def wrap(response)
+      # Primitives are not wrapped
+      if [String, Numeric, TrueClass, FalseClass, NilClass].any? {|primitive| primitive === response }
+        response
+      # Enumerables are mapped with wrapped values (except Hash-like objects)
+      elsif !response.respond_to?(:has_key?) && response.respond_to?(:map)
+        response.map {|v| wrap(v) }
+      else
+        Wrapper.new(response, self)
+      end
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 4
-  version: 0.7.4
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-22 00:00:00 -05:00
+date: 2010-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -168,6 +168,7 @@ files:
 - lib/slim/sections.rb
 - lib/slim/template.rb
 - lib/slim/version.rb
+- lib/slim/wrapper.rb
 has_rdoc: true
 homepage: http://github.com/stonean/slim
 licenses: []