PoParser 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51fdd38830e2b62a5a45d55c42379bad6042d4b66d077d503e6d9f39b77e7b78
-  data.tar.gz: 74eca178ccba6c57fc9e871f22724b191de09bd6765b88cfdbad1e734378cfa4
+  metadata.gz: da904ab0d854e46b77269f997ef79680df4de08762f96fa0a67443f0c68d931c
+  data.tar.gz: cbfe2b90c9ae91420f745ffb023fcd966df7c9d2c04cbdfc6b5ea99ba8ae550f
 SHA512:
-  metadata.gz: a7a0538d3922051d8b90b5f0d8c4faa56aa17833d99624038961d1b4af82f7db62a1facab385a8aa6bc80e32159ff60e61b69a50dfbbf5b19852a3ab040993b0
-  data.tar.gz: 96cf2e9fd9c58b98b1bd05c1db92bbc4afa915a1a97f1acb7ef87df884b52cdf9940c249bfc3a1ddda234953a1cc5c80084f3af04df64f0b5f432678db9d707f
+  metadata.gz: 52bbe60150f1d217a625695984c6aad16dbf220f66c4cba5b4e1d158603711ce5424fcc4e46c51c7147c92c233b7a3fa61d42d968f6531f050a6727097e07a04
+  data.tar.gz: 7b983cc9036bb9020d17d854651821bc19cfbe99d14309fe1bf5352e8edf46e26cc6141206698d5bd684da891109d93733bf5918b0e53d452cef18a6c0c56d73

data/.rubocop.yml

@@ -1,13 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.6
   Exclude:
   - 'spec/**/*'
-  - 'db/**/*'
-  - 'app/views/**/*'
-  - 'config/**/*'
   - 'bin/*'
-  - 'Rakefile'
-  - 'node_modules/**/*'
 
 Bundler/OrderedGems:
   Enabled: false
@@ -27,9 +22,28 @@ Layout/AlignParameters:
   EnforcedStyle: with_fixed_indentation
 
 Style/FrozenStringLiteralComment:
-  Enabled: false
+  Enabled: true
 
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%i': '()'
     '%w': '()'
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArguments:
+  Enabled: true
+  EnforcedStyleForMultiline: comma
+
+Layout/EmptyLines:
+  Enabled: true
+
+Metrics/LineLength:
+  Max: 100
+  IgnoreCopDirectives: True

data/.travis.yml

@@ -2,7 +2,7 @@ bundler_args: --without development
 language: ruby
 sudo: false
 rvm:
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.4.5
+  - 2.5.3
+  - 2.6.2
 script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-3.2.1 / 2017-09-05
+3.2.3 / 2019-03-23
+==================
+
+  * Entries can be removed, Courtesy of @lremes
+  * Cleanups and refactors
+
+3.2.2 / 2018-05-03
 ==================
 
   * Fix warning in JRuby 9.1.14.0 Courtesy of @remofritzsche

data/Gemfile

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 group :test do
-  gem 'coveralls', :require => false
-  gem 'rspec', '~> 3.6.0'
+  gem 'coveralls', require: false
+  gem 'rspec', '~> 3.8'
   gem 'awesome_print'
 end
 
@@ -12,7 +14,7 @@ group :development do
 end
 
 group :test, :development do
-  gem 'pry-byebug', :platforms => :mri
+  gem 'pry-byebug', platforms: :mri
 end
 
 # Specify your gem's dependencies in poparser.gemspec

data/README.md

@@ -175,6 +175,12 @@ entry.to_h
 entry.to_s
 ```
 
+To remove an entry from the PO, use `PO#delete`
+
+```ruby
+po.delete(entry)
+```
+
 ### Searching
 
 `PO` is an `Enumerable`. All exciting methods from `Enumerable` are available in `PO`. The `PO` yields `Entry`.

data/bin/rspec

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")

data/lib/poparser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # External Libs
 require 'simple_po_parser'
 

data/lib/poparser/comment.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 module PoParser
   class Comment
     attr_accessor :type, :value
 
     def initialize(type, value)
       @type = type
-      @value  = value
+      @value = value
 
-      if @type.to_s =~ /^previous_/ # these behave more like messages
-        remove_empty_line
-      end
+      # these behave more like messages
+      remove_empty_line if /^previous_/.match?(@type.to_s)
     end
 
     def to_s(with_label = false)
       return to_str unless with_label
