evil-front 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a47e77c7be1810c15637823b7d63e8a41d349fe9
-  data.tar.gz: 31a607bc832991a5251c46cec2082a961becc8a5
+  metadata.gz: c636a83e8c1760ba3efc8b772e9c2469f93326b1
+  data.tar.gz: 7dfa9640396ac0bc5ef31a2108c5806cbf4d1369
 SHA512:
-  metadata.gz: c41b73c3bf5a2ec8c9a0fd7d5d6a99344b0819511ae5c2aa9c919feff458fd9f7ca6d5e10b9820f41d4077ba9fbbe2583151e96c615867ce234c133b7d9e05d7
-  data.tar.gz: 37de02c4256222eedd533f053fa1f9e5de04a304fbf0430c4344bc474bcb2ff63dba7b1f11ddfbf458781d784c624e3a43134a854c0c7efc8dc5b73fbb5f37ec
+  metadata.gz: f86d71ebb02a8f8ae0d00cf8eef0534e06f1d14266c53fb88e4b5c3f49fc6d3e72dc6773910aac0f4ab862c22bc41e8127ed53dd556c001ce6db751b35556b40
+  data.tar.gz: f1e1468a3d1b20f24d0295d7e13f0a774c0a3a328c1b796df7e9b82320c857de10e0627de6df5750c71b3ad9b2778637b50e4b2bc8ba0d22711147f58ac8839b

data/ChangeLog.md

@@ -1,3 +1,8 @@
+## 0.3 “Samara Vallis”
+
+* Russian typograph doesn’t insert flying quotes tag anymore.
+* Add separated `auto_flying_quotes` helper.
+
 ## 0.2.1
 
 * Fix encoding issue with Nokogiri in `english_typograph`.

data/lib/evil-front/helpers/auto_flying_quotes.rb

@@ -0,0 +1,16 @@
+module EvilFront::Helpers
+  # Find quotes and add tags to flying quotes
+  #
+  #   = auto_flying_quotes post.body
+  #
+  # Don’t forget to install styles by `quotes` Sass mixin.
+  def auto_flying_quotes(text = nil, &block)
+    text = if block_given?
+      capture(&block).strip
+    else
+      EvilFront.escape(text)
+    end
+    text = EvilFront::Russian.auto_flying_quotes(text)
+    EvilFront.html_safe(text)
+  end
+end

data/lib/evil-front/russian.rb

@@ -16,9 +16,11 @@ module EvilFront
     end
 
     # Find quotes in text and make them flying
-    def self.auto_flying_quotes(text)
-      text.gsub(/\s«[^»]+»/) { |i| flying_quotes i[2..-2], space: i[0] }.
-           gsub(/^«[^»]+»/)  { |i| flying_quotes i[1..-2], space: '' }
+    def self.auto_flying_quotes(html)
+      process_html(html) do |text|
+        text.gsub(/\s«[^»]+»/) { |i| flying_quotes i[2..-2], space: i[0] }.
+             gsub(/^«[^»]+»/)  { |i| flying_quotes i[1..-2], space: '' }
+      end
     end
 
     # Mark quotes to move first quote before the text line.
@@ -45,10 +47,5 @@ module EvilFront
     def self.use_right_symbols(text)
       StandaloneTypograf::Typograf.new(text).prepare
     end
-
-    # Apply all typograph methods to text
-    def self.typograph_all(text)
-      auto_flying_quotes(typograph(text))
-    end
   end
 end

data/lib/evil-front/typograph.rb

@@ -9,15 +9,7 @@ module EvilFront
     #
     #   EvilFront::Russian.typograph_html(article.html)
     def typograph_html(html)
-      return html if html.nil? or html.empty?
-
-      if html.include? '<'
-        nodes = Nokogiri::HTML::DocumentFragment.parse(html, 'utf-8')
-        typograph_node! nodes
-        nodes.to_html
-      else
-        typograph_all(html)
-      end
+      process_html(html) { |text| typograph(text) }
     end
 
     # Insert non-break spaces and mark quotes to have nice text.
@@ -36,21 +28,29 @@ module EvilFront
 
     private
 
-    # Apply all typograph methods to text
-    def typograph_all(text)
-      typograph(text)
+    # Parse HTML and run block only on texts
+    def process_html(html, &block)
+      return html if html.nil? or html.empty?
+
+      if html.include? '<'
+        nodes = Nokogiri::HTML::DocumentFragment.parse(html, 'utf-8')
+        process_node!(nodes, &block)
+        nodes.to_html
+      else
+        yield(html)
+      end
     end
 
-    # Recursively apply typography to Nokogiri nodes
-    def typograph_node!(node)
+    # Run block on every text node recursively
+    def process_node!(node, &block)
       return if %w(pre code kbd script style math).include? node.name
 
       node.children.each do |child|
         if child.is_a? Nokogiri::XML::Text
           text = EvilFront.escape(child.content)
-          child.replace( typograph_all(text) )
+          child.replace( yield(text) )
         else
-          typograph_node! child
+          process_node! child, &block
         end
       end
     end

data/lib/evil-front/version.rb

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

data/spec/helpers_spec.rb

@@ -37,6 +37,22 @@ describe EvilFront::Helpers do
 
   end
 
+  describe 'auto_flying_quotes' do
+
+    it 'set quotes to text' do
+      auto_flying_quotes('от «a»').should ==
+        'от<span class="space-before-quote"> </span>' +
+        '<span class="quotes">«a»</span>'
+    end
+
+    it 'escapes HTML' do
+      auto_flying_quotes('от «<br>»').should ==
+        'от<span class="space-before-quote"> </span>' +
+        '<span class="quotes">«&lt;br&gt;»</span>'
+    end
+
+  end
+
   describe 'ruble' do
 
     it 'returns span' do
@@ -81,7 +97,7 @@ describe EvilFront::Helpers do
       typograph_by_locale('"a"').should == '“a”'
 
       I18n.locale = :ru
-      typograph_by_locale('"a"').should == '<span class="quotes">«a»</span>'
+      typograph_by_locale('"a"').should == '«a»'
     end
 
     it 'returns origin text on unknown locale' do

data/spec/russian_spec.rb

@@ -46,6 +46,11 @@ describe EvilFront::Russian do
         '<span class="quotes">«тесте»</span>.'
     end
 
+    it 'works with HTML' do
+      EvilFront::Russian.auto_flying_quotes('<a>«ссылка»</a>').should ==
+        '<a><span class="quotes">«ссылка»</span></a>'
+    end
+
   end
 
   describe 'typograph' do
@@ -90,11 +95,6 @@ describe EvilFront::Russian do
         '<b>&lt;a&gt;</b>'
     end
 
-    it 'inserts flying quotes' do
-      EvilFront::Russian.typograph_html('<a>"ссылка"</a>').should ==
-        '<a><span class="quotes">«ссылка»</span></a>'
-    end
-
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evil-front
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -180,10 +180,11 @@ files:
 - lib/evil-front.rb
 - lib/evil-front/english.rb
 - lib/evil-front/helpers.rb
+- lib/evil-front/helpers/auto_flying_quotes.rb
 - lib/evil-front/helpers/capitalize_first.rb
 - lib/evil-front/helpers/disable_mobile_zoom.rb
 - lib/evil-front/helpers/english_typograph.rb
-- lib/evil-front/helpers/flying_quote.rb
+- lib/evil-front/helpers/flying_quotes.rb
 - lib/evil-front/helpers/head_content.rb
 - lib/evil-front/helpers/head_tag.rb
 - lib/evil-front/helpers/ruble.rb