phew 0.0.2 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 77b4ad7bcdd167fc10b7ba80145217cc833f2fc1
-  data.tar.gz: 24d2b4f26a4cc6c74c2b0e979006069b467bae87
+SHA256:
+  metadata.gz: 5eb7e4c39012f4c7c899d8bd44f5556b01b635145c347029643293b447908aa6
+  data.tar.gz: f2041da52a3da3557cfbb9c14141d3a321c346341c6710f34161a233b16cf477
 SHA512:
-  metadata.gz: 1d6819401d22edf6df33042eb9632c5bcd4f558540acf6c3245eeda5c4d988c24a7cb9fca9b58ad84c54f97fb2bcf822a3d2dee8b762eafb0d5b35e917bf9fd5
-  data.tar.gz: 050afc7ffa55d0c1f89845a5fa89b6396b5e914f56ded42623bc313af77561d51cf159c239f0a4b1e92551d13bd1172ef03acf8957aa32294b84f8bc719d34ed
+  metadata.gz: 0c0c685cb173aceb658e0f275ba64d3e3fccf41ebacafff19e65d3619c270b67f3ff835dfcc6595bca9400e224c2adffb38d79c2a9def42fafa138e661163719
+  data.tar.gz: 5a968a69a7d6c30a9c798c59a75c81b7091a48992fbac49937ccbaa6de064ab64f7433706e8e65da0fd765604ad93f6423c93bb6338a51311fc083efea2145ed

data/bin/phew

@@ -1,138 +1,29 @@
 #!/usr/bin/env ruby
-require 'phew'
+# frozen_string_literal: true
 
-Gtk.init
+require "phew"
 
-module Phew
-  # Drop-down list of available scripts.
-  class ScriptList < Gtk::ComboBoxText
-    # FIXME: Should be able to fill inside #initialize
-    def fill
-      Pango::Script::Enum.symbols.
-        map(&:to_s).
-        each { |str| append str, str }
-    end
-  end
+myapp = Gtk::Application.new("net.matijs.phew", { none: true })
 
-  # Main Phew window
-  class Window < Gtk::Window
-    # Set up generic signal handlers for the window:
-    # - Closing the window ends the application
-    # - Pressing Ctrl-Q closes the window.
-    def connect_signals
-      signal_connect('destroy') { on_destroy_event }
-      signal_connect('key-press-event') { |_, evt, _| on_key_press_event evt }
-    end
+myapp.signal_connect "startup" do |app|
+  action = Gio::SimpleAction.new("quit", nil)
+  action.signal_connect("activate") { app.quit }
+  myapp.add_action action
 
-    def on_destroy_event
-      Gtk.main_quit
-      false
-    end
+  myapp.set_accels_for_action "app.quit", ["<Ctrl>Q"]
 
-    def on_key_press_event evt
-      destroy if evt.state == :control_mask && evt.keyval == 'q'.ord
-      false
-    end
-  end
+  # Add menu so Atspi has a way to access the actions
+  menu = Gio::Menu.new
+  file_menu = Gio::Menu.new
+  file_menu.append "Quit", "app.quit"
+  menu.append_submenu "File", file_menu
 
-  # Main Phew application.
-  class Application
-    def combo
-      @combo ||= ScriptList.new.tap(&:fill)
-    end
-
-    def textview
-      @textview ||= Gtk::TextView.new
-    end
-
-    def build_vbox
-      vbox = Gtk::VBox.new false, 0
-
-      vbox.pack_start combo, false, false, 0
-      vbox.pack_start textview, false, false, 0
-      vbox.pack_start script_list_scroller, true, true, 0
-      vbox
-    end
-
-    def vbox
-      @vbox ||= build_vbox
-    end
-
-    def script_list_scroller
-      @script_list_scroller ||= Gtk::ScrolledWindow.new(nil, nil).tap do |scr|
-        lst = script_list
-        scr.add lst
-        lst.hadjustment = scr.hadjustment
-        lst.vadjustment = scr.vadjustment
-      end
-    end
-
-    def script_list
-      @script_list ||= Gtk::TreeView.new_with_model(scriptmodel).tap do |view|
-        renderer = Gtk::CellRendererText.new
-        col = Gtk::TreeViewColumn.new
-        col.set_title 'Font Name'
-        col.pack_start renderer, true
-        col.add_attribute renderer, 'text', 0
-        view.append_column col
-      end
-    end
-
-    def scriptmodel
-      @scriptmodel ||= Gtk::ListStore.new [GObject::TYPE_STRING]
-    end
-
-    def build_win
-      win = Window.new :toplevel
-      win.add vbox
-      win
-    end
-
-    def win
-      @win ||= build_win
-    end
-
-    # Set up all signal handlers
-    def connect_signals
-      win.connect_signals
-      combo.signal_connect('changed') { on_combo_changed_signal }
-    end
-
-    def on_combo_changed_signal
-      script = Script.new combo.active_text.to_sym
-      textview.buffer.text = script.sample_string
-      fill_font_list script
-    end
-
-    def initialize
-      @context = Gdk.pango_context_get
-      @font_repository = FontRepository.new @context
-      connect_signals
-      win.show_all
-    end
-
-    def fill_font_list script
-      scriptmodel.clear
-
-      fontmap = @context.get_font_map
-
-      fontmap.list_families.each do |fam|
-        font = @font_repository.get_font fam.name
-
-        sample_cov = font.coverage_summary script.sample_string
-        mostly = [:none, :fallback, :approximate, :exact].max_by { |i| sample_cov[i] }
-
-        if mostly == :exact
-          row = scriptmodel.append
-          scriptmodel.set_value row, 0, fam.name
-        end
-      end
-    end
+  myapp.menubar = menu
+end
 
