slim 1.3.9 → 2.0.0

data/test/logic_less/test_logic_less.rb

@@ -133,6 +133,23 @@ p
     assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => object, :dictionary_access => :instance_variable
   end
 
+  def test_to_s_access
+    source = %q{
+p
+ - people
+  .name = self
+}
+
+    hash = {
+      :people => [
+        'Joe',
+        'Jack'
+      ]
+    }
+
+    assert_html '<p><div class="name">Joe</div><div class="name">Jack</div></p>', source, :scope => hash, :dictionary_access => :symbol
+  end
+
   def test_string_hash
     source = %q{
 p

data/test/rails/app/controllers/application_controller.rb

@@ -1,3 +1,2 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery
 end

data/test/rails/app/controllers/entries_controller.rb

@@ -0,0 +1,5 @@
+class EntriesController < ApplicationController
+  def edit
+    @entry = Entry.new
+  end
+end

data/test/rails/app/controllers/slim_controller.rb

@@ -2,6 +2,9 @@ class SlimController < ApplicationController
   def normal
   end
 
+  def xml
+  end
+
   def no_layout
     render :layout => false
   end

data/test/rails/app/models/entry.rb

@@ -0,0 +1,16 @@
+class Entry
+  include ActiveModel::Conversion
+  extend ActiveModel::Naming
+
+  attr_accessor :name
+
+  def initialize(attributes = {})
+    attributes.each do |name, value|
+      send("#{name}=", value)
+    end
+  end
+
+  def persisted?
+    false
+  end
+end

data/test/rails/app/views/entries/edit.html.slim

@@ -0,0 +1,3 @@
+= form_for @entry do |f|
+  label: b Name
+  = f.text_field :name

data/test/rails/app/views/slim/form_for.html.slim

@@ -0,0 +1,2 @@
+= form_for @entry do |f|
+  = f.text_field :name

data/test/rails/app/views/slim/xml.slim

@@ -0,0 +1 @@
+h1 Hello Slim!

data/test/rails/config/application.rb

@@ -1,10 +1,10 @@
 require File.expand_path('../boot', __FILE__)
 
 require 'active_model/railtie'
-require 'active_record/railtie'
 require 'action_controller/railtie'
 require 'action_view/railtie'
-require 'action_mailer/railtie'
+#require 'active_record/railtie'
+#require 'action_mailer/railtie'
 
 require 'slim'
 

data/test/rails/config/environments/test.rb

@@ -20,7 +20,7 @@ Dummy::Application.configure do
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
+  #config.action_mailer.delivery_method = :test
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,

data/test/rails/config/routes.rb

@@ -2,7 +2,7 @@ Dummy::Application.routes.draw do
   # The priority is based upon order of creation:
   # first created -> highest priority.
 
-  resources :parents
+  resources :entries
 
   # Sample of regular route:
   #   match 'products/:id' => 'catalog#view'

data/test/rails/test/helper.rb

@@ -5,6 +5,3 @@ require File.expand_path("../../config/environment.rb", __FILE__)
 require "rails/test_help"
 
 Rails.backtrace_cleaner.remove_silencers!
-
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../../db/migrate/", __FILE__)

data/test/rails/test/test_slim.rb

@@ -9,6 +9,14 @@ class TestSlim < ActionDispatch::IntegrationTest
     assert_html "<h1>Hello Slim!</h1>"
   end
 
+  test "xml view" do
+    get "slim/xml"
+    assert_response :success
+    assert_template "slim/xml"
+    assert_template "layouts/application"
+    assert_html "<h1>Hello Slim!</h1>"
+  end
+
   test "normal erb view" do
     get "slim/erb"
     assert_html "<h1>Hello Erb!</h1>"
@@ -58,14 +66,11 @@ class TestSlim < ActionDispatch::IntegrationTest
     assert_html "<p>Page content</p><h1><p>Hello Slim!</p></h1><h2><p>Hello Slim!</p></h2>", :heading => 'Heading set from a view'
   end
 
-  test "nested_attributes_form" do
-    post "parents", 'parent[name]' => "p1", 'parent[children_attributes][0][name]' => "c1"
-    get "parents/1/edit"
-
-    assert_match %r{action="/parents/1"}, @response.body
-    assert_match %r{<input id="parent_name" name="parent\[name\]"}, @response.body
-    assert_match %r{<input id="parent_children_attributes_0_name" name="parent\[children_attributes\]\[0\]\[name\]"}, @response.body
-    assert_match %r{<input id="parent_children_attributes_0_id" name="parent\[children_attributes\]\[0\]\[id\]"}, @response.body
+  test "form_for" do
+    get "entries/edit/1"
+    assert_match %r{action="/entries"}, @response.body
+    assert_match %r{<label><b>Name</b></label>}, @response.body
+    assert_match %r{<input id="entry_name" name="entry\[name\]"}, @response.body
   end
 
   protected

data/test/translator/test_translator.rb

@@ -26,8 +26,19 @@ markdown:
   * one
   * two
 }
