improve_typography 0.1.14 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 050ccf9750f3535176023f6156dd7397130fd1b30c03787f49b5a0a453959f72
-  data.tar.gz: e7a4c3661192eb7a19670e1b4f8c59896be5c16921976ab14dab7be4cc3bcd83
+  metadata.gz: a1b2c092429e7061298051978b7e283e506720e521f9e56a20f31b599194df39
+  data.tar.gz: 02c3b65a7e6c7c7ab0ef36fd3772e83aa23fd6dbea1755db361466ea858b4dc1
 SHA512:
-  metadata.gz: 60e078a0c5fc8c35956e407d3ac5fc81fdc9c8cfa0b239b934d6986137e22a1d2b2a81d27f6e445617d6fdf5fb2ab34f733f477d49149ecaf3f454ad5d5039c8
-  data.tar.gz: 9c400979338141b2660c679a0504ca8da41e0a2d7812e57b1d0d66d02a74b3ae61f0d3e1460c40fa41744976a0e0ea5fe5394446ee1042fa63f5b68c14e5e4b5
+  metadata.gz: 43da94383330d521447b7d7be4560c3f539a2718d8e853ee05edeb3a26a2b08e78239f67030b85aee101a8bdaf000edf7bfe4f10a4b8e3014b6afb94e5dfc58d
+  data.tar.gz: d9521e056f4867743541d1a40b3614aba9149ba59c7707ed5fd80a5b0a53a2aaf2765ce92545a8b570d97ae0fedcfafd3c80328c67112807bc588bba50b9b593

data/.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: ruby
 script: 'bundle exec rake'
 rvm:
-  - 2.2.5
+  - 2.5.1
 before_install:
   - gem install bundler -v 1.12.5
 notifications:

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+## 0.1.17
+
+* fix single quote capturing apostrophes (@asgerb)
+
+## 0.1.16
+
+* guard for missing `i18n` translations (@asgerb)
+* refactor inheritance logic (@asgerb)
+
+## 0.1.15
+
+* fix the `ImproveTypography.configure` method
+
 ## 0.1.14
 
 * first run simplest `match?` before `gsub` to make sure the replacement is actually needed

data/README.md

@@ -74,7 +74,7 @@ You can configure applied processors (and their order).
 
 ```ruby
 ImproveTypography.configure do |config|
-  processors = [ImproveTypography::Processors::Ellipsis]
+  config.processors = [ImproveTypography::Processors::Ellipsis]
 end
 ```
 

data/improve_typography.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'i18n'
   spec.add_dependency 'nokogiri'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
 end

data/lib/config/locales/da.yml

@@ -0,0 +1,2 @@
+da:
+  foo: bar

data/lib/improve_typography/base.rb

@@ -2,8 +2,20 @@ require 'nokogiri'
 
 module ImproveTypography
   class Base < Struct.new(:str, :options)
-    def self.call(*args)
-      new(*args).call
+    class << self
+      def all_processor_classes
+        @@all_processor_classes ||= []
+      end
+
+      def add_processor_class(klass)
+        unless all_processor_classes.include?(klass)
+          all_processor_classes << klass
+        end
+      end
+
+      def call(*args)
+        new(*args).call
+      end
     end
 
     def initialize(str, options = {})
@@ -30,12 +42,8 @@ module ImproveTypography
       @doc ||= Nokogiri::HTML::DocumentFragment.parse("<div>#{str}</div>")
     end
 
-    def configuration
-      @configuration ||= Configuration.new
-    end
-
     def processors
-      options.fetch(:processors, configuration.processors)
+      options.fetch(:processors, ImproveTypography.configuration.processors)
     end
 
     def processor_classes
@@ -45,7 +53,7 @@ module ImproveTypography
     end
 
     def all_processor_classes
-      @all_processor_classes ||= ObjectSpace.each_object(Class).select { |klass| klass < Processor }
+      self.class.all_processor_classes
     end
 
     def processor_for_locale(klass)