-    def run
-      Gtk.main
-    end
-  end
+myapp.signal_connect "activate" do |app, _user_data|
+  @app ||= Phew::Application.new(app)
+  @app.present
 end
 
-Phew::Application.new.run
+exit(myapp.run([$PROGRAM_NAME] + ARGV))

data/lib/phew/application.rb

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+require "gir_ffi-gtk3"
+
+require "phew/font_repository"
+require "phew/script"
+require "phew/script_list"
+
+module Phew
+  # Main Phew application.
+  class Application
+    def initialize(gtk_application)
+      @gtk_application = gtk_application
+      @context = Gdk.pango_context_get
+      @font_repository = FontRepository.new @context
+      connect_signals
+    end
+
+    def present
+      win.show_all
+      win.children.first.visible = false if win.show_menubar
+      win.present
+    end
+
+    private
+
+    def combo
+      @combo ||= ScriptList.new.tap(&:fill)
+    end
+
+    def textview
+      @textview ||= Gtk::TextView.new
+    end
+
+    def build_vbox
+      vbox = Gtk::VBox.new false, 0
+
+      vbox.pack_start combo, false, false, 0
+      vbox.pack_start textview, false, false, 0
+      vbox.pack_start script_list_scroller, true, true, 0
+      vbox
+    end
+
+    def vbox
+      @vbox ||= build_vbox
+    end
+
+    def script_list_scroller
+      @script_list_scroller ||= Gtk::ScrolledWindow.new(nil, nil).tap do |scr|
+        lst = script_list
+        scr.add lst
+        lst.hadjustment = scr.hadjustment
+        lst.vadjustment = scr.vadjustment
+      end
+    end
+
+    def script_list
+      @script_list ||= Gtk::TreeView.new_with_model(scriptmodel).tap do |view|
+        renderer = Gtk::CellRendererText.new
+        col = Gtk::TreeViewColumn.new
+        col.set_title "Font Name"
+        col.pack_start renderer, true
+        col.add_attribute renderer, "text", 0
+        view.append_column col
+      end
+    end
+
+    def scriptmodel
+      @scriptmodel ||= Gtk::ListStore.new [GObject::TYPE_STRING]
+    end
+
+    def build_win
+      win = Gtk::ApplicationWindow.new @gtk_application
+      win.add vbox
+      win
+    end
+
+    def win
+      @win ||= build_win
+    end
+
+    # Set up all signal handlers
+    def connect_signals
+      combo.signal_connect("changed") { on_combo_changed_signal }
+    end
+
+    def on_combo_changed_signal
+      script = Script.new combo.active_text.to_sym
+      # FIXME: Add override for Gtk::TextBuffer.set_text so #text= works properly
+      textview.buffer.set_text script.sample_string, -1
+      fill_font_list script
+    end
+
+    def fill_font_list(script)
+      scriptmodel.clear
+
+      font_families.each do |fam|
+        font = @font_repository.get_font fam.name
+
+        if sample_coverage(font, script) == :exact
+          row = scriptmodel.append
+          scriptmodel.set_value row, 0, fam.name
+        end
+      end
+    end
+
+    def sample_coverage(font, script)
+      sample_cov = font.coverage_summary script.sample_string
+      [:none, :fallback, :approximate, :exact].max_by { |i| sample_cov[i] }
+    end
+
+    def font_families
+      fontmap = @context.get_font_map
+
+      fontmap.list_families
+    end
+  end
+end

data/lib/phew/font.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "gir_ffi-pango"
+
 module Phew
   # Font family. Handles coverage, among other things.
   class Font
