gd2-ffij 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 383f80ad5319daf9f51c299f347a70b6079c8bae
-  data.tar.gz: 589fae25257e031c4223a91348dacd7bb8c5d939
+  metadata.gz: fa7d138e9bc1811d93f29940223d4ef351cb386e
+  data.tar.gz: d5d2045cd120680ca95fb4b0fe45f5faab48145b
 SHA512:
-  metadata.gz: 18f27d6513e196b676cbe8b4cf55a200646e8bc1870041f0f1dc806b52314e142e2525e21f63aad4e3de2f48cb59b980874dfb18212b1fc472e67182e2617c71
-  data.tar.gz: d0805bf758ee510aba798c7702fd5b1eba932ba992aeeb60d414a2167b71d09078b3e1aaa49b30047122c642bc29ce3eb4694cf9e61c1ad51ccab70e7a4e0317
+  metadata.gz: 9874c2866d83776849d4208176df0f0068505cc50b226eea321ace4ae9cfbc06ca0b7f75184e14a3ea332a7dbdf013a069bf9b8439305e061c89e694ece8acf8
+  data.tar.gz: 792e63569a789cf97722e116b1c65907c7ffee7fa332abe0481d2db952a7297ad5b0c57aab2b0036a1e047527c4c019fb28acac3cb76fcf7260a343dcf858555

data/COPYRIGHT

@@ -1,6 +1,4 @@
 
-THIS BRANCH CONTAINS A PROPOSAL FOR A LICENSE CHANGE AND IS NOT MEANT FOR RELEASE
-
 Original Ruby/GD2 library placed in public domain by Robert Leslie:
 
 "I hereby relinquish my copyright claim and place the library
@@ -18,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-2013
+Subsequent code added and modified to create gd2-ffij copyright (C) 2010-2015
 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

@@ -6,12 +6,17 @@ gem "rdoc", "~> 3.12"
 gem "rake", "~> 10.0"
 gem "minitest"
 gem "minitest-reporters"
-gem "guard-minitest"
-gem "simplecov"
 
-if RbConfig::CONFIG['host_os'] =~ /^darwin/
-  gem "rb-fsevent"
-  gem "growl"
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end
+
+
+if RUBY_VERSION >= '1.9'
+  gem "simplecov"
+  gem "guard"
+  gem 'guard-minitest'
 end
 
 if File.exists?('Gemfile.local')

data/README.rdoc

@@ -1,6 +1,4 @@
 
-= THIS BRANCH CONTAINS A PROPOSAL FOR A LICENSE CHANGE AND IS NOT MEANT FOR RELEASE
-
 = gd2-ffij - Ruby FFI Bindings for Thomas Boutell's gd 2.x Graphics Library
 
 The gd2-ffij project page can be found at

data/Rakefile

@@ -22,5 +22,5 @@ Rake::RDocTask.new do |t|
   t.title = "gd2-ffij #{version}"
   t.main = 'README.rdoc'
   t.rdoc_dir = 'doc'
-  t.rdoc_files.include('README.rdoc', 'COPYING', 'COPYRIGHT', 'lib/**/*.rb')
+  t.rdoc_files.include('README.rdoc', 'COPYRIGHT', 'lib/**/*.rb')
 end

data/lib/gd2-ffij.rb

@@ -40,13 +40,7 @@ module GD2
 
     extend FFI::Library
 
-    begin
-      ffi_lib(*gd_library_name)
-    rescue LoadError, NoMethodError
-      raise LoadError.new("Couldn't load the gd2 library.")
-    end
-
-    {
+    FFI_LAYOUT = {
       :gdImageCreate                      => [ :pointer,  :int, :int ],
       :gdImageCreateTrueColor             => [ :pointer,  :int, :int ],
       :gdImageCreatePaletteFromTrueColor  => [ :pointer,  :pointer, :int, :int ],
@@ -137,9 +131,23 @@ module GD2
       :gdFontCacheShutdown                => [ :void ],
       :gdFTUseFontConfig                  => [ :int,      :int ],
       :gdFree                             => [ :void,     :pointer ]
-    }.each do |fun, ary|
-      ret = ary.shift
-      attach_function(fun, ary, ret)
+    }
+
+    begin
+      ffi_lib(gd_library_name)
+
+      FFI_LAYOUT.each do |fun, ary|
+        ret = ary.shift
+        begin
+          self.class_eval do
+            attach_function(fun, ary, ret)
+          end
+        rescue FFI::NotFoundError
+          # that's okay
+        end
+      end
+    rescue LoadError, NoMethodError
+      raise LoadError.new("Couldn't load the gd2 library.")
     end
   end
 

data/lib/gd2/version.rb

@@ -1,6 +1,6 @@
 # encoding: ASCII-8BIT
 
 module GD2
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gd2-ffij
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: gd2-ffij is a refactoring of the Ruby/GD2 library implemented with FFI