slim 1.3.3 → 1.3.4

data/CHANGES

@@ -1,3 +1,8 @@
+1.3.4
+
+  * Fixed #314
+  * Logic-less test cases added
+
 1.3.3
 
   * Attribute handling made consistent:

data/README.md

@@ -408,6 +408,24 @@ renders as
 
     div class="first second third"
 
+#### Dynamic tags `*`
+
+You can create completely dynamic tags using the splat attributes. Just create a method which returns a hash
+with the :tag key.
+
+    ruby:
+      def a_unless_current
+        @page_current ? {:tag => 'span'} : {:tag => 'a', :href => 'http://slim-lang.com/'}
+      end
+    - @page_current = true
+    *a_unless_current Link
+    - @page_current = false
+    *a_unless_current Link
+
+renders as
+
+    <span>Link</span><a href="http://slim-lang.com/">Link</a>
+
 #### ID shortcut `#` and class shortcut `.`
 
 Similarly to Haml, you can specify the `id` and `class` attributes in the following shortcut form

data/Rakefile

@@ -20,6 +20,7 @@ namespace 'test' do
     t.libs << 'lib' << 'test/core'
     t.test_files = FileList['test/core/test_*.rb']
     t.verbose = true
+    #t.ruby_opts << '-w' << '-v'
   end
 
   Rake::TestTask.new('literate') do |t|

data/lib/slim/filter.rb

@@ -26,10 +26,5 @@ module Slim
     def on_slim_output(code, escape, content)
       [:slim, :output, code, escape, compile(content)]
     end
-
-    # Pass-through handler
-    def on_slim_attrs(*attrs)
-      [:slim, :attrs, *attrs.map {|a| compile(a) }]
-    end
   end
 end

data/lib/slim/logic_less/filter.rb

@@ -41,8 +41,8 @@ module Slim
       [:slim, :output, escape, access(name), content]
     end
 
-    def on_slim_attr(name, escape, value)
-      [:slim, :attr, name, escape, access(value)]
+    def on_slim_attrvalue(escape, value)
+      [:slim, :attrvalue, escape, access(value)]
     end
 
     def on_slim_splat(code)

data/lib/slim/version.rb

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

data/test/core/test_html_structure.rb

@@ -77,7 +77,7 @@ h1#title This is my title
  }
 
     assert_html '<section class="hello world" id="notice">Hello World from @env</section>', source, :default_tag => 'section'
-   end
+  end
 
   def test_render_with_custom_shortcut
     source = %q{
@@ -225,7 +225,7 @@ p class='underscored_class_name' = output_number
 }
 
     assert_html '<p class="underscored_class_name">1337</p>', source
