phew 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76bdc848ba00cbe93dcbd8bd4f18255af08e7b11eb35704404a4e80fe9d3d06a
-  data.tar.gz: a15961a04d5673672b9d3deec4f58e9ec559a9c925b2608648def511249aab82
+  metadata.gz: cff9393daf26cbbd2eb966bbb810a5218cdba85c5a97d06837e92ff7e8554ba3
+  data.tar.gz: 65083fa7e4189889205a70d61fc3824ae0f2eb62ec5cf31bcb61444f3ecc5bf3
 SHA512:
-  metadata.gz: 6999d0de88e2e3feae5d92d7556821dbeff21f3fbb3968ab698a0f28611f0d098ef03414d3d8691761cd748300af5495812afcb4161ada42d05df4426df0933d
-  data.tar.gz: fc76fd22022ef3883ffae54df23e0a207c3d836de672a47def2204e3d3e48a5032e759945c082b3fafce5dbbaea7aec8b0cf9e3af61492411958bfdf63e3d40f
+  metadata.gz: 5ef231b206e5d251169dc0a3b0fc9f4de004cf5f512a13d3c761c5537bb431425c824bbd237ca9df1bafcc729989ff5e1e4c8ed8f7a37830c53ff927ca46f18a
+  data.tar.gz: 3cdfa3b3c0af96afed9edc88bc4f9fdf78c94403b7cd7a541899fea9cb24589a00c9cdde4def70ba0fbbd25d96267a49f64f54ceafb11a07dc7e19baa71e4197

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # The gem's dependencies are specified in the gemspec
 gemspec

data/Rakefile

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-require 'rake/clean'
-require 'bundler/gem_helper'
-require 'rake/testtask'
+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/**/*_test.rb']
+    t.libs = ["lib"]
+    t.test_files = FileList["test/**/*_test.rb"]
     t.warning = true
   end
 
   Rake::TestTask.new(:features) do |t|
-    t.libs = ['lib']
-    t.test_files = FileList['features/**/*_test.rb']
+    t.libs = ["lib"]
+    t.test_files = FileList["features/**/*_test.rb"]
     t.warning = true
   end
 
   task all: [:unit, :features]
 end
 
-task test: 'test:all'
+task test: "test:all"
 
-task default: 'test'
+task default: "test"

data/bin/phew

@@ -1,147 +1,29 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'phew'
+require "phew"
 
-Gtk.init
+myapp = Gtk::Application.new("net.matijs.phew", { none: true })
 
-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.signal_connect "startup" do |app|
+  action = Gio::SimpleAction.new("quit", nil)
+  action.signal_connect("activate") { app.quit }
+  myapp.add_action action
 
-  # 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.set_accels_for_action "app.quit", ["<Ctrl>Q"]
 
-    def on_destroy_event
-      Gtk.main_quit
-      false
-    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
 
-    def on_key_press_event(evt)
-      destroy if evt.state[:control_mask] && evt.keyval == 'q'.ord
-      false
-    end
-  end
-
-  # 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
-      # 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 initialize
-      @context = Gdk.pango_context_get
-      @font_repository = FontRepository.new @context
-      connect_signals
-      win.show_all
-    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
+  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.rb

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

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,5 +1,7 @@
 # frozen_string_literal: true
 
+require "gir_ffi-pango"
+
 module Phew
   # Font family. Handles coverage, among other things.
   class Font
@@ -10,6 +12,7 @@ module Phew
     # @param [String] text_description Description of the font to create.
     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

data/lib/phew/font_repository.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "phew/font"
+
 module Phew
   # Cache for font information retrieved from a Pango context
   class FontRepository

data/lib/phew/script.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "gir_ffi-pango"
+
 module Phew
   # A script.
   class Script
@@ -11,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/test/phew/font_repository_test.rb

@@ -1,22 +1,22 @@
 # frozen_string_literal: true
 
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 describe Phew::FontRepository do
-  describe '#get_font' do
-    it 'returns an instance of Phew::Font' 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
+      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
+    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
+      font = repo.get_font "Sans"
+      font_again = repo.get_font "Sans"
+      _(font_again).must_be_same_as font
     end
   end
 end

data/test/phew/font_test.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require_relative '../test_helper'
+require_relative "../test_helper"
 
 describe Phew::Font do
-  describe '#coverage_summary' do
-    it 'returns summarized coverage information for the given string' 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'
+      pfont = Phew::Font.new ctx, "Sans"
 
-      test_string = 'This is a test'
-      sum = pfont.coverage_summary test_string
+      test_string = "This is a test"
+      summary = pfont.coverage_summary test_string
 
-      sum.keys.sort.must_equal [:none, :fallback, :approximate, :exact].sort
-      sum.values.inject(:+).must_equal test_string.size
+      _(summary.keys.sort).must_equal [:none, :fallback, :approximate, :exact].sort
+      _(summary.values.sum).must_equal test_string.size
     end
   end
 end

data/test/test_helper.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'minitest/autorun'
+require "minitest/autorun"
 
-require 'phew'
+require "phew"
 
 # Gtk must be initialized for all the font retrieval methods to work.
 Gtk.init

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phew
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Matijs van Zuijlen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-25 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi-gtk
@@ -16,70 +16,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.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.10
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: atspi_app_driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        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.12'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        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: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: 1.9.1
 description: List and compare installed fonts on GNOME
 email:
 - matijs@matijs.net
@@ -100,9 +156,11 @@ files:
 - 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
+- lib/phew/script_list.rb
 - test/phew/font_repository_test.rb
 - test/phew/font_test.rb
 - test/test_helper.rb
@@ -110,7 +168,7 @@ homepage: http://www.github.com/mvz/phew-font-viewer
 licenses:
 - GPL-3
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -121,16 +179,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A GNOME Font Viewer
 test_files: []