RubyGems - slim - Versions diffs - 1.3.6 → 1.3.8 - Mend

slim 1.3.6 → 1.3.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (38) hide show

checksums.yaml +7 -0
data/.travis.yml +17 -5
data/CHANGES +32 -0
data/Gemfile +9 -1
data/README.md +51 -32
data/lib/slim.rb +2 -2
data/lib/slim/code_attributes.rb +3 -3
data/lib/slim/command.rb +4 -7
data/lib/slim/{control_structures.rb → controls.rb} +1 -1
data/lib/slim/{embedded_engine.rb → embedded.rb} +23 -4
data/lib/slim/end_inserter.rb +1 -1
data/lib/slim/engine.rb +28 -13
data/lib/slim/filter.rb +1 -1
data/lib/slim/logic_less/filter.rb +1 -1
data/lib/slim/parser.rb +49 -22
data/lib/slim/splat_attributes.rb +7 -7
data/lib/slim/template.rb +2 -2
data/lib/slim/translator.rb +3 -3
data/lib/slim/version.rb +1 -1
data/slim.gemspec +1 -8
data/test/core/helper.rb +21 -13
data/test/core/test_code_escaping.rb +62 -4
data/test/core/test_code_structure.rb +42 -0
data/test/core/test_embedded_engines.rb +79 -0
data/test/core/test_html_attributes.rb +23 -1
data/test/core/test_parser_errors.rb +8 -0
data/test/core/test_pretty.rb +37 -8
data/test/core/test_ruby_errors.rb +6 -2
data/test/core/test_tabs.rb +169 -0
data/test/literate/TESTS.md +26 -6
data/test/rails/app/controllers/parents_controller.rb +1 -0
data/test/rails/app/controllers/slim_controller.rb +1 -1
data/test/rails/config/environments/test.rb +2 -0
data/test/rails/config/initializers/secret_token.rb +1 -1
data/test/rails/test/test_slim.rb +6 -2
metadata +12 -115
data/test/rails/config/environments/development.rb +0 -23
data/test/rails/config/environments/production.rb +0 -49

data/test/literate/TESTS.md CHANGED Viewed

@@ -87,7 +87,9 @@ body
 renders as
 ~~~ html
-<body>Text</body>
+<body>
+  Text
+</body>
 ~~~
 You can embed html code in the text which is not escaped.
@@ -211,7 +213,15 @@ HTML tags allow nested blocks inside.
 renders as
 ~~~ html
-<html><head><title>Example</title></head><body>yes</body></html>
+<html><head>
+<title>
+  Example
+</title>
+</head>
+<body>
+  yes
+</body>
+</html>
 ~~~
 ### Control code `-`
@@ -421,7 +431,9 @@ renders as
 ~~~ html
 <body>
-  <p>Hello!</p>
+  <p>
+    Hello!
+  </p>
 </body>
 ~~~
@@ -448,7 +460,9 @@ renders as
 <body>
   <!--Another comment
   with multiple lines-->
-  <p>Hello!</p>
+  <p>
+    Hello!
+  </p>
   <!--First line determines indentation
   of the comment-->
@@ -465,7 +479,11 @@ renders as
 renders as
 ~~~ html
-<!--[if IE]><p>Get a better browser.</p><![endif]-->
+<!--[if IE]>
+<p>
+  Get a better browser.
+</p>
+<![endif]-->
 ~~~
 ## HTML tags
@@ -959,7 +977,9 @@ h1 Welcome #{user}!
 renders as
 ~~~ html
-<h1>Welcome John Doe &lt;john@doe.net&gt;!</h1>
+<h1>
+  Welcome John Doe &lt;john@doe.net&gt;!
+</h1>
 ~~~
 ## Embedded engines

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

@@ -41,6 +41,7 @@ class ParentsController < ApplicationController
   # POST /parents
   # POST /parents.xml
   def create
+    params.permit! if params.respond_to? :permit!
     @parent = Parent.new(params[:parent])
     respond_to do |format|

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

@@ -23,7 +23,7 @@ class SlimController < ApplicationController
   end
   def thread_options
-    Slim::Engine.with_options(:shortcut => {'@' => "div #{params[:attr]}"}) do
+    Slim::Engine.with_options(:shortcut => {'@' => { :attr => params[:attr] }}) do
       render
     end
   end

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

@@ -29,4 +29,6 @@ Dummy::Application.configure do
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+  config.eager_load = false
 end

