storable 0.7.0 → 0.7.1

data/CHANGES.txt

@@ -3,6 +3,10 @@ STORABLE, CHANGES
 * TODO: Handle nested hashes and arrays.                                 
 * TODO: to_xml, see: http://codeforpeople.com/lib/ruby/xx/xx-2.0.0/README
 
+#### 0.7.1 (2010-04-04) #############################
+
+* FIXED: Missing proc_source.rb in gemspec.
+
 #### 0.7.0 (2010-04-03) #############################
 
 * FIXED: Default initialize method missed the last argument

data/README.rdoc

@@ -1,4 +1,4 @@
-= Storable - v0.6
+= Storable - v0.7
 
 Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)
 

data/lib/proc_source.rb

@@ -0,0 +1,215 @@
+#--
+# Based on:
+# http://github.com/imedo/background
+#++
+
+require 'stringio'
+require 'irb/ruby-lex'
+#SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
+
+class ProcString < String
+  attr_accessor :file, :lines, :arity, :kind
+  def to_proc(kind="proc")
+    result = eval("#{kind} #{self}")
+    result.source = self
+    result
+  end
+  def to_lambda
+    to_proc "lamda"
+  end
+end
+
+class RubyToken::Token
+  
+    # These EXPR_BEG tokens don't have associated end tags
+  FAKIES = [RubyToken::TkWHEN, RubyToken::TkELSIF, RubyToken::TkTHEN]
+  
+  def open_tag?
+    return false if @name.nil? || get_props.nil?
+    a = (get_props[1] == RubyToken::EXPR_BEG) &&
+          self.class.to_s !~ /_MOD/  && # ignore onliner if, unless, etc...
+          !FAKIES.member?(self.class)  
+    a 
+  end
+  
+  def get_props
+    RubyToken::TkReading2Token[@name]
+  end
+  
+end
+
+# Based heavily on code from http://github.com/imedo/background
+# Big thanks to the imedo dev team!
+#
+module ProcSource
+  
+  def self.find(filename, start_line=0, block_only=true)
+    lines, lexer = nil, nil
+    retried = 0
+    loop do
+      lines = get_lines(filename, start_line)
+      #p [start_line, lines[0]]
+      if !line_has_open?(lines.join) && start_line >= 0
+        start_line -= 1 and retried +=1 and redo 
+      end
+      lexer = RubyLex.new
+      lexer.set_input(StringIO.new(lines.join))
+      break
+    end
+    stoken, etoken, nesting = nil, nil, 0
+    while token = lexer.token
+      n = token.instance_variable_get(:@name)
+      
+      if RubyToken::TkIDENTIFIER === token
+        #nothing
+      elsif token.open_tag? || RubyToken::TkfLBRACE === token
+        nesting += 1
+        stoken = token if nesting == 1
+      elsif RubyToken::TkEND === token || RubyToken::TkRBRACE === token
+        if nesting == 1
+          etoken = token 
+          break
+        end
+        nesting -= 1
+      elsif RubyToken::TkBITOR === token && stoken
+        #nothing
+      elsif RubyToken::TkNL === token && stoken && etoken
+        break if nesting <= 0
+      else
+        #p token
+      end
+    end
+#     puts lines if etoken.nil?
+    lines = lines[stoken.line_no-1 .. etoken.line_no-1]
+    
+    # Remove the crud before the block definition. 
+    if block_only
+      spaces = lines.last.match(/^\s+/)[0] rescue ''
+      lines[0] = spaces << lines[0][stoken.char_no .. -1]
+    end
+    ps = ProcString.new lines.join
+    ps.file, ps.lines = filename, start_line .. start_line+etoken.line_no-1
+    
+    ps
+  end
+  
+  # A hack for Ruby 1.9, otherwise returns true.
+  #
+  # Ruby 1.9 returns an incorrect line number
+  # when a block is specified with do/end. It
+  # happens b/c the line number returned by 
+  # Ruby 1.9 is based on the first line in the
+  # block which contains a token (i.e. not a
+  # new line or comment etc...). 
+  #
+  # NOTE: This won't work in cases where the 
+  # incorrect line also contains a "do". 
+  #
+  def self.line_has_open?(str)
+    return true unless RUBY_VERSION >= '1.9'
+    lexer = RubyLex.new
+    lexer.set_input(StringIO.new(str))
+    success = false
+    while token = lexer.token
+      case token
+      when RubyToken::TkNL
+        break
+      when RubyToken::TkDO
+        success = true
+      when RubyToken::TkCONSTANT
+        if token.instance_variable_get(:@name) == "Proc" &&
+           lexer.token.is_a?(RubyToken::TkDOT)
+          method = lexer.token
+          if method.is_a?(RubyToken::TkIDENTIFIER) &&
+             method.instance_variable_get(:@name) == "new"
+            success = true
+          end
+        end
+      end
+    end
+    success
+  end
+  
+  
+  def self.get_lines(filename, start_line = 0)
+    case filename
+      when nil
+        nil
+      ## NOTE: IRB AND EVAL LINES NOT TESTED
+      ### special "(irb)" descriptor?
+      ##when "(irb)"
+      ##  IRB.conf[:MAIN_CONTEXT].io.line(start_line .. -2)
+      ### special "(eval...)" descriptor?
+      ##when /^\(eval.+\)$/
+      ##  EVAL_LINES__[filename][start_line .. -2]
+      # regular file
+      else
+        # Ruby already parsed this file? (see disclaimer above)
+        if defined?(SCRIPT_LINES__) && SCRIPT_LINES__[filename]
+          SCRIPT_LINES__[filename][(start_line - 1) .. -1]
+        # If the file exists we're going to try reading it in
+        elsif File.exist?(filename)
+          begin
+            File.readlines(filename)[(start_line - 1) .. -1]
+          rescue
+            nil
+          end
+        end
+    end
+  end
+end
+
+class Proc #:nodoc:
+  attr_reader :file, :line
+  attr_writer :source
+  
+  def source_descriptor
+    unless @file && @line
+      if md = /^#<Proc:0x[0-9A-Fa-f]+@(.+):(\d+)(.+?)?>$/.match(inspect)
+        @file, @line = md.captures
+      end
+    end
+    [@file, @line.to_i]
+  end
+  
+  def source
+    @source ||= ProcSource.find(*self.source_descriptor)
+  end
+  
+  # Create a Proc object from a string of Ruby code. 
+  # It's assumed the string contains do; end or { }.
+  #
+  #     Proc.from_string("do; 2+2; end")
+  #
+  def self.from_string(str)
+    eval "Proc.new #{str}"
+  end
+  
+end
+
+if $0 == __FILE__
+  def store(&blk)
+    @blk = blk
+  end
+
+  store do |blk|
+    puts "Hello Rudy1"
+  end
+
+  a = Proc.new() { |a|
+    puts  "Hello Rudy2" 
+  }
+ 
+  b = Proc.new() do |b|
+    puts { "Hello Rudy3" } if true
+  end
+  
+  puts @blk.inspect, @blk.source
+  puts [a.inspect, a.source]
+  puts b.inspect, b.source
+  
+  proc = @blk.source.to_proc
+  proc.call(1)
+end
+
+

data/lib/storable.rb

@@ -39,7 +39,7 @@ class Storable
   require 'proc_source'  
   require 'storable/orderedhash' if USE_ORDERED_HASH
   unless defined?(SUPPORTED_FORMATS) # We can assume all are defined
-    VERSION = "0.7.0"
+    VERSION = "0.7.1"
     NICE_TIME_FORMAT  = "%Y-%m-%d@%H:%M:%S".freeze 
     SUPPORTED_FORMATS = [:tsv, :csv, :yaml, :json, :s, :string].freeze 
   end

data/storable.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "storable"
   s.rubyforge_project = "storable"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
   s.summary = "Storable: Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)"
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -28,6 +28,7 @@
   LICENSE.txt
   README.rdoc
   Rakefile
+  lib/proc_source.rb
   lib/storable.rb
   lib/storable/orderedhash.rb
   storable.gemspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: storable
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 -04:00
+date: 2010-04-04 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- lib/proc_source.rb
 - lib/storable.rb
 - lib/storable/orderedhash.rb
 - storable.gemspec