+
       if @value.is_a? Array
-        if @type.to_s =~ /^previous_/ # these behave more like messages
+        if /^previous_/.match?(@type.to_s) # these behave more like messages
           string = ["#{COMMENTS_LABELS[@type]} \"\"\n"]
           @value.each do |str|
             string << "#| \"#{str}\"\n".gsub(/[\p{Blank}]+$/, '')
@@ -27,7 +29,7 @@ module PoParser
         end
         return string.join
       else
-        if @type.to_s =~ /^previous_/ # these behave more like messages
+        if /^previous_/.match?(@type.to_s) # these behave more like messages
           "#{COMMENTS_LABELS[@type]} \"#{@value}\"\n".gsub(/[\p{Blank}]+$/, '')
         else
           # removes the space but not newline at the end
@@ -38,7 +40,7 @@ module PoParser
 
     def to_str
       if @value.is_a?(Array)
-        if @type.to_s =~ /^previous_/ # these behave more like messages
+        if /^previous_/.match?(@type.to_s) # these behave more like messages
           @value.join
         else
           @value.join("\n")
@@ -53,10 +55,9 @@ module PoParser
     end
 
   private
+
     def remove_empty_line
-      if @value.is_a? Array
-        @value.shift if @value.first == ''
-      end
+      @value.shift if @value.is_a?(Array) && @value.first == ''
     end
   end
 end

data/lib/poparser/constants.rb

@@ -1,34 +1,36 @@
+# frozen_string_literal: true
+
 module PoParser
   COMMENTS_LABELS = {
-    :translator_comment => '#',
-    :extracted_comment => '#.',
-    :reference => '#:',
-    :flag => '#,',
-    :previous_msgctxt => '#| msgctxt',
-    :previous_msgid => '#| msgid',
-    :previous_msgid_plural => '#| msgid_plural',
-    :obsolete => '#~'
-  }
+    translator_comment: '#',
+    extracted_comment: '#.',
+    reference: '#:',
+    flag: '#,',
+    previous_msgctxt: '#| msgctxt',
+    previous_msgid: '#| msgid',
+    previous_msgid_plural: '#| msgid_plural',
+    obsolete: '#~',
+  }.freeze
 
   ENTRIES_LABELS = {
-    :msgctxt => 'msgctxt',
-    :msgid => 'msgid',
-    :msgid_plural => 'msgid_plural',
-    :msgstr => 'msgstr'
-  }
+    msgctxt: 'msgctxt',
+    msgid: 'msgid',
+    msgid_plural: 'msgid_plural',
+    msgstr: 'msgstr',
+  }.freeze
 
   LABELS = COMMENTS_LABELS.merge(ENTRIES_LABELS).keys
 
   HEADER_LABELS = {
-    :pot_creation_date => "POT-Creation-Date",
-    :po_revision_date => "PO-Revision-Date",
-    :project_id => "Project-Id-Version",
-    :report_to => "Project-Id-Version",
-    :last_translator => "Last-Translator",
-    :team => "Language-Team",
-    :language => "Language",
-    :charset => "Content-Type",
-    :encoding => "Content-Transfer-Encoding",
-    :plural_forms => "Plural-Forms"
-  }
+    pot_creation_date: 'POT-Creation-Date',
+    po_revision_date: 'PO-Revision-Date',
+    project_id: 'Project-Id-Version',
+    report_to: 'Project-Id-Version',
+    last_translator: 'Last-Translator',
+    team: 'Language-Team',
+    language: 'Language',
+    charset: 'Content-Type',
+    encoding: 'Content-Transfer-Encoding',
+    plural_forms: 'Plural-Forms',
+  }.freeze
 end

data/lib/poparser/entry.rb

@@ -1,66 +1,49 @@
+# frozen_string_literal: true
+
 module PoParser
-  class Entry
-    # TODO: raise error if a label is not known
+  # A single translation entity in a PO file
+  class Entry # rubocop:disable Metrics/ClassLength
     def initialize(args = {})
       # Defining all instance variables to prevent warnings
-      LABELS.each do |label|
-        instance_variable_set "@#{label.to_s}".to_sym, nil
-      end
-
-      # Set passed arguments
-      args.each do |name, value|
-        raise(ArgumentError, "Unknown label #{name}") if !valid_label? name
-        set_instance_variable(name, value)
-      end
-
+      define_labels_instance_variables
+      define_args_instance_variables(args)
       define_writer_methods(COMMENTS_LABELS, 'Comment')
       define_writer_methods(ENTRIES_LABELS, 'Message')
       define_reader_methods
