ffi-mysql 1.1.0 → 1.1.1

data/.hgtags

@@ -2,3 +2,4 @@ afd66b4b7cda50c08a79f51574d46e49c4dc083b v0.0.1
 2bfcf2ddedd5d9589ecc0dc915d0393e218aa603 v0.0.2
 a8bbc2c818cd66f86fbeb43f59bdb21499d58768 v1.0.0
 84d7cd84016aaade9b5530d183d9d3378d1c0c33 v1.1.0
+9f6397d60c7bf3361ddd23a6aa4ee728879a2d21 v1.1.1

data/History.markdown

@@ -1,3 +1,8 @@
+1.1.1 / 2012-02-01
+------------------
+
+* Fix maybe_attach_function for JRuby compatibility
+  
 1.1.0 / 2012-01-21
 ------------------
 

data/lib/ffi-mysql/mysql.rb

@@ -65,7 +65,7 @@ class Mysql
 
         def self.maybe_attach_function name, *args
             attach_function name, *args
-        rescue FFI::NotFoundError => e
+        rescue => e
             define_singleton_method(name) {|*a| raise e}
         end
 

data/lib/ffi-mysql/version.rb

@@ -4,7 +4,7 @@ class Mysql
     # Minor version
     MINOR = 1
     # Tiny version
-    TINY = 0
+    TINY = 1
 
     # Version string
     VERSION = [MAJOR, MINOR, TINY].join('.')

metadata

@@ -2,94 +2,89 @@
 name: ffi-mysql
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
-- Frank Fischer
+  - Frank Fischer
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-01-21 00:00:00 +01:00
-default_executable: 
+date: 2012-02-01 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bones
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.7.3
-  type: :development
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: ffi
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: "1.0"
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: bones
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 3.7.3
+    type: :development
+    version_requirements: *id002
 description: Pure Ruby FFI interface to MySQL.
 email: frank.fischer@mathematik.tu-chemnitz.de
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- announcement.txt
-- lib/ffi-mysql/mysql.rb.rej
+extra_rdoc_files: []
+
 files: 
-- .hgignore
-- .hgtags
-- History.markdown
-- README.markdown
-- Rakefile
-- announcement.txt
-- lib/ffi-mysql.rb
-- lib/ffi-mysql/constants.rb
-- lib/ffi-mysql/error.rb
-- lib/ffi-mysql/field.rb
-- lib/ffi-mysql/mysql.rb
-- lib/ffi-mysql/mysql.rb.rej
-- lib/ffi-mysql/result.rb
-- lib/ffi-mysql/stmt.rb
-- lib/ffi-mysql/time.rb
-- lib/ffi-mysql/version.rb
-- test/test_mysql.rb
-has_rdoc: true
+  - .hgignore
+  - .hgtags
+  - History.markdown
+  - README.markdown
+  - Rakefile
+  - lib/ffi-mysql.rb
+  - lib/ffi-mysql/constants.rb
+  - lib/ffi-mysql/error.rb
+  - lib/ffi-mysql/field.rb
+  - lib/ffi-mysql/mysql.rb
+  - lib/ffi-mysql/result.rb
+  - lib/ffi-mysql/stmt.rb
+  - lib/ffi-mysql/time.rb
+  - lib/ffi-mysql/version.rb
+  - test/test_mysql.rb
 homepage: http://bitbucket.org/lyro/ffi-mysql
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.markdown
+  - --main
+  - README.markdown
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: ffi-mysql
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Pure Ruby FFI interface to MySQL.
 test_files: 
-- test/test_mysql.rb
+  - test/test_mysql.rb

data/announcement.txt

@@ -1,13 +0,0 @@
-ffi-mysql version 1.1.0
-    by Frank Fischer
-    http://bitbucket.org/lyro/ffi-mysql
-
-== DESCRIPTION
-
-Pure Ruby FFI interface to MySQL.
-
-== CHANGES
-
-* add several methods for compatibility with MySQL 5.0 and MySQL/Ruby
-  2.8.2
-

data/lib/ffi-mysql/mysql.rb.rej

@@ -1,10 +0,0 @@
---- mysql.rb
-+++ mysql.rb
-@@ -74,6 +74,7 @@
-         attach_function :mysql_ping, [:pointer], :int
-         attach_function :mysql_refresh, [:pointer, :uint ], :int
-         attach_function :mysql_reload, [:pointer], :int
-+        attach_function :mysql_shutdown, [:pointer], :int
-         attach_function :mysql_change_user, [:pointer, :string, :string, :string], :char
-         attach_function :mysql_select_db, [:pointer, :string], :int
-         attach_function :mysql_thread_id, [:pointer], :ulong