RubyInline 3.3.2 → 3.4.0

data/History.txt

@@ -1,3 +1,13 @@
+*** 3.4.0 / 2005-07-13
+
++ 2 minor enhancement
+	+ Changed inline to take the language and a hash of options.
+		+ Still backwards compatible, for now, and emits a warning.
+	+ Options are available via the builder passed to your block.
++ 2 bug fixes
+	+ Modified caller discovery, yet again, due to changes in ruby 1.8.3.
+	+ More compatible and clean with non-gems systems.
+
 *** 3.3.2 / 2005-05-19
 
 + 4 bug fixes

data/Makefile

@@ -1,5 +1,5 @@
 RUBY?=/usr/local/bin/ruby
-RDOC?=rdoc18
+RDOC?=rdoc
 RUBYLIB=$(shell $(RUBY) -rrbconfig -e 'include Config; print CONFIG["sitelibdir"]')
 PREFIX?=/usr/local
 

data/example.rb

@@ -1,11 +1,7 @@
 #!/usr/local/bin/ruby -w
 
-begin
-  require 'rubygems'
-  require_gem "RubyInline"
-rescue LoadError
-  require 'inline'
-end
+begin require 'rubygems' rescue LoadError end
+require 'inline'
 
 class MyTest
 

data/inline.rb

@@ -51,7 +51,7 @@ class CompilationError < RuntimeError; end
 # the current namespace.
 
 module Inline
-  VERSION = '3.3.2'
+  VERSION = '3.4.0'
 
   $stderr.puts "RubyInline v #{VERSION}" if $DEBUG
 
@@ -262,9 +262,12 @@ module Inline
 
     def initialize(mod)
       raise ArgumentError, "Class/Module arg is required" unless Module === mod
-
-      real_caller = caller[2] # new -> inline -> real_caller|eval
-      real_caller = caller[5] if real_caller =~ /\(eval\)/
+      # new (but not on some 1.8s) -> inline -> real_caller|eval
+      stack = caller
+      meth = stack.shift until meth =~ /in .(inline|test_)/ or stack.empty?
+      raise "Couldn't discover caller" if stack.empty?
+      real_caller = stack.first
+      real_caller = stack[3] if real_caller =~ /\(eval\)/
       @real_caller = real_caller.split(/:/).first
       @rb_file = File.expand_path(@real_caller)
 
@@ -549,25 +552,41 @@ end # module Inline
 
 class Module
 
+  ##
+  # options is a hash that allows you to pass extra data to your
+  # builder.  The only key that is guaranteed to exist is :testing.
+
+  attr_reader :options
+
   ##
   # Extends the Module class to have an inline method. The default
   # language/builder used is C, but can be specified with the +lang+
   # parameter.
   
-  def inline(lang = :C, testing=false)
-
-    begin
-      builder_class = Inline.const_get(lang)
-    rescue NameError
-      require "inline/#{lang}"
-      builder_class = Inline.const_get(lang)
+  def inline(lang = :C, options={})
+    case options
+    when TrueClass, FalseClass then
+      warn "WARNING: 2nd argument to inline is now a hash, changing to {:testing=>#{options}}" unless options
+      options = { :testing => options  }
+    when Hash
+      options[:testing] ||= false
+    else
+      raise ArgumentError, "BLAH"
     end
 
+    builder_class = begin
+                      Inline.const_get(lang)
+                    rescue NameError
+                      require "inline/#{lang}"
+                      Inline.const_get(lang)
+                    end
+
+    @options = options
     builder = builder_class.new self
 
     yield builder
 
-    unless testing then
+    unless options[:testing] then
       unless builder.load_cache then
         builder.build
         builder.load

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.10.1
 specification_version: 1
 name: RubyInline
 version: !ruby/object:Gem::Version 
-  version: 3.3.2
-date: 2005-05-19
+  version: 3.4.0
+date: 2005-07-13
 summary: Multi-language extension coding within ruby.
 require_paths: 
   - "."