-    assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source, :tr_mode => :dynamic
-    assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source, :tr_mode => :static
+    if !Gem::Specification::find_all_by_name('redcarpet').empty?
+      # redcarpet
+      assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n<li>one</li>\n<li>two</li>\n</ul>\n", source, :tr_mode => :dynamic
+      assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n<li>one</li>\n<li>two</li>\n</ul>\n", source, :tr_mode => :static
+    elsif !Gem::Specification::find_all_by_name('rdiscount').empty?
+      # rdiscount
+      assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n<li>one</li>\n<li>two</li>\n</ul>\n\n", source, :tr_mode => :dynamic
+      assert_html "<h1>Header</h1>\n\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n<li>one</li>\n<li>two</li>\n</ul>\n\n", source, :tr_mode => :static
+    else
+      # kramdown
+      assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source, :tr_mode => :dynamic
+      assert_html "<h1 id=\"header\">Header</h1>\n<p>Hello from Markdown!</p>\n\n<p>3</p>\n\n<ul>\n  <li>one</li>\n  <li>two</li>\n</ul>\n", source, :tr_mode => :static
+    end
   end
 
   def test_no_translation_of_attrs

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.5
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -74,14 +74,18 @@ files:
 - benchmarks/view.haml
 - benchmarks/view.slim
 - bin/slimrb
+- doc/logic_less.md
+- doc/translator.md
 - kill-travis.sh
 - lib/slim.rb
 - lib/slim/code_attributes.rb
 - lib/slim/command.rb
 - lib/slim/controls.rb
+- lib/slim/do_inserter.rb
 - lib/slim/embedded.rb
 - lib/slim/end_inserter.rb
 - lib/slim/engine.rb
+- lib/slim/erb_converter.rb
 - lib/slim/filter.rb
 - lib/slim/grammar.rb
 - lib/slim/interpolation.rb
@@ -89,7 +93,8 @@ files:
 - lib/slim/logic_less/context.rb
 - lib/slim/logic_less/filter.rb
 - lib/slim/parser.rb
-- lib/slim/splat_attributes.rb
+- lib/slim/splat/builder.rb
+- lib/slim/splat/filter.rb
 - lib/slim/template.rb
 - lib/slim/translator.rb
 - lib/slim/version.rb
@@ -102,6 +107,7 @@ files:
 - test/core/test_code_structure.rb
 - test/core/test_embedded_engines.rb
 - test/core/test_encoding.rb
+- test/core/test_erb_converter.rb
 - test/core/test_html_attributes.rb
 - test/core/test_html_escaping.rb
 - test/core/test_html_structure.rb
@@ -112,35 +118,33 @@ files:
 - test/core/test_tabs.rb
 - test/core/test_text_interpolation.rb
 - test/core/test_thread_options.rb
+- test/core/test_unicode.rb
 - test/literate/TESTS.md
 - test/literate/helper.rb
 - test/literate/run.rb
 - test/logic_less/test_logic_less.rb
 - test/rails/Rakefile
 - test/rails/app/controllers/application_controller.rb
