slim 1.1.1 → 1.2.0

data/lib/slim/sections.rb

@@ -45,6 +45,10 @@ module Slim
       [:slim, :attr, name, escape, access(value)]
     end
 
+    def on_slim_splat(code)
+      [:slim, :splat, access(code)]
+    end
+
     def on_dynamic(code)
       raise 'Embedded code is forbidden in sections mode'
     end

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.email             = ['andy@stonean.com', 'ifredwu@gmail.com', 'mail@daniel-mendler.de']
   s.summary           = 'Slim is a template language.'
   s.description       = 'Slim is a template language whose goal is reduce the syntax to the essential parts without becoming cryptic.'
-  s.homepage          = 'http://github.com/stonean/slim'
-  s.extra_rdoc_files  = %w(README.md)
+  s.homepage          = 'http://slim-lang.com/'
+  s.extra_rdoc_files  = %w(README.md LICENSE CHANGES)
   s.rdoc_options      = %w(--charset=UTF-8)
   s.rubyforge_project = s.name
 
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w(lib)
 
   s.add_runtime_dependency('temple', ['~> 0.4.0'])
-  s.add_runtime_dependency('tilt', ['~> 1.3.2'])
+  s.add_runtime_dependency('tilt', ['~> 1.3.3'])
 
   s.add_development_dependency('rake', ['>= 0.8.7'])
   s.add_development_dependency('sass', ['>= 3.1.0'])

data/test/slim/helper.rb

@@ -9,7 +9,7 @@ MiniTest::Unit.autorun
 
 Slim::Engine.after  Slim::Parser, Temple::Filters::Validator, :grammar => Slim::Grammar
 Slim::Engine.before Slim::Compiler, Temple::Filters::Validator, :grammar => Slim::Grammar
-Slim::Engine.before :Pretty, Temple::Filters::Validator
+Slim::Engine.before :AttributeMerger, Temple::Filters::Validator
 
 class TestSlim < MiniTest::Unit::TestCase
   def setup

data/test/slim/test_code_evaluation.rb

@@ -194,6 +194,14 @@ p id="#{(false ? 'notshown' : 'shown')}" = output_number
     assert_html '<p id="shown">1337</p>', source
   end
 
