gtksourceview3 2.2.5 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be6a6b5fa59d4a6e2e0de555d3c6afbd2aa88313
-  data.tar.gz: 3e2895495825738e986f5cd1bc6610d18c796861
+  metadata.gz: c7687d9d29363321b3c2fca3d6763990cc5e1ed9
+  data.tar.gz: 87f2b45bdc9ce78c3a97d2a444eaee1a8615cb37
 SHA512:
-  metadata.gz: 9d7bd1d93166bfd83281f25fcbaa0488d2cdda8df4b8e428d7fa6c9aaa237bd7ab59689c912fdba1887eddd090da1dedccf1828002877d4efbe9e3fc8e79c6cd
-  data.tar.gz: 286730de78737e6237418ee1afcfbbcfe3bf0b5b0d6f75d897759beb34f6eaf3781efca80e335a20d00e29f3bc7d9ca75156c06efa708d641a60ee0530146f2e
+  metadata.gz: e185d927d0217a17648cc84628dcab33cd98bcb7a0d5f328076189c64f6ddf9759407bc0232f34fded8990b693f5cba02953a0e5871c1852b66877fd0d06d465
+  data.tar.gz: 53d4be80181dd2121293c50126d87d1e686b2d5668e75cdec7933b2254739d9f4cc78e253aaf16374282323cb98bb4de8772b2f9f547c2e3045bb44d89363a75

data/Rakefile

@@ -1,6 +1,6 @@
 # -*- ruby -*-
 #
-# Copyright (C) 2012-2013  Ruby-GNOME2 Project Team
+# Copyright (C) 2012-2015  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -22,7 +22,7 @@ require "gnome2/rake/package-task"
 package_task = GNOME2::Rake::PackageTask.new do |package|
   package.summary = "Ruby/GtkSourceView3 is a Ruby binding of gtksourceview-3.x."
   package.description = "Ruby/GtkSourceView3 is a Ruby binding of gtksourceview-3.x."
