RubyInline 3.12.1 → 3.12.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 3.12.2 / 2013-04-18
+
+* 2 minor enhancements:
+
+  * Added #prefix code to MD5 calculation to force rebuilds on non-signature changes.
+  * Separated out #prefix code from #src.
+
 === 3.12.1 / 2013-02-14
 
 * 2 bug fixes:

data/README.txt

@@ -41,7 +41,7 @@ See hoe for more details.
 * Pretends to be secure.
 * Only requires standard ruby libraries, nothing extra to download.
 
-== SYNOPSYS:
+== SYNOPSIS:
 
   require "inline"
   class MyTest
@@ -57,7 +57,7 @@ See hoe for more details.
   t = MyTest.new()
   factorial_5 = t.factorial(5)
 
-== SYNOPSYS (C++):
+== SYNOPSIS (C++):
 
   require 'inline'
   class MyTest

data/lib/inline.rb

@@ -65,7 +65,7 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.12.1'
+  VERSION = "3.12.2"
 
   WINDOZE  = /mswin|mingw/ =~ RUBY_PLATFORM
   RUBINIUS = defined? RUBY_ENGINE
@@ -317,6 +317,10 @@ module Inline
 
       ext << @inc
       ext << nil
+      unless @pre.empty? then
+        ext << @pre.join("\n\n")
+        ext << nil
+      end
       ext << @src.join("\n\n")
       ext << nil
       ext << nil
@@ -368,6 +372,7 @@ module Inline
       unless defined? @module_name then
         module_name = @mod.name.gsub('::','__')
         md5 = Digest::MD5.new
+        @pre.each { |m| md5 << m.to_s }
         @sig.keys.sort_by { |x| x.to_s }.each { |m| md5 << m.to_s }
         @module_name = "Inline_#{module_name}_#{md5}"
       end
@@ -383,7 +388,7 @@ module Inline
 
     attr_reader :rb_file, :mod
     attr_writer :mod
-    attr_accessor :src, :sig, :flags, :libs, :init_extra
+    attr_accessor :src, :pre, :sig, :flags, :libs, :init_extra
 
     ##
     # Sets the name of the C struct for generating accessors.  Used with
@@ -404,6 +409,7 @@ module Inline
       @rb_file = File.expand_path real_caller
 
       @mod = mod
+      @pre = []
       @src = []
       @inc = []
       @sig = {}
@@ -763,7 +769,7 @@ VALUE #{method}_equals(VALUE value) {
     # Adds any amount of text/code to the source
 
     def prefix(code)
-      @src << code
+      @pre << code
     end
 
     ##

data/test/test_inline.rb

@@ -748,11 +748,15 @@ puts(s); return rb_str_new2(s)}"
 
     @builder.c "VALUE my_method() { return Qnil; }"
 
+    @builder.prefix "static int x;"
+
     windoze = "\n  __declspec(dllexport)" if Inline::WINDOZE
 
     expected = <<-EXT
 #include "ruby.h"
 
+static int x;
+
 # line N "#{$test_inline_path}"
 static VALUE allocate(VALUE self) {
  return (Qnil); }
@@ -765,7 +769,7 @@ static VALUE my_method(VALUE self) {
 #ifdef __cplusplus
 extern \"C\" {
 #endif#{windoze}
-  void Init_Inline_TestInline__TestC_eba5e5454322e22fe2310198ef14e43f() {
+  void Init_Inline_TestInline__TestC_3ab8c09639e499394bb1f0a0194a839f() {
     VALUE c = rb_cObject;
     c = rb_const_get(c, rb_intern("TestInline"));
     c = rb_const_get(c, rb_intern("TestC"));

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 3
   - 12
-  - 1
-  version: 3.12.1
+  - 2
+  version: 3.12.2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-02-15 00:00:00 Z
+date: 2013-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ZenTest
@@ -61,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 4
-        - 6
-        version: "4.6"
+        - 7
+        version: "4.7"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -76,11 +76,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 27
         segments: 
-        - 3
-        - 10
-        version: "3.10"
+        - 4
+        - 0
+        version: "4.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -91,11 +91,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 3
-        - 5
-        version: "3.5"
+        - 6
+        version: "3.6"
   type: :development
   version_requirements: *id004
 description: |-