-
-      self.class.send(:alias_method, :translate, :msgstr=)
-      self.class.send(:alias_method, :cached, :obsolete)
-      self.class.send(:alias_method, :cached=, :obsolete=)
-      # alias for backward compatibility of this typo
-      self.class.send(:alias_method, :refrence, :reference)
-      self.class.send(:alias_method, :refrence=, :reference=)
-      if self.obsolete?
-        obsolete_content = SimplePoParser.parse_message(obsolete.value.join("\n").gsub(/^\|/, "#|"))
-        obsolete_content.each do |name, value|
-          raise(ArgumentError, "Unknown label #{name}") if !valid_label? name
-          set_instance_variable(name, value)
-        end
-      end
+      define_aliases
+      define_obsolete_instance_variables
     end
 
     # If entry doesn't have any msgid, it's probably a obsolete entry that is
-    # kept by the program for later use. These entries will usually start with: #~
+    # kept by the program for later use. These entries will usually start
+    # with: #~
     #
     # @return [Boolean]
     def obsolete?
       !@obsolete.nil?
     end
-    alias_method :cached?, :obsolete?
+    alias cached? obsolete?
 
     # Checks if the entry is untraslated
     #
     # @return [Boolean]
     def untranslated?
       return false if obsolete? || fuzzy?
-      if @msgstr.is_a? Array
-        return @msgstr.map {|ms| ms.str}.join.empty?
-      end
+      return @msgstr.map(&:str).join.empty? if @msgstr.is_a? Array
+
       @msgstr.nil? || @msgstr.str.empty?
     end
-    alias_method :incomplete? , :untranslated?
+    alias incomplete? untranslated?
 
     # Checks if the entry is translated
     #
     # @return [Boolean]
     def translated?
       return false if obsolete? || fuzzy?
-      not untranslated?
+
+      !untranslated?
     end
-    alias_method :complete? , :translated?
+    alias complete? translated?
 
     # Checks if the entry is plural
     #
@@ -74,10 +57,12 @@ module PoParser
     # @return [Boolean]
     def fuzzy?
       return false if obsolete?
-      @flag.to_s.match('fuzzy') ? true : false
+
+      @flag.to_s.match?('fuzzy') ? true : false
     end
 
     # Flag the entry as Fuzzy
+    #
     # @return [Entry]
     def flag_as_fuzzy
       @flag = 'fuzzy'
@@ -87,58 +72,54 @@ module PoParser
     # Set flag to a custom string
     def flag_as(flag)
       raise ArgumentError if flag.class != String
+
       @flag = flag
     end
 
     # Convert entry to a hash key value
+    #
     # @return [Hash]
     def to_h
-      hash = {}
-      instance_variables.each do |label|
+      instance_variables.each_with_object({}) do |label, hash|
         object = instance_variable_get(label)
         # If it's a plural msgstr
-        if object.is_a? Array
+        if object.is_a?(Array)
           object.each do |entry|
-            hash[entry.type] = entry.to_s if not entry.nil?
+            hash[entry.type] = entry.to_s unless entry.nil?
           end
         else
-          hash[object.type] = object.to_s if not object.nil?
+          hash[object.type] = object.to_s unless object.nil?
         end
       end
-      hash
     end
 
     # Convert entry to a string
+    #
     # @return [String]
     def to_s
-      lines = []
-      LABELS.each do |label|
+      LABELS.each_with_object([]) do |label, arr|
         object = instance_variable_get("@#{label}".to_sym)
         # If it's a plural msgstr
-        if object.is_a? Array
-          object.each do |entry|
-            lines << entry.to_s(true) if not entry.nil?
-          end
+        if object.is_a?(Array)
+          arr.push(*object.map { |entry| entry.to_s(true) }.compact)
         else
-          lines << object.to_s(true) if not object.nil?
+          arr << object.to_s(true) unless object.nil?
         end
-      end
-
-      lines.join
+      end.join
     end
 
     def inspect
       to_s
     end
 
-    private
+  private
 
     def set_instance_variable(name, value)
       if COMMENTS_LABELS.include? name
-        instance_variable_set "@#{name.to_s}".to_sym, Comment.new(name, value)
+        instance_variable_set "@#{name}".to_sym, Comment.new(name, value)
       elsif ENTRIES_LABELS.include? name
