typographer 0.4.1 → 0.5

data/lib/typographer/parsers/basic.rb

@@ -8,64 +8,60 @@ module TypographerHelper
 
       def parse(string)
         #apostrophe
-        # Here comes 1.9 compatibility.
-        # My eyes bleed !!
 
-        string= string.gsub(/“/,'„')
+        string = string.gsub(/“/,'„')
         string.gsub!(/”/,'“')
 
-        if Regexp.instance_methods.include?(:encoding)
-          string.gsub!(/(\p{Word})'(\p{Word})/, '\1’\2')
-
-          #russian quotes
-          string = replace_quotes string, '«', '»', '„', '“', 'а-яА-Я'
-
-          #english quotes
-          string = replace_quotes string
-
-          #mdash
-          string.gsub!(/--/, '—')
-          string.gsub!(/(\p{Word}|;|,)\s+(—|–|-)\s*(\p{Word})/, '\1 — \3')
-          string.gsub!(/\s+—/, ' —')
-
-          #nobr
-          #around dash-separated words (что-то)
-          string.gsub!(/(^|\s)((\p{Word}|0-9){1,3})-((\p{Word}|0-9){1,3})($|\s)/, '\1<span class="nobr">\2-\4</span>\6')
-          #1980-x почему-то
-          string.gsub!(/(^|\s)((\p{Word}|0-9)+)-((\p{Word}|0-9){1,3})($|\s)/, '\1<span class="nobr">\2-\4</span>\6')
-
-          #non brake space
-          string.gsub!(/(^|\s|\()(\p{Word}{1,2})\s+([^\s])/i, '\1\2&nbsp;\3')
-          string.gsub!(/(^|\s|\()&([A-Za-z0-9]{2,8}|#[\d]*);(\p{Word}{1,2})\s+([^\s])/i, '\1&\2;\3&nbsp;\4') #entities
-          string.gsub!(/(&nbsp;|&#161;)(\p{Word}{1,2})\s+([^\s])/i, '\1\2&nbsp;\3\4')
+        if (RUBY_VERSION > '1.9')
+          string.gsub!(Regexp.new('(\p{Word})\'(\p{Word})'), '\1&#146;\2')
         else
           string.gsub!(/(\w)'(\w)/, '\1&#146;\2')
+        end
 
-          #russian quotes
-          string = replace_quotes string, '&laquo;', '&raquo;', '&#132;', '&#147;', 'а-яА-Я'
-
-          #english quotes
-          string = replace_quotes string
-
-          #mdash
-          string.gsub!(/--/, '&mdash;')
-          string.gsub!(/(\w|;|,)\s+(—|–|-)\s*(\w)/, '\1&nbsp;&mdash; \3')
-          string.gsub!(/\s+&mdash;/, '&nbsp;&mdash;')
-
-          #nobr
-          #around dash-separated words (что-то)
-          string.gsub!(/(^|\s)((\w|0-9){1,3})-((\w|0-9){1,3})($|\s)/, '\1<span class="nobr">\2-\4</span>\6')
-          #1980-x почему-то
-          string.gsub!(/(^|\s)((\w|0-9)+)-((\w|0-9){1,3})($|\s)/, '\1<span class="nobr">\2-\4</span>\6')
+        #russian quotes
+        string = replace_quotes string, '&laquo;', '&raquo;', '&#132;', '&#147;', 'а-яА-Я'
 
-          #non brake space
-          string.gsub!(/(^|\s|\()(\w{1,2})\s+([^\s])/i, '\1\2&nbsp;\3')
-          string.gsub!(/(^|\s|\()&([A-Za-z0-9]{2,8}|#[\d]*);(\w{1,2})\s+([^\s])/i, '\1&\2;\3&nbsp;\4') #entities
-          string.gsub!(/(&nbsp;|&#161;)(\w{1,2})\s+([^\s])/i, '\1\2&nbsp;\3\4')
+        #english quotes
+        string = replace_quotes string
+        
+        replaces.each do |replacement|
+          string.gsub!(replacement[0], replacement[1])
         end
-
+        
         string
       end
+      
+      private
+      
+      def replaces
+        @@replacements ||= make_replaces
+      end
+      
+      def make_replaces
+          a = [
+            ['--', '&mdash;'],
+            
+            ['(\p{Word}|;|,)\s+(—|–|-)\s*(\p{Word})', '\1&nbsp;&mdash; \3'],
+            ['\s+&mdash;', '&nbsp;&mdash;'],
+  
+            #nobr
+            #around dash-separated words (что-то)
+            ['(^|\s)((\p{Word}|0-9){1,3})-((\p{Word}|0-9){1,3})($|\s)', '\1<span class="nobr">\2-\4</span>\6'],
+            #1980-x почему-то
+            ['(^|\s)((\p{Word}|0-9)+)-((\p{Word}|0-9){1,3})($|\s)', '\1<span class="nobr">\2-\4</span>\6'],
+  
+            #non brake space
+            ['(^|\s|\()(\p{Word}{1,2})\s+([^\s])', '\1\2&nbsp;\3'],
+            ['(^|\s|\()&([A-Za-z0-9]{2,8}|#[\d]*);(\p{Word}{1,2})\s+([^\s])', '\1&\2;\3&nbsp;\4'], #entities
+            ['(&nbsp;|&#161;)(\p{Word}{1,2})\s+([^\s])', '\1\2&nbsp;\3\4'],
+          ]
+          
+          a.collect do |regex, replacement|
+            regex = regex.gsub('\p{Word}', '\w') if (RUBY_VERSION < '1.9')
+            regex = Regexp.new(regex)
+            [regex, replacement]
+          end
+      end
 
       def replace_quotes(string, left1 = '&#147;', right1 = '&#148;', left2 = '&#145;', right2 = '&#146;', letters = 'a-zA-Z')
         str = string.dup

data/lib/typographer/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 module TypographerHelper
   GEM_NAME = "typographer"
-  VERSION = "0.4.1"
+  VERSION = "0.5"
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-$KCODE = 'u'
+$KCODE = 'u' unless RUBY_VERSION > '1.9'
 require 'rubygems'
 require 'bundler'
 Bundler.require(:default, :development)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: typographer
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Dmitry Shaposhnik
@@ -18,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +03:00
-default_executable: 
+date: 2011-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -79,19 +77,18 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- lib/typographer.rb
 - lib/typographer/parsers/basic.rb
 - lib/typographer/parsers/simple_format.rb
-- lib/typographer/helper.rb
 - lib/typographer/version.rb
-- spec/typography_spec.rb
+- lib/typographer/helper.rb
+- lib/typographer.rb
 - spec/spec_helper.rb
+- spec/typography_spec.rb
 - README.rdoc
 - Rakefile
 - Changelog
 - Gemfile
 - init.rb
-has_rdoc: true
 homepage: https://github.com/Slotos/typographer
 licenses: []
 
@@ -122,10 +119,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ""
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: typographer-0.4.1
+summary: typographer-0.5
 test_files: 
-- spec/typography_spec.rb
 - spec/spec_helper.rb
+- spec/typography_spec.rb