noble_names 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca9a5ec054a904befe7713c8b1bb2de83b2badde064e28ba274ef0d94b74992
-  data.tar.gz: 67720c835320318c01b2193755928f82bde606db4ab360daa2cd76625fef4e83
+  metadata.gz: 55fac8ca35e105fab52df4aac55c9617ee4066eefcddba318dfba63ccb4b026c
+  data.tar.gz: 65d66d6376cd0376d923bb57d0ffe3592fe4732326169a744b8f47bd6942559b
 SHA512:
-  metadata.gz: 37c81bd00fb1ec5955179e1b6cecc2e278049be0b3bdb607d4307b7172d7b8bd118da9318c0cb79ae428ff1df7da872644c48b0e51dfcf1d9d63f7556e611a98
-  data.tar.gz: 84ab027a7ceb38f420c17410e6f9136592bc7bdc38297b517f4de1d4f88b0e82686aa477d8feb7c45f20d1847e948ac019ad4c1c6fc0b73bea1fd058391d65c9
+  metadata.gz: 553a0ecebfb0d0f4896b9f08d2ad43319015f0b5ddec15df19dcf317d7ecff36a5d54a7016dd28b3f8869883d0a7ef9e492b68e1964d8a3c5b9dc9a621d526f2
+  data.tar.gz: ec9b7bb5c0a88b5188f2d076c9d44ffb01a2bcd8f08b453ad9f83366cb6d96895ae9730c010b324f9fc1ada4e6df229203ac4426d61d101541b0b706e2aa6598

data/.circleci/config.yml

@@ -0,0 +1,43 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
+# See: https://circleci.com/docs/2.0/orb-intro/
+orbs:
+  ruby: circleci/ruby@1.7.1
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  build:
+    parameters:
+      ruby-version:
+        type: string
+    docker:
+      - image: cimg/ruby:3.1.0
+    executor: ruby/default
+    steps:
+      - checkout
+      - ruby/install:
+          version: << parameters.ruby-version >>
+      - run:
+          name: bundle install
+          command: gem install bundler && bundle install
+      - ruby/rubocop-check
+      - run:
+          name: Minitest
+          command: bundle exec rake
+      - run:
+          name: Flay
+          command: bundle exec flay
+
+# Invoke jobs via workflows
+# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
+workflows:
+  all-tests:
+    jobs:
+      - build:
+          matrix:
+            parameters:
+              ruby-version: ["2.6.0", "2.7.0", "3.1.2", "jruby-9.3.4.0"]

data/.gitignore

@@ -8,3 +8,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/bundle/

data/.rubocop.yml

@@ -1,21 +1,8 @@
-Layout/AlignParameters:
-  # Alignment of parameters in multi-line method calls.
-  #
-  # The `with_first_parameter` style aligns the following lines along the same
-  # column as the first parameter.
-  #
-  #     method_call(a,
-  #                 b)
-  #
-  # The `with_fixed_indentation` style aligns the following lines with one
-  # level of indentation relative to the start of the line with the method call.
-  #
-  #     method_call(a,
-  #       b)
-  EnforcedStyle: with_fixed_indentation
-  SupportedStyles:
-    - with_first_parameter
-    - with_fixed_indentation
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.6
+  SuggestExtensions: false
 
 Metrics/BlockLength:
   # Ignore the block lengths in these files as they are based on long blocks.
@@ -24,3 +11,8 @@ Metrics/BlockLength:
     - '*.gemspec'
     - '**/*.rake'
     - 'test/**/*.rb'
+
+Metrics/ClassLength:
+  # Ignore the block lengths in these files as they are based on long blocks.
+  Exclude:
+    - 'test/**/*.rb'

data/.travis.yml

@@ -5,6 +5,8 @@ rvm:
   - 2.3.3
   - 2.4.1
   - 2.5.0
+  - 2.7.0
+  - 3.1.2
 install:
   - bundle install --retry=3
 script:

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 <!--
 
-// Please add your own contribution below inside the Master section, no need to
+// Please add your own contribution below inside the Main section, no need to
 // set a version number, that happens during a deploy.
 //
 // These docs are aimed at users rather than danger developers, so please limit technical
@@ -8,7 +8,11 @@
 
 -->
 
