diacritics 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 819a11d5ad9fab59051154e2238802053e7df6bb
-  data.tar.gz: 1873d3de563547dd0888fd89ffdba0137f3a23c1
+  metadata.gz: cadcaa152badc5ffa3119d7ea996e0219bb416bd
+  data.tar.gz: c0795350eac1c5716818ee3e8c708229d3825800
 SHA512:
-  metadata.gz: 44a90379ff5c310542bcbdb0de8bfaff5e2afdf666e1bd012aca1042f28b6b311fa5692d46f10528de81eab38158db9cc7b2486855cb0d4fd8566bd27ada400b
-  data.tar.gz: babe37ae10a720370805663be0cedd30894592f8e6959a61ffe49e22c75e60e7c03b65de380c5bb69f3a58ca1b4ee30e38f3bde1f1c87f375195cbea32984464
+  metadata.gz: a74f4a9b7ad8c0eef3d318fca50350f379f5769bc655a9e95499d619c24dc05d1ad2deb644061258607eaa7f9ee45f9dcb972649f519b1442ae3aad541b3a36d
+  data.tar.gz: caca7dd56f5837ac415db9df5f5bcb7eccec00040a002f70971e772b87fdd978c2a6e3657465a2ab521628a3f1f0168c838db041b3f8e512c8404b87aeb0b2cd

data/.rspec

@@ -1,2 +1 @@
 --color
---format documentation

data/.rubocop.yml

@@ -1,6 +1,11 @@
 AllCops:
   Excludes:
     - diacritics.gemspec
+    - Guardfile
 LineLength:
   Enabled: true
   Max: 79
+Style/AsciiComments:
+  Enabled: false
+Style/FrozenStringLiteralComment:
+    Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.3

data/.travis.yml

@@ -4,4 +4,8 @@ rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
+  - 2.3.0
   - jruby-head
+before_install:
+  - gem install bundler
+  - gem update bundler

data/Gemfile

@@ -3,11 +3,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'coveralls', require: false
+  # gem 'coveralls', require: false
   gem 'rspec', '~> 3.4.0'
-  gem 'guard'
-  gem 'guard-bundler'
-  gem 'guard-rspec'
-  gem 'rb-readline', '~> 0.5.0', require: false
-  gem 'simplecov', require: false
 end

data/README.md

