gir_ffi-cairo 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bdfee0ee121e41438b7d0dabfcabae03362a42b9
-  data.tar.gz: 4f0553d509425734c116294a3f199c34e5cd12f2
+SHA256:
+  metadata.gz: 15b274d8e00c739bf2ac1fc4a160ce2d535ee94c7b0dfcdff9a6e162c7991393
+  data.tar.gz: 78b673223b0653a824aea70f58386cc1a7bc5f522b0b758c24f319efd286747e
 SHA512:
-  metadata.gz: c63df99ed7f65a180a8acb285fbce7bbbb3b214019e1763a6c90ba62cc65f3ee74b098dac8d8c0560e3dab0b45f74abc4154c62603f336369487e6de2ba09393
-  data.tar.gz: b2efb29f129d6e5086ab6296e56f030b79e55ff3eef05d53a85c2cb588d6e63a3441aa6bb9e942c4d78916f17edcb8ce5e891f4c218457a8675f584648f8341d
+  metadata.gz: 0dd29d627b52e35329bf8dee8177c6e39281f3c609fd3bf09bc11536b51f7434692cdb3e4da44c1798dcc069034b21574de7791b4a5142ad546d0b330e19530f
+  data.tar.gz: 3132145bd971d040484c55315ef29899330db73d31eb22757e3ec521e21f4cc606578379d5beef5b834664126768f1ac6f226beb177c9cec88d073e859fa46d6

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_helper'
 require 'rake/testtask'
 
@@ -16,9 +18,9 @@ namespace :test do
     t.warning = true
   end
 
-  task :all => [:unit, :integration]
+  task all: [:unit, :integration]
 end
 
-task :test => 'test:all'
+task test: 'test:all'
 
-task :default => 'test'
+task default: 'test'

data/lib/gir_ffi-cairo/context.rb

@@ -1,10 +1,13 @@
-module Cairo
-  load_class :Context
+# frozen_string_literal: true
+
+Cairo.load_class :Context
 
+module Cairo
+  # Overrides for CairoContext (cairo_t)
   class Context
-    def self.create target
+    def self.create(target)
       ptr = Lib.cairo_create target
-      self.wrap ptr
+      wrap ptr
     end
 
     def move_to(x, y)
@@ -23,7 +26,7 @@ module Cairo
       Lib.cairo_rectangle self, x, y, width, height
     end
 
-    def arc xc, yc, radius, angle1, angle2
+    def arc(xc, yc, radius, angle1, angle2)
       Lib.cairo_arc self, xc, yc, radius, angle1, angle2
     end
 
@@ -40,7 +43,7 @@ module Cairo
       Surface.wrap ptr
     end
 
-    def set_source_rgba red, green, blue, alpha
+    def set_source_rgba(red, green, blue, alpha)
       Lib.cairo_set_source_rgba self, red, green, blue, alpha
     end
 
@@ -56,26 +59,26 @@ module Cairo
       Lib.cairo_show_page self
     end
   end
+end
 
-  module Lib
-    attach_function :cairo_create, [:pointer], :pointer
-    attach_function :cairo_get_target, [:pointer], :pointer
+Cairo::Lib.module_eval do
+  attach_function :cairo_create, [:pointer], :pointer
+  attach_function :cairo_get_target, [:pointer], :pointer
 
-    attach_function :cairo_move_to, [:pointer, :double, :double], :void
-    attach_function :cairo_line_to, [:pointer, :double, :double], :void
-    attach_function :cairo_arc,
-      [:pointer, :double, :double, :double, :double, :double], :void
-    attach_function :cairo_close_path, [:pointer], :void
-    attach_function :cairo_rectangle, [:pointer, :double, :double, :double, :double], :void
+  attach_function :cairo_move_to, [:pointer, :double, :double], :void
+  attach_function :cairo_line_to, [:pointer, :double, :double], :void
+  attach_function :cairo_arc,
+                  [:pointer, :double, :double, :double, :double, :double], :void
+  attach_function :cairo_close_path, [:pointer], :void
+  attach_function :cairo_rectangle, [:pointer, :double, :double, :double, :double], :void
 