-  package.dependency.gem.runtime = ["gtk3"]
+  package.dependency.gem.runtime = ["gtk3", "gobject-introspection"]
   package.windows.packages = []
   package.windows.dependencies = []
   package.windows.build_dependencies = [
@@ -44,7 +44,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "gtksourceview",
       :download_site => :gnome,
       :label => "GtkSourceView",
-      :version => "3.14.2",
+      :version => "3.16.1",
       :compression_method => "xz",
       :windows => {
         :configure_args => [
@@ -56,4 +56,3 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
   ]
 end
 package_task.define
-

data/lib/gtksourceview3/loader.rb

@@ -0,0 +1,46 @@
+# Copyright (C) 2014-2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module GtkSource
+  class Loader < GObjectIntrospection::Loader
+    private
+    def load_function_info(info)
+      name = info.name
+      case name
+      when "init"
+        # ignore
+      else
+        super
+      end
+    end
+
+    def post_load(repository, namespace)
+      require_libraries
+    end
+
+    def require_libraries
+      require "gtksourceview3/mark-attributes"
+
+      require "gtksourceview3/deprecated"
+    end
+
+    def initialize_post(object)
+      super
+      return unless object.is_a?(GLib::Object)
+      self.class.reference_gobject(object, :sink => true)
+    end
+  end
+end

data/lib/gtksourceview3/mark-attributes.rb

@@ -0,0 +1,29 @@
+# Copyright (C) 2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+module GtkSource
+  class MarkAttributes
+    alias_method :background_raw, :background
+    def background
+      set, rgba = background_raw
+      if set
+        rgba
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/gtksourceview3.rb

@@ -1,20 +1,55 @@
-=begin
-  Copyright (c) 2008-2011 Ruby-GNOME2 Project Team
-  This program is licensed under the same licence as Ruby-GNOME2.
-=end
+# Copyright (C) 2014-2015  Ruby-GNOME2 Project Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
-require 'gtk3'
+require "gtk3"
 
 base_dir = Pathname.new(__FILE__).dirname.dirname.expand_path
 vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_dll_path(vendor_bin_dir)
-begin
-  major, minor, = RUBY_VERSION.split(/\./)
-  require "#{major}.#{minor}/gtksourceview3.so"
-rescue LoadError
-  require "gtksourceview3.so"
-end
+vendor_girepository_dir = vendor_dir + "lib" + "girepository-1.0"
+GObjectIntrospection.prepend_typelib_path(vendor_girepository_dir)
+
+require "gtksourceview3/loader"
+
+module GtkSource
+  LOG_DOMAIN = "GtkSource"
+  GLib::Log.set_log_domain(LOG_DOMAIN)
 
-require 'gtksourceview3/deprecated'
+  class Error < StandardError
+  end
 
+  class << self
+    def const_missing(name)
+      init
+      if const_defined?(name)
+        const_get(name)
+      else
+        super
+      end
+    end
+
+    def init
+      class << self
+        remove_method(:init)
+        remove_method(:const_missing)
+      end
+      Gtk.init if Gtk.respond_to?(:init)
+      loader = Loader.new(self)
+      loader.load("GtkSource")
+    end
+  end
+end

data/test/run-test.rb

@@ -9,6 +9,7 @@ cairo_gobject_base = File.join(ruby_gnome2_base, "cairo-gobject")
 pango_base = File.join(ruby_gnome2_base, "pango")
 gdk_pixbuf_base = File.join(ruby_gnome2_base, "gdk_pixbuf2")
 gobject_introspection_base = File.join(ruby_gnome2_base, "gobject-introspection")
+gio2_base = File.join(ruby_gnome2_base, "gio2")
 gdk3_base = File.join(ruby_gnome2_base, "gdk3")
 gtk3_base = File.join(ruby_gnome2_base, "gtk3")
 gtk_source_view3_base = File.join(ruby_gnome2_base, "gtksourceview3")
@@ -23,6 +24,7 @@ dependencies = [
   pango_base,
   gdk_pixbuf_base,
   gobject_introspection_base,
+  gio2_base,
   gdk3_base,
   gtk3_base,
   gtk_source_view3_base,

data/test/{test_mark_attributes.rb → test-mark-attributes.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2015  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

data/test/{test_source_language_manager.rb → test-source-language-manager.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014-2015  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -16,12 +16,12 @@
 
 class TestLanguageManager < Test::Unit::TestCase
   def setup
-    @lang = GtkSource::LanguageManager.new
+    @manager = GtkSource::LanguageManager.new
     @view = GtkSource::View.new
   end
 
   def test_language
-    language = @lang.get_language("ruby")
+    language = @manager.get_language("ruby")
     @view.buffer.language = language
     assert_equal(language, @view.buffer.language)
 
@@ -34,13 +34,13 @@ class TestLanguageManager < Test::Unit::TestCase
   end
 
   def test_language_ids
-    ids = @lang.language_ids
+    ids = @manager.language_ids
     assert_include(ids, "ruby")
   end
 
   def test_search_path
     custom_path = "/path/to/search"
-    @lang.search_path = custom_path
-    assert_equal([custom_path], @lang.search_path)
+    @manager.search_path = [custom_path]
+    assert_equal([custom_path], @manager.search_path)
   end
 end

data/test/{test_source_view.rb → test-source-view.rb}

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright (C) 2011-2014  Ruby-GNOME2 Project Team
+# Copyright (C) 2014  Ruby-GNOME2 Project Team
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtksourceview3
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 3.0.1
 platform: ruby
 authors:
 - The Ruby-GNOME2 Project Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk3
@@ -16,53 +16,44 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 3.0.1
+- !ruby/object:Gem::Dependency
+  name: gobject-introspection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 description: Ruby/GtkSourceView3 is a Ruby binding of gtksourceview-3.x.
 email: ruby-gnome2-devel-en@lists.sourceforge.net
 executables: []
-extensions:
-- ext/gtksourceview3/extconf.rb
+extensions: []
 extra_rdoc_files: []
 files:
 - Rakefile
-- ext/gtksourceview3/depend
-- ext/gtksourceview3/extconf.rb
-- ext/gtksourceview3/gtksourceview3.def
-- ext/gtksourceview3/rbgtksource.c
-- ext/gtksourceview3/rbgtksourcebuffer.c
-- ext/gtksourceview3/rbgtksourcegutter.c
-- ext/gtksourceview3/rbgtksourcegutterrenderer.c
-- ext/gtksourceview3/rbgtksourcegutterrendererpixbuf.c
-- ext/gtksourceview3/rbgtksourcegutterrenderertext.c
-- ext/gtksourceview3/rbgtksourcelanguage.c
-- ext/gtksourceview3/rbgtksourcelanguagemanager.c
-- ext/gtksourceview3/rbgtksourcemark.c
-- ext/gtksourceview3/rbgtksourcemarkattributes.c
-- ext/gtksourceview3/rbgtksourceprintcompositor.c
-- ext/gtksourceview3/rbgtksourcestyle.c
-- ext/gtksourceview3/rbgtksourcestylescheme.c
-- ext/gtksourceview3/rbgtksourcestyleschememanager.c
-- ext/gtksourceview3/rbgtksourceundomanager.c
-- ext/gtksourceview3/rbgtksourceview.c
-- ext/gtksourceview3/rbgtksourceview3conversions.h
-- ext/gtksourceview3/rbgtksourceview3private.h
-- extconf.rb
 - lib/gtksourceview3.rb
 - lib/gtksourceview3/deprecated.rb
-- sample/sourcelanguagemanager.rb
-- sample/test.rb
+- lib/gtksourceview3/loader.rb
+- lib/gtksourceview3/mark-attributes.rb
 - test/run-test.rb
-- test/test_mark_attributes.rb
-- test/test_source_gutter_renderer.rb
-- test/test_source_language_manager.rb
-- test/test_source_view.rb
+- test/test-mark-attributes.rb
+- test/test-source-gutter-renderer.rb
+- test/test-source-language-manager.rb
+- test/test-source-view.rb
 homepage: http://ruby-gnome2.sourceforge.jp/
 licenses:
 - LGPLv2.1 or later

data/ext/gtksourceview3/depend

@@ -1,6 +0,0 @@
-install: install-pc
-install-pc:
-	if test -n "$(pkgconfigdir)"; then				\
-	  $(MAKEDIRS) $(pkgconfigdir);					\
-	  $(INSTALL_DATA) ruby-gtksourceview3.pc $(pkgconfigdir);	\
-	fi

data/ext/gtksourceview3/extconf.rb

@@ -1,67 +0,0 @@
-=begin
-extconf.rb for Ruby/GtkSourceView3 extension library
-=end
-
-require 'pathname'
-
-base_dir = Pathname(__FILE__).dirname.parent.parent.expand_path
-top_dir = base_dir.parent
-top_build_dir = Pathname(".").parent.parent.parent.expand_path
-
-mkmf_gnome2_dir = top_dir + "glib2" + 'lib'
-version_suffix = ""
-unless mkmf_gnome2_dir.exist?
-  if /(-\d+\.\d+\.\d+)\z/ =~ base_dir.basename.to_s
-    version_suffix = $1
-    mkmf_gnome2_dir = top_dir + "glib2#{version_suffix}" + 'lib'
-  end
-end
-
-$LOAD_PATH.unshift(mkmf_gnome2_dir.to_s)
-
-module_name = "gtksourceview3"
-package_id = "gtksourceview-3.0"
-
-begin
-  require 'mkmf-gnome2'
-rescue LoadError
-  require 'rubygems'
-  gem 'glib2'
-  require 'mkmf-gnome2'
-end
-
-["glib2", "atk", "pango", "gdk_pixbuf2", "gtk3"].each do |package|
-  directory = "#{package}#{version_suffix}"
-  build_dir = "#{directory}/tmp/#{RUBY_PLATFORM}/#{package}/#{RUBY_VERSION}"
-  add_depend_package(package, "#{directory}/ext/#{package}",
-                     top_dir.to_s,
-                     :top_build_dir => top_build_dir.to_s,
-                     :target_build_dir => build_dir)
-end
-
-unless check_cairo(:top_dir => top_dir)
-  exit(false)
-end
-
-setup_windows(module_name, base_dir)
-
-unless required_pkg_config_package(package_id,
-                                   :debian => "libgtksourceview-3.0-dev",
-                                   :fedora => "gtksourceview3-devel",
-                                   :homebrew => "gtksourceview3",
-                                   :macports => "gtksourceview3")
-  exit(false)
-end
-
-make_version_header("GTKSOURCEVIEW3", package_id, ".")
-
-create_pkg_config_file("Ruby/GtkSourceView3", package_id)
-$defs << "-DRUBY_GTKSOURCEVIEW3_COMPILATION"
-create_makefile(module_name)
-pkg_config_dir = with_config("pkg-config-dir")
-if pkg_config_dir.is_a?(String)
-  File.open("Makefile", "ab") do |makefile|
-    makefile.puts
-    makefile.puts("pkgconfigdir=#{pkg_config_dir}")
-  end
-end

data/ext/gtksourceview3/gtksourceview3.def

@@ -1,2 +0,0 @@
-EXPORTS
-	Init_gtksourceview3

data/ext/gtksourceview3/rbgtksource.c

@@ -1,53 +0,0 @@
-/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/*
- *  Copyright (C) 2011  Ruby-GNOME2 Project Team
- *  Copyright (C) 2004,2005 Ruby-GNOME2 Project Team
- *  Copyright (C) 2003  Geoff Youngs, based on gtktextview.c by Masao Mutoh
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2.1 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *  MA  02110-1301  USA
- */
-
-#include "rbgtksourceview3private.h"
-
-#define RG_TARGET_NAMESPACE mGtkSource
-
-void
-Init_gtksourceview3 (void)
-{
-    VALUE RG_TARGET_NAMESPACE = rb_define_module("GtkSource");
-
-    rb_define_const(RG_TARGET_NAMESPACE, "BUILD_VERSION",
-                    rb_ary_new3(3,
-                                INT2FIX(GTKSOURCEVIEW3_MAJOR_VERSION),
-                                INT2FIX(GTKSOURCEVIEW3_MINOR_VERSION),
-                                INT2FIX(GTKSOURCEVIEW3_MICRO_VERSION)));
-
-    Init_gtksource_view (RG_TARGET_NAMESPACE);
-    Init_gtksource_buffer (RG_TARGET_NAMESPACE);
-    Init_gtksource_language (RG_TARGET_NAMESPACE);
-    Init_gtksource_languagemanager (RG_TARGET_NAMESPACE);
-    Init_gtksource_mark (RG_TARGET_NAMESPACE);
-    Init_gtksource_printcompositor (RG_TARGET_NAMESPACE);
-    Init_gtksource_style (RG_TARGET_NAMESPACE);
-    Init_gtksource_stylescheme (RG_TARGET_NAMESPACE);
-    Init_gtksource_styleschememanager (RG_TARGET_NAMESPACE);
-    Init_gtksource_gutter(RG_TARGET_NAMESPACE);
-    Init_gtksource_gutterrenderer(RG_TARGET_NAMESPACE);
-    Init_gtksource_gutterrendererpixbuf(RG_TARGET_NAMESPACE);
-    Init_gtksource_gutterrenderertext(RG_TARGET_NAMESPACE);
-    Init_gtksource_markattributes(RG_TARGET_NAMESPACE);
-    Init_gtksource_undomanager(RG_TARGET_NAMESPACE);
-}