data/lib/improve_typography/processor.rb

@@ -1,7 +1,14 @@
 module ImproveTypography
   class Processor < Struct.new(:str, :options)
-    def self.call(*args)
-      new(*args).call
+    class << self
+      def call(*args)
+        new(*args).call
+      end
+
+      def inherited(klass)
+        ImproveTypography::Base.add_processor_class(klass)
+        super
+      end
     end
 
     def initialize(str, options = {})
@@ -14,6 +21,14 @@ module ImproveTypography
 
     private
 
+    def translation(key)
+      I18n.t(key, scope: %i(improve_typography), locale: locale)
+    end
+
+    def sign_exists?(sign)
+      !sign.nil? && !sign.match?(/translation missing/)
+    end
+
     def configuration
       @configuration ||= Configuration.new
     end

data/lib/improve_typography/processors/apostrophe.rb

@@ -4,6 +4,7 @@ module ImproveTypography
       REGEXP = /(\w+)'(\w*)/i
 
       def call
+        return str unless sign_exists?(apostrophe_sign)
         return str unless str.match?(/'/)
         replace_apostrophe
       end
@@ -15,7 +16,7 @@ module ImproveTypography
       end
 
       def apostrophe_sign
-        options.fetch(:apostrophe_sign, I18n.t(:apostrophe_sign, scope: %i(improve_typography), locale: locale))
+        options.fetch(:apostrophe_sign, translation(:apostrophe_sign))
       end
     end
   end

data/lib/improve_typography/processors/double_quotes.rb

@@ -2,6 +2,7 @@ module ImproveTypography
   module Processors
     class DoubleQuotes < Processor
       def call
+        return str unless sign_exists?(double_quotes)
         return str unless str.match?(/[\"#{double_quotes[0]}#{double_quotes[1]}]/)
         replace_double_quotes
       end
@@ -17,7 +18,7 @@ module ImproveTypography
       end
 
       def double_quotes
-        options.fetch(:double_quotes, I18n.t(:double_quotes, scope: %i(improve_typography), locale: locale))
+        options.fetch(:double_quotes, translation(:double_quotes))
       end
     end
   end

data/lib/improve_typography/processors/ellipsis.rb

@@ -4,7 +4,7 @@ module ImproveTypography
       REGEXP = /(\.\s*?){3,}/i
 
       def call
-        return str unless ellipsis_sign
+        return str unless sign_exists?(ellipsis_sign)
         return str unless str.match?(REGEXP)
 
         str.gsub(REGEXP, ellipsis_sign)
@@ -13,7 +13,7 @@ module ImproveTypography
       private
 
       def ellipsis_sign
-        options.fetch(:ellipsis_sign, I18n.t(:ellipsis_sign, scope: %i(improve_typography), locale: locale))
+        options.fetch(:ellipsis_sign, translation(:ellipsis_sign))
       end
     end
   end

data/lib/improve_typography/processors/em_dash.rb

@@ -4,6 +4,7 @@ module ImproveTypography
       REGEXP = /(\w+?)\s+-{1,3}\s+(\w+?)/i
 
       def call
+        return str unless sign_exists?(em_dash_sign)
         return str unless str.match?(/-{1,3}/)
         str.gsub(REGEXP, '\1'+em_dash_sign+'\2')
       end
@@ -11,7 +12,7 @@ module ImproveTypography
       private
 
       def em_dash_sign
-        options.fetch(:em_dash_sign, I18n.t(:em_dash_sign, scope: %i(improve_typography), locale: locale))
+        options.fetch(:em_dash_sign, translation(:em_dash_sign))
       end
     end
   end

data/lib/improve_typography/processors/en_dash.rb

@@ -4,6 +4,7 @@ module ImproveTypography
       REGEXP = /(\w+?)\s+-{1,2}\s+(\w+?)/i
 
       def call
+        return str unless sign_exists?(en_dash_sign)
         return str unless str.match?(/-{1,3}/)
         str.gsub(REGEXP, '\1'+en_dash_sign+'\2')
       end
@@ -11,7 +12,7 @@ module ImproveTypography
       private
 
       def en_dash_sign
-        options.fetch(:en_dash_sign, I18n.t(:en_dash_sign, scope: %i(improve_typography), locale: locale))
+        options.fetch(:en_dash_sign, translation(:en_dash_sign))
       end
     end
   end

data/lib/improve_typography/processors/multiply_sign.rb

@@ -4,7 +4,7 @@ module ImproveTypography
       REGEXP = /(\d+|[½⅓¼⅔⅛⅜⅝⅞])(\s*)x(\s*)(\d+|[½⅓¼⅔⅛⅜⅝⅞])/i
 
       def call
-        return str unless multiply_sign
+        return str unless sign_exists?(multiply_sign)
         return str unless str.match?(REGEXP)
 
         str.gsub(REGEXP, '\1'+multiply_sign+'\4')
@@ -13,7 +13,7 @@ module ImproveTypography
       private
 
       def multiply_sign
-        options.fetch(:multiply_sign, I18n.t(:multiply_sign, scope: %i(improve_typography), locale: locale))
+        options.fetch(:multiply_sign, translation(:multiply_sign))
       end
     end
   end

data/lib/improve_typography/processors/single_quotes.rb

@@ -2,7 +2,8 @@ module ImproveTypography
   module Processors
     class SingleQuotes < Processor
       def call
-        return str unless str.match?(/[\'#{single_quotes[0]}#{single_quotes[1]}]/)
+        return str unless sign_exists?(single_quotes)
+        return str unless str.match?(regexp)
         replace_single_quotes
       end
 
@@ -13,11 +14,11 @@ module ImproveTypography
       end
 
       def regexp
-        @regexp ||= Regexp.new("['#{single_quotes[0]}#{single_quotes[1]}](.*?)['#{single_quotes[0]}#{single_quotes[1]}](?!\\w)")
+        @regexp ||= Regexp.new("(?<=\\A|\\W)['#{single_quotes[0]}#{single_quotes[1]}](.*?)['#{single_quotes[0]}#{single_quotes[1]}](?!\\w)")
       end
 
       def single_quotes
-        options.fetch(:single_quotes, I18n.t(:single_quotes, scope: %i(improve_typography), locale: locale))
+        options.fetch(:single_quotes, translation(:single_quotes))
       end
     end
   end

data/lib/improve_typography/version.rb

@@ -1,3 +1,3 @@
 module ImproveTypography
-  VERSION = '0.1.14'.freeze
+  VERSION = '0.1.17'.freeze
 end

data/lib/improve_typography.rb

@@ -8,6 +8,24 @@ require 'improve_typography/processor'
 Dir["#{File.dirname(__FILE__)}/improve_typography/processors/**/*.rb"].each { |f| require f }
 
 I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-I18n.load_path += Dir.glob(File.join( File.dirname(__FILE__), 'config', 'locales', '*.yml' ))
+I18n.load_path += Dir.glob(File.join(File.dirname(__FILE__), 'config', 'locales', '*.yml'))
 
 require 'improve_typography/version'
+
+module ImproveTypography
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configuration=(config)
+    @configuration = config
+  end
+
+  def self.configure
+    yield configuration
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: improve_typography
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.17
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2022-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -42,16 +42,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 description: 
 email:
 - tomas.celizna@gmail.com
@@ -127,6 +127,7 @@ files:
 - bin/setup
 - improve_typography.gemspec
 - lib/config/locales/cs.yml
+- lib/config/locales/da.yml
 - lib/config/locales/en.yml
 - lib/improve_typography.rb
 - lib/improve_typography/base.rb
@@ -163,8 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Improves typography (quotes, hyphens, etc.) of a given string. Works well