typefactory 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9f5fcbeb7da610147172db87669cf14d2276f78
-  data.tar.gz: aa9b1fe52967584ebf7e7152f6de9ae22c86f58b
+  metadata.gz: c2fe21cb2ab6aa014e67f167bfe81b267ef4c40c
+  data.tar.gz: d73ee014c70f97d1c22c2a15fb1a19308e524241
 SHA512:
-  metadata.gz: 7319b9cafe6b6c17b7d316b3db07a6d90e9bc271503fb821b7eba70d2ebbf73924afb835313b79c86754d7a4a9a140d257ffdfba5105b6b56f8ea58c9ad39ce1
-  data.tar.gz: 5ffdebc7571581a5580278b50ba0aca1dbf55b421dbac0150008dd2b1eb26816642aec46834617cb42f9d33ac59059c0fec2dfbc018a133297cdaad5b9978036
+  metadata.gz: 6a003ce61ed456fcc81d4d7c9fc25f0c91429995c01e37975c3af3545be14f8a047060107ea0480deb14616716afe60e6924889fe1e7f09d8c0c1dbc96e25a6a
+  data.tar.gz: f419813e8aca8619caae749a68c93fd2c531963ecd5294e2234d1bd07a38ae6455b9cdb2847c848d56b2803425775f261d6c98766faff691e21740ef64640c02

data/.rspec

@@ -0,0 +1 @@
+-- color

data/README.md

@@ -27,7 +27,9 @@ Typefactory adds method `prepare` for standard Ruby class `String`. You can use
 ## Customize
 
 Need customization? Please use generator:
+
 	$ rails generate typefactory config
+	
 Now you can modify `config/initializers/typefactory.rb`
 
 ## Help to improve

data/lib/typefactory.rb

@@ -5,40 +5,44 @@ module Typefactory
 
   autoload :Processor, 'typefactory/processor'
 