data/test/rails/config/initializers/secret_token.rb CHANGED Viewed

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '123a9119fb14a410f485f9390286b33f2743b9d348246cf3e4434522078f77c202d7a1fb7e42666dd0844bcb10d0ff3d8b4ee087796269d4c574837948512dbf'
+Dummy::Application.config.secret_token = Dummy::Application.config.secret_key_base = '123a9119fb14a410f485f9390286b33f2743b9d348246cf3e4434522078f77c202d7a1fb7e42666dd0844bcb10d0ff3d8b4ee087796269d4c574837948512dbf'

data/test/rails/test/test_slim.rb CHANGED Viewed

@@ -4,7 +4,8 @@ class TestSlim < ActionDispatch::IntegrationTest
   test "normal view" do
     get "slim/normal"
     assert_response :success
-    assert_template ["slim/normal", "layouts/application"]
+    assert_template "slim/normal"
+    assert_template "layouts/application"
     assert_html "<h1>Hello Slim!</h1>"
   end
@@ -61,7 +62,10 @@ class TestSlim < ActionDispatch::IntegrationTest
     post "parents", 'parent[name]' => "p1", 'parent[children_attributes][0][name]' => "c1"
     get "parents/1/edit"
-    assert_match(%r{<div class="content"><h1>Edit</h1><h2>Form</h2><form accept-charset="UTF-8" action="/parents/1" class="edit_parent" enctype="multipart/form-data" id="edit_parent_1" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /><input name="_method" type="hidden" value="[^"]+" /></div><h1>Parent</h1><input id="parent_name" name="parent\[name\]" size="30" type="text" value="p1" /><h2>Children</h2><ul><li><input id="parent_children_attributes_0_name" name="parent\[children_attributes\]\[0\]\[name\]" size="30" type="text" value="c1" /></li><input id="parent_children_attributes_0_id" name="parent\[children_attributes\]\[0\]\[id\]" type="hidden" value="1" /></ul></form></div>}, @response.body)
+    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
   end
   protected

metadata CHANGED Viewed

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.3.6
-  prerelease:
+  version: 1.3.8
 platform: ruby
 authors:
 - Daniel Mendler
@@ -11,28 +10,25 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-01-06 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -40,107 +36,10 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        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
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        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
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: kramdown
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: creole
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  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:
@@ -173,8 +72,8 @@ files:
 - lib/slim.rb
 - lib/slim/code_attributes.rb
 - lib/slim/command.rb
-- lib/slim/control_structures.rb
-- lib/slim/embedded_engine.rb
+- lib/slim/controls.rb
+- lib/slim/embedded.rb
 - lib/slim/end_inserter.rb
 - lib/slim/engine.rb
 - lib/slim/filter.rb
@@ -204,6 +103,7 @@ files:
 - test/core/test_pretty.rb
 - test/core/test_ruby_errors.rb
 - test/core/test_slim_template.rb
+- test/core/test_tabs.rb
 - test/core/test_text_interpolation.rb
 - test/core/test_thread_options.rb
 - test/literate/TESTS.md
@@ -236,8 +136,6 @@ files:
 - test/rails/config/boot.rb
 - test/rails/config/database.yml
 - test/rails/config/environment.rb
-- test/rails/config/environments/development.rb
-- test/rails/config/environments/production.rb
 - test/rails/config/environments/test.rb
 - test/rails/config/initializers/backtrace_silencers.rb
 - test/rails/config/initializers/inflections.rb
@@ -253,26 +151,25 @@ files:
 - test/translator/test_translator.rb
 homepage: http://slim-lang.com/
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: slim
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Slim is a template language.
 test_files: []

data/test/rails/config/environments/development.rb DELETED Viewed

@@ -1,23 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-  # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
-  config.cache_classes = false
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
-  config.action_controller.perform_caching = false
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
-  # Print deprecation notices to the Rails logger
-  config.active_support.deprecation = :log
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-end

data/test/rails/config/environments/production.rb DELETED Viewed

@@ -1,49 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-  # The production environment is meant for finished, "live" apps.
-  # Code is not reloaded between requests
-  config.cache_classes = true
-  # Full error reports are disabled and caching is turned on
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-  # Enable serving of images, stylesheets, and javascripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
-  # Enable threaded mode
-  # config.threadsafe!
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
-  config.i18n.fallbacks = true
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
-end