-- test/rails/app/controllers/parents_controller.rb
+- test/rails/app/controllers/entries_controller.rb
 - test/rails/app/controllers/slim_controller.rb
 - test/rails/app/helpers/application_helper.rb
-- test/rails/app/models/child.rb
-- test/rails/app/models/parent.rb
+- test/rails/app/models/entry.rb
+- test/rails/app/views/entries/edit.html.slim
 - test/rails/app/views/layouts/application.html.slim
-- test/rails/app/views/parents/_form.html.slim
-- test/rails/app/views/parents/edit.html.slim
-- test/rails/app/views/parents/new.html.slim
-- test/rails/app/views/parents/show.html.slim
 - test/rails/app/views/slim/_partial.html.slim
 - test/rails/app/views/slim/content_for.html.slim
 - test/rails/app/views/slim/erb.html.erb
+- test/rails/app/views/slim/form_for.html.slim
 - test/rails/app/views/slim/integers.html.slim
 - test/rails/app/views/slim/no_layout.html.slim
 - test/rails/app/views/slim/normal.html.slim
 - test/rails/app/views/slim/partial.html.slim
 - test/rails/app/views/slim/thread_options.html.slim
 - test/rails/app/views/slim/variables.html.slim
+- test/rails/app/views/slim/xml.slim
 - test/rails/config.ru
 - test/rails/config/application.rb
 - test/rails/config/boot.rb
-- test/rails/config/database.yml
 - test/rails/config/environment.rb
 - test/rails/config/environments/test.rb
 - test/rails/config/initializers/backtrace_silencers.rb
@@ -150,7 +154,6 @@ files:
 - test/rails/config/initializers/session_store.rb
 - test/rails/config/locales/en.yml
 - test/rails/config/routes.rb
-- test/rails/db/migrate/20101220223037_parents_and_children.rb
 - test/rails/script/rails
 - test/rails/test/helper.rb
 - test/rails/test/test_slim.rb

data/lib/slim/splat_attributes.rb