@@ -6,8 +10,9 @@ module Phew
     #
     # @param [Pango::Context] context Pango context to retrieve font from.
     # @param [String] text_description Description of the font to create.
-    def initialize context, text_description
+    def initialize(context, text_description)
       fd = Pango::FontDescription.from_string text_description
+      fd.size = 10
       fontmap = context.get_font_map
       @font = fontmap.load_font context, fd
     end
@@ -16,12 +21,11 @@ module Phew
     #
     # @return A hash with keys :none, :fallback, :approximate, :exact, and values
     #   indicating the number of characters in the text that have that coverage.
-    def coverage_summary text
+    def coverage_summary(text)
       lang = Pango::Language.new
       cov = @font.get_coverage lang
       text_cov = text.each_codepoint.map { |cp| cov.get cp }
-      Hash[
-        Pango::CoverageLevel::Enum.symbols.map { |lvl| [lvl, text_cov.count(lvl)] }]
+      Pango::CoverageLevel::Enum.symbols.to_h { |lvl| [lvl, text_cov.count(lvl)] }
     end
   end
 end

data/lib/phew/font_repository.rb

@@ -1,16 +1,21 @@
+# frozen_string_literal: true
+
+require "phew/font"
+
 module Phew
   # Cache for font information retrieved from a Pango context
   class FontRepository
     # @param [Pango::Context] context Pango context to retrieve fonts from.
-    def initialize context
+    def initialize(context)
       @store = {}
       @context = context
     end
+
     # Retrieve a font based on the given text description. The text description
     # should be in the format accepted by Font#new.
     #
     # @param [String] text_description Description of the font to retrieve.
-    def get_font text_description
+    def get_font(text_description)
       @store[text_description] ||= Font.new @context, text_description
     end
   end

data/lib/phew/script.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
+require "gir_ffi-pango"
+
 module Phew
   # A script.
   class Script
-    def initialize name
+    def initialize(name)
       symbol = name.to_sym
       @symbol = symbol
       @lang = Pango.script_get_sample_language symbol
@@ -9,7 +13,7 @@ module Phew
 
     def sample_string
       if @lang.nil?
-        'No sample available'
+        "No sample available"
       else
         @lang.get_sample_string
       end

data/lib/phew/script_list.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "gir_ffi-gtk3"
+require "gir_ffi-pango"
+
+module Phew
+  # Drop-down list of available scripts.
+  class ScriptList < Gtk::ComboBoxText
+    # FIXME: Should be able to fill inside #initialize
+    def fill
+      Pango::Script::Enum.symbols
+        .map(&:to_s)
+        .each { |str| append str, str }
+    end
+  end
+end

data/lib/phew/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module Phew
+  VERSION = "0.0.6"
+end

data/lib/phew.rb

@@ -1,6 +1,4 @@
-require 'gir_ffi-gtk3'
-require 'gir_ffi-pango'
+# frozen_string_literal: true
 
-require 'phew/script'
-require 'phew/font'
-require 'phew/font_repository'
+require "phew/application"
+require "phew/version"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phew
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.6
 platform: ruby
 authors:
 - Matijs van Zuijlen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2022-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi-gtk
@@ -16,120 +16,183 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: gir_ffi-pango
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.15
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: atspi_app_driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.12'
 - !ruby/object:Gem::Dependency
-  name: atspi_app_driver
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rake-manifest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.25.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.25.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.13.0
 description: List and compare installed fonts on GNOME
 email:
 - matijs@matijs.net
-executables: []
+executables:
+- phew
 extensions: []
 extra_rdoc_files: []
 files:
 - COPYING
-- Gemfile
 - README.md
-- Rakefile
 - bin/phew
-- doc/character_map.png
-- doc/fontviewer.gif
-- doc/gfontview.png
-- doc/gnome_specimen.png
-- doc/prior-art.md
-- doc/waterfall.png
 - lib/phew.rb
+- lib/phew/application.rb
 - lib/phew/font.rb
 - lib/phew/font_repository.rb
 - lib/phew/script.rb
-- test/end_to_end/basic_run_test.rb
-- test/test_helper.rb
-- test/unit/font_repository_test.rb
-- test/unit/font_test.rb
+- lib/phew/script_list.rb
+- lib/phew/version.rb
 homepage: http://www.github.com/mvz/phew-font-viewer
 licenses:
 - GPL-3
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
 require_paths:
 - lib
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A GNOME Font Viewer
 test_files: []

data/Gemfile

@@ -1,6 +0,0 @@
-source 'https://rubygems.org'
-
-# The gem's dependencies are specified in the gemspec
-gemspec
-
-gem 'pry', '~> 0.10.0', type: :development

data/Rakefile

