evil-front 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe12fe2c6e73339048942e618cd2d71af5a0a48
-  data.tar.gz: 6d44c469fed3bf9e79e105d717707011e21ff359
+  metadata.gz: 5d96eb4951a8bdbffddf9a0ef42f019779815c47
+  data.tar.gz: be71847e890181a430ffb82dd809aef78a653dcd
 SHA512:
-  metadata.gz: 8d053af5722b38cb46ae0daeb7c0947bb78cbadb5adf8078d1c48b95b63386f557dcfd352b6e71966228f1b39731a01ba97339966df4ee13cebf56b388347f06
-  data.tar.gz: 1135cbdff9e14a8c864d4dcfb221561cff3362bb32f28cd6f5bc94d125ee7a8638bb7a57f6bcdc1b8c92dfc61f2bd467f6c6011afc7fc364b29b3371720564f5
+  metadata.gz: ac095442776a4cc72d4ad17fe0a0c568cfe2218cefca03b2782074ebf27c89d68d481f640459638b2de202211e723326e5270f9471b203b2e228144fdc58d46f
+  data.tar.gz: 9f7b2aab0ca2560f2c2a6502ccd6f1553d3ff3df60e6a3be3c83afe518c6487c47731dcbd7ccdc1d2aceeb4d7595c33f725c98d141ef7cb990e3a128c35e4181

data/ChangeLog.md

@@ -1,3 +1,7 @@
+## 0.3.7
+
+* Use non-break dash only in Russian words.
+
 ## 0.3.6
 
 * Russian typograph inserts non-break space before m-dash.

data/lib/evil-front/russian.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 require 'unicode_utils'
+# encoding: utf-8
+
 require 'standalone_typograf'
 
 module EvilFront
@@ -46,7 +48,8 @@ module EvilFront
     # Replace symbols to right ones, like m-dash, quotes, etc.
     def self.use_right_symbols(text)
       StandaloneTypograf::Typograf.new(text).prepare
-        .gsub(' —', ' —') # nbsp before m-dash
+        .gsub(' —', ' —')                       # nbsp before m-dash
+        .gsub(/([а-яА-Я])-([а-яА-Я])/, '\1‑\2') # non-break dash
     end
   end
 end

data/lib/evil-front/typograph.rb

@@ -20,7 +20,6 @@ module EvilFront
 
       text.gsub! '"', '"'
       text = use_right_symbols(text)
-      text.gsub!(/([^\s" ]+)-([^\s" ]+)/, '\1‑\2')
       tiny_words.each { |regexp| text.gsub! regexp, "\\1\\2 " }
 
       text

data/lib/evil-front/version.rb

@@ -1,3 +1,3 @@
 module EvilFront
-  VERSION = '0.3.6' unless defined? EvilFront::VERSION
+  VERSION = '0.3.7' unless defined? EvilFront::VERSION
 end

data/spec/english_spec.rb

@@ -10,19 +10,19 @@ describe EvilFront::English do
   describe 'typograph' do
 
     it 'changes quotes' do
-      nbsp_mark_typograph('"a".').should == '“a”.'
+      expect(nbsp_mark_typograph('"a".')).to eq '“a”.'
     end
 
     it 'changes dashes' do
-      nbsp_mark_typograph('a - b').should == 'a - b'
+      expect(nbsp_mark_typograph('a - b')).to eq 'a - b'
     end
 
     it 'changes ellipsis' do
-      nbsp_mark_typograph('a...').should == 'a…'
+      expect(nbsp_mark_typograph('a...')).to eq 'a…'
     end
 
     it 'inserts non-break spaces' do
-      nbsp_mark_typograph('he is a hero').should == 'he is_a_hero'
+      expect(nbsp_mark_typograph('he is a hero')).to eq 'he is_a_hero'
     end
 
   end

data/spec/helpers_spec.rb

@@ -9,7 +9,7 @@ describe EvilFront::Helpers do
   describe 'capitalize_first' do
 
     it 'capitalizes Russian' do
-      capitalize_first('тест').should == 'Тест'
+      expect(capitalize_first('тест')).to eq 'Тест'
     end
 
   end
@@ -17,7 +17,7 @@ describe EvilFront::Helpers do
   describe 'disable_mobile_zoom' do
 
     it 'returns viewport meta tag' do
-      disable_mobile_zoom.should =~ /^<meta name="viewport" /
+      expect(disable_mobile_zoom).to match(/^<meta name="viewport" /)
     end
 
   end