-        instance_variable_set "@#{name.to_s}".to_sym, Message.new(name, value)
-      elsif name.to_s.match(/^msgstr\[[0-9]\]/)
+        instance_variable_set "@#{name}".to_sym, Message.new(name, value)
+      elsif /^msgstr\[[0-9]\]/.match?(name.to_s)
         # If it's a plural msgstr
         @msgstr ||= []
         @msgstr << Message.new(name, value)
@@ -147,29 +128,34 @@ module PoParser
 
     def define_writer_methods(labels, object)
       object = PoParser.const_get(object)
-      labels.each do |type, mark|
-        unless Entry.method_defined? "#{type}=".to_sym
-          self.class.send(:define_method, "#{type}=".to_sym, lambda { |val|
-            if instance_variable_get("@#{type}".to_sym).is_a? object
-              klass      = instance_variable_get "@#{type}".to_sym
-              klass.type = type
-              klass.value  = val
-            else
-              instance_variable_set "@#{type}".to_sym, object.new(type, val)
-            end
-            # return value
-            instance_variable_get "@#{type}".to_sym
-          })
-        end
+
+      labels.each do |type, _mark|
+        next if Entry.method_defined?("#{type}=".to_sym)
+
+        define_writer_method(type, object)
       end
     end
 
+    def define_writer_method(type, object)
+      self.class.send(:define_method, "#{type}=".to_sym, lambda { |val|
+        if instance_variable_get("@#{type}".to_sym).is_a? object
+          klass       = instance_variable_get "@#{type}".to_sym
+          klass.type  = type
+          klass.value = val
+        else
+          instance_variable_set "@#{type}".to_sym, object.new(type, val)
+        end
+        # return value
+        instance_variable_get "@#{type}".to_sym
+      })
+    end
+
     def define_reader_methods
       LABELS.each do |label|
-        unless Entry.method_defined? "#{label}".to_sym
-          self.class.send(:define_method, label.to_sym) do
-            instance_variable_get "@#{label}".to_sym
-          end
+        next if Entry.method_defined? label.to_s.to_sym
+
+        self.class.send(:define_method, label.to_sym) do
+          instance_variable_get "@#{label}".to_sym
         end
       end
     end
@@ -177,5 +163,41 @@ module PoParser
     def valid_label?(label)
       !(label =~ /^msgstr\[[0-9]\]/).nil? || LABELS.include?(label)
     end
+
+    def define_labels_instance_variables
+      LABELS.each { |label| instance_variable_set("@#{label}".to_sym, nil) }
+    end
+
+    def define_obsolete_instance_variables
+      return unless obsolete?
+
+      obsolete_content = SimplePoParser.parse_message(
+        obsolete.value.join("\n").gsub(/^\|/, '#|'),
+      )
+
+      obsolete_content.each do |name, value|
+        raise(ArgumentError, "Unknown label #{name}") unless valid_label? name
+
+        set_instance_variable(name, value)
+      end
+    end
+
+    def define_args_instance_variables(args)
+      # Set passed arguments
+      args.each do |name, value|
+        raise(ArgumentError, "Unknown label #{name}") unless valid_label? name
+
+        set_instance_variable(name, value)
+      end
+    end
+
+    def define_aliases
+      self.class.send(:alias_method, :translate, :msgstr=)
+      self.class.send(:alias_method, :cached, :obsolete)
+      self.class.send(:alias_method, :cached=, :obsolete=)
+      # alias for backward compatibility of this typo
+      self.class.send(:alias_method, :refrence, :reference)
+      self.class.send(:alias_method, :refrence=, :reference=)
+    end
   end
 end

data/lib/poparser/header.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module PoParser
+  # The very first entry of the PO file is considered the header
   class Header
     attr_reader :entry, :original_configs, :flag
     attr_accessor :comments, :pot_creation_date, :po_revision_date, :project_id,
-            :report_to, :last_translator, :team, :language, :charset,
-            :encoding, :plural_forms
+      :report_to, :last_translator, :team, :language, :charset,
+      :encoding, :plural_forms
 
     def initialize(entry)
       @entry            = entry
@@ -11,27 +14,25 @@ module PoParser
       @original_configs = convert_msgstr_to_hash(entry.msgstr)
       @flag             = entry.flag
 