@@ -1,25 +0,0 @@
-require 'rake/clean'
-require 'bundler/gem_helper'
-require 'rake/testtask'
-
-Bundler::GemHelper.install_tasks
-
-namespace :test do
-  Rake::TestTask.new(:unit) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/unit/*_test.rb']
-    t.warning = true
-  end
-
-  Rake::TestTask.new(:end_to_end) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['test/end_to_end/*_test.rb']
-    t.warning = true
-  end
-
-  task all: [:unit, :end_to_end]
-end
-
-task test: 'test:all'
-
-task default: 'test'

data/doc/prior-art.md

@@ -1,40 +0,0 @@
-# Prior Art
-
-## Font Viewer
-
-[Website](http://fontviewer.net/)
-
-![FontViewer screen shot](fontviewer.gif)
-
-Pleasantly sparse interface with obnoxious branding.
-
-The grid display of different font weights is a nice touch. 
-
-## GFontView
-
-[Website](http://gfontview.sourceforge.net/)
-
-![GFontView screen shot](gfontview.png)
-
-Based on files rather than installed fonts.
-
-Only shows one font at a time.
-
-## Gnome Specimen
-
-![Specimen screen shot](gnome_specimen.png)
-
-Clean interface. Does not allow filtering by desired script or text.
-
-
-## Waterfall
-
-![Waterfall screen shot](waterfall.png)
-
-Allows easy switching between different parts of the character set.
-
-## Character Map
-
-![Character map screen shot](character_map.png)
-
-A different way of selecting scripts. Nice balanced UI.

data/test/end_to_end/basic_run_test.rb

@@ -1,53 +0,0 @@
-require_relative '../test_helper'
-require 'atspi_app_driver'
-
-# Test driver for the Phew application.
-class PhewDriver < AtspiAppDriver
-  def initialize
-    verbose = ENV['VERBOSE'] == 'true'
-    super 'phew', verbose: verbose
-  end
-end
-
-describe 'The Phew application' do
-  before do
-    @driver = PhewDriver.new
-    @driver.boot
-  end
-
-  it 'starts and can be quit with Ctrl-q' do
-    sleep 0.05
-    @driver.press_ctrl_q
-
-    status = @driver.cleanup
-    status.exitstatus.must_equal 0
-  end
-
-  it 'shows a dropdown list of scripts' do
-    frame = @driver.frame
-
-    box = frame.find_role :combo_box
-
-    latin = box.find_role :menu_item, /latin/
-    latin.wont_be_nil
-
-    textbox = frame.find_role :text
-    textbox.wont_be_nil
-    textbox.get_text(0, 100).must_equal ''
-
-    box.get_action_name(0).must_equal 'press'
-    box.do_action 0
-    latin.get_action_name(0).must_equal 'click'
-    latin.do_action 0
-
-    textbox.get_text(0, 100).must_equal 'The quick brown fox jumps over the lazy dog.'
-
-    @driver.press_ctrl_q
-    status = @driver.cleanup
-    status.exitstatus.must_equal 0
-  end
-
-  after do
-    @driver.cleanup
-  end
-end

data/test/test_helper.rb

@@ -1,6 +0,0 @@
-require 'minitest/autorun'
-
-require 'phew'
-
-# Gtk must be initialized for all the font retrieval methods to work.
-Gtk.init

data/test/unit/font_repository_test.rb

@@ -1,20 +0,0 @@
-require_relative '../test_helper'
-
-describe Phew::FontRepository do
-  describe '#get_font' do
-    it 'returns an instance of Phew::Font' do
-      ctx = Gdk.pango_context_get
-      repo = Phew::FontRepository.new ctx
-      font = repo.get_font 'Sans'
-      font.must_be_instance_of Phew::Font
-    end
-
-    it 'returns the same object if called again with the same description' do
-      ctx = Gdk.pango_context_get
-      repo = Phew::FontRepository.new ctx
-      font = repo.get_font 'Sans'
-      font_again = repo.get_font 'Sans'
-      font_again.must_be_same_as font
-    end
-  end
-end

data/test/unit/font_test.rb

@@ -1,17 +0,0 @@
-require_relative '../test_helper'
-
-describe Phew::Font do
-  describe '#coverage_summary' do
-    it 'returns summarized coverage information for the given string' do
-      ctx = Gdk.pango_context_get
-
-      pfont = Phew::Font.new ctx, 'Sans'
-
-      test_string = 'This is a test'
-      sum = pfont.coverage_summary test_string
-
-      sum.keys.sort.must_equal [:none, :fallback, :approximate, :exact].sort
-      sum.values.inject(:+).must_equal test_string.size
-    end
-  end
-end