RubyGems - slim - Versions diffs - 1.3.4 → 1.3.5 - Mend

slim 1.3.4 → 1.3.5

Files changed (11) hide show

data/CHANGES +7 -0
data/Gemfile +1 -1
data/README.md +24 -8
data/lib/slim/logic_less.rb +1 -1
data/lib/slim/logic_less/context.rb +119 -0
data/lib/slim/logic_less/filter.rb +28 -46
data/lib/slim/version.rb +1 -1
data/test/logic_less/test_logic_less.rb +157 -14
metadata +60 -22
data/lib/slim/logic_less/wrapper.rb +0 -64
data/test/logic_less/test_wrapper.rb +0 -31

data/CHANGES CHANGED

@@ -1,3 +1,10 @@
+1.3.5
+  * Logic-less:
+    - Rewrote logic-less mode (Issue #326, #327)
+    - Logic-less mode supports lambdas
+    - Option :dictionary_access made more powerful, value :wrapped deprecated
 1.3.4
   * Fixed #314

data/Gemfile CHANGED

@@ -20,7 +20,7 @@ if ENV['RAILS']
     gem 'activerecord-jdbc-adapter'
     gem 'activerecord-jdbcsqlite3-adapter'
   else
-    gem 'sqlite3-ruby'
+    gem 'sqlite3'
   end
 end

data/README.md CHANGED

@@ -93,7 +93,7 @@ Indentation matters, but the indentation depth can be chosen as you like. If you
 ### Text `|`
 The pipe tells Slim to just copy the line. It essentially escapes any processing.
-Each following line that is indented greater than the backtick is copied over.
+Each following line that is indented greater than the pipe is copied over.
     body
       p
@@ -104,7 +104,7 @@ Each following line that is indented greater than the backtick is copied over.
     <body><p>This is a test of the text block.</p></body>
-  The left margin is set at the indent of the backtick + one space.
+  The left margin is set at the indent of the pipe + one space.
   Any additional spaces will be copied over.
     body
@@ -657,18 +657,34 @@ If the object is an array, the section will iterate
     - articles
       tr: td = title
-#### Wrapped dictionary - Resolution order
+#### Lambdas
+Like mustache, Slim supports lambdas.
+    = person
+      = name
+The lambda method could be defined like this
+    def lambda_method
+      "<div class='person'>#{yield(:name => 'Andrew')}</div>"
+    end
+You can optionally pass one or more hashes to `yield`. If you pass multiple hashes, the block will be iterated as described above.
+#### Dictionary access
 Example code:
     - article
       h1 = title
-In wrapped dictionary acccess mode (the default, see the options), the dictionary object is accessed in the following order.
+The dictionary object is accessed in the order given by the `:dictionary_access`. Default order:
-1. If `article.respond_to?(:title)`, Slim will execute `article.send(:title)`
-2. If `article.respond_to?(:has_key?)` and `article.has_key?(:title)`, Slim will execute `article[:title]`
-3. If `article.instance_variable_defined?(@title)`, Slim will execute `article.instance_variable_get @title`
+1. `:symbol` - If `article.respond_to?(:has_key?)` and `article.has_key?(:title)`, Slim will execute `article[:title]`
+2. `:string` - If `article.respond_to?(:has_key?)` and `article.has_key?('title')`, Slim will execute `article['title']`
+3. `:method` - If `article.respond_to?(:title)`, Slim will execute `article.send(:title)`
+4. `:instance_variable` - If `article.instance_variable_defined?(@title)`, Slim will execute `article.instance_variable_get @title`
 If all the above fails, Slim will try to resolve the title reference in the same order against the parent object. In this example, the parent would be the dictionary object you are rendering the template against.
@@ -723,7 +739,7 @@ and activate logic less mode per render call in your application
 <tbody>
 <tr><td>Boolean</td><td>:logic_less</td><td>true</td><td>Enable logic less mode (Enabled if 'slim/logic_less' is required)</td></tr>
 <tr><td>String</td><td>:dictionary</td><td>"self"</td><td>Dictionary where variables are looked up</td></tr>
-<tr><td>Symbol</td><td>:dictionary_access</td><td>:wrapped</td><td>Dictionary access mode (:string, :symbol, :wrapped)</td></tr>
+<tr><td>Symbol/Array of Symbols</td><td>:dictionary_access</td><td>[:symbol, :string, :method, :instance_variable]</td><td>Dictionary access order (:symbol, :string, :method, :instance_variable)</td></tr>
 </tbody>
 </table>

data/lib/slim/logic_less.rb CHANGED

@@ -1,6 +1,6 @@
 require 'slim'
 require 'slim/logic_less/filter'
-require 'slim/logic_less/wrapper'
+require 'slim/logic_less/context'
 # Insert plugin filter into Slim engine chain
 Slim::Engine.after(Slim::Interpolation, Slim::LogicLess, :logic_less, :dictionary, :dictionary_access)

data/lib/slim/logic_less/context.rb ADDED

@@ -0,0 +1,119 @@
+module Slim
+  class LogicLess
+    # @api private
+    class Context
+      def initialize(dict, lookup)
+        @scope = [Scope.new(dict, lookup)]
+      end
+      def [](name)
+        scope[name]
+      end
+      def lambda(name)
+        scope.lambda(name) do |*dict|
+          if dict.empty?
+            yield
+          else
+            new_scope do
+              dict.inject('') do |result, d|
+                scope.dict = d
+                result << yield
+              end
+            end
+          end
+        end
+      end
+      def section(name)
+        if dict = scope[name]
+          if !dict.respond_to?(:has_key?) && dict.respond_to?(:each)
+            new_scope do
+              dict.each do |d|
+                scope.dict = d
+                yield
+              end
+            end
+          else
+            new_scope(dict) { yield }
+          end
+        end
+      end
+      def inverted_section(name)
+        value = scope[name]
+        yield if !value || (value.respond_to?(:empty?) && value.empty?)
+      end
+      private
+      class Scope
+        attr_reader :lookup
+        attr_writer :dict
+        def initialize(dict, lookup, parent = nil)
+          @dict, @lookup, @parent = dict, lookup, parent
+        end
+        def lambda(name, &block)
+          @lookup.each do |lookup|
+            case lookup
+            when :method
+              return @dict.send(name, &block) if @dict.respond_to?(name)
+            when :symbol
+              return @dict[name].call(&block) if has_key?(name)
+            when :string
+              return @dict[name.to_s].call(&block) if has_key?(name.to_s)
+            when :instance_variable
+              var_name = "@#{name}"
+              return @dict.instance_variable_get(var_name).call(&block) if instance_variable?(var_name)
+            end
+          end
+          @parent.lambda(name) if @parent
+        end
+        def [](name)
+          @lookup.each do |lookup|
+            case lookup
+            when :method
+              return @dict.send(name) if @dict.respond_to?(name)
+            when :symbol
+              return @dict[name] if has_key?(name)
+            when :string
+              return @dict[name.to_s] if has_key?(name.to_s)
+            when :instance_variable
+              var_name = "@#{name}"
+              return @dict.instance_variable_get(var_name) if instance_variable?(var_name)
+            end
+          end
+          @parent[name] if @parent
+        end
+        private
+        def has_key?(name)
+          @dict.respond_to?(:has_key?) && @dict.has_key?(name)
+        end
+        def instance_variable?(name)
+          begin
+            @dict.instance_variable_defined?(name)
+          rescue NameError
+            false
+          end
+        end
+      end
+      def scope
+        @scope.last
+      end
+      def new_scope(dict = nil)
+        @scope << Scope.new(dict, scope.lookup, scope)
+        yield
+      ensure
+        @scope.pop
+      end
+    end
+  end
+end

data/lib/slim/logic_less/filter.rb CHANGED

@@ -3,24 +3,34 @@ module Slim
   # This filter can be activated with the option "logic_less"
   # @api private
   class LogicLess < Filter
+    # Default dictionary access order, change it with the option :dictionary_access
+    DEFAULT_ACCESS_ORDER = [:symbol, :string, :method, :instance_variable].freeze
     define_options :logic_less => true,
                    :dictionary => 'self',
-                   :dictionary_access => :wrapped # :symbol, :string, :wrapped
+                   :dictionary_access => DEFAULT_ACCESS_ORDER
     def initialize(opts = {})
       super
-      unless [:string, :symbol, :wrapped].include?(options[:dictionary_access])
-        raise ArgumentError, "Invalid dictionary access #{options[:dictionary_access].inspect}"
+      access = options[:dictionary_access]
+      if access == :wrapped
+        puts 'Slim::LogicLess - Wrapped dictionary access is deprecated'
+        access = DEFAULT_ACCESS_ORDER
+      else
+        access = [access].flatten.compact
+        access.each do |type|
+          raise ArgumentError, "Invalid dictionary access #{type.inspect}" unless DEFAULT_ACCESS_ORDER.include?(type)
+        end
+        raise ArgumentError, 'Option dictionary access is missing' if access.empty?
       end
+      @access = access.inspect
     end
     def call(exp)
       if options[:logic_less]
-        @dict = unique_name
-        dictionary = options[:dictionary]
-        dictionary = "::Slim::LogicLess::Wrapper.new(#{dictionary})" if options[:dictionary_access] == :wrapped
+        @context = unique_name
         [:multi,
-         [:code, "#{@dict} = #{dictionary}"],
+         [:code, "#{@context} = ::Slim::LogicLess::Context.new(#{options[:dictionary]}, #{@access})"],
          super]
       else
         exp
@@ -29,16 +39,19 @@ module Slim
     # Interpret control blocks as sections or inverted sections
     def on_slim_control(name, content)
-      if name =~ /\A!\s*(.*)/
-        on_slim_inverted_section($1, content)
-      else
-        on_slim_section(name, content)
-      end
+      method =
+        if name =~ /\A!\s*(.*)/
+          name = $1
+          'inverted_section'
+        else
+          'section'
+        end
+      [:block, "#{@context}.#{method}(#{name.to_sym.inspect}) do", compile(content)]
     end
     def on_slim_output(escape, name, content)
-      raise(Temple::FilterError, 'Output statements with content are forbidden in logic less mode') if !empty_exp?(content)
-      [:slim, :output, escape, access(name), content]
+      [:slim, :output, escape, empty_exp?(content) ? access(name) :
+       "#{@context}.lambda(#{name.to_sym.inspect}) do", compile(content)]
     end
     def on_slim_attrvalue(escape, value)
@@ -57,41 +70,10 @@ module Slim
       raise Temple::FilterError, 'Embedded code is forbidden in logic less mode'
     end
-    protected
-    def on_slim_inverted_section(name, content)
-      tmp = unique_name
-      [:multi,
-       [:code, "#{tmp} = #{access name}"],
-       [:if, "!#{tmp} || #{tmp}.respond_to?(:empty) && #{tmp}.empty?",
-        compile(content)]]
-    end
-    def on_slim_section(name, content)
-      content = compile(content)
-      tmp1, tmp2 = unique_name, unique_name
-      [:if, "#{tmp1} = #{access name}",
-       [:if, "#{tmp1} == true",
-        content,
-        [:multi,
-         # Wrap map in array because maps implement each
-         [:code, "#{tmp1} = [#{tmp1}] if #{tmp1}.respond_to?(:has_key?) || !#{tmp1}.respond_to?(:map)"],
-         [:code, "#{tmp2} = #{@dict}"],
-         [:block, "#{tmp1}.each do |#{@dict}|", content],
-         [:code, "#{@dict} = #{tmp2}"]]]]
-    end
     private
     def access(name)
-      return name if name == 'yield'
-      case options[:dictionary_access]
-      when :string
-        "#{@dict}[#{name.to_s.inspect}]"
-      else
-        "#{@dict}[#{name.to_sym.inspect}]"
-      end
+      name == 'yield' ? name : "#{@context}[#{name.to_sym.inspect}]"
     end
   end
 end

data/lib/slim/version.rb CHANGED

@@ -1,5 +1,5 @@
 module Slim
   # Slim version string
   # @api public
-  VERSION = '1.3.4'
+  VERSION = '1.3.5'
 end

data/test/logic_less/test_logic_less.rb CHANGED

@@ -13,6 +13,70 @@ class TestSlimLogicLess < TestSlim
     end
   end
+  def test_lambda
+    source = %q{
+p
+ == person
+  .name = name
+ == simple
+  .hello= hello
+ == list
+  li = key
+}
+    hash = {
+      :hello => 'Hello!',
+      :person => lambda do |&block|
+        %w(Joe Jack).map do |name|
+          "<b>#{block.call(:name => name)}</b>"
+        end.join
+      end,
+      :simple => lambda do |&block|
+        "<div class=\"simple\">#{block.call}</div>"
+      end,
+      :list => lambda do |&block|
+        list = [{:key => 'First'}, {:key => 'Second'}]
+        "<ul>#{block.call(*list)}</ul>"
+      end
+    }
+    assert_html '<p><b><div class="name">Joe</div></b><b><div class="name">Jack</div></b><div class="simple"><div class="hello">Hello!</div></div><ul><li>First</li><li>Second</li></ul></p>', source, :scope => hash
+  end
+  def test_symbol_hash
+    source = %q{
+p
+ - person
+  .name = name
+}
+    hash = {
+      :person => [
+        { :name => 'Joe', },
+        { :name => 'Jack', }
+      ]
+    }
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash
+  end
+  def test_string_access
+    source = %q{
+p
+ - person
+  .name = name
+}
+    hash = {
+      'person' => [
+        { 'name' => 'Joe', },
+        { 'name' => 'Jack', }
+      ]
+    }
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :dictionary_access => :string
+  end
   def test_symbol_access
     source = %q{
 p
@@ -30,17 +94,46 @@ p
     assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :dictionary_access => :symbol
   end
-  def test_dictionary_option
+  def test_method_access
     source = %q{
 p
  - person
   .name = name
 }
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => Scope.new, :dictionary => '@hash', :dictionary_access => :symbol
+    object = Object.new
+    def object.person
+      %w(Joe Jack).map do |name|
+        person = Object.new
+        person.instance_variable_set(:@name, name)
+        def person.name
+          @name
+        end
+        person
+      end
+    end
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => object, :dictionary_access => :method
   end
-  def test_string_access
+  def test_instance_variable_access
+    source = %q{
+p
+ - person
+  .name = name
+}
+    object = Object.new
+    object.instance_variable_set(:@person, %w(Joe Jack).map do |name|
+                                   person = Object.new
+                                   person.instance_variable_set(:@name, name)
+                                   person
+                                 end)
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => object, :dictionary_access => :instance_variable
+  end
+  def test_string_hash
     source = %q{
 p
  - person
@@ -54,7 +147,17 @@ p
       ]
     }
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :dictionary_access => :string
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash
+  end
+  def test_dictionary_option
+    source = %q{
+p
+ - person
+  .name = name
+}
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => Scope.new, :dictionary => '@hash'
   end
   def test_flag_section
@@ -94,14 +197,6 @@ p
     assert_html '<p>No person No person 2</p>', source, :scope => hash
   end
-  def test_output_with_content
-    source = %{
-p = method_with_block do
-  block
-}
-    assert_runtime_error 'Output statements with content are forbidden in logic less mode', source
-  end
   def test_escaped_interpolation
     source = %q{
 p text with \#{123} test
@@ -120,7 +215,7 @@ p
     Person
 }
-    assert_html '<p><b name="Joe">Person</b><a id="Joe">1</a><span class="Joe"><Person></Person></span><b name="Jack">Person</b><a id="Jack">2</a><span class="Jack"><Person></Person></span></p>', source, :scope => Scope.new, :dictionary => '@hash', :dictionary_access => :symbol
+    assert_html '<p><b name="Joe">Person</b><a id="Joe">1</a><span class="Joe"><Person></Person></span><b name="Jack">Person</b><a id="Jack">2</a><span class="Jack"><Person></Person></span></p>', source, :scope => Scope.new, :dictionary => '@hash'
   end
   def test_boolean_attributes
@@ -130,6 +225,54 @@ p
    input checked=selected = name
 }