@@ -25,14 +25,15 @@ describe EvilFront::Helpers do
   describe 'flying_quotes' do
 
     it 'set quotes to text' do
-      flying_quotes('a').should == '<span class="space-before-quote"> </span>' +
-                                   '<span class="quotes">«a»</span>'
+      expect(flying_quotes('a')).to eq(
+        '<span class="space-before-quote"> </span>' +
+        '<span class="quotes">«a»</span>')
     end
 
     it 'escapes HTML' do
-      flying_quotes('<br>').should ==
+      expect(flying_quotes('<br>')).to eq(
         '<span class="space-before-quote"> </span>' +
-        '<span class="quotes">«&lt;br&gt;»</span>'
+        '<span class="quotes">«&lt;br&gt;»</span>')
     end
 
   end
@@ -40,15 +41,15 @@ describe EvilFront::Helpers do
   describe 'auto_flying_quotes' do
 
     it 'set quotes to text' do
-      auto_flying_quotes('от «a»').should ==
+      expect(auto_flying_quotes('от «a»')).to eq(
         'от<span class="space-before-quote"> </span>' +
-        '<span class="quotes">«a»</span>'
+        '<span class="quotes">«a»</span>')
     end
 
     it 'escapes HTML' do
-      auto_flying_quotes('от «<br>»').should ==
+      expect(auto_flying_quotes('от «<br>»')).to eq(
         'от<span class="space-before-quote"> </span>' +
-        '<span class="quotes">«&lt;br&gt;»</span>'
+        '<span class="quotes">«&lt;br&gt;»</span>')
     end
 
   end
@@ -56,7 +57,7 @@ describe EvilFront::Helpers do
   describe 'ruble' do
 
     it 'returns span' do
-      ruble.should be_a(String)
+      expect(ruble).to be_a(String)
     end
 
   end
@@ -65,11 +66,11 @@ describe EvilFront::Helpers do
 
     it 'typographs text inside tags' do
       tag = '<a title="а...">а...</a>'.html_safe
-      russian_typograph(tag).should == '<a title="а...">а…</a>'
+      expect(russian_typograph(tag)).to eq'<a title="а...">а…</a>'
     end
 
     it 'escapes HTML' do
-      russian_typograph('<a>').should == '&lt;a&gt;'
+      expect(russian_typograph('<a>')).to eq '&lt;a&gt;'
     end
 
   end
@@ -78,11 +79,11 @@ describe EvilFront::Helpers do
 
     it 'typographs text inside tags' do
       tag = '<a title="a...">a...</a>'.html_safe
-      english_typograph(tag).should == '<a title="a...">a…</a>'
+      expect(english_typograph(tag)).to eq '<a title="a...">a…</a>'
     end
 
     it 'escapes HTML' do
-      english_typograph('<a>').should == '&lt;a&gt;'
+      expect(english_typograph('<a>')).to eq '&lt;a&gt;'
     end
 
   end
@@ -94,15 +95,15 @@ describe EvilFront::Helpers do
 
     it 'typographs by current locale' do
       I18n.locale = :en
-      typograph_by_locale('"a"').should == '“a”'
+      expect(typograph_by_locale('"a"')).to eq '“a”'
 
       I18n.locale = :ru
-      typograph_by_locale('"a"').should == '«a»'
+      expect(typograph_by_locale('"a"')).to eq '«a»'
     end
 
     it 'returns origin text on unknown locale' do
       I18n.locale = :fr
-      typograph_by_locale('"a"').should == '"a"'
+      expect(typograph_by_locale('"a"')).to eq '"a"'
     end
 
   end
@@ -114,37 +115,37 @@ describe EvilFront::Helpers do
     end
 
     it 'shows site name' do
-      title_tag('Site').should == '<title>Site</title>'
+      expect(title_tag('Site')).to eq '<title>Site</title>'
     end
 
     it 'shows site names' do
-      title_tag('One', 'Two').should == '<title>One - Two</title>'
+      expect(title_tag('One', 'Two')).to eq '<title>One - Two</title>'
     end
 
     it 'shows page name' do
       title 'Page', 'Section'
-      title_tag('Site').should == '<title>Page - Section - Site</title>'
+      expect(title_tag('Site')).to eq '<title>Page - Section - Site</title>'
     end
 
     it 'shows Russian separator' do
       I18n.locale = :ru
       title 'Страница', 'Раздел'
