[ruby-gnome2-cvs] ruby-gnome2/ruby-gnome2@e00253c [master] Add Poppler::Version in its own file

[cedlemo <nu...@co...>]

cedlemo	2017-07-21 02:02:55 +0900 (Fri, 21 Jul 2017)

  New Revision: e00253c14bdc897b84abc66ec3c62db109a5836f
  https://github.com/ruby-gnome2/ruby-gnome2/commit/e00253c14bdc897b84abc66ec3c62db109a5836f

  Merged 7316c70: Merge pull request #1068 from cedlemo/poppler_gi_form

  Message:
    Add Poppler::Version in its own file

  Copied files:
    poppler/lib/poppler/version.rb
      (from poppler/lib/poppler/loader.rb)
  Modified files:
    poppler/lib/poppler.rb
    poppler/lib/poppler/loader.rb

  Modified: poppler/lib/poppler.rb (+0 -18)
===================================================================
--- poppler/lib/poppler.rb    2017-07-21 01:59:47 +0900 (33393b3)
+++ poppler/lib/poppler.rb    2017-07-21 02:02:55 +0900 (009ace7)
@@ -33,24 +33,6 @@ module Poppler
   loader = Loader.new(self)
   loader.load("Poppler")
 
-  module Version
-    MAJOR = MAJOR_VERSION
-    MINOR = MINOR_VERSION
-    MICRO = MICRO_VERSION
-    STRING = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{MICRO_VERSION}"
-    class << self
-      def or_later?(major, minor, micro=nil)
-        micro ||= 0
-        version = [
-          MAJOR_VERSION,
-          MINOR_VERSION,
-          MICRO_VERSION,
-        ]
-        (version <=> [major, minor, micro]) >= 0
-      end
-    end
-  end
-
   class AnnotCalloutLine
     alias_method :initialize_raw, :initialize
     def initialize(*args)

  Modified: poppler/lib/poppler/loader.rb (+1 -0)
===================================================================
--- poppler/lib/poppler/loader.rb    2017-07-21 01:59:47 +0900 (9bee7b3)
+++ poppler/lib/poppler/loader.rb    2017-07-21 02:02:55 +0900 (23253cc)
@@ -25,6 +25,7 @@ module Poppler
     end
 
     def require_libraries
+      require "poppler/version"
     end
   end
 end

  Copied: poppler/lib/poppler/version.rb (+15 -10) 66%
===================================================================
--- poppler/lib/poppler/loader.rb    2017-07-21 01:59:47 +0900 (9bee7b3)
+++ poppler/lib/poppler/version.rb    2017-07-21 02:02:55 +0900 (9678b91)
@@ -15,16 +15,21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Poppler
-  class Loader < GObjectIntrospection::Loader
-    private
-    def pre_load(repository, namespace)
-    end
-
-    def post_load(repository, namespace)
-      require_libraries
-    end
-
-    def require_libraries
+  module Version
+    MAJOR = MAJOR_VERSION
+    MINOR = MINOR_VERSION
+    MICRO = MICRO_VERSION
+    STRING = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{MICRO_VERSION}"
+    class << self
+      def or_later?(major, minor, micro=nil)
+        micro ||= 0
+        version = [
+          MAJOR_VERSION,
+          MINOR_VERSION,
+          MICRO_VERSION,
+        ]
+        (version <=> [major, minor, micro]) >= 0
+      end
     end
   end
 end