-    assert_html '<p><input checked="checked">Joe</input><input>Jack</input></p>', source, :scope => Scope.new, :dictionary => '@hash', :dictionary_access => :symbol
+    assert_html '<p><input checked="checked">Joe</input><input>Jack</input></p>', source, :scope => Scope.new, :dictionary => '@hash'
+  end
+  def test_sections
+    source = %q{
+p
+ - person
+  .name = name
+}
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :dictionary => 'ViewEnv.new'
+  end
+  def test_with_array
+    source = %q{
+ul
+ - people_with_locations
+  li = name
+  li = city
+}
+    assert_html '<ul><li>Andy</li><li>Atlanta</li><li>Fred</li><li>Melbourne</li><li>Daniel</li><li>Karlsruhe</li></ul>', source, :dictionary => 'ViewEnv.new'
+  end
+  def test_method
+    source = %q{
+a href=output_number Link
+}
+    assert_html '<a href="1337">Link</a>', source, :dictionary => 'ViewEnv.new'
+  end
+  def test_conditional_parent
+    source = %q{
+- prev_page
+  li.previous
+    a href=prev_page Older
+- next_page
+  li.next
+    a href=next_page Newer}
+    assert_html'<li class="previous"><a href="prev">Older</a></li><li class="next"><a href="next">Newer</a></li>', source, :scope => {:prev_page => 'prev', :next_page => 'next'}
+  end
+  def test_render_with_yield
+    source = %q{
+div
+  == yield
+}
+    assert_html '<div>This is the menu</div>', source do
+      'This is the menu'
+    end
   end
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
   prerelease:
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &6992320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,15 @@ dependencies:
         version: 0.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *6992320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &6991480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +39,15 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *6991480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7050740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *7050740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &7050220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *7050220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &7049700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +87,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7049700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &7049220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +103,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7049220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &7048720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +119,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7048720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &7048140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +135,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7048140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -141,8 +181,8 @@ files:
 - lib/slim/grammar.rb
 - lib/slim/interpolation.rb
 - lib/slim/logic_less.rb