-      HEADER_LABELS.each do |k, v|
-        instance_variable_set "@#{k.to_s}".to_sym, @original_configs[v]
-      end
+      define_labels_instance_variables
     end
 
     def configs
-      hash = {}
-      HEADER_LABELS.each do |k, v|
+      configs = HEADER_LABELS.each_with_object({}) do |(k, v), hash|
         hash[v] = instance_variable_get "@#{k}".to_sym
       end
-      @original_configs.merge(hash)
+      @original_configs.merge(configs)
     end
 
     # Checks if the entry is fuzzy
     #
     # @return [Boolean]
     def fuzzy?
-      @flag.to_s.match('fuzzy') ? true : false
+      @flag.to_s.match?('fuzzy') ? true : false
     end
 
     # Flag the entry as Fuzzy
+    #
     # @return [Header]
     def flag_as_fuzzy
       @flag = 'fuzzy'
@@ -41,6 +42,7 @@ module PoParser
     # Set flag to a custom string
     def flag_as(flag)
       raise ArgumentError if flag.class != String
+
       @flag = flag
     end
 
@@ -57,7 +59,7 @@ module PoParser
       else
         string << "# #{@comments}".strip
       end
-      string << "#, #{@flag.to_s}" if @flag
+      string << "#, #{@flag}" if @flag
       string << "msgid \"\"\nmsgstr \"\""
       configs.each do |k, v|
         if v.nil? || v.empty?
@@ -79,18 +81,18 @@ module PoParser
       else
         string << "# #{@comments}".strip
       end
-      string << "#, #{@flag.to_s}" if @flag
+      string << "#, #{@flag}" if @flag
       string << "msgid \"\"\nmsgstr \"\""
       configs.each do |k, v|
-        if v.nil? || v.empty?
-          next
-        end
+        next if v.nil? || v.empty?
+
         string << "#{k}: #{v}\n".dump
       end
       string.join("\n")
     end
 
   private
+
     def convert_msgstr_to_hash(msgstr)
       options_array = msgstr.value.map do |options|
         options.split(':', 2).each do |k|
@@ -108,10 +110,16 @@ module PoParser
     # [['a', 'b'], ['c']] #=> [['a', 'bc']]
     def merge_to_previous_string(array)
       array.each_with_index do |key, index|
-        if key.length == 1
-          array[index - 1][1] += key[0]
-          array.delete_at(index)
-        end
+        next unless key.length == 1
+
+        array[index - 1][1] += key[0]
+        array.delete_at(index)
+      end
+    end
+
+    def define_labels_instance_variables
+      HEADER_LABELS.each do |k, v|
+        instance_variable_set("@#{k}".to_sym, @original_configs[v])
       end
     end
   end

data/lib/poparser/message.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module PoParser
   class Message
     attr_accessor :type, :value
 
     def initialize(type, value)
       @type = type
-      @value  = value
+      @value = value
 
       remove_empty_line
     end
@@ -15,6 +17,7 @@ module PoParser
 
     def to_s(with_label = false)
       return to_str unless with_label
+
       if @value.is_a? Array
         remove_empty_line
         # multiline messages should be started with an empty line
@@ -37,6 +40,7 @@ module PoParser
     end
 
   private
+
     def remove_empty_line
       if @value.is_a? Array
         @value.shift if @value.first == ''
@@ -44,7 +48,7 @@ module PoParser
     end
 
     def label
-      if @type.to_s.match(/msgstr\[[0-9]\]/)
+      if /msgstr\[[0-9]\]/.match?(@type.to_s)
         @type
       else
         ENTRIES_LABELS[@type]

data/lib/poparser/po.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PoParser
   # Po class keeps all entries of a Po file
   class Po
@@ -25,68 +27,66 @@ module PoParser
     # @param entry [Hash, Array] a hash of entry contents or an array of hashes
     # @return [Po]
     def add(entry)
-      if entry.kind_of? Hash
-        import_hash(entry)
-      elsif entry.kind_of? Array
-        import_array(entry)
-      else
-        raise ArgumentError, 'Must be a hash or an array of hashes'
-      end
-      self
+      return import_hash(entry) if entry.is_a?(Hash)
+      return import_array(entry) if entry.is_a?(Array)
+
+      raise ArgumentError, 'Must be a hash or an array of hashes'
+    end
+    alias << add
+
+    # Delete entry from po file
+    #
+    # @example
+    #
+    #   delete(entry)
+    #
+    # @param entry [Entry] to be deleted
+    # @return [Entry]
+    def delete(entry)
+      raise(ArgumentError, 'Must be an Entry') unless entry.is_a?(PoParser::Entry)
+
+      @entries.delete(entry)
     end