-      title_tag('Сайт').should == '<title>Страница — Раздел — Сайт</title>'
+      expect(title_tag('Сайт')).to eq '<title>Страница — Раздел — Сайт</title>'
     end
 
     it 'shows custom separator' do
       title 'One', 'Two'
-      title_tag(separator: ' | ').should == '<title>One | Two</title>'
+      expect(title_tag(separator: ' | ')).to eq '<title>One | Two</title>'
     end
 
     it 'escapes HTML' do
       title '<B>'
-      title_tag.should == '<title>&lt;B&gt;</title>'
+      expect(title_tag).to eq '<title>&lt;B&gt;</title>'
     end
 
     it 'hides site name on request' do
       title 'Page', no_site: true
-      title_tag('Site').should == '<title>Page</title>'
+      expect(title_tag('Site')).to eq '<title>Page</title>'
     end
 
   end

data/spec/russian_spec.rb

@@ -7,7 +7,7 @@ describe EvilFront::Russian do
   describe 'capitalize_first' do
 
     it 'capitalizes first letter in russian text' do
-      EvilFront::Russian.capitalize_first('тест тест').should == 'Тест тест'
+      expect(EvilFront::Russian.capitalize_first('тест тест')).to eq 'Тест тест'
     end
 
   end
@@ -15,20 +15,20 @@ describe EvilFront::Russian do
   describe 'flying_quotes' do
 
     it 'inserts tags and quotes with space by default' do
-      EvilFront::Russian.flying_quotes('тест').should ==
+      expect(EvilFront::Russian.flying_quotes('тест')).to eq(
         '<span class="space-before-quote"> </span>' +
-        '<span class="quotes">«тест»</span>'
+        '<span class="quotes">«тест»</span>')
     end
 
     it 'inserts specified space' do
-      EvilFront::Russian.flying_quotes('тест', space: '-').should ==
+      expect(EvilFront::Russian.flying_quotes('тест', space: '-')).to eq(
         '<span class="space-before-quote">-</span>' +
-        '<span class="quotes">«тест»</span>'
+        '<span class="quotes">«тест»</span>')
     end
 
     it 'ignores space on request' do
-      EvilFront::Russian.flying_quotes('тест', space: '').should ==
-        '<span class="quotes">«тест»</span>'
+      expect(EvilFront::Russian.flying_quotes('тест', space: '')).to eq(
+        '<span class="quotes">«тест»</span>')
     end
 
   end
@@ -36,19 +36,19 @@ describe EvilFront::Russian do
   describe 'auto_flying_quotes' do
 
     it 'replaces quotes on start' do
-      EvilFront::Russian.auto_flying_quotes('«тест»').should ==
-        '<span class="quotes">«тест»</span>'
+      expect(EvilFront::Russian.auto_flying_quotes('«тест»')).to eq(
+        '<span class="quotes">«тест»</span>')
     end
 
     it 'replaces quotes in middle' do
-      EvilFront::Russian.auto_flying_quotes('на «тесте».').should ==
+      expect(EvilFront::Russian.auto_flying_quotes('на «тесте».')).to eq(
         'на<span class="space-before-quote"> </span>' +
-        '<span class="quotes">«тесте»</span>.'
+        '<span class="quotes">«тесте»</span>.')
     end
 
     it 'works with HTML' do
-      EvilFront::Russian.auto_flying_quotes('<a>«ссылка»</a>').should ==
-        '<a><span class="quotes">«ссылка»</span></a>'
+      expect(EvilFront::Russian.auto_flying_quotes('<a>«ссылка»</a>')).to eq(
+        '<a><span class="quotes">«ссылка»</span></a>')
     end
 
   end
@@ -59,20 +59,25 @@ describe EvilFront::Russian do
     end
 
     it 'changes quotes' do
-      nbsp_mark_typograph('сказал "смотри "зорко"".').should ==
-        'сказал «смотри „зорко“».'
+      expect(nbsp_mark_typograph('сказал "смотри "зорко"".')).to eq(
+        'сказал «смотри „зорко“».')
     end
 
     it 'changes dashes' do
-      nbsp_mark_typograph('а - это б').should == 'а_— это_б'
+      expect(nbsp_mark_typograph('а - это б')).to eq 'а_— это_б'
     end
 
     it 'changes ellipsis' do
-      nbsp_mark_typograph('а...').should == 'а…'
+      expect(nbsp_mark_typograph('а...')).to eq 'а…'
     end
 
     it 'inserts non-break spaces' do