-  @@quote_marks = [
-    { :left => '«', :right => '»' },
-    { :left => '„', :right => '“' },
-    { :left => '‘', :right => '’' }
-  ]
-  mattr_accessor :quote_marks
-
-  @@glyphs = {
-    nbsp:  { mark: ' ', sign: ' ', letter_code: ' ', digital_code: ' ' },
-    quot:  { mark: '"', sign: '"', letter_code: '"', digital_code: '"' },
-    mdash: { mark: '-', sign: '—', letter_code: '—', digital_code: '—' }
-    # :nbsp       => ' ',
-    # :ndash      => '–',
-    # :mdash      => '—',
-    # :minus      => '−',
-    # :section    => '§',
-    # :paragraph  => '¶',
-    # :copy       => '©',
-    # :registered => '®',
-    # :trademark  => '™',
-    # :degree     => '°',
-    # :inch       => '″',
-    # :multiple   => '×',
-    # :middot     => '·',
-    # :bullit     => '•',
-    # :quot       => '"'
+  MODE = :entity
+
+  LOCALE = :ru
+
+  QUOTES = {
+    ru: [
+          {
+            left:  { mark: '"', symbol: '«', entity: '«', decimal: '«' },
+            right: { mark: '"', symbol: '»', entity: '»', decimal: '»' }
+          },
+          {
+            left:  { mark: '"', symbol: '„', entity: '„', decimal: '„' },
+            right: { mark: '"', symbol: '“', entity: '“', decimal: '“' }
+          },
+          {
+            left:  { mark: '"', symbol: '‘', entity: '‘', decimal: '‘' },
+            right: { mark: '"', symbol: '’', entity: '’', decimal: '’' }
+          }
+        ],
+    en: [
+          {
+            left:  { mark: '"', symbol: '“', entity: '“', decimal: '“' },
+            right: { mark: '"', symbol: '”', entity: '”', decimal: '”' }
+          },
+          {
+            left:  { mark: '"', symbol: '‘', entity: '‘', decimal: '‘' },
+            right: { mark: '"', symbol: '’', entity: '’', decimal: '’' }
+          }
+        ]
   }
-  mattr_accessor :glyphs
 
-  def self.setup
-    yield self
-  end
+  GLYPHS = {
+    nbsp:  { mark: ' ', symbol: ' ', entity: ' ', decimal: ' ' },
+    quot:  { mark: '"', symbol: '"', entity: '"', decimal: '"' },
+    mdash: { mark: '-', symbol: '—', entity: '—', decimal: '—' },
+    copy:  { mark: '(c)', symbol: '©', entity: '©', decimal: '©' }
+  }
 
-  # @note In next versions here will be `settings`
   def self.prepare(text)
     Processor.new(text).prepare
   end

data/lib/typefactory/processor.rb

@@ -4,51 +4,54 @@ module Typefactory
 
     @buffer = nil
 
-    # @param original [String] a text for preparing
     def initialize(original)
       @buffer = original
     end
 
-    # @return [String] web-prepared text
     def prepare
       cleanup
-      escape_html
-      quotes
-      descape_html
-      emdashes
-      short_words
+      preserve_html
+      process_quotes
+      revive_html
+      process_emdaches
+      process_short_words
+
       @buffer
     end
 
     private
 
-    # Purging text from already replaced glyphs (includes quotation marks of whole levels)
     def cleanup
-
-      # Replacing all special chars to human-like marks
-      Typefactory::glyphs.each do |glyph, settings|
-        @buffer.gsub!(/#{settings[:sign]}|#{settings[:letter_code]}|#{settings[:digital_code]}/, settings[:mark])
+      GLYPHS.each do |key, glyph|
+        @buffer.gsub!(/#{glyph[:entity]}|#{glyph[:decimal]}|#{glyph[:symbol]}/) do
+          glyph[:mark]
+        end
       end
 
-      # Replacing quote marks
-      expression = String.new
-      Typefactory::quote_marks.each do |mark|
-        expression += "#{mark[:left]}|#{mark[:right]}|"
+      expression = ''
+      QUOTES.each_pair do |locale, quotes|
+        quotes.each do |level|
+          level.each do |side, glyph|
+            expression += "#{glyph[:symbol]}|#{glyph[:entity]}|#{glyph[:decimal]}|"
+          end
+        end
       end
-      @buffer.gsub!(/#{expression[0..-2]}/, Typefactory::glyphs[:quot][:mark])
-
+      @buffer.gsub!(/#{expression[0..-2]}/, GLYPHS[:quot][:mark])
     end
 
-    def escape_html
-      @buffer.gsub!(/<([^\/].*?)>/) { |block| block.gsub(/"/, '\'') }
+    def preserve_html
+      @buffer.gsub!(/<([^\/].*?)>/) do |tag|
+        tag.gsub(/"/, '\'')
+      end
     end
 
-    def descape_html
-      @buffer.gsub!(/<([^\/].*?)>/) { |block| block.gsub(/'/, '"') }
+    def revive_html
+      @buffer.gsub!(/<([^\/].*?)>/) do |tag|
+        tag.gsub(/'/, '"')
+      end
     end
 
-    # Quotes
-    def quotes
+    def process_quotes
       result = String.new
       level  = -1
       @buffer.split('').each_with_index do |character, index|
@@ -56,10 +59,12 @@ module Typefactory
           side = quote_mark_side(index)
           if side == :left
             level  += 1
-            result += Typefactory::quote_marks[level][side]
+            level  = QUOTES[LOCALE].length - 1 if level > QUOTES[LOCALE].length - 1
+            result += QUOTES[LOCALE][level][side][MODE]
           else
-            result += Typefactory::quote_marks[level][side]
+            result += QUOTES[LOCALE][level][side][MODE]
             level  -= 1
+            level  = -1 if level < -1
           end
         else
           result += character
@@ -104,12 +109,16 @@ module Typefactory
       end
     end
 
-    def short_words
-      @buffer.gsub!(/\s([a-zA-Z,а-яА-Я]{1,2})\s/) { |word| " #{$1}#{Typefactory::glyphs[:nbsp][:sign]}" }
+    def process_short_words
+      @buffer.gsub!(/(\s)([a-z,A-Z,а-я,А-Я]{1,2})\s(\S)/) do
+        "#{$1}#{$2}#{GLYPHS[:nbsp][MODE]}#{$3}"
+      end
     end
 
-    def emdashes
-      @buffer.gsub!(/\s\-\s/, "#{Typefactory::glyphs[:nbsp][:sign]}#{Typefactory::glyphs[:mdash][:sign]} ")
+    def process_emdaches
+      @buffer.gsub!(/\s\-\s/) do
+        "#{GLYPHS[:nbsp][MODE]}#{GLYPHS[:mdash][MODE]} "
+      end
     end
 
   end

data/lib/typefactory/version.rb

@@ -1,3 +1,3 @@
 module Typefactory
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/spec/typefactory_spec.rb

@@ -5,11 +5,12 @@ RSpec.describe 'Typefactory' do
   describe 'Core' do
     it 'Parameters can be updated successfully' do
       Typefactory.setup do |config|
-        config.quote_marks = [
-          { :left => '«', :right => '»' },
-          { :left => '„', :right => '“' },
-          { :left => '‘', :right => '’' }
-        ]
+        config.locale      = :ru
+        # config.quote_marks = [
+        #   { :left => '«', :right => '»' },
+        #   { :left => '„', :right => '“' },
+        #   { :left => '‘', :right => '’' }
+        # ]
         expect(config.quote_marks.class).to eq(Array)
         expect(config.quote_marks[2][:right]).to eq('’')
       end
@@ -52,6 +53,13 @@ RSpec.describe 'Typefactory' do
       example = 'Едет Санта на оленях'
       expect(example.prepare).to eq('Едет Санта на оленях')
     end
+
+    it 'Processing demo paragraph' do
+      example = <<eot
+<p>&laquo;Можем "Демо" однозначно констатировать, что, по&nbsp;данным Системы контроля космического пространства Российской Федерации, в&nbsp;период с&nbsp;10:00 до&nbsp;13:00 мск (09:00 до&nbsp;12:00 укр) 12, 16, 17, и&nbsp;18 июля украинские спутники &bdquo;Сич-1&ldquo; и&nbsp;&bdquo;Сич-2&ldquo; над указанными территориями не&nbsp;пролетали. В&nbsp;обозначенное на&nbsp;снимках время над зоной катастрофы находился американский спутник оптико-электронной разведки типа &bdquo;Кихоул&ldquo; (KeyHole). Таким образом, источник получения фотоосновы для дальнейшей обработки СБУ не&nbsp;должен вызывать ни&nbsp;у кого сомнений&raquo;,&nbsp;&mdash; замечает Минобороны.</p>
+eot
+      puts example.prepare
+    end
   end
 
   describe 'Glyphs' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typefactory
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Evgeny Boyko
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -93,6 +93,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".yardopts"
 - Gemfile
 - LICENSE.txt