-    alias_method :<<, :add
 
     # Returns an array of all entries in po file
     #
     # @param include_obsolete [Boolean] Whether include obsolete entries or not
     # @return [Array]
-    def entries(include_obsolete=false)
-      if include_obsolete
-        @entries
-      else
-        find_all do |entry|
-          !entry.obsolete?
-        end
-      end
+    def entries(include_obsolete = false)
+      return @entries if include_obsolete
+
+      find_all { |entry| !entry.obsolete? }
     end
-    alias_method :all, :entries
+    alias all entries
 
     # Finds all entries that are flaged as fuzzy
     #
     # @return [Array] an array of fuzzy entries
     def fuzzy
-      find_all do |entry|
-        entry.fuzzy?
-      end
+      find_all(&:fuzzy?)
     end
 
     # Finds all entries that are untranslated
     #
     # @return [Array] an array of untranslated entries
     def untranslated
-      find_all do |entry|
-        entry.untranslated?
-      end
+      find_all(&:untranslated?)
     end
 
     # Finds all entries that are translated
     #
     # @return [Array] an array of translated entries
     def translated
-      find_all do |entry|
-        entry.translated?
-      end
+      find_all(&:translated?)
     end
 
     # Finds all obsolete entries
     #
     # @return [Array] an array of obsolete entries
     def obsolete
-      find_all do |entry|
-        entry.obsolete?
-      end
+      find_all(&:obsolete?)
     end
-    alias_method :cached, :obsolete
+    alias cached obsolete
 
     # Count of all entries without counting obsolete entries
     #
@@ -94,7 +94,7 @@ module PoParser
     def size
       entries.length
     end
-    alias_method :length, :size
+    alias length size
 
     # Search for entries with provided string
     #
@@ -102,9 +102,7 @@ module PoParser
     # @param string [String] String to search for
     # @return [Array] Array of matched entries
     def search_in(label, string)
-      if !LABELS.include? label.to_sym
-        raise ArgumentError, "Unknown key: #{label}"
-      end
+      raise(ArgumentError, "Unknown key: #{label}") unless LABELS.include?(label.to_sym)
 
       find_all do |entry|
         text = entry.send(label).str
@@ -121,9 +119,9 @@ module PoParser
       fuzzy_size        = fuzzy.size
 
       {
-        translated:   percentage(translated_size),
+        translated: percentage(translated_size),
         untranslated: percentage(untranslated_size),
-        fuzzy:        percentage(fuzzy_size)
+        fuzzy: percentage(fuzzy_size),
       }
     end
 
@@ -131,11 +129,8 @@ module PoParser
     #
     # @return [Array] array of hashes of entries
     def to_h
-      array = []
-      array << @header.to_h if @header
-      @entries.each do |entry|
-        array << entry.to_h
-      end
+      array = @entries.map(&:to_h)
+      array.unshift(@header.to_h) if @header
       array
     end
 
@@ -143,22 +138,17 @@ module PoParser
     #
     # @return [String]
     def to_s
-      array = []
-      array << @header.to_s if @header
+      array = @entries.map(&:to_s)
       # add a blank line after header
-      array << ""
-      @entries.each do |entry|
-        array << entry.to_s
-      end
+      array.unshift(@header.to_s, '') if @header
       array.join("\n")
     end
 
     # Saves the file to the provided path
     def save_file
       raise ArgumentError, 'Need a Path to save the file' if @path.nil?
-      File.open(@path, 'w') do |f|
-        f.write to_s
-      end
+
+      File.open(@path, 'w') { |file| file.write(to_s) }
     end
 
     def each
@@ -168,35 +158,45 @@ module PoParser
     end
 
     def inspect
-      "<#{self.class.name}, Translated: #{translated.length}(#{stats[:translated]}%) Untranslated: #{untranslated.length}(#{stats[:untranslated]}%) Fuzzy: #{fuzzy.length}(#{stats[:fuzzy]}%)>"
+      "<#{self.class.name}, Translated: #{translated.length}"\
+        "(#{stats[:translated]}%) Untranslated: #{untranslated.length}"\
+        "(#{stats[:untranslated]}%) Fuzzy: #{fuzzy.length}(#{stats[:fuzzy]}%)>"
     end
 
   private