-      nbsp_mark_typograph('оно не надо').should == 'оно не_надо'
+      expect(nbsp_mark_typograph('оно не надо')).to eq 'оно не_надо'
+    end
+
+    it 'uses non-break dash on for Russian' do
+      expect(nbsp_mark_typograph('web-standards.ru')).to eq 'web-standards.ru'
+      expect(nbsp_mark_typograph('а-то')).to eq 'а‑то'
     end
 
   end
@@ -80,22 +85,22 @@ describe EvilFront::Russian do
   describe 'typograph_html' do
 
     it 'typographs plain text' do
-      EvilFront::Russian.typograph_html('а...').should == 'а…'
+      expect(EvilFront::Russian.typograph_html('а...')).to eq 'а…'
     end
 
     it 'typographs only in text nodes' do
-      EvilFront::Russian.typograph_html('<a title="а...">а...</a>').should ==
-        '<a title="а...">а…</a>'
+      expect(EvilFront::Russian.typograph_html('<a title="а...">а...</a>')).
+        to eq '<a title="а...">а…</a>'
     end
 
     it 'ignores code tags' do
-      EvilFront::Russian.typograph_html('<code>а...</code>').should ==
-        '<code>а...</code>'
+      expect(EvilFront::Russian.typograph_html('<code>а...</code>')).
+        to eq '<code>а...</code>'
     end
 
     it 'keeps escaping' do
-      EvilFront::Russian.typograph_html('<b>&lt;a&gt;</b>').should ==
-        '<b>&lt;a&gt;</b>'
+      expect(EvilFront::Russian.typograph_html('<b>&lt;a&gt;</b>')).
+        to eq '<b>&lt;a&gt;</b>'
     end
 
   end

data/spec/sass_spec.rb

@@ -14,27 +14,27 @@ describe 'Sass Helpers' do
   end
 
   it 'loads Rails Sass Images' do
-    @assets['load'].to_s.should =~ /data:text\/plain/
+    expect(@assets['load'].to_s).to match(/data:text\/plain/)
   end
 
   it 'loads variables, functions and mixins' do
     load = @assets['load'].to_s
-    load.should =~ /rgba\(0, 0, 0, 0.5\)/
-    load.should =~ /cubic-bezier\(0.47, 0, 0.745, 0.715\)/
-    load.should =~ /a:after/
+    expect(load).to match(/rgba\(0, 0, 0, 0.5\)/)
+    expect(load).to match(/cubic-bezier\(0.47, 0, 0.745, 0.715\)/)
+    expect(load).to match(/a:after/)
   end
 
   describe '+import-ruble' do
 
     it 'adds font-faces and .ruble' do
       ruble = @assets['ruble'].to_s
-      ruble.should =~ /font-family: ALSRubl-Arial, PT Sans, sans-serif/
-      ruble.should_not =~ /font-woff;base64/
+      expect(ruble).to match(/font-family: ALSRubl-Arial, PT Sans, sans-serif/)
+      expect(ruble).not_to match(/font-woff;base64/)
     end
 
     it 'inlines specified fonts' do
       ruble = @assets['inline-ruble'].to_s
-      ruble.should =~ /font-style: italic;\s*src: url\('data/n
+      expect(ruble).to match(/font-style: italic;\s*src: url\('data/n)
     end
 
   end
@@ -45,11 +45,11 @@ describe 'Sass Helpers' do
     end
 
     it 'receives size without units' do
-      @media.should =~ /max-width: 100px/
+      expect(@media).to match(/max-width: 100px/)
     end
 
     it 'receives size with units' do
-      @media.should =~ /min-width: 200px/
+      expect(@media).to match(/min-width: 200px/)
     end
 
   end
@@ -60,15 +60,15 @@ describe 'Sass Helpers' do
     end
 
     it 'receives 2 sizes' do
-      @size.should =~ /.all {\s*width: 10px;\s*height: 20px; }/
+      expect(@size).to match(/.all {\s*width: 10px;\s*height: 20px; }/)
     end
 
     it 'receives 1 sizes' do
-      @size.should =~ /.one {\s*width: 30px;\s*height: 30px; }/
+      expect(@size).to match(/.one {\s*width: 30px;\s*height: 30px; }/)
     end
 
     it 'receives size without unit' do
-      @size.should =~ /.no-unit {\s*width: 15px;\s*height: 15px; }/
+      expect(@size).to match(/.no-unit {\s*width: 15px;\s*height: 15px; }/)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evil-front
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n