-    attach_function :cairo_fill, [:pointer], :void
-    attach_function :cairo_stroke, [:pointer], :void
+  attach_function :cairo_fill, [:pointer], :void
+  attach_function :cairo_stroke, [:pointer], :void
 
-    attach_function :cairo_set_source_rgba,
-      [:pointer, :double, :double, :double, :double], :void
+  attach_function :cairo_set_source_rgba,
+                  [:pointer, :double, :double, :double, :double], :void
 
-    attach_function :cairo_save, [:pointer], :void
-    attach_function :cairo_restore, [:pointer], :void
-    attach_function :cairo_show_page, [:pointer], :void
-  end
+  attach_function :cairo_save, [:pointer], :void
+  attach_function :cairo_restore, [:pointer], :void
+  attach_function :cairo_show_page, [:pointer], :void
 end

data/lib/gir_ffi-cairo/format.rb

@@ -1,15 +1,13 @@
-module Cairo
-  module Lib
-    enum :Format, [
-      :invalid, -1,
-      :argb32, 0,
-      :rgb24,
-      :a8,
-      :a1,
-      :rgb16_565,
-      :rgb30
-    ]
-  end
+# frozen_string_literal: true
 
-  Format = Lib.enum_type :Format
+module Cairo
+  Format = Lib.enum :Format, [
+    :invalid, -1,
+    :argb32, 0,
+    :rgb24,
+    :a8,
+    :a1,
+    :rgb16_565,
+    :rgb30
+  ]
 end

data/lib/gir_ffi-cairo/image_surface.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 module Cairo
+  # Surface subclass for (bitmap) images.
   class ImageSurface < Surface
-    def self.create format, width, height
+    def self.create(format, width, height)
       ptr = Lib.cairo_image_surface_create format, width, height
-      self.wrap ptr
+      wrap ptr
     end
   end
-
-  module Lib
-    attach_function :cairo_image_surface_create, [Cairo::Format, :int, :int], :pointer
-  end
 end
 
+Cairo::Lib.attach_function(:cairo_image_surface_create,
+                           [Cairo::Format, :int, :int], :pointer)

data/lib/gir_ffi-cairo/pdf_surface.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module Cairo
+  # Surface subclass for PDFs.
   class PDFSurface < Surface
-    def self.create filename, width, height
+    def self.create(filename, width, height)
       ptr = Lib.cairo_pdf_surface_create filename, width, height
-      surface = self.wrap ptr
+      surface = wrap ptr
 
       if block_given?
         yield surface
@@ -16,9 +19,9 @@ module Cairo
       Lib.cairo_pdf_surface_set_size(self, width, height)
     end
   end
+end
 
-  module Lib
-    attach_function :cairo_pdf_surface_create, [:string, :double, :double], :pointer
-    attach_function :cairo_pdf_surface_set_size, [:pointer, :double, :double], :void
-  end
+Cairo::Lib.module_eval do
+  attach_function :cairo_pdf_surface_create, [:string, :double, :double], :pointer
+  attach_function :cairo_pdf_surface_set_size, [:pointer, :double, :double], :void
 end

data/lib/gir_ffi-cairo/surface.rb

@@ -1,19 +1,21 @@
-module Cairo
-  load_class :Surface
+# frozen_string_literal: true
+
+Cairo.load_class :Surface
 
+module Cairo
+  # Overrides for CairoSurface (cairo_surface_t)
   class Surface
-    # TODO: Add overrides
     def flush
       Lib.cairo_surface_flush(self)
     end
+
     def finish
       Lib.cairo_surface_finish(self)
     end
   end
+end
 
-  module Lib
-    # TODO: Attach functions
-    attach_function :cairo_surface_flush, [:pointer], :void
-    attach_function :cairo_surface_finish, [:pointer], :void
-  end
+Cairo::Lib.module_eval do
+  attach_function :cairo_surface_flush, [:pointer], :void
+  attach_function :cairo_surface_finish, [:pointer], :void
 end

data/lib/gir_ffi-cairo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'gir_ffi'
 
 GirFFI.setup :cairo