+
     # calculates percentages based on total number of entries
     #
     # @param [Integer] number of entries
     # @return [Float] percentage of the provided entries
     def percentage(count)
-      ((count.to_f / self.size) * 100).round(1)
+      ((count.to_f / size) * 100).round(1)
     end
 
     def import_hash(entry)
       add_entry(entry)
+
+      self
     end
 
     def import_array(entry)
-      entry.each do |en|
-        add_entry(en)
-      end
+      entry.each { |en| add_entry(en) }
+
+      self
     end
 
+    # rubocop:disable Style/SafeNavigation
     def add_entry(entry)
-      if entry[:msgid] && entry[:msgid].length == 0
-        raise(RuntimeError, "Duplicate entry, header was already instantiated") if @header != nil
-        @header = Header.new(Entry.new(entry))
-      else
-        @entries << Entry.new(entry)
-      end
+      return add_header_entry(entry) if entry[:msgid] && entry[:msgid].empty?
+
+      @entries << Entry.new(entry)
+    end
+    # rubocop:enable Style/SafeNavigation
+
+    def add_header_entry(entry)
+      raise('Duplicate entry, header was already instantiated') if @header
+
+      @header = Header.new(Entry.new(entry))
     end
   end
 end

data/lib/poparser/tokenizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PoParser
   # Feed each block of PO file to Parser.
   class Tokenizer

data/lib/poparser/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PoParser
-  VERSION = '3.2.2'.freeze
+  VERSION = '3.2.3'
 end

data/poparser.gemspec

@@ -1,27 +1,28 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'poparser/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "PoParser"
+  spec.name          = 'PoParser'
   spec.version       = PoParser::VERSION
-  spec.authors       = ["Arash Mousavi"]
-  spec.email         = ["mousavi.arash@gmail.com"]
-  spec.summary       = %q{A PO file parser, editor and generator.}
-  spec.description   = %q{A PO file parser, editor and generator. PO files are translation files generated by GNU/Gettext tool.}
-  spec.homepage      = "http://github.com/arashm/poparser"
-  spec.license       = "MIT"
+  spec.authors       = ['Arash Mousavi']
+  spec.email         = ['mousavi.arash@gmail.com']
+  spec.summary       = 'A PO file parser, editor and generator.'
+  spec.description   = 'A PO file parser, editor and generator. PO files are translation files generated by GNU/Gettext tool.'
+  spec.homepage      = 'http://github.com/arashm/poparser'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^spec/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   # Runtime deps
-  spec.add_runtime_dependency "simple_po_parser", "~> 1.1.2"
+  spec.add_runtime_dependency 'simple_po_parser', '~> 1.1.2'
 
   # Development deps
-  spec.add_development_dependency "bundler", ">= 0"
-  spec.add_development_dependency "rake", ">= 0"
+  spec.add_development_dependency 'bundler', '>= 0'
+  spec.add_development_dependency 'rake', '>= 0'
 end

data/spec/poparser/po_spec.rb

@@ -20,6 +20,14 @@ describe PoParser::Po do
     expect(@po << entry).to be_a_kind_of PoParser::Po
   end
 
+  it 'should be able to remove an entry from Po' do
+    entries = [entry, entry.dup]
+    @po << entries
+    e = @po.entries.first
+    expect(@po.delete(e)).to eq e
+    expect(@po.delete(e)).to be_nil
+  end
+
   it 'should be able to add multiple entries' do
     entries = [entry, entry.dup]
     expect(@po << entries).to be_a_kind_of PoParser::Po
@@ -125,5 +133,4 @@ describe PoParser::Po do
       }.to raise_error(RuntimeError, "Duplicate entry, header was already instantiated")
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: PoParser
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Arash Mousavi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_po_parser
@@ -56,7 +56,8 @@ description: A PO file parser, editor and generator. PO files are translation fi
   generated by GNU/Gettext tool.
 email:
 - mousavi.arash@gmail.com
-executables: []
+executables:
+- rspec
 extensions: []
 extra_rdoc_files: []
 files:
@@ -70,6 +71,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/rspec
 - lib/poparser.rb
 - lib/poparser/comment.rb
 - lib/poparser/constants.rb
@@ -120,8 +122,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.0.3
 signing_key: 
 specification_version: 4
 summary: A PO file parser, editor and generator.