gd2-ffij 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa7d138e9bc1811d93f29940223d4ef351cb386e
-  data.tar.gz: d5d2045cd120680ca95fb4b0fe45f5faab48145b
+  metadata.gz: 6aa4ff4f4aa7e5c580dd3c9d464c8c1df57a98a5
+  data.tar.gz: 211bf9eef3b61bffe85ec4a2e5a2a97affe26bad
 SHA512:
-  metadata.gz: 9874c2866d83776849d4208176df0f0068505cc50b226eea321ace4ae9cfbc06ca0b7f75184e14a3ea332a7dbdf013a069bf9b8439305e061c89e694ece8acf8
-  data.tar.gz: 792e63569a789cf97722e116b1c65907c7ffee7fa332abe0481d2db952a7297ad5b0c57aab2b0036a1e047527c4c019fb28acac3cb76fcf7260a343dcf858555
+  metadata.gz: b7ed5a027a534a36f2b144392aa8e1f1f56e2a3c2e230d31f4d31409353ab8d7a6d7a9846d12d024ccc9d9b892219e8a4e27a48d2a4b7cc641cdfcc3e7efde88
+  data.tar.gz: 3b5973311c1080fe04273a0dd4923589f9192b1265fe3e5b2fe607acb648af87001fd7fc54cd72a35a02664a26c23c5db60595182d404f1aabbc9e254092a411

data/.travis.yml

@@ -0,0 +1,20 @@
+dist: precise
+cache: bundler
+sudo: false
+language: ruby
+rvm:
+  - 2.4.2
+  - 2.3.5
+  - 2.2.8
+  - rbx-3
+  - jruby-head
+matrix:
+  allow_failures:
+    - rvm: rbx-3
+    - rvm: jruby-head
+addons:
+  apt:
+    packages:
+      - libgd2-noxpm
+before_install:
+  - wget -q -O - https://www.mongodb.org/static/pgp/server-3.2.pub | sudo apt-key add -

data/COPYRIGHT

@@ -16,7 +16,7 @@ See https://github.com/dark-panda/gd2-ffij/issues/10 ("Consider moving back to
 BSD now that FFI is back to BSD?") for details.
 
 
-Subsequent code added and modified to create gd2-ffij copyright (C) 2010-2015
+Subsequent code added and modified to create gd2-ffij copyright (C) 2010-2017
 J Smith <dark.panda@gmail.com> and published under the MIT license as follows:
 
 Permission is hereby granted, free of charge, to any person

data/Gemfile

@@ -19,7 +19,7 @@ if RUBY_VERSION >= '1.9'
   gem 'guard-minitest'
 end
 
-if File.exists?('Gemfile.local')
+if File.exist?('Gemfile.local')
   instance_eval File.read('Gemfile.local')
 end
 

data/Guardfile

@@ -11,7 +11,7 @@ guard 'minitest', :test_folders => 'test', :test_file_patterns => '*_tests.rb' d
   end
 end
 
-if File.exists?('Guardfile.local')
+if File.exist?('Guardfile.local')
   instance_eval File.read('Guardfile.local')
 end
 

data/Rakefile

@@ -12,11 +12,14 @@ version = GD2::VERSION
 
 desc 'Test GD2 interface'
 Rake::TestTask.new(:test) do |t|
+  t.libs << "#{File.dirname(__FILE__)}/test"
   t.test_files = FileList['test/**/*_tests.rb']
   t.verbose = !!ENV['VERBOSE_TESTS']
   t.warning = !!ENV['WARNINGS']
 end
 
+task :default => :test
+
 desc 'Build docs'
 Rake::RDocTask.new do |t|
   t.title = "gd2-ffij #{version}"

data/lib/gd2-ffij.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 #
 # See COPYRIGHT for license details.
 

data/lib/gd2/canvas.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 #
 # See COPYRIGHT for license details.
 

data/lib/gd2/color.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 #
 # See COPYRIGHT for license details.
 

data/lib/gd2/ffi_struct.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 #
 # See COPYRIGHT for license details.
 

data/lib/gd2/font.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 #
 # See COPYRIGHT for license details.
 

