storable 0.8.6 → 0.8.7

data/CHANGES.txt

@@ -1,5 +1,6 @@
 STORABLE, CHANGES
 
+* TODO: https://github.com/delano/storable/pull/2
 * TODO: Handle nested hashes and arrays.                                 
 * TODO: to_xml, see: http://codeforpeople.com/lib/ruby/xx/xx-2.0.0/README
 

data/README.rdoc

@@ -96,7 +96,8 @@ or via download:
 
 == Thanks
 
-* Pierre Riteau (priteau[http://github.com/priteau]) for bug fixes. 
+* Pierre Riteau (priteau[https://github.com/priteau]) for bug fixes. 
+* notro[https://github.com/priteau] for proc_source improvements.
 
 
 == More Info

data/Rakefile

@@ -33,7 +33,9 @@ version = @spec.version
 
 # TESTS/SPECS =========================================================
 
-
+task :test do
+	sh "try"
+end
 
 # INSTALL =============================================================
 
@@ -41,7 +43,7 @@ Rake::GemPackageTask.new(@spec) do |p|
   p.need_tar = true if RUBY_PLATFORM !~ /mswin/
 end
 
-task :build => [ :package ]
+task :build => [ :test, :package ]
 task :release => [ :rdoc, :package ]
 task :install => [ :rdoc, :package ] do
 	sh %{sudo gem install pkg/#{name}-#{version}.gem}

data/lib/proc_source.rb

@@ -1,6 +1,8 @@
 #--
 # Based on:
 # http://github.com/imedo/background
+# With improvements by:
+# https://github.com/notro/storable
 #++
 
 require 'stringio'
@@ -8,14 +10,31 @@ require 'irb/ruby-lex'
 #SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
 
 class ProcString < String
-  attr_accessor :file, :lines, :arity, :kind
+  # Filename where the proc is defined
+  attr_accessor :file
+  
+  # Range of lines where the proc is defined
+  #   ex. (12..16)
+  attr_accessor :lines
+  
+  attr_accessor :arity, :kind     # :nodoc:  FIXME: Should be removed?
+  
+  # Return a Proc object
+  # If #lines and #file is specified, these are tied to the proc.
   def to_proc(kind="proc")
-    result = eval("#{kind} #{self}")
+    if @file && @lines
+      raise "#lines must be a range" unless @lines.kind_of? Range
+      result = eval("#{kind} #{self}", binding, @file, @lines.min)
+    else
+      result = eval("#{kind} #{self}")
+    end
     result.source = self
     result
   end
+  
+  # Return a lambda
   def to_lambda
-    to_proc "lamda"
+    to_proc "lambda"
   end
 end
 
@@ -24,8 +43,12 @@ class RubyToken::Token
     # These EXPR_BEG tokens don't have associated end tags
   FAKIES = [RubyToken::TkWHEN, RubyToken::TkELSIF, RubyToken::TkTHEN]
   
+  def name
+    @name ||= nil
+  end
+  
   def open_tag?
-    return false if @name.nil? || get_props.nil?
+    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)  
@@ -33,7 +56,7 @@ class RubyToken::Token
   end
   
   def get_props
-    RubyToken::TkReading2Token[@name]
+    RubyToken::TkReading2Token[name]
   end
   
 end
@@ -43,7 +66,7 @@ end
 #
 module ProcSource
   
-  def self.find(filename, start_line=0, block_only=true)
+  def self.find(filename, start_line=1, block_only=true)
     lines, lexer = nil, nil
     retried = 0
     loop do
@@ -59,7 +82,7 @@ module ProcSource
     end
     stoken, etoken, nesting = nil, nil, 0
     while token = lexer.token
-      n = token.instance_variable_get(:@name)
+      n = token.name
       
       if RubyToken::TkIDENTIFIER === token
         #nothing
@@ -72,6 +95,8 @@ module ProcSource
           break
         end
         nesting -= 1
+      elsif RubyToken::TkLBRACE === token
+        nesting += 1
       elsif RubyToken::TkBITOR === token && stoken
         #nothing
       elsif RubyToken::TkNL === token && stoken && etoken
@@ -117,12 +142,14 @@ module ProcSource
         break
       when RubyToken::TkDO
         success = true
+      when RubyToken::TkfLBRACE
+        success = true
       when RubyToken::TkCONSTANT
-        if token.instance_variable_get(:@name) == "Proc" &&
+        if token.name == "Proc" &&
            lexer.token.is_a?(RubyToken::TkDOT)
           method = lexer.token
           if method.is_a?(RubyToken::TkIDENTIFIER) &&
-             method.instance_variable_get(:@name) == "new"
+             method.name == "new"
             success = true
           end
         end
@@ -132,7 +159,7 @@ module ProcSource
   end
   
   
-  def self.get_lines(filename, start_line = 0)
+  def self.get_lines(filename, start_line = 1)
     case filename
       when nil
         nil
@@ -157,22 +184,68 @@ module ProcSource
 end
 
 class Proc #:nodoc:
-  attr_reader :file, :line
   attr_writer :source
   
   def source_descriptor
+    @file ||= nil
+    @line ||= nil
     unless @file && @line
       if md = /^#<Proc:0x[0-9A-Fa-f]+@(.+):(\d+)(.+?)?>$/.match(inspect)
         @file, @line = md.captures
       end
     end
-    [@file, @line.to_i]
+    @line = @line.to_i
+    [@file, @line]
   end
   
   def source
     @source ||= ProcSource.find(*self.source_descriptor)
   end
   
+  def line
+    source_descriptor
+    @line
+  end
+  
+  def file
+    source_descriptor
+    @file
+  end
+  
+  # Dump to Marshal format.
+  #   p = Proc.new { false }
+  #   Marshal.dump p
+  def _dump(limit)
+    raise "can't dump proc, #source is nil" if source.nil?
+    str = Marshal.dump(source)
+    str
+  end
+  
+  # Load from Marshal format.
+  #   p = Proc.new { false }
+  #   Marshal.load Marshal.dump p
+  def self._load(str)
+    @source = Marshal.load(str)
+    @source.to_proc
+  end
+  
+  # Dump to JSON string
+  def to_json(*args)
+    raise "can't serialize proc, #source is nil" if source.nil?
+    {
+      'json_class' => self.class.name,
+      'data'       => [source.to_s, source.file, source.lines.min, source.lines.max]
+    }.to_json#(*args)
+  end
+  
+  def self.json_create(o)
+    s, file, min, max = o['data']
+    ps = ProcString.new s
+    ps.file = file
+    ps.lines = (min..max)
+    ps.to_proc
+  end
+  
   # Create a Proc object from a string of Ruby code. 
   # It's assumed the string contains do; end or { }.
   #

data/lib/storable.rb

@@ -35,7 +35,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.8.5"
+    VERSION = "0.8.7"
     NICE_TIME_FORMAT  = "%Y-%m-%d@%H:%M:%S".freeze 
     SUPPORTED_FORMATS = [:tsv, :csv, :yaml, :json, :s, :string].freeze 
   end
@@ -200,7 +200,7 @@ class Storable
   def init *args
     from_array *args
   end
-
+  
   def initialize *args
     init *args
   end

data/storable.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "storable"
   s.rubyforge_project = "storable"
-  s.version = "0.8.6"
+  s.version = "0.8.7"
   s.summary = "Storable: Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)"
   s.description = s.summary
   s.author = "Delano Mandelbaum"

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: storable
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 6
-  version: 0.8.6
+  prerelease: 
+  version: 0.8.7
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-31 00:00:00 -05:00
+date: 2011-03-03 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -55,23 +50,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: storable
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: "Storable: Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)"