-## master
+## main
+
+* Changed `da` to `del` in Spanish.
+* Fixed processing of business names to work as described in README: only fix the business particles and leave the rest of the name alone.
+* Make recognition of business names case insensitive
 
 ### 1.0.0
 
@@ -16,3 +20,13 @@
 * Added project to code-climate.
 * Added support for native UTF-8 upcasing for ruby `>= 2.4`.
 * Drop support for ruby 1.9.3 and updated development dependencies.
+
+### 1.1.0
+
+* Merged PR #5 by @judith-easybill:
+  * Fixes business particle handling
+  * Adds associated tests
+  * Replaced mentions of `master` with `main`
+* Added ruby 3.1.2 to tested versions
+* Dropped support for ruby < 2.5
+* Added testing for ruby 3.1.2

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in noble_names.gemspec

data/README.md

@@ -1,7 +1,6 @@
 # NobleNames
-[![Build Status](https://travis-ci.org/Haniyya/noble_names.svg?branch=master)](https://travis-ci.org/Haniyya/noble_names)
-[![Documentation
-Status](https://readthedocs.org/projects/noble-names/badge/?version=latest)](http://www.rubydoc.info/gems/noble_names)
+[![CircleCI](https://circleci.com/gh/Haniyya/noble_names/tree/main.svg?style=svg)](https://circleci.com/gh/Haniyya/noble_names/tree/main)
+[![Documentation Status](https://readthedocs.org/projects/noble-names/badge/?version=latest)](http://www.rubydoc.info/gems/noble_names)
 [![Maintainability](https://api.codeclimate.com/v1/badges/614fe2d4f930a092e6f5/maintainability)](https://codeclimate.com/github/Haniyya/noble_names/maintainability)
 
 A small Gem to capitalize names with regard to nobility particles and prefixes.
@@ -72,6 +71,7 @@ To install this gem onto your local machine, run `bundle exec rake install`.
 - Fork it ( https://github.com/Haniyya/noble_names/fork )
 - Create your feature branch (git checkout -b my-new-feature)
 - Commit your changes (git commit -am 'Add some feature')
+- Add your changes to `CHANGELOG.md`.
 - Push to the branch (git push origin my-new-feature)
 - Create a new Pull Request
 
@@ -83,10 +83,9 @@ This gem has no runtime-dependencies outside of the standard library and is
 therefore compatible with the following ruby versions:
 
 - jruby
-- 2.5.0
-- 2.4.3
-- 2.3.0
-- 2.2.4
+- 2.6.0
+- 2.7.0
+- 3.1.2
 
 Other verions might work to but are not tested in ci so far.
 

data/Rakefile

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'rake/testtask'
 
@@ -28,11 +29,9 @@ task :source_encoding do
       # We have a shebang. Encoding comment is to put on the second line
       file_content.sub!(/(\n|\r\n)/, "\\1#{magic_comment}\\1")
     else
-      file_content = magic_comment + "\n" + file_content
+      file_content = "#{magic_comment}\n#{file_content}"
     end
 
-    File.open(file_name, 'w') do |file|
-      file.write file_content
-    end
+    File.write(file_name, file_content)
   end
 end

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'noble_names'

data/data/nobility_particles.yml

@@ -22,7 +22,7 @@ nobility_particles:
     - 'la'
   spanish:
     - 'de'
-    - 'da'
+    - 'del'
   portuguese:
     - 'de'
     - 'da'
@@ -32,4 +32,3 @@ nobility_particles:
     - 'de'
     - 'ter'
 
-

data/lib/noble_names/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 # :nodoc:
 module NobleNames

data/lib/noble_names/core_ext/string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module NobleNames
   module CoreExt

data/lib/noble_names/data.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 
 module NobleNames
   # The module responsible for maintaining and delivering
   # the match data as defined in the `data` directory.
   module Data
-    DATA_PATH = File.expand_path('../../../data/', __FILE__).freeze
+    DATA_PATH = File.expand_path('../../data', __dir__).freeze
 
     @nobility_particles = MatchIndex.new('nobility_particles.yml')
     @nobility_prefixes  = MatchIndex.new('nobility_prefixes.yml')
@@ -13,7 +14,7 @@ module NobleNames
     # Otherwise it calls super.
     def self.method_missing(method, *args, &block)
       var = instance_variable_get("@#{method}")
-      var ? var : super
+      var || super
     end
 
     # Remember to define respond_to_missing.

data/lib/noble_names/initializer.rb

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 
-require_relative 'core_ext/string.rb'
+require_relative 'core_ext/string'
 
 # :nodoc:
 module NobleNames

data/lib/noble_names/match_index.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'yaml'
 
@@ -29,7 +30,7 @@ module NobleNames
         @data = YAML.load_file(File.expand_path(list, Data::DATA_PATH))
         @data = @data.values.first
       else
-        @data = Hash[list]
+        @data = list.to_h
       end
       @lanugages = NobleNames.configuration.languages
     end
@@ -43,7 +44,7 @@ module NobleNames
     #   MatchIndex.new('nobility_particles.yml')
     #     .particles['von']                          #=> 'von'
     def particles
-      @particles ||= Hash[selected_data.collect { |v| [v.downcase, v] }]
+      @particles ||= selected_data.to_h { |v| [v.downcase, v] }
     end
 
     # Checks weither a word is in the nobility particle list.
@@ -77,7 +78,7 @@ module NobleNames
     def prefix?(word)
       reindex if languages != NobleNames.configuration.languages
       prefixes.each do |pre|
-        return pre unless (word =~ Regexp.new('^' + pre.to_s)).nil?
+        return pre unless (word =~ Regexp.new("^#{pre}")).nil?
       end
       nil
     end

data/lib/noble_names/version.rb

@@ -1,4 +1,5 @@
+# frozen_string_literal: true
 
 module NobleNames
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'
 end

data/lib/noble_names.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'noble_names/match_index'
 require 'noble_names/version'
@@ -39,7 +40,7 @@ module NobleNames
     #   capitalize('john james')  #=> 'John james'
     #   capitalize('eBase')       #=> 'eBase'
     def capitalize(word)
-      if word =~ /[A-Z]|Ä|Ö|Ü/
+      if word.match?(/[A-Z]|Ä|Ö|Ü/)
         word
       else
         word.gsub first_small_letters do |letter|
@@ -48,12 +49,12 @@ module NobleNames
       end
     end
 
-    # Checks weither a word is in the business particle list
+    # Checks whether a word is in the business particle list
     # @param [String] word The word in question.
     # @return [Boolean] result `true` if `word` is a business-particle
     #   `false` otherwise
     def business_particle?(word)
-      Data.business_particles.in_particle_list? word
+      Data.business_particles.in_particle_list? word.downcase
     end
 
     # Corrects only the business particle and leaves the
@@ -70,35 +71,30 @@ module NobleNames
           word
             .replace(Data.business_particles.particles[word.downcase])
         else
-          noble_capitalize(word)
+          word
         end
       end
     end
 
     private
 
+    MUTATED_UPCASE_VOWELS = { 'ä' => 'Ä', 'ü' => 'Ü', 'ö' => 'Ö' }.freeze
+
     # Upcases a letter even if it is a german mutated vowel.
     # @return [String] letter the upcased letter.
     # @example
     #   upcase('t')         #=> 'T'
     def upcase(letter)
       return letter.upcase if STANDARD_UPACE_SUPPORT
-      match = letter.match(/ä|ö|ü/)
-      if match
-        case match.to_s
-        when 'ä' then 'Ä'
-        when 'ö' then 'Ö'
-        when 'ü' then 'Ü'
-        end
-      else letter.upcase
-      end
+
+      MUTATED_UPCASE_VOWELS[letter] || letter.upcase
     end
 
     # A Regex literal to find the first letter of a string
     # as well as the first letter after a hyphon.
     # @return [Regexp] first_small_letters the regexp in question
     def first_small_letters
-      /((\A.|(?<=\-).))/
+      /((\A.|(?<=-).))/
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: noble_names
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Paul Martensen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-02-03 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: flay
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '1.28'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.28'
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.17'
 description: |2
       This Gem uses a list of nobility particles to keep track of what to
       capitalize and what not.
@@ -89,6 +103,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -116,7 +131,8 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,16 +140,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A gem that titleizes strings while respecting certain linguistic differences.
 test_files: []