data/test/gir_ffi-cairo/context_test.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
 describe Cairo::Context do
-  describe ".create" do
-    it "creates a new Cairo::Context" do
+  describe '.create' do
+    it 'creates a new Cairo::Context' do
       obj = Cairo::Context.create(nil)
       obj.must_be_instance_of Cairo::Context
     end
@@ -10,7 +12,7 @@ describe Cairo::Context do
 
   let(:instance) { Cairo::Context.create(nil) }
 
-  describe "#get_target" do
+  describe '#get_target' do
     it "returns the context's target" do
       instance.get_target.must_be_instance_of Cairo::Surface
     end

data/test/gir_ffi-cairo/image_surface_test.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
+
 require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
 describe Cairo::ImageSurface do
-  it "is a subclass of Cairo::Surface" do
+  it 'is a subclass of Cairo::Surface' do
     Cairo::ImageSurface.superclass.must_equal Cairo::Surface
   end
 
-  describe ".create" do
-    it "creates a new Cairo::ImageSurface" do
+  describe '.create' do
+    it 'creates a new Cairo::ImageSurface' do
       obj = Cairo::ImageSurface.create(:argb32, 300, 200)
       obj.must_be_instance_of Cairo::ImageSurface
     end
   end
 end
-

data/test/gir_ffi-cairo/pdf_surface_test.rb

@@ -1,29 +1,29 @@
+# frozen_string_literal: true
+
 require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
 describe Cairo::PDFSurface do
-  it "is a subclass of Cairo::Surface" do
+  it 'is a subclass of Cairo::Surface' do
     Cairo::PDFSurface.superclass.must_equal Cairo::Surface
   end
 
-  describe ".create" do
+  describe '.create' do
     before { @path = 'test.pdf' }
     after  { File.delete(@path) if File.exist? @path }
 
-    it "creates a new Cairo::PDFSurface" do
+    it 'creates a new Cairo::PDFSurface' do
       obj = Cairo::PDFSurface.create(@path, 300, 200)
       obj.must_be_instance_of Cairo::PDFSurface
     end
 
-    it "creates a new Cairo::PDFSurface with block" do
+    it 'creates a new Cairo::PDFSurface with block' do
       called = nil
-      Cairo::PDFSurface.create(@path, 300, 200) {|surface|
+      Cairo::PDFSurface.create(@path, 300, 200) do |surface|
         surface.must_be_instance_of Cairo::PDFSurface
         called = true
-      }
+      end
       refute_nil called
       assert File.exist?(@path)
     end
-
   end
 end
-

data/test/integration/context_test.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
 describe Cairo::Context do
-  it "can retrieve the surface it was created for" do
+  it 'can retrieve the surface it was created for' do
     dst = Cairo::ImageSurface.create(:argb32, 400, 300)
     ctx = Cairo::Context.create(dst)
     ctx.get_target.to_ptr.must_equal dst.to_ptr
     pass
   end
 
-  it "can create and fill a path" do
+  it 'can create and fill a path' do
     dst = Cairo::ImageSurface.create(:argb32, 400, 300)
     ctx = Cairo::Context.create(dst)
     ctx.arc(300, 200, 100, 0, 2 * Math::PI)
@@ -21,14 +23,14 @@ describe Cairo::Context do
     before { @path = 'integration-test.pdf' }
     after  { File.delete(@path) if File.exist? @path }
 
-    it "can create pdf" do
-      Cairo::PDFSurface.create(@path, 400, 300) {|surface|
+    it 'can create pdf' do
+      Cairo::PDFSurface.create(@path, 400, 300) do |surface|
         ctx = Cairo::Context.create(surface)
         ctx.arc(300, 200, 100, 0, 2 * Math::PI)
         ctx.set_source_rgba(1, 1, 0, 0.5)
         ctx.fill
         ctx.show_page
-      }
+      end
       pass
     end
   end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'minitest/autorun'
 
 require 'gir_ffi-cairo'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi-cairo
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-16 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gir_ffi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
 description: Bindings for Cairo generated by GirFFI, with overrides.
 email:
 - matijs@matijs.net
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: GirFFI-based bindings for Cairo