Introduce support for Ruby 2.0+

.travis.yml

@@ -3,11 +3,11 @@ sudo: false
 cache: bundler
 script: 'bundle exec rake test:coverage --trace'
 rvm:
+  - 2.0
+  - 2.1
   - 2.2
   - jruby-head
-  - rbx-2
 
 matrix:
   allow_failures:
     - rvm: jruby-head
-    - rvm: rbx-2

lib/lotus/helpers/html_helper/html_builder.rb

@@ -1,3 +1,4 @@
+require 'lotus/utils' # RUBY_VERSION >= '2.2'
 require 'lotus/utils/escape'
 require 'lotus/helpers/html_helper/empty_html_node'
 require 'lotus/helpers/html_helper/html_node'
@@ -269,9 +270,16 @@ def nested?
         #
         # @since x.x.x
         # @api private
-        def resolve(&blk)
-          @context = blk.binding.receiver
-          instance_exec(&blk)
+        if RUBY_VERSION >= '2.2' && !Utils.jruby?
+          def resolve(&blk)
+            @context = blk.binding.receiver
+            instance_exec(&blk)
+          end
+        else
+          def resolve(&blk)
+            @context = eval 'self', blk.binding
+            instance_exec(&blk)
+          end
         end
 
         # Forward missing methods to the current context.

test/fixtures.rb

@@ -42,8 +42,12 @@ def div_with_attr
     html.div(id: 'container')
   end
 
+  # RUBY_VERSION >= '2.2'
+  # def div_with_data_attr
+  #   html.div('data-where': 'up')
+  # end
   def div_with_data_attr
-    html.div('data-where': 'up')
+    html.div(:'data-where' => 'up')
   end
 
   def div_with_attrs

test/html_helper/html_builder_test.rb

@@ -126,7 +126,9 @@
 
   describe '<meta>' do
     it 'generates HTML4 content type' do
-      result = @builder.meta('http-equiv': 'Content-Type', content: 'text/html; charset=utf-8').to_s
+      # RUBY_VERSION >= 2.2
+      # result = @builder.meta('http-equiv': 'Content-Type', content: 'text/html; charset=utf-8').to_s
+      result = @builder.meta(:'http-equiv' => 'Content-Type', content: 'text/html; charset=utf-8').to_s
       result.must_equal %(<meta http-equiv="Content-Type" content="text/html; charset=utf-8">)
     end
 
@@ -136,7 +138,9 @@
     end
 
     it 'generates a page refresh' do
-      result = @builder.meta('http-equiv': 'refresh', content: '23;url=http://lotusrb.org').to_s
+      # RUBY_VERSION >= 2.2
+      # result = @builder.meta('http-equiv': 'refresh', content: '23;url=http://lotusrb.org').to_s
+      result = @builder.meta(:'http-equiv' => 'refresh', content: '23;url=http://lotusrb.org').to_s
       result.must_equal %(<meta http-equiv="refresh" content="23;url=http://lotusrb.org">)
     end
   end