data/lib/gd2/image.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 #
 # See COPYRIGHT for license details.
 
@@ -44,6 +44,7 @@ module GD2
   #
   class Image
     class UnrecognizedImageTypeError < StandardError; end
+    class MemoryAllocationError < StandardError; end
 
     attr_reader :image_ptr  #:nodoc:
 
@@ -138,7 +139,7 @@ module GD2
     # part of the image. Use options :x, :y, :width, and :height to specify the
     # part of the image to import.
     def self.import(filename, options = {})
-      raise Errno::ENOENT.new(filename) unless File.exists?(filename)
+      raise Errno::ENOENT.new(filename) unless File.exist?(filename)
 
       unless format = options.delete(:format)
         md = filename.match(/\.([^.]+)\z/)
@@ -203,7 +204,16 @@ module GD2
     private_class_method :image_true_color?
 
     def self.create_image_ptr(sx, sy, alpha_blending = true)  #:nodoc:
-      ptr = FFIStruct::ImagePtr.new(::GD2::GD2FFI.send(create_image_sym, sx.to_i, sy.to_i))
+      x = sx.to_i
+      y = sy.to_i
+
+      raise ArgumentError, "sx must be > 0" unless x.positive?
+      raise ArgumentError, "sy must be > 0" unless y.positive?
+
+      ptr = FFIStruct::ImagePtr.new(::GD2::GD2FFI.send(create_image_sym, x, y))
+
+      raise MemoryAllocationError, "Could not allocation memory for image" if ptr.null?
+
       ::GD2::GD2FFI.send(:gdImageAlphaBlending, ptr, alpha_blending ? 1 : 0)
       ptr
     end

data/lib/gd2/palette.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 #
 # See COPYRIGHT for license details.
 

data/lib/gd2/version.rb

@@ -1,6 +1,6 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 
 module GD2
-  VERSION = "0.2.0"
+  VERSION = '0.3.0'.freeze
 end
 

data/test/canvas_tests.rb

@@ -1,8 +1,8 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 
 require './test/test_helper'
 
-class CanvasTest < MiniTest::Unit::TestCase
+class CanvasTest < Minitest::Test
   include TestHelper
 
   def test_line

data/test/image_tests.rb

@@ -1,10 +1,36 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 
 require './test/test_helper'
 
-class ImageTest < MiniTest::Unit::TestCase
+class ImageTest < Minitest::Test
   include TestHelper
 
+  def test_invalid_image_sizes
+    assert_raises(ArgumentError) do
+      GD2::Image.new(-10, 10)
+    end
+
+    assert_raises(ArgumentError) do
+      GD2::Image.new(0, 10)
+    end
+
+    assert_raises(ArgumentError) do
+      GD2::Image.new(10, -10)
+    end
+
+    assert_raises(ArgumentError) do
+      GD2::Image.new(10, 0)
+    end
+
+    assert_raises(GD2::Image::MemoryAllocationError) do
+      n_bytes = [42].pack('i').size
+      n_bits = n_bytes * 8
+      max = 2 ** (n_bits - 2) - 1
+
+      GD2::Image.new(max, max)
+    end
+  end
+
   def test_image_new_and_release
     GD2::Image.new(50, 50)
   end
@@ -41,7 +67,7 @@ class ImageTest < MiniTest::Unit::TestCase
         out = File.join(Dir.tmpdir, 'test.#{ext}')
         img.export(out)
 
-        assert(File.exists?(out))
+        assert(File.exist?(out))
 
         imgA = GD2::Image.import(out)
         imgB = GD2::Image.import(File.join(PATH_TO_IMAGES, 'test.#{ext}'))

data/test/test_helper.rb

@@ -1,4 +1,4 @@
-# encoding: ASCII-8BIT
+# frozen_string_literal: true; encoding: ASCII-8BIT
 
 if RUBY_VERSION >= '1.9'
   require 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gd2-ffij
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -32,6 +32,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".gitignore"
+- ".travis.yml"
 - COPYRIGHT
 - Gemfile
 - Guardfile
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: gd2-ffij is a refactoring of the Ruby/GD2 library implemented with FFI