+- lib/slim/logic_less/context.rb
 - lib/slim/logic_less/filter.rb
-- lib/slim/logic_less/wrapper.rb
 - lib/slim/parser.rb
 - lib/slim/splat_attributes.rb
 - lib/slim/template.rb
@@ -170,7 +210,6 @@ files:
 - test/literate/helper.rb
 - test/literate/run.rb
 - test/logic_less/test_logic_less.rb
-- test/logic_less/test_wrapper.rb
 - test/rails/Rakefile
 - test/rails/app/controllers/application_controller.rb
 - test/rails/app/controllers/parents_controller.rb
@@ -232,9 +271,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slim
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: Slim is a template language.
 test_files: []
-has_rdoc:

data/lib/slim/logic_less/wrapper.rb DELETED

@@ -1,64 +0,0 @@
-module Slim
-  class LogicLess
-    # For logic less mode, objects can be encased in the Wrapper class.
-    # @api private
-    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)
-        return wrap(value.send(name)) if value.respond_to?(name)
-        if value.respond_to?(:has_key?)
-          return wrap(value[name.to_sym]) if value.has_key?(name.to_sym)
-          return wrap(value[name.to_s]) if value.has_key?(name.to_s)
-        end
-        begin
-          var_name = "@#{name}"
-          return wrap(value.instance_variable_get(var_name)) if value.instance_variable_defined?(var_name)
-        rescue NameError
-          # Do nothing
-        end
-        parent[name] if parent
-      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
-end

data/test/logic_less/test_wrapper.rb DELETED

@@ -1,31 +0,0 @@
-require 'helper'
-require 'slim/logic_less'
-class TestSlimWrapper < TestSlim
-  def test_sections
-    source = %q{
-p
- - person
-  .name = name
-}
-    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :dictionary => 'ViewEnv.new'
-  end
-  def test_with_array
-    source = %q{
-ul
- - people_with_locations
-  li = name
-  li = city
-}
-    assert_html '<ul><li>Andy</li><li>Atlanta</li><li>Fred</li><li>Melbourne</li><li>Daniel</li><li>Karlsruhe</li></ul>', source, :dictionary => 'ViewEnv.new'
-  end
-  def test_method
-    source = %q{
-a href=output_number Link
-}
-    assert_html '<a href="1337">Link</a>', source, :dictionary => 'ViewEnv.new'
-  end
-end