+  def test_ternary_operation_in_attribute_2
+    source = %q{
+p id=(false ? 'notshown' : 'shown') = output_number
+}
+
+    assert_html '<p id="shown">1337</p>', source
+  end
+
   def test_class_attribute_merging
     source = %{
 .alpha class="beta" Test it

data/test/slim/test_code_output.rb

@@ -136,8 +136,8 @@ p(id="test")==hello_world
   def test_render_with_backslash_end
 # Keep trailing spaces!
     source = %q{
-p = \  
-"Hello" + \  
+p = \
+"Hello" + \
 " Ruby!"
 - variable = 1 + \
       2 + \

data/test/slim/test_embedded_engines.rb

@@ -15,14 +15,13 @@ p
   end
 
   def test_render_with_markdown
-    # Keep the trailing spaces.
     source = %q{
 markdown:
   #Header
   Hello from #{"Markdown!"}
-  
+
   #{1+2}
-  
+
   * one
   * two
 }
@@ -77,7 +76,6 @@ p Hi
   end
 
   def test_render_with_javascript_with_tabs
-    # Keep the trailing space behind "javascript:   "!
     source = "javascript:\n\t$(function() {});\n\talert('hello')\np Hi"
     assert_html "<script type=\"text/javascript\">$(function() {});\nalert('hello')</script><p>Hi</p>", source
   end

data/test/slim/test_html_structure.rb

@@ -15,7 +15,6 @@ html
   end
 
   def test_html_tag_with_text_and_empty_line
-    # Keep the trailing space behind "body "!
     source = %q{
 p Hello
 
@@ -74,10 +73,21 @@ h1#title This is my title
   def test_render_with_overwritten_default_tag
     source = %q{
 #notice.hello.world
+   = hello_world
+ }
+
+    assert_html '<section class="hello world" id="notice">Hello World from @env</section>', source, :default_tag => 'section'
+   end
+
+  def test_render_with_custom_shortcut
+    source = %q{
+#notice.hello.world@test
+  = hello_world
+@abc
   = hello_world
 }
 
-    assert_html '<section class="hello world" id="notice">Hello World from @env</section>', source, :default_tag => 'section'
+    assert_html '<div class="hello world" id="notice" role="test">Hello World from @env</div><section role="abc">Hello World from @env</section>', source, :shortcut => {'#' => 'id', '.' => 'class', '@' => 'section role'}
   end
 
   def test_render_with_text_block
@@ -468,4 +478,94 @@ input[value=succ_x]
     assert_html %{<input value="1" /><input value="2" />}, source
   end
 
+  def test_shortcut_splat
+    source = %q{
+*hash This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b">This is my title</div>', source
+  end
+
+  def test_splat
+    source = %q{
+h1 *hash This is my title
+}
+
+    assert_html '<h1 a="The letter a" b="The letter b">This is my title</h1>', source
+  end
+
+  def test_splat_tag_name
+    source = %q{
+*{:tag => 'h1', :id => 'title'} This is my title
+}
+
+    assert_html '<h1 id="title">This is my title</h1>', source
+  end
+
+
+  def test_splat_empty_tag_name
+    source = %q{
+*{:tag => '', :id => 'test'} This is my title
+}
+
+    assert_html '<div id="test">This is my title</div>', source, :remove_empty_attrs => true
+    assert_html '<div id="test">This is my title</div>', source, :remove_empty_attrs => false
+  end
+
+  def test_closed_splat_tag
+    source = %q{
+*hash / This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b"/>', source
+  end
+
+  def test_splat_with_id_shortcut
+    source = %q{
+#myid*hash This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b" id="myid">This is my title</div>', source
+  end
+
+  def test_splat_with_class_shortcut
+    source = %q{
+.myclass*hash This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b" class="myclass">This is my title</div>', source
+  end
+
+  def test_splat_with_id_and_class_shortcuts
+    source = %q{
+#myid.myclass*hash This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b" class="myclass" id="myid">This is my title</div>', source
+  end
+
+  def test_splat_with_class_merging
+    source = %q{
+#myid.myclass *{:class => [:secondclass, %w(x y z)]} *hash This is my title
+}
+
+    assert_html '<div a="The letter a" b="The letter b" class="myclass secondclass x y z" id="myid">This is my title</div>', source
+  end
+
+  def test_splat_with_boolean_attribute
+    source = %q{
+*{:disabled => true, :empty1 => false, :empty2 => '', :empty3 => nil} This is my title
+}
+
+    assert_html '<div disabled="disabled">This is my title</div>', source
+    assert_html '<div disabled="disabled" empty1="" empty2="" empty3="">This is my title</div>', source, :remove_empty_attrs => false
+  end
+
+  def test_splat_with_other_attributes
+    source = %q{
+h1 data-id="123" *hash This is my title
+}
+
+    assert_html '<h1 a="The letter a" b="The letter b" data-id="123">This is my title</h1>', source
+  end
 end

data/test/slim/test_parser_errors.rb

@@ -82,7 +82,7 @@ p
   img src=[hash[1] + hash[2]
 }
 
-    assert_syntax_error "Expected closing attribute delimiter ]\n  (__TEMPLATE__), Line 3\n    img src=[hash[1] + hash[2]\n                              ^\n", source
+    assert_syntax_error "Expected closing delimiter ]\n  (__TEMPLATE__), Line 3\n    img src=[hash[1] + hash[2]\n                              ^\n", source
   end
 
   def test_expected_attribute

data/test/slim/test_ruby_errors.rb

@@ -194,9 +194,16 @@ div
     assert_runtime_error 'Explicit end statements are forbidden', source
   end
 
-  def test_id_attribute_merging2
+  def test_multiple_id_attribute
     source = %{
 #alpha id="beta" Test it
+}
+    assert_runtime_error 'Multiple id attributes specified', source
+  end
+
+  def test_splat_multiple_id_attribute
+    source = %{
+#alpha *{:id =>"beta"} Test it
 }
     assert_runtime_error 'Multiple id attributes specified', source
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &17637820 !ruby/object:Gem::Requirement
+  requirement: &4011380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,21 +23,21 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *17637820
+  version_requirements: *4011380
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &17637240 !ruby/object:Gem::Requirement
+  requirement: &4026080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *17637240
+  version_requirements: *4026080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17636740 !ruby/object:Gem::Requirement
+  requirement: &4025180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *17636740
+  version_requirements: *4025180
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &17636160 !ruby/object:Gem::Requirement
+  requirement: &4024320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *17636160
+  version_requirements: *4024320
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &17652060 !ruby/object:Gem::Requirement
+  requirement: &4023580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17652060
+  version_requirements: *4023580
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &17651560 !ruby/object:Gem::Requirement
+  requirement: &4022620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17651560
+  version_requirements: *4022620
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &17650940 !ruby/object:Gem::Requirement
+  requirement: &4021940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17650940
+  version_requirements: *4021940
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &17649640 !ruby/object:Gem::Requirement
+  requirement: &4021020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17649640
+  version_requirements: *4021020
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -112,6 +112,8 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.md
+- LICENSE
+- CHANGES
 files:
 - .gemtest
 - .gitignore
@@ -130,8 +132,6 @@ files:
 - benchmarks/view.haml
 - benchmarks/view.slim
 - bin/slimrb
-- extra/slim-mode.el
-- extra/test.slim
 - lib/slim.rb
 - lib/slim/command.rb
 - lib/slim/compiler.rb
@@ -205,7 +205,7 @@ files:
 - test/slim/test_slim_template.rb
 - test/slim/test_text_interpolation.rb
 - test/slim/test_wrapper.rb
-homepage: http://github.com/stonean/slim
+homepage: http://slim-lang.com/
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: slim
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Slim is a template language.

data/extra/slim-mode.el

@@ -1,409 +0,0 @@
-;;; slim-mode.el --- Major mode for editing Slim files
-
-;; Copyright (c) 2007, 2008 Nathan Weizenbaum
-;; Modified slightly for Slim by Daniel Mendler
-
-;; Author: Nathan Weizenbaum
-;; URL: http://github.com/stonean/slim
-;; Version: 1.0
-;; Keywords: markup, language
-
-;;; Commentary:
-
-;; Because Slim's indentation schema is similar
-;; to that of YAML and Python, many indentation-related
-;; functions are similar to those in yaml-mode and python-mode.
-
-;; TODO: This whole file has to be reworked to provide optimal support
-;; for Slim. This is only a slightly adapted haml version.
-
-;; To install, save this on your load path and add the following to
-;; your .emacs file:
-
-;;
-;; (require 'slim-mode)
-
-;;; Code:
-
-(eval-when-compile (require 'cl))
-
-;; User definable variables
-
-(defgroup slim nil
-  "Support for the Slim template language."
-  :group 'languages
-  :prefix "slim-")
-
-(defcustom slim-mode-hook nil
-  "Hook run when entering Slim mode."
-  :type 'hook
-  :group 'slim)
-
-(defcustom slim-indent-offset 2
-  "Amount of offset per level of indentation."
-  :type 'integer
-  :group 'slim)
-
-(defcustom slim-backspace-backdents-nesting t
-  "Non-nil to have `slim-electric-backspace' re-indent all code
-nested beneath the backspaced line be re-indented along with the
-line itself."
-  :type 'boolean
-  :group 'slim)
-
-(defface slim-tab-face
-  '((((class color)) (:background "hotpink"))
-    (t (:reverse-video t)))
-  "Face to use for highlighting tabs in Slim files."
-  :group 'faces
-  :group 'slim)
-
-(defvar slim-indent-function 'slim-indent-p
-  "This function should look at the current line and return true
-if the next line could be nested within this line.")
-
-(defvar slim-block-openers
-  `("^ *\\([\\.#a-z][^ \t]*\\)\\(\\[.*\\]\\)?[ \t]*$"
-    "^ *[-=].*do[ \t]*\\(|.*|[ \t]*\\)?$"
-    ,(concat "^ *-[ \t]*\\("
-             (regexp-opt '("if" "unless" "while" "until" "else"
-                           "begin" "elsif" "rescue" "ensure" "when"))
-             "\\)")
-    "^ *|"
-    "^ */"
-    "^ *[a-z0-9_]:")
-  "A list of regexps that match lines of Slim that could have
-text nested beneath them.")
-
-;; Font lock
-
-;; Helper for nested block (comment, embedded, text)
-(defun slim-nested-re (re)
-  (concat "^\\( *\\)" re "\n\\(?:\\(?:\\1 .*\\)\n\\)*"))
-
-(defconst slim-font-lock-keywords
-  `((,(slim-nested-re "/.*")              0 font-lock-comment-face)                 ;; Comment block
-    (,(slim-nested-re "[a-z0-9_]+:")      0 font-lock-string-face)                  ;; Embedded block
-    (,(slim-nested-re "[\|'`].*")         0 font-lock-string-face)                  ;; Text block
-    ("^!.*"                               0 font-lock-constant-face)                ;; Directive
-    ("^ *\\(\t\\)"                        1 'slim-tab-face)
-    ("\\('[^']*'\\)"                      1 font-lock-string-face append)           ;; Single quote string TODO
-    ("\\(\"[^\"]*\"\\)"                   1 font-lock-string-face append)           ;; Double quoted string TODO
-    ("@[a-z0-9_]+"                        0 font-lock-variable-name-face append)    ;; Class variable TODO
-    ("^ *\\(#[a-z0-9_]+\/?\\)"            1 font-lock-keyword-face)                 ;; #id
-    ("^ *\\(\\.[a-z0-9_]+\/?\\)"          1 font-lock-type-face)                    ;; .class
-    ("^ *\\([a-z0-9_]+\/?\\)"             1 font-lock-function-name-face)           ;; div
-    ("^ *\\(#[a-z0-9_]+\/?\\)"            (1 font-lock-keyword-face)                ;; #id.class
-     ("\\.[a-z0-9_]+" nil nil             (0 font-lock-type-face)))
-    ("^ *\\(\\.[a-z0-9_]+\/?\\)"          (1 font-lock-type-face)                   ;; .class.class
-     ("\\.[a-z0-9_]+" nil nil             (0 font-lock-type-face)))
-    ("^ *\\(\\.[a-z0-9_]+\/?\\)"          (1 font-lock-type-face)                   ;; .class#id
-     ("\\#[a-z0-9_]+" nil nil             (0 font-lock-keyword-face)))
-    ("^ *\\([a-z0-9_]+\/?\\)"             (1 font-lock-function-name-face)          ;; div.class
-     ("\\.[a-z0-9_]+" nil nil             (0 font-lock-type-face)))
-    ("^ *\\([a-z0-9_]+\/?\\)"             (1 font-lock-function-name-face)          ;; div#id
-     ("\\#[a-z0-9_]+" nil nil             (0 font-lock-keyword-face)))
-    ("^ *\\(\\(==?|-\\) .*\\)"            1 font-lock-preprocessor-face prepend)    ;; ==, =, -
-    ("^ *[\\.#a-z0-9_]+\\(==? .*\\)"      1 font-lock-preprocessor-face prepend)))  ;; tag ==, tag =
-
-(defconst slim-embedded-re "^ *[a-z0-9_]+:")
-(defconst slim-comment-re  "^ */")
-
-(defun* slim-extend-region ()
-  "Extend the font-lock region to encompass embedded engines and comments."
-  (let ((old-beg font-lock-beg)
-        (old-end font-lock-end))
-    (save-excursion
-      (goto-char font-lock-beg)
-      (beginning-of-line)
-      (unless (or (looking-at slim-embedded-re)
-                  (looking-at slim-comment-re))
-        (return-from slim-extend-region))
-      (setq font-lock-beg (point))
-      (slim-forward-sexp)
-      (beginning-of-line)
-      (setq font-lock-end (max font-lock-end (point))))
-    (or (/= old-beg font-lock-beg)
-        (/= old-end font-lock-end))))
-
-
-;; Mode setup
-
-(defvar slim-mode-syntax-table
-  (let ((table (make-syntax-table)))
-    (modify-syntax-entry ?: "." table)
-    (modify-syntax-entry ?_ "w" table)
-    table)
-  "Syntax table in use in slim-mode buffers.")
-
-(defvar slim-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map [backspace] 'slim-electric-backspace)
-    (define-key map "\C-?" 'slim-electric-backspace)
-    (define-key map "\C-c\C-f" 'slim-forward-sexp)
-    (define-key map "\C-c\C-b" 'slim-backward-sexp)
-    (define-key map "\C-c\C-u" 'slim-up-list)
-    (define-key map "\C-c\C-d" 'slim-down-list)
-    (define-key map "\C-c\C-k" 'slim-kill-line-and-indent)
-    map))
-
-;;;###autoload
-(define-derived-mode slim-mode fundamental-mode "Slim"
-  "Major mode for editing Slim files.
-
-\\{slim-mode-map}"
-  (set-syntax-table slim-mode-syntax-table)
-  (add-to-list 'font-lock-extend-region-functions 'slim-extend-region)
-  (set (make-local-variable 'font-lock-multiline) t)
-  (set (make-local-variable 'indent-line-function) 'slim-indent-line)
-  (set (make-local-variable 'indent-region-function) 'slim-indent-region)
-  (set (make-local-variable 'parse-sexp-lookup-properties) t)
-  (setq comment-start "/")
-  (setq indent-tabs-mode nil)
-  (setq font-lock-defaults '((slim-font-lock-keywords) nil t)))
-
-;; Useful functions
-
-(defun slim-comment-block ()
-  "Comment the current block of Slim code."
-  (interactive)
-  (save-excursion
-    (let ((indent (current-indentation)))
-      (back-to-indentation)
-      (insert "/")
-      (newline)
-      (indent-to indent)
-      (beginning-of-line)
-      (slim-mark-sexp)
-      (slim-reindent-region-by slim-indent-offset))))
-
-(defun slim-uncomment-block ()
-  "Uncomment the current block of Slim code."
-  (interactive)
-  (save-excursion
-    (beginning-of-line)
-    (while (not (looking-at slim-comment-re))
-      (slim-up-list)
-      (beginning-of-line))
-    (slim-mark-sexp)
-    (kill-line 1)
-    (slim-reindent-region-by (- slim-indent-offset))))
-
-;; Navigation
-
-(defun slim-forward-through-whitespace (&optional backward)
-  "Move the point forward at least one line, until it reaches
-either the end of the buffer or a line with no whitespace.
-
-If `backward' is non-nil, move the point backward instead."
-  (let ((arg (if backward -1 1))
-        (endp (if backward 'bobp 'eobp)))
-    (loop do (forward-line arg)
-          while (and (not (funcall endp))
-                     (looking-at "^[ \t]*$")))))
-
-(defun slim-at-indent-p ()
-  "Returns whether or not the point is at the first
-non-whitespace character in a line or whitespace preceding that
-character."
-  (let ((opoint (point)))
-    (save-excursion
-      (back-to-indentation)
-      (>= (point) opoint))))
-
-(defun slim-forward-sexp (&optional arg)
-  "Move forward across one nested expression.
-With `arg', do it that many times.  Negative arg -N means move
-backward across N balanced expressions.
-
-A sexp in Slim is defined as a line of Slim code as well as any
-lines nested beneath it."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (if (and (< arg 0) (not (slim-at-indent-p)))
-      (back-to-indentation)
-    (while (/= arg 0)
-      (let ((indent (current-indentation)))
-        (loop do (slim-forward-through-whitespace (< arg 0))
-              while (and (not (eobp))
-                         (not (bobp))
-                         (> (current-indentation) indent)))
-        (back-to-indentation)
-        (setq arg (+ arg (if (> arg 0) -1 1)))))))
-
-(defun slim-backward-sexp (&optional arg)
-  "Move backward across one nested expression.
-With ARG, do it that many times.  Negative arg -N means move
-forward across N balanced expressions.
-
-A sexp in Slim is defined as a line of Slim code as well as any
-lines nested beneath it."
-  (interactive "p")
-  (slim-forward-sexp (if arg (- arg) -1)))
-
-(defun slim-up-list (&optional arg)
-  "Move out of one level of nesting.
-With ARG, do this that many times."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (while (> arg 0)
-    (let ((indent (current-indentation)))
-      (loop do (slim-forward-through-whitespace t)
-            while (and (not (bobp))
-                       (>= (current-indentation) indent)))
-      (setq arg (- arg 1))))
-  (back-to-indentation))
-
-(defun slim-down-list (&optional arg)
-  "Move down one level of nesting.
-With ARG, do this that many times."
-  (interactive "p")
-  (or arg (setq arg 1))
-  (while (> arg 0)
-    (let ((indent (current-indentation)))
-      (slim-forward-through-whitespace)
-      (when (<= (current-indentation) indent)
-        (slim-forward-through-whitespace t)
-        (back-to-indentation)
-        (error "Nothing is nested beneath this line"))
-      (setq arg (- arg 1))))
-  (back-to-indentation))
-
-(defun slim-mark-sexp ()
-  "Marks the next Slim block."
-  (let ((forward-sexp-function 'slim-forward-sexp))
-    (mark-sexp)))
-
-(defun slim-mark-sexp-but-not-next-line ()
-  "Marks the next Slim block, but puts the mark at the end of the
-last line of the sexp rather than the first non-whitespace
-character of the next line."
-  (slim-mark-sexp)
-  (set-mark
-   (save-excursion
-     (goto-char (mark))
-     (forward-line -1)
-     (end-of-line)
-     (point))))
-
-;; Indentation and electric keys
-
-(defun slim-indent-p ()
-  "Returns true if the current line can have lines nested beneath it."
-  (loop for opener in slim-block-openers
-        if (looking-at opener) return t
-        finally return nil))
-
-(defun slim-compute-indentation ()
-  "Calculate the maximum sensible indentation for the current line."
-  (save-excursion
-    (beginning-of-line)
-    (if (bobp) 0
-      (slim-forward-through-whitespace t)
-      (+ (current-indentation)
-         (if (funcall slim-indent-function) slim-indent-offset
-           0)))))
-
-(defun slim-indent-region (start end)
-  "Indent each nonblank line in the region.
-This is done by indenting the first line based on
-`slim-compute-indentation' and preserving the relative
-indentation of the rest of the region.
-
-If this command is used multiple times in a row, it will cycle
-between possible indentations."
-  (save-excursion
-    (goto-char end)
-    (setq end (point-marker))
-    (goto-char start)
-    (let (this-line-column current-column
-          (next-line-column
-           (if (and (equal last-command this-command) (/= (current-indentation) 0))
-               (* (/ (- (current-indentation) 1) slim-indent-offset) slim-indent-offset)
-             (slim-compute-indentation))))
-      (while (< (point) end)
-        (setq this-line-column next-line-column
-              current-column (current-indentation))
-        ;; Delete whitespace chars at beginning of line
-        (delete-horizontal-space)
-        (unless (eolp)
-          (setq next-line-column (save-excursion
-                                   (loop do (forward-line 1)
-                                         while (and (not (eobp)) (looking-at "^[ \t]*$")))
-                                   (+ this-line-column
-                                      (- (current-indentation) current-column))))
-          ;; Don't indent an empty line
-          (unless (eolp) (indent-to this-line-column)))
-        (forward-line 1)))
-    (move-marker end nil)))
-
-(defun slim-indent-line ()
-  "Indent the current line.
-The first time this command is used, the line will be indented to the
-maximum sensible indentation.  Each immediately subsequent usage will
-back-dent the line by `slim-indent-offset' spaces.  On reaching column
-0, it will cycle back to the maximum sensible indentation."
-  (interactive "*")
-  (let ((ci (current-indentation))
-        (cc (current-column))
-        (need (slim-compute-indentation)))
-    (save-excursion
-      (beginning-of-line)
-      (delete-horizontal-space)
-      (if (and (equal last-command this-command) (/= ci 0))
-          (indent-to (* (/ (- ci 1) slim-indent-offset) slim-indent-offset))
-        (indent-to need)))
-      (if (< (current-column) (current-indentation))
-          (forward-to-indentation 0))))
-
-(defun slim-reindent-region-by (n)
-  "Add N spaces to the beginning of each line in the region.
-If N is negative, will remove the spaces instead.  Assumes all
-lines in the region have indentation >= that of the first line."
-  (let ((ci (current-indentation)))
-    (save-excursion
-      (replace-regexp (concat "^" (make-string ci ? ))
-                      (make-string (max 0 (+ ci n)) ? )
-                      nil (point) (mark)))))
-
-(defun slim-electric-backspace (arg)
-  "Delete characters or back-dent the current line.
-If invoked following only whitespace on a line, will back-dent
-the line and all nested lines to the immediately previous
-multiple of `slim-indent-offset' spaces.
-
-Set `slim-backspace-backdents-nesting' to nil to just back-dent
-the current line."
-  (interactive "*p")
-  (if (or (/= (current-indentation) (current-column))
-          (bolp)
-          (looking-at "^[ \t]+$"))
-      (backward-delete-char arg)
-    (save-excursion
-      (let ((ci (current-column)))
-        (beginning-of-line)
-        (if slim-backspace-backdents-nesting
-            (slim-mark-sexp-but-not-next-line)
-          (set-mark (save-excursion (end-of-line) (point))))
-        (slim-reindent-region-by (* (- arg) slim-indent-offset))
-        (back-to-indentation)
-        (pop-mark)))))
-
-(defun slim-kill-line-and-indent ()
-  "Kill the current line, and re-indent all lines nested beneath it."
-  (interactive)
-  (beginning-of-line)
-  (slim-mark-sexp-but-not-next-line)
-  (kill-line 1)
-  (slim-reindent-region-by (* -1 slim-indent-offset)))
-
-(defun slim-indent-string ()
-  "Return the indentation string for `slim-indent-offset'."
-  (mapconcat 'identity (make-list slim-indent-offset " ") ""))
-
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.slim$" . slim-mode))
-
-;; Setup/Activation
-(provide 'slim-mode)
-;;; slim-mode.el ends here