@@ -4,7 +4,6 @@
 [![Dependency Status](https://gemnasium.com/fractalsoft/diacritics.png)](https://gemnasium.com/fractalsoft/diacritics)
 [![Coverage Status](https://coveralls.io/repos/fractalsoft/diacritics/badge.png)](https://coveralls.io/r/fractalsoft/diacritics)
 [![Stories in Ready](https://badge.waffle.io/fractalsoft/diacritics.png)](http://waffle.io/fractalsoft/diacritics)
-[![endorse](https://api.coderwall.com/torrocus/endorsecount.png)](https://coderwall.com/torrocus)
 
 Diacritics is a gem which support downcase, upcase and permanent link with diacritical characters.
 
@@ -49,3 +48,6 @@ and use
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+Please remember about tests. Before you add new characters add test first and check that this test doesn't pass.
+Many of characters are the same in different languages.

data/TODO.md

@@ -1,12 +1,9 @@
 ## Examples containing:
 
-* Czech [Ď, Ě, Ň, Ť, Ů, Ú, Û, "aábcčdďeéěfghiíjklmnňoópqrřsštťuúůvwxyýzž", "AÁBCČDĎEÉĚFGHIÍJKLMNŇOÓPQRŘSŠTŤUÚŮVWXYÝZŽ"]
-* French [Œ, Ÿ, Î, Ï, "abcdefghijklmnopqrstuvwxyzàâæçéèêëîïôœùûüÿ", "ABCDEFGHIJKLMNOPQRSTUVWXYZÀÂÆÇÉÈÊËÎÏÔŒÙÛÜŸ"]
 * Portuguese [Â, "abcdefghijklmnopqrstuvwxyzáâãàçéêíóôõú", "ABCDEFGHIJKLMNOPQRSTUVWXYZÁÂÃÀÇÉÊÍÓÔÕÚ"]
 * Russian [Щ, Ъ, Э, "абвгдеёжзийклмнопрстуфхцчшщъыьэюя", "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"]
 * Greek [Β, Μ, Χ, Ω, Ή, Ύ, Ώ, ΐ, ΰ, Ϊ, Ϋ]
 * Slovak ["aáäeéiíoóôuúyýbcčdďfghjklĺľmnňpqrŕsštťvwxzž", "AÁÄEÉIÍOÓÔUÚYÝBCČDĎFGHJKLĹĽMNŇPQRŔSŠTŤVWXZŽ"]
-* Spanish [ñ Ñ]
 * Italian ["aàbcdeèéfghiìíîlmnoòópqrstuùúvz", "AÀBCDEÈÉFGHIÌÍÎLMNOÒÓPQRSTUÙÚVZ"]
 * Romanian ["aăâbcdefghiîjklmnopqrsștțuvwxyz", "AĂÂBCDEFGHIÎJKLMNOPQRSȘTȚUVWXYZ"]
 * Danish [å, â, ô, Å, Â, Ô]

data/lib/diacritics/alphabet.rb

@@ -5,6 +5,7 @@ module Diacritics
   private
 
   # Characters from many alphabets
+  # Get from https://en.wikipedia.org/wiki/Diacritic
   class Alphabet
     attr_reader :regexp, :hash
 
@@ -25,10 +26,10 @@ module Diacritics
     end
 
     def prepare_hash
-      klass = Diacritics::Alphabet
-      hash = klass.hashed(@downcase, @upcase)
-      one = klass.hashed(@downcase, @permanent)
-      two = klass.hashed(@upcase, @permanent)
+      class_name = Diacritics::Alphabet
+      hash = class_name.hashed(@downcase, @upcase)
+      one = class_name.hashed(@downcase, @permanent)
+      two = class_name.hashed(@upcase, @permanent)
       {
         downcase: hash.invert,
         upcase: hash,
@@ -37,7 +38,8 @@ module Diacritics
     end
 
     def prepare_regexp
-      downcase, upcase = @upcase.join, @downcase.join
+      downcase = @upcase.join
+      upcase = @downcase.join
       permanent = (@downcase + @upcase).uniq.join
       {
         downcase: /[#{downcase}]/,
@@ -50,23 +52,24 @@ module Diacritics
     #
     #   ["a", "b"], ["A", "B"] #=> {"a" => "A", "b" => "B"}
     def self.hashed(one, two)
-      hash = {}
-      [one, two].transpose.each { |key, value| hash[key] = value }
-      hash
+      Hash[one.zip two]
     end
 
     def data
-      {
-        en: en, de: de, pl: pl, cs: cs, fr: fr, it: it, eo: eo,
-        is: is, pt: pt, sp: sp, hu: hu, nn: nn, ru: ru, gr: gr
-      }
+      languages.each_with_object({}) do |language, hash|
+        hash[language] = send(language)
+      end
+    end
+
+    def languages
+      [:en, :de, :pl, :cs, :fr, :it, :eo, :is, :pt, :sp, :hu, :nn, :ru, :gr]
     end
 
     def en
       { # English
-        downcase:  [' ', '?', '.', ','],
-        upcase:    [' ', '?', '.', ','],
-        permanent: ['-', '', '', '']
+        downcase:  [' ', '!', ',', '.', ':', '?', '«', '»'],
+        upcase:    [' ', '!', ',', '.', ':', '?', '«', '»'],
+        permanent: ['-', '', '', '', '', '', '', '']
       }
     end
 
@@ -87,15 +90,19 @@ module Diacritics
     end
 
     def cs
-      { # Czech
-        downcase:  %w(á č í ř š ý ž),
-        upcase:    %w(Á Č Í Ř Š Ý Ž),
-        permanent: %w(a c i r s y z)
+      { # Czech uses acute (á é í ó ú ý), caron (č ď ě ň ř š ť ž), ring (ů)
+        # aábcčdďeéěfghiíjklmnňoópqrřsštťuúůvwxyýzž
+        # AÁBCČDĎEÉĚFGHIÍJKLMNŇOÓPQRŘSŠTŤUÚŮVWXYÝZŽ
+        downcase:  %w(á é í ó ú ý č ď ě ň ř š ť ů ž),
+        upcase:    %w(Á É Í Ó Ú Ý Č Ď Ě Ň Ř Š Ť Ů Ž),
+        permanent: %w(a e i o u y c d e n r s t u z)
       }
     end
 
     def fr
       { # French
+        # abcdefghijklmnopqrstuvwxyzàâæçéèêëîïôœùûüÿ
+        # ABCDEFGHIJKLMNOPQRSTUVWXYZÀÂÆÇÉÈÊËÎÏÔŒÙÛÜŸ
         downcase:  %w(à â é è ë ê ï î ô ù û ü ÿ ç œ æ),
         upcase:    %w(À Â É È Ë Ê Ï Î Ô Ù Û Ü Ÿ Ç Œ Æ),
         permanent: %w(a a e e e e i i o u u ue y c oe ae)
@@ -104,14 +111,14 @@ module Diacritics
 
     def it
       { # Italian
-        downcase:  %w(ì ù ò),
-        upcase:    %w(Ì Ù Ò),
-        permanent: %w(i u o)
+        downcase:  %w(à è é ì î ò ó ù),
+        upcase:    %w(À È É Ì Î Ò Ó Ù),
+        permanent: %w(a e e i i o o u)
       }
     end
 
     def eo
-      { # Esperanto
+      { # Esperantohas the symbols ŭ, ĉ, ĝ, ĥ, ĵ and ŝ
         downcase:  %w(ĉ ĝ ĥ ĵ ŝ ŭ),
         upcase:    %w(Ĉ Ĝ Ĥ Ĵ Ŝ Ŭ),
         permanent: %w(c g h j s u)
@@ -127,7 +134,7 @@ module Diacritics
     end
 
     def pt
-      { # Portugal
+      { # Portugal uses á, â, ã, à, ç, é, ê, í, ó, ô, õ and ú
         downcase:  %w(ã ç),
         upcase:    %w(Ã Ç),
         permanent: %w(a c)
@@ -136,9 +143,9 @@ module Diacritics
 
     def sp
       { # Spanish
-        downcase:  ['¿'],
-        upcase:    ['¿'],
-        permanent: ['']
+        downcase:  ['ñ', 'õ', '¿', '¡'],
+        upcase:    ['Ñ', 'Õ', '¿', '¡'],
+        permanent: ['n', 'o', '', '']
       }
     end
 

data/lib/diacritics/cases.rb

@@ -15,8 +15,9 @@ module Diacritics
     end
 
     def initialize
-      @alphabet = Diacritics::Alphabet.new
-      @hash, @regexp = @alphabet.hash, @alphabet.regexp
+      alphabet = Diacritics::Alphabet.new
+      @hash = alphabet.hash
+      @regexp = alphabet.regexp
     end
 
     def downcase(text)

data/lib/diacritics/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 # Gem version
 module Diacritics
-  VERSION = '0.0.8'
+  VERSION = '0.0.10'.freeze
 end

data/spec/diacritics/string_spec.rb

@@ -167,6 +167,32 @@ describe Diacritics::String do
     end
   end
 
+  context 'Spanish' do
+    it_behaves_like 'word processing' do
+      subject { 'Whisky bueno: ¡excitad mi frágil pequeña vejez!' }
+      let(:result) do
+        [
+          'whisky bueno: ¡excitad mi frágil pequeña vejez!',
+          'WHISKY BUENO: ¡EXCITAD MI FRÁGIL PEQUEÑA VEJEZ!',
+          'whisky-bueno-excitad-mi-fragil-pequena-vejez'
+        ]
+      end
+    end
+  end
+
+  context 'Portugués' do
+    it_behaves_like 'word processing' do
+      subject { 'Luís argüia à Júlia que «brações, fé, chá, óxido, pôr, zângão» eram palavras do português.' }
+      let(:result) do
+        [
+          'luís argüia à júlia que «brações, fé, chá, óxido, pôr, zângão» eram palavras do português.',
+          'LUÍS ARGÜIA À JÚLIA QUE «BRAÇÕES, FÉ, CHÁ, ÓXIDO, PÔR, ZÂNGÃO» ERAM PALAVRAS DO PORTUGUÊS.',
+          'luis-argueia-a-julia-que-bracoes-fe-cha-oxido-por-zangao-eram-palavras-do-portugues'
+        ]
+      end
+    end
+  end
+
   context do
     it_behaves_like 'word processing' do
       subject { 'À l’époque de la conquête de la Gaule par les armées' }
@@ -510,7 +536,7 @@ describe Diacritics::String do
         [
           'dès noël où un zéphyr haï me vêt de glaçons würmiens je dîne d’exquis rôtis de bœuf au kir à l’aÿ d’âge mûr & cætera !',
           'DÈS NOËL OÙ UN ZÉPHYR HAÏ ME VÊT DE GLAÇONS WÜRMIENS JE DÎNE D’EXQUIS RÔTIS DE BŒUF AU KIR À L’AŸ D’ÂGE MÛR & CÆTERA !',
-          'des-noel-ou-un-zephyr-hai-me-vet-de-glacons-wuermiens-je-dine-d’exquis-rotis-de-boeuf-au-kir-a-l’ay-d’age-mur-&-caetera-!'
+          'des-noel-ou-un-zephyr-hai-me-vet-de-glacons-wuermiens-je-dine-d’exquis-rotis-de-boeuf-au-kir-a-l’ay-d’age-mur-&-caetera-'
         ]
       end
     end

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
 # encoding: utf-8
 require 'diacritics'
-require 'coveralls'
-Coveralls.wear!
-require 'simplecov'
-SimpleCov.start
+# require 'coveralls'
+# Coveralls.wear!
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diacritics
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Aleksander Malaszkiewicz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Support diacritics