deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

prep for realz

Browse source
This commit is contained in:
Thomas Reynolds 2014-08-18 14:00:28 -07:00
parent e9661a88c5
commit d4010c9dc4
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -6,8 +6,6 @@ gem 'yard', '~> 0.8', require: false
# Test tools # Test tools
gem 'pry', '~> 0.10', group: :development, require: false gem 'pry', '~> 0.10', group: :development, require: false
gem 'pry-debugger', platforms: [:ruby_19, :ruby_20], require: false
gem 'pry-stack_explorer', platforms: [:ruby_19, :ruby_20], require: false
gem 'aruba', '~> 0.6', require: false gem 'aruba', '~> 0.6', require: false
gem 'rspec', '~> 3.0', require: false gem 'rspec', '~> 3.0', require: false
gem 'fivemat', '~> 1.3', require: false gem 'fivemat', '~> 1.3', require: false
@ -38,5 +36,5 @@ gem 'codeclimate-test-reporter', '~> 0.3', require: false, group: :test
# Middleman itself # Middleman itself
gem 'middleman-cli', path: 'middleman-cli' gem 'middleman-cli', path: 'middleman-cli'
gem 'middleman-core', path: 'middleman-core' gem 'middleman-core', path: 'middleman-core'
gem 'middleman-compass', github: 'middleman/middleman-compass', require: false # gem 'middleman-compass', github: 'middleman/middleman-compass', require: false
# gem 'middleman-sprockets', github: 'middleman/middleman-sprockets', require: false # gem 'middleman-sprockets', github: 'middleman/middleman-sprockets', require: false

2
middleman-core/lib/middleman-core/renderers/kramdown.rb
View file

@ -33,7 +33,7 @@ module Middleman
mail_addr = el.attr['href'].sub(/\Amailto:/, '') mail_addr = el.attr['href'].sub(/\Amailto:/, '')
href = obfuscate('mailto') << ':' << obfuscate(mail_addr) href = obfuscate('mailto') << ':' << obfuscate(mail_addr)
content = obfuscate(content) if content == mail_addr content = obfuscate(content) if content == mail_addr
return %Q(<a href="#{href}">#{content}</a>) return %(<a href="#{href}">#{content}</a>)
end end
attr = el.attr.dup attr = el.attr.dup

4
middleman-core/lib/middleman-core/renderers/redcarpet.rb
View file

@ -69,7 +69,7 @@ module Middleman
scope.image_tag(link, title: title, alt: alt_text) scope.image_tag(link, title: title, alt: alt_text)
else else
link_string = link.dup link_string = link.dup
link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text link_string << %("#{title}") if title && title.length > 0 && title != alt_text
"![#{alt_text}](#{link_string})" "![#{alt_text}](#{link_string})"
end end
end end
@ -82,7 +82,7 @@ module Middleman
scope.link_to(content, link, attributes) scope.link_to(content, link, attributes)
else else
link_string = link.dup link_string = link.dup
link_string << %Q("#{title}") if title && title.length > 0 && title != alt_text link_string << %("#{title}") if title && title.length > 0 && title != alt_text
"[#{content}](#{link_string})" "[#{content}](#{link_string})"
end end
end end

3
middleman/middleman.gemspec
View file

@ -21,7 +21,8 @@ Gem::Specification.new do |s|
s.add_dependency('middleman-core', Middleman::VERSION) s.add_dependency('middleman-core', Middleman::VERSION)
s.add_dependency('middleman-cli', Middleman::VERSION) s.add_dependency('middleman-cli', Middleman::VERSION)
# s.add_dependency('middleman-sprockets', '>= 3.1.2') Disabled in alphas # s.add_dependency('middleman-sprockets', '>= 3.1.2') Disabled in alphas
s.add_dependency('middleman-compass', Middleman::VERSION) # s.add_dependency('middleman-compass', '4.0.0.alpha.2')
s.add_dependency('sass', ['>= 3.3.0'])
s.add_dependency('haml', ['>= 4.0.5']) s.add_dependency('haml', ['>= 4.0.5'])
s.add_dependency('coffee-script', ['~> 2.2']) s.add_dependency('coffee-script', ['~> 2.2'])
s.add_dependency('kramdown', ['~> 1.2']) s.add_dependency('kramdown', ['~> 1.2'])