@@ -1,113 +0,0 @@
-module Slim
-  # @api private
-  class SplatAttributes < Filter
-    define_options :sort_attrs, :default_tag, :merge_attrs, :attr_quote
-
-    def call(exp)
-      @merge_attrs, @splat_used = unique_name, false
-      exp = compile(exp)
-      if @splat_used
-        [:multi, [:code, "#{@merge_attrs} = #{@options[:merge_attrs].inspect}"], exp]
-      else
-        exp
-      end
-    end
-
-    # Handle tag expression `[:html, :tag, name, attrs, content]`
-    #
-    # @param [String] name Tag name
-    # @param [Array] attrs Temple expression
-    # @param [Array] content Temple expression
-    # @return [Array] Compiled temple expression
-    def on_html_tag(name, attrs, content = nil)
-      return super if name != '*'
-      hash, merger, formatter = splat_attributes(attrs[2..-1])
-      tmp = unique_name
-      tag = [:multi,
-             merger,
-             [:code, "#{tmp} = #{hash}.delete('tag').to_s"],
-             [:if, "#{tmp}.empty?",
-              [:code, "#{tmp} = #{@options[:default_tag].inspect}"]],
-             [:static, '<'],
-             [:dynamic, "#{tmp}"],
-             formatter]
-      tag << if content
-               [:multi,
-                [:static, '>'],
-                compile(content),
-                [:static, '</'],
-                [:dynamic, "#{tmp}"],
-                [:static, '>']]
-             else
-               [:static, '/>']
-             end
-    end
-
-    # Handle attributes expression `[:html, :attrs, *attrs]`
-    #
-    # @param [Array] attrs Array of temple expressions
-    # @return [Array] Compiled temple expression
-    def on_html_attrs(*attrs)
-      return super if attrs.all? {|attr| attr[1] != :splat}
-      hash, merger, formatter = splat_attributes(attrs)
-      [:multi, merger, formatter]
-    end
-
-    protected
-
-    def splat_attributes(attrs)
-      @splat_used = true
-
-      hash, name, value, tmp = unique_name, unique_name, unique_name, unique_name
-
-      merger = [:multi, [:code, "#{hash} = {}"]]
-      attrs.each do |attr|
-        merger << if attr[0] == :html && attr[1] == :attr
-          [:multi,
-           [:capture, tmp, compile(attr[3])],
-           [:code, "(#{hash}[#{attr[2].inspect}] ||= []) << #{tmp}"]]
-        elsif attr[0] == :slim
-          if attr[1] == :attr
-            [:code, "(#{hash}[#{attr[2].inspect}] ||= []) << (#{attr[4]})"]
-          elsif attr[1] == :splat
-            [:code, "(#{attr[2]}).each {|#{name},#{value}| (#{hash}[#{name}.to_s] ||= []) << (#{value}) }"]
-          else
-            attr
-          end
-        else
-          attr
-        end
-      end
-
-      merger << [:block, "#{hash}.keys.each do |#{name}|",
-                 [:multi,
-                  [:code, "#{value} = #{hash}[#{name}]"],
-                  [:if, "#{@merge_attrs}[#{name}]",
-                   [:multi,
-                    [:code, "#{value}.flatten!"],
-                    [:code, "#{value}.map!(&:to_s)"],
-                    [:code, "#{value}.reject!(&:empty?)"],
-                    [:if, "#{value}.empty?",
-                     [:code, "#{hash}.delete(#{name})"],
-                     [:code, "#{hash}[#{name}] = #{value}.join(#{@merge_attrs}[#{name}].to_s)"]]],
-                   [:multi,
-                    [:if, "#{value}.size > 1",
-                     [:code, %{raise("Multiple #\{#{name}\} attributes specified")}]],
-                    [:case, "#{value}.first",
-                     ['true', [:code, "#{hash}[#{name}] = #{name}"]],
-                     ['false, nil', [:code, "#{hash}.delete(#{name})"]],
-                     [:else, [:code, "#{hash}[#{name}] = #{value}.first"]]]]]]]
-
-      attr = [:multi,
-              [:static, ' '],
-              [:dynamic, name],
-              [:static, "=#{options[:attr_quote]}"],
-              [:escape, true, [:dynamic, value]],
-              [:static, options[:attr_quote]]]
-      enumerator = options[:sort_attrs] ? "#{hash}.sort_by {|#{name},#{value}| #{name} }" : hash
-      formatter = [:block, "#{enumerator}.each do |#{name},#{value}|", attr]
-
-      return hash, merger, formatter
-    end
-  end
-end

data/test/rails/app/controllers/parents_controller.rb

@@ -1,85 +0,0 @@
-class ParentsController < ApplicationController
-  # GET /parents
-  # GET /parents.xml
-  def index
-    @parents = Parent.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @parents }
-    end
-  end
-
-  # GET /parents/1
-  # GET /parents/1.xml
-  def show
-    @parent = Parent.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.xml  { render :xml => @parent }
-    end
-  end
-
-  # GET /parents/new
-  # GET /parents/new.xml
-  def new
-    @parent = Parent.new
-    @parent.children.build
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @parent }
-    end
-  end
-
-  # GET /parents/1/edit
-  def edit
-    @parent = Parent.find(params[:id])
-  end
-
-  # POST /parents
-  # POST /parents.xml
-  def create
-    params.permit! if params.respond_to? :permit!
-    @parent = Parent.new(params[:parent])
-
-    respond_to do |format|
-      if @parent.save
-        format.html { redirect_to(@parent, :notice => 'Parent was successfully created.') }
-        format.xml  { render :xml => @parent, :status => :created, :location => @parent }
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @parent.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /parents/1
-  # PUT /parents/1.xml
-  def update
-    @parent = Parent.find(params[:id])
-
-    respond_to do |format|
-      if @parent.update_attributes(params[:parent])
-        format.html { redirect_to(@parent, :notice => 'Parent was successfully updated.') }
-        format.xml  { head :ok }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @parent.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /parents/1
-  # DELETE /parents/1.xml
-  def destroy
-    @parent = Parent.find(params[:id])
-    @parent.destroy
-
-    respond_to do |format|
-      format.html { redirect_to(parents_url) }
-      format.xml  { head :ok }
-    end
-  end
-end