- end
+  end
 
   def test_nonstandard_attributes
     source = %q{

data/test/core/test_slim_template.rb

@@ -4,9 +4,6 @@ class ::MockError < NameError
 end
 
 class TestSlimTemplate < TestSlim
-  class Scope
-  end
-
   def test_default_mime_type
     assert_equal 'text/html', Slim::Template.default_mime_type
   end
@@ -20,11 +17,6 @@ class TestSlimTemplate < TestSlim
     assert_equal "<p>Hello World!</p>", template.render
   end
 
-  def test_passing_locals
-    template = Slim::Template.new { "p = 'Hey ' + name + '!'\n" }
-    assert_equal "<p>Hey Joe!</p>", template.render(Object.new, :name => 'Joe')
-  end
-
   def test_evaluating_in_an_object_scope
     template = Slim::Template.new { "p = 'Hey ' + @name + '!'\n" }
     scope = Object.new
@@ -58,57 +50,20 @@ class TestSlimTemplate < TestSlim
       res = template.render(Object.new, :name => 'Joe', :foo => 'bar')
     rescue => ex
       assert_kind_of MockError, ex
-      assert_backtrace(ex, 'test.slim:4')
+      assert_backtrace(ex, 'test.slim:5')
     end
   end
 
   def test_compiling_template_source_to_a_method
     template = Slim::Template.new { |t| "Hello World!" }
-    template.render(Scope.new)
+    template.render
     method = template.send(:compiled_method, [])
     assert_kind_of UnboundMethod, method
   end
 
   def test_passing_locals
     template = Slim::Template.new { "p = 'Hey ' + name + '!'\n" }
-    assert_equal "<p>Hey Joe!</p>", template.render(Scope.new, :name => 'Joe')
-  end
-
-  def test_evaluating_in_an_object_scope
-    template = Slim::Template.new { "p = 'Hey ' + @name + '!'\n" }
-    scope = Scope.new
-    scope.instance_variable_set :@name, 'Joe'
-    assert_equal "<p>Hey Joe!</p>", template.render(scope)
-  end
-
-  def test_passing_a_block_for_yield
-    template = Slim::Template.new { "p = 'Hey ' + yield + '!'\n" }
-    assert_equal "<p>Hey Joe!</p>", template.render(Scope.new) { 'Joe' }
-  end
-
-  def test_backtrace_file_and_line_reporting_without_locals
-    data = File.read(__FILE__).split("\n__END__\n").last
-    fail unless data[0] == ?h
-    template = Slim::Template.new('test.slim', 10) { data }
-    begin
-      template.render(Scope.new)
-      fail 'should have raised an exception'
-    rescue => ex
-      assert_kind_of NameError, ex
-      assert_backtrace(ex, 'test.slim:12')
-    end
-  end
-
-  def test_backtrace_file_and_line_reporting_with_locals
-    data = File.read(__FILE__).split("\n__END__\n").last
-    fail unless data[0] == ?h
-    template = Slim::Template.new('test.slim') { data }
-    begin
-      res = template.render(Scope.new, :name => 'Joe', :foo => 'bar')
-    rescue => ex
-      assert_kind_of MockError, ex
-      assert_backtrace(ex, 'test.slim:5')
-    end
+    assert_equal "<p>Hey Joe!</p>", template.render(Object.new, :name => 'Joe')
   end
 end
 

data/test/literate/TESTS.md

@@ -782,6 +782,29 @@ renders as
 
 #### Splat attributes `*`
 
+
+#### Dynamic tags `*`
+
+You can create completely dynamic tags using the splat attributes. Just create a method which returns a hash
+with the :tag key.
+
+~~~ slim
+ruby:
+  def a_unless_current
+    @page_current ? {:tag => 'span'} : {:tag => 'a', :href => 'http://slim-lang.com/'}
+  end
+- @page_current = true
+*a_unless_current Link
+- @page_current = false
+*a_unless_current Link
+~~~
+
+renders as
+
+~~~ html
+<span>Link</span><a href="http://slim-lang.com/">Link</a>
+~~~
+
 #### ID shortcut and class shortcut `.`
 
 #### Attribute shortcuts

data/test/literate/helper.rb

@@ -8,7 +8,7 @@ Slim::Engine.after  Slim::Parser, Temple::Filters::Validator, :grammar => Slim::
 Slim::Engine.before :Pretty, Temple::Filters::Validator
 Slim::Engine.set_default_options :tr => false, :logic_less => false
 
-module Helper
+class MiniTest::Spec
   def render(source, options = {}, &block)
     Slim::Template.new(options) { source }.render(self, &block)
   end

data/test/literate/run.rb

@@ -34,20 +34,16 @@ class LiterateTest < Temple::Engine
 
   class Compiler < Temple::Filter
     def call(exp)
-      @opts, @in_testcase, @level = {}, false, 0
-      "require 'helper'\n\n" << compile(exp)
+      @opts, @in_testcase = {}, false
+      "require 'helper'\n\n#{compile(exp)}"
     end
 
     def on_section(title, body)
       old_opts = @opts.dup
-      @level += 1
       raise Temple::FilterError, 'New section between slim and html block' if @in_testcase
-      result = "describe #{title.inspect} do\n  "
-      result << "include Helper\n  " if @level == 1
-      result << compile(body).gsub("\n", "\n  ") << "\nend\n"
+      "describe #{title.inspect} do\n  #{compile(body).gsub("\n", "\n  ")}\nend\n"
     ensure
       @opts = old_opts
-      @level -= 1
     end
 
     def on_multi(*exps)

data/test/logic_less/test_logic_less.rb

@@ -6,8 +6,8 @@ class TestSlimLogicLess < TestSlim
     def initialize
       @hash = {
         :person => [
-                    { :name => 'Joe', },
-                    { :name => 'Jack', }
+                    { :name => 'Joe', :age => 1, :selected => true },
+                    { :name => 'Jack', :age => 2 }
                    ]
       }
     end
@@ -109,4 +109,27 @@ p text with \#{123} test
 
     assert_html '<p>text with #{123} test</p>', source
   end
+
+  def test_ruby_attributes
+    source = %q{
+p
+ - person
+  b name=name Person
+  a id=name = age
+  span class=name
+    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
+  end
+
+  def test_boolean_attributes
+    source = %q{
+p
+ - person
+   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
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &6992320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,15 +23,10 @@ dependencies:
         version: 0.5.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.5
+  version_requirements: *6992320
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &6991480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -39,15 +34,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.3
+  version_requirements: *6991480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7050740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,15 +45,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+  version_requirements: *7050740
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7050220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -71,15 +56,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
+  version_requirements: *7050220
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7049700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,15 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *7049700
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7049220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -103,15 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *7049220
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7048720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -119,15 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *7048720
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &7048140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -135,12 +100,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *7048140
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -272,8 +232,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slim
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Slim is a template language.
 test_files: []
+has_rdoc: