anpo 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdf7af205951539c90a16f0cec615f1acfc247c8a573ed5e65fbb904cecd1470
-  data.tar.gz: a07c13bf87ed7199242ee4b6bafc4144dbe8f87a13e95e956900f1fa2c62def4
+  metadata.gz: b86255b8dcc794f8aa38dbd06a8b24840baae8308192061673a1b4c024d2887d
+  data.tar.gz: 91ae182af6f1f8f398b0ee0c61821ebd829398f486f3001ef10c9f4197c74aa8
 SHA512:
-  metadata.gz: 0b4fe961b9a28bbcbe6353939b0bd5a4ead8e06cbf90720c949971c0cdfb93383808b675a4d3ad29cf6364ec0bb83655a6c76e963efba838176d95c7cf11f6ed
-  data.tar.gz: 2fe2ae8f06f395272eb715993a3fcbb7d3d942ed88270117f4d25e81adc282b90a26cc19a5d8b86079235bd2b61c3ad6cb33f04e07b5d56253e358cccf1e7833
+  metadata.gz: cfce5c4b50344e28e1ba6a86226206bd1c6c7a80bca17bc45ac42a4cd776db882dc63dc5d09278bf76f5871abb9529734f8da50b2e67e8c65e21845c6157905d
+  data.tar.gz: aaf924b90685cad5da37f685426548bdd254f6cd13e89ae91c5f943fe7e77ad85cafa6f70adddbbbdb6fc862e798663f9d7e8317e42db2f2cc48d1171d3f9589

data/Rakefile

@@ -2,7 +2,10 @@
 
 require "bundler/gem_tasks"
 require "rubocop/rake_task"
+require "rspec/core/rake_task"
 
 RuboCop::RakeTask.new
 
-task default: :rubocop
+RSpec::Core::RakeTask.new("spec")
+
+task default: :spec

data/anpo.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  #spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
+  # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/soburi/anpo"
@@ -29,8 +29,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/bin/anpofilter

@@ -0,0 +1,81 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "anpo"
+require "optparse"
+
+def ep(x)
+  $stderr.print(x.inspect)
+  $stderr.print("\n")
+end
+
+opt = OptionParser.new
+
+exclude_not_fuzzy = false
+exclude_not_translated = false
+exclude_translated = false
+exclude_fuzzy = false
+matchstr = false
+
+subtract  = false
+intersect = false
+
+argfile = nil
+
+opt.on("--str") { matchstr = true }
+
+opt.on("--intersect") { |_f| intersect = true }
+opt.on("--and")       { |_f| intersect = true }
+opt.on("-A")          { |_f| intersect = true }
+opt.on("--subtract")  { |_f| subtract  = true }
+opt.on("-S")          { |_f| subtract  = true }
+
+opt.on("-f") { |_x| exclude_not_fuzzy      = true }
+opt.on("-F") { |_x| exclude_fuzzy          = true }
+opt.on("-t") { |_x| exclude_not_translated = true }
+opt.on("-T") { |_x| exclude_translated     = true }
+
+argv = opt.parse!(ARGV)
+
+if intersect || subtract
+
+  inputs = []
+  inputs = if argv.length == 1
+             [argv[0], $stdin]
+           else
+             [argv[1], argv[0]]
+           end
+
+  File.open(inputs[0]) do |file|
+    Anpo::PO.parse(file) do |cmpfile|
+      infile = Anpo::PO.parse(inputs[1])
+
+      cmpfile.entries.delete_if(&:is_fuzzy?) if exclude_fuzzy
+      cmpfile.entries.delete_if { |e| !e.is_translated? } if exclude_not_translated
+
+      ids = []
+      infile.each do |ent|
+        ids.push(ent.msgid) if !cmpfile.msg[ent.msgid] || ((cmpfile.msg[ent.msgid] != ent.msgstr) && matchstr)
+      end
+
+      if subtract
+        infile.filter_by_ids(ids)
+      elsif intersect
+        infile.delete_by_ids(ids)
+      end
+
+      print infile
+    end
+  end
+
+else
+
+  Anpo::PO.parse(argv.empty? ? $stdin : ARGV[0]) do |po|
+    po.entries.delete_if { |e| !e.is_fuzzy? } if exclude_not_fuzzy
+    po.entries.delete_if(&:is_fuzzy?) if exclude_fuzzy
+    po.entries.delete_if { |e| !e.is_translated? } if exclude_translated
+    po.entries.delete_if(&:is_translated?) if exclude_not_translated
+    print po
+  end
+
+end

data/lib/anpo.rb

@@ -1,37 +1,63 @@
 # frozen_string_literal: true
 
 require_relative "anpo/version"
+require "csv"
+require "stringio"
 
 module Anpo
   class Error < StandardError; end
 
   class POEntry
-    attr_accessor :msgid
-    attr_accessor :msgstr
     attr_accessor :comments
-    attr_accessor :is_header
 
-    def initialize(lines, header=false)
-      state = ''
-      @is_header = header
+    def on_changed(&proc)
+      @change_listener.push(proc)
+    end
+
+    def msgid
+      @msgid.clone
+    end
+
+    def msgid=(id)
+      @change_listener.each do |prc|
+        prc.call(self, id, @msgstr)
+      end
+      @msgid = id
+    end
+
+    def msgstr
+      @msgstr.clone
+    end
+
+    def msgstr=(str)
+      @change_listener.each do |prc|
+        prc.call(self, @msgid, str)
+      end
+      @msgstr = str
+    end
+
+    def initialize(lines = nil)
+      state = ""
+      @change_listener = []
       @msgid = nil
       @msgstr = nil
       @comments = []
-      lines.each do |l|
-        if l.start_with?("msgid")
-          state = "msgid"
-          @msgid = l.gsub("msgid \"","").gsub(/\"\s*$/,"")
-        elsif l.start_with?("msgstr")
-          state = "msgstr"
-          @msgstr = l.gsub("msgstr \"","").gsub(/\"\s*$/,"")
-        elsif l.start_with?("#")
-          state = "comment"
-          @comments.push(l.gsub("\n",'') )
-        else
-          if state == "msgid"
-            @msgid = @msgid + "\n" + l.gsub(/^\s*\"/,'').gsub(/\"\s*$/,'')
+
+      unless lines.nil?
+        lines.each do |l|
+          if l.start_with?("msgid")
+            state = "msgid"
+            @msgid = l.gsub("msgid \"", "").gsub(/"\s*$/, "")
+          elsif l.start_with?("msgstr")
+            state = "msgstr"
+            @msgstr = l.gsub("msgstr \"", "").gsub(/"\s*$/, "")
+          elsif l.start_with?("#")
+            state = "comment"
+            @comments.push(l.gsub("\n", ""))
+          elsif state == "msgid"
+            @msgid = @msgid + "\n" + l.gsub(/^\s*"/, "").gsub(/"\s*$/, "")
           elsif state == "msgstr"
-            @msgstr = @msgstr + "\n" + l.gsub(/^\s*\"/,'').gsub(/\"\s*$/,'')
+            @msgstr = @msgstr + "\n" + l.gsub(/^\s*"/, "").gsub(/"\s*$/, "")
           end
         end
       end
@@ -42,26 +68,30 @@ module Anpo
     end
 
     def is_translated?
-      @msgstr.empty? and not @msgid.empty?
+      (@msgid and !@msgid.empty?) and (@msgstr and !@msgstr.empty?)
+    end
+
+    def is_header?
+      @msgid and @msgid.empty? and !@msgstr.empty?
     end
 
     def msgid_to_s
-      if @msgid == nil and @is_header
-        "msgid \"\"\n"
-      elsif @msgid == nil
+      if @msgid.nil?
         ""
+      elsif is_header?
+        "msgid \"\"\n"
       else
-        "msgid " + @msgid.split("\n").collect{|x| "\"#{x}\""}.join("\n") + "\n"
+        "msgid " + @msgid.split("\n").collect { |x| "\"#{x}\"" }.join("\n") + "\n"
       end
     end
 
     def msgstr_to_s
-      if @msgid == nil and not @is_header
+      if @msgid.nil?
         ""
       elsif @msgstr.empty?
         "msgstr \"\"\n"
       else
-        "msgstr " + @msgstr.split("\n").collect{|x| "\"#{x}\""}.join("\n") + "\n"
+        "msgstr " + @msgstr.split("\n").collect { |x| "\"#{x}\"" }.join("\n") + "\n"
       end
     end
 
@@ -74,126 +104,285 @@ module Anpo
     end
 
     def to_s
-      comments_to_s + msgid_to_s + msgstr_to_s 
+      comments_to_s + msgid_to_s + msgstr_to_s
     end
   end
 
-  class PO
-
-    include Enumerable
+  class PO < Array
+    private
 
-    def self.parse(file, &block)
-      pofile = PO.new(file)
-      if block
-        block.call(pofile)
-      else
-        pofile
+    def set_on_changed(entry)
+      entry.on_changed do |_e, _newid, _newstr|
+        @dirty = true
       end
     end
 
-    attr_accessor :entries
+    public
 
-    def [](key)
-      @hcache[key]
+    def <<(*args)
+      super
+      @dirty = true
     end
 
-    def update_hashcache
-      @hcache = {}
-      @entries.each do |e|
-        @hcache[e.msgid] = e.msgstr
-      end
+    def append(*args)
+      super
+      @dirty = true
     end
 
-    def entry(id)
-      @entries.find {|e| e.msgid == id}
+    def clear(*args)
+      super
+      @dirty = true
     end
 
-    def each(&block)
-      @entries.each do |e|
-        block.call(e)
-      end
+    def collect!(*args)
+      super
+      @dirty = true
+    end
+
+    def compact!(*args)
+      super
+      @dirty = true
+    end
+
+    def concat(*args)
+      super
+      @dirty = true
+    end
+
+    def delete(*args)
+      super
+      @dirty = true
+    end
+
+    def delete_at(*args)
+      super
+      @dirty = true
+    end
+
+    def delete_if(*args)
+      super
+      @dirty = true
+    end
+
+    def fill(*args)
+      super
+      @dirty = true
+    end
+
+    def filter!(*args)
+      super
+      @dirty = true
+    end
+
+    def flatten!(*args)
+      super
+      @dirty = true
+    end
+
+    def insert(*args)
+      super
+      @dirty = true
+    end
+
+    def keep_if(*args)
+      super
+      @dirty = true
+    end
+
+    def map!(*args)
+      super
+      @dirty = true
+    end
+
+    def pop(*args)
+      super
+      @dirty = true
+    end
+
+    def prepend(*args)
+      super
+      @dirty = true
+    end
+
+    def push(*args)
+      super
+      @dirty = true
+    end
+
+    def reject!(*args)
+      super
+      @dirty = true
+    end
+
+    def replace(*args)
+      super
+      @dirty = true
+    end
+
+    def reverse!(*args)
+      super
+      @dirty = true
+    end
+
+    def rotate!(*args)
+      super
+      @dirty = true
+    end
+
+    def select!(*args)
+      super
+      @dirty = true
     end
 
-    def keys()
-      @hcache.keys
+    def shift(*args)
+      super
+      @dirty = true
     end
 
-    def values()
-      @hcache.values
+    def shuffle!(*args)
+      super
+      @dirty = true
     end
 
-    def filter_by_ids(ids)
-      filterids = @entries.collect {|e| e.msgid}
+    def slice!(*args)
+      super
+      @dirty = true
+    end
+
+    def sort!(*args)
+      super
+      @dirty = true
+    end
+
+    def sort_by!(*args)
+      super
+      @dirty = true
+    end
+
+    def uniq!(*args)
+      super
+      @dirty = true
+    end
 
-      if not (ids - filterids).empty?
-        raise
+    def unshift(*args)
+      super
+      @dirty = true
+    end
+
+    def msg
+      if @dirty
+        @msg.clear
+        each do |e|
+          @msg[e.msgid] = e.msgstr
+        end
+        @dirty = false
+      end
+      @msg
+    end
+
+    def self.parse(input, mode = "r", _opt = {}, &block)
+      po = nil
+      if input.is_a?(IO)
+        po = PO.new(input)
+      elsif FileTest.exists?(input.to_s)
+        File.open(input.to_s, mode) do |f|
+          po = PO.new(f)
+        end
       end
 
-      filterids = filterids - ids
-      @entries.delete_if {|e| filterids.include?(e.msgid)}
-      update_hashcache
+      if block
+        block.call(po)
+        nil
+      else
+        po
+      end
+    end
+
+    def entry(id)
+      find { |e| e.msgid == id }
+    end
+
+    def new_entry(msgid, msgstr, comments = nil)
+      poe = POEntry.new
+      set_on_changed(poe)
+      poe.msgid = msgid
+      poe.msgstr = msgstr
+      poe.comments = comments || []
+      push(poe)
+    end
+
+    def filter_by_ids(keepids, _force = false)
+      ids = collect { |e| e.msgid }
+
+      raise unless (keepids - ids).empty?
+
+      keep_if { |e| keepids.include?(e.msgid) }
     end
 
     def delete_by_ids(deleteids)
-      ids = @entries.collect {|e| e.msgid}
+      ids = collect { |e| e.msgid }
 
-      if not (deleteids - ids).empty?
-        raise
-      end
+      raise unless (deleteids - ids).empty?
 
-      @entries.delete_if {|e| deleteids.include?(e.msgid)}
-      update_hashcache
+      delete_if { |e| deleteids.include?(e.msgid) }
     end
 
-    def initialize(file)
+    def initialize(io = nil)
+      super()
       @caches = []
-      @entries = []
       @header = nil
+      @msg = {}
 
-      buffer = []
+      if io
+        _self = self
+        proc_new_entry = proc do |buf|
+          ent = POEntry.new(buf)
+          set_on_changed(ent)
 
-      while l = file.gets
-        if not @header
-          if l == "\n"
-            @header = POEntry.new(buffer, true)
-            buffer = []
+          if ent.is_header?
+            if @header
+              STDERR.print("duplicate header\n" + ent.to_s)
+            else
+              @header = ent
+            end
+          elsif ent.msgid.nil?
+            @caches.push(ent)
           else
-            buffer.push(l)
+            push(ent)
           end
-          next
         end
 
-        if l == "\n"
-          ent = POEntry.new(buffer)
-          if ent.msgid == nil
-            @caches.push(ent)
+        buffer = []
+        while (l = io.gets)
+          if l == "\n"
+            proc_new_entry.call(buffer)
+            buffer = []
           else
-            if ent.msgid != nil and ent.msgid.empty?
-              STDERR.print("duplicate header\n" + ent.to_s)
-            else
-              @entries.push(ent)
-            end
+            buffer.push(l)
           end
-          buffer = []
-        else
-          buffer.push(l)
         end
-      end
-      ent = POEntry.new(buffer)
-      if ent.msgid == nil
-        @caches.push(ent)
+
+        proc_new_entry.call(buffer)
       else
-        if not (ent.msgid != nil and ent.msgid.empty?)
-          @entries.push(ent)
-        end
+        @header = POEntry.new
+        set_on_changed(@header)
+        @header.msgid = ""
+        @header.msgstr = "\n"
       end
-      update_hashcache
-      self
     end
 
-    def to_s(with_cache=true)
-      ([@header] + @entries + (with_cache ? @caches : [])).collect{|e| e.to_s}.join("\n").to_s
+    def to_s(with_cache = true)
+      ([@header] + self + (with_cache ? @caches : [])).collect { |e| e.to_s }.join("\n").to_s
     end
 
+    def to_csv(opts = {})
+      # CSV.new(StringIO.new, opts)
+      csvstr = CSV.generate(opts) do |csv|
+        ([@header] + self + @caches).each do |e|
+          csv << [e.comments_to_s.chop, e.msgid, e.msgstr]
+        end
+      end
+      CSV.new(StringIO.new(csvstr))
+    end
   end
 end

data/lib/anpo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Anpo
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: anpo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - TOKITA, Hiroshi
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
-dependencies: []
+date: 2021-03-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Simple and stupidly pofile parser.
 email:
 - tokita.hiroshi@gmail.com
@@ -27,6 +69,7 @@ files:
 - README.md
 - Rakefile
 - anpo.gemspec
+- bin/anpofilter
 - bin/console
 - bin/setup
 - lib/anpo.rb
@@ -38,7 +81,7 @@ metadata:
   homepage_uri: https://github.com/soburi/anpo
   source_code_uri: https://github.com/soburi/anpo
   changelog_uri: https://github.com/soburi/anpo/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -53,8 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.9
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A nutty pofile parser
 test_files: []