storable 0.8.9 → 0.9.pre.RC1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: f22223588dad9fc35c869793a01e3bf186afd4a5ebdb0d4016a25ae75a317f18
+  data.tar.gz: 001b177ce5a50d59afe1123bb866591147bbddfe197a969c9cb01d80268cda31
+SHA512:
+  metadata.gz: a103e403fc9017f6dfeab08c0b5ce0f886bfacff25294f24d8c0cd292069a7f69e23c91c1aef550f73fdab40d852295158b1f673ef87dd099c48fb03c42ebd19
+  data.tar.gz: 308682df363bcdb31822e10ee8b023bb329eadf30cf8a70664c8819e514f0d3f123b51cf57c8059bf6bc8c5445df1bd68225e82541e86fe31fb14cce3d17a969

data/{README.rdoc → README.md}

@@ -1,76 +1,76 @@
-= Storable - v0.8
+# Storable - v0.9-RC1
 
-Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)
+Marshal Ruby classes in to and out of multiple formats (yaml, json, csv, tsv).
+
+## Example
 
-== Example
-    
     require 'storable'
-    
+
     class Machine < Storable
       field :environment            # Define field names for Machine. The
       field :role                   # default type is String, but you can
       field :position => Integer    # specify a type using a hash syntax.
     end
-    
+
     mac1 = Machine.new              # Instances of Machine have accessors
-    mac1.environment = "stage"      # just like regular attributes. 
+    mac1.environment = "stage"      # just like regular attributes.
     mac1.role = "app"
     mac1.position = 1
-    
-    puts "# YAML", mac1.to_yaml     # Note: the field order is maintained     
+
+    puts "# YAML", mac1.to_yaml     # Note: the field order is maintained
     puts "# CSV", mac1.to_csv       # => stage,app,1
     puts "# JSON", mac1.to_json     # Note: field order not maintained.
-    
+
     mac2 = Machine.from_yaml(mac1.to_yaml)
     puts mac2.environment           # => "stage"
     puts mac2.position.class        # => Fixnum
 
 
-== Sensitive Fields
+## Sensitive Fields
 
     require 'storable'
-    
+
     class Calc < Storable
       field :three
       field :two
       field :one
       sensitive_fields :three
     end
-    
+
     calc = Calc.new 3, 2, 1
     calc.to_a                       # => [3, 2, 1]
     calc.sensitive!
     calc.to_a                       # => [2, 1]
-    
-    
-== Storing Procs
 
-Storable can also marshal Proc objects to and from their actual source code. 
-    
+
+## Storing Procs
+
+Storable can also marshal Proc objects to and from their actual source code.
+
     require 'storable'
-    
+
     class Maths < Storable
       field :x         => Float
       field :y         => Float
       field :calculate => Proc
     end
-    
+
     m1 = Maths.new 2.0, 3.0
     m1.calculate = Proc.new { @x * @y }
-    
+
     m1.calculate.source            # => "{ @x * @y }"
     m1.call :calculate             # => 6.0
-    
+
     dump = m1.to_json
-    
+
     m2 = Maths.from_json dump
     m2.call :calculate             # => 6.0
-    
-   
-Anything is possible when you keep your mind open and you use Ruby. 
 
 
-== Installation
+Anything is possible when you keep your mind open and you use Ruby.
+
+
+## Installation
 
 Via Rubygems, one of:
 
@@ -80,30 +80,30 @@ Via Rubygems, one of:
 or via download:
 * storable-latest.tar.gz[http://github.com/delano/storable/tarball/latest]
 * storable-latest.zip[http://github.com/delano/storable/zipball/latest]
- 
 
-== Prerequisites
 
-* Ruby 1.8, Ruby 1.9, or JRuby 1.2+
+## Prerequisites
+
+* Ruby <=2.7, >=1.9, possibly JRuby
 
 
-== Credits
+## Credits
 
 * Delano Mandelbaum (delano@solutious.com)
 * lib/proc_source.rb is based on http://github.com/imedo/background
 * OrderedHash implementation by Jan Molic
 
 
-== Thanks
+## Thanks
 
-* Pierre Riteau (priteau[https://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
+## More Info
 
-* Codes[http://github.com/delano/storable]
+* GitHub[http://github.com/delano/storable]
 
-== License
+## License
 
-See: LICENSE.txt
+See: LICENSE.txt

data/Rakefile

@@ -1,22 +1,17 @@
 require 'rubygems'
 require 'rake/clean'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'fileutils'
+require 'rdoc/task'
 include FileUtils
 
-begin
-  require 'hanna/rdoctask'
-rescue LoadError
-  require 'rake/rdoctask'
-end
-
 task :default => :package
- 
+
+
 # CONFIG =============================================================
 
 # Change the following according to your needs
-README = "README.rdoc"
-CHANGES = "CHANGES.txt"
+README = "README.md"
 LICENSE = "LICENSE.txt"
 
 # Files and directories to be deleted when you run "rake clean"
@@ -28,7 +23,7 @@ load "#{name}.gemspec"
 version = @spec.version
 
 # That's it! The following defaults should allow you to get started
-# on other things. 
+# on other things.
 
 
 # TESTS/SPECS =========================================================
@@ -39,7 +34,7 @@ end
 
 # INSTALL =============================================================
 
-Rake::GemPackageTask.new(@spec) do |p|
+Gem::PackageTask.new(@spec) do |p|
   p.need_tar = true if RUBY_PLATFORM !~ /mswin/
 end
 
@@ -53,65 +48,15 @@ task :uninstall => [ :clean ] do
 end
 
 
-# RUBYFORGE RELEASE / PUBLISH TASKS ==================================
-
-if @spec.rubyforge_project
-  desc 'Publish website to rubyforge'
-  task 'publish:rdoc' => 'doc/index.html' do
-    sh "scp -rp doc/* rubyforge.org:/var/www/gforge-projects/#{name}/"
-  end
-
-  desc 'Public release to rubyforge'
-  task 'publish:gem' => [:package] do |t|
-    sh <<-end
-      rubyforge add_release -o Any -a #{CHANGES} -f -n #{README} #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.gem &&
-      rubyforge add_file -o Any -a #{CHANGES} -f -n #{README} #{name} #{name} #{@spec.version} pkg/#{name}-#{@spec.version}.tgz 
-    end
-  end
-end
-
-
-
 # RUBY DOCS TASK ==================================
-begin
-  require 'hanna/rdoctask'
-rescue LoadError
-  require 'rake/rdoctask'
-end
 
-Rake::RDocTask.new do |t|
+RDoc::Task.new do |t|
 	t.rdoc_dir = 'doc'
 	t.title    = @spec.summary
 	t.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
 	t.options << '--charset' << 'utf-8'
 	t.rdoc_files.include(LICENSE)
 	t.rdoc_files.include(README)
-	t.rdoc_files.include(CHANGES)
 	#t.rdoc_files.include('bin/*')
 	t.rdoc_files.include('lib/**/*.rb')
 end
-
-
-
-
-#Hoe.new('rspec', Spec::VERSION::STRING) do |p|
-#  p.summary = Spec::VERSION::SUMMARY
-#  p.description = "Behaviour Driven Development for Ruby."
-#  p.rubyforge_name = 'rspec'
-#  p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-#  p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
-#  p.remote_rdoc_dir = "rspec/#{Spec::VERSION::STRING}"
-#  p.rspec_options = ['--options', 'spec/spec.opts']
-#  p.history_file = 'History.rdoc'
-#  p.readme_file  = 'README.rdoc'
-#  p.post_install_message = <<-POST_INSTALL_MESSAGE
-##{'*'*50}
-#
-#  Thank you for installing rspec-#{Spec::VERSION::STRING}
-#
-#  Please be sure to read History.rdoc and Upgrade.rdoc
-#  for useful information about this release.
-#
-#{'*'*50}
-#POST_INSTALL_MESSAGE
-#end

data/lib/core_ext.rb

@@ -0,0 +1,273 @@
+
+#
+# RubyToken was removed in >= 2.7
+# Direct copy from Ruby 2.6.6 source
+#
+
+# frozen_string_literal: false
+#
+#   irb/ruby-token.rb - ruby tokens
+#     $Release Version: 0.9.6$
+#     $Revision$
+#     by Keiju ISHITSUKA(keiju@ruby-lang.org)
+#
+# --
+#
+#
+#
+# :stopdoc:
+module RubyToken
+  EXPR_BEG = :EXPR_BEG
+  EXPR_MID = :EXPR_MID
+  EXPR_END = :EXPR_END
+  EXPR_ARG = :EXPR_ARG
+  EXPR_FNAME = :EXPR_FNAME
+  EXPR_DOT = :EXPR_DOT
+  EXPR_CLASS = :EXPR_CLASS
+
+  class Token
+    def initialize(seek, line_no, char_no)
+      @seek = seek
+      @line_no = line_no
+      @char_no = char_no
+    end
+    attr_reader :seek, :line_no, :char_no
+  end
+
+  class TkNode < Token
+    def initialize(seek, line_no, char_no)
+      super
+    end
+    attr_reader :node
+  end
+
+  class TkId < Token
+    def initialize(seek, line_no, char_no, name)
+      super(seek, line_no, char_no)
+      @name = name
+    end
+    attr_reader :name
+  end
+
+  class TkVal < Token
+    def initialize(seek, line_no, char_no, value = nil)
+      super(seek, line_no, char_no)
+      @value = value
+    end
+    attr_reader :value
+  end
+
+  class TkOp < Token
+    attr_accessor :name
+  end
+
+  class TkOPASGN < TkOp
+    def initialize(seek, line_no, char_no, op)
+      super(seek, line_no, char_no)
+      op = TkReading2Token[op][0] unless op.kind_of?(Symbol)
+      @op = op
+    end
+    attr_reader :op
+  end
+
+  class TkUnknownChar < Token
+    def initialize(seek, line_no, char_no, id)
+      super(seek, line_no, char_no)
+      @name = name
+    end
+    attr_reader :name
+  end
+
+  class TkError < Token
+  end
+
+  def Token(token, value = nil)
+    case token
+    when String
+      if (tk = TkReading2Token[token]).nil?
+        IRB.fail TkReading2TokenNoKey, token
+      end
+      tk = Token(tk[0], value)
+      if tk.kind_of?(TkOp)
+        tk.name = token
+      end
+      return tk
+    when Symbol
+      if (tk = TkSymbol2Token[token]).nil?
+        IRB.fail TkSymbol2TokenNoKey, token
+      end
+      return Token(tk[0], value)
+    else
+      if (token.ancestors & [TkId, TkVal, TkOPASGN, TkUnknownChar]).empty?
+        token.new(@prev_seek, @prev_line_no, @prev_char_no)
+      else
+        token.new(@prev_seek, @prev_line_no, @prev_char_no, value)
+      end
+    end
+  end
+
+  TokenDefinitions = [
+    [:TkCLASS,      TkId,  "class",  EXPR_CLASS],
+    [:TkMODULE,     TkId,  "module", EXPR_BEG],
+    [:TkDEF,      TkId,  "def",    EXPR_FNAME],
+    [:TkUNDEF,      TkId,  "undef",  EXPR_FNAME],
+    [:TkBEGIN,      TkId,  "begin",  EXPR_BEG],
+    [:TkRESCUE,     TkId,  "rescue", EXPR_MID],
+    [:TkENSURE,     TkId,  "ensure", EXPR_BEG],
+    [:TkEND,      TkId,  "end",    EXPR_END],
+    [:TkIF,         TkId,  "if",     EXPR_BEG, :TkIF_MOD],
+    [:TkUNLESS,     TkId,  "unless", EXPR_BEG, :TkUNLESS_MOD],
+    [:TkTHEN,     TkId,  "then",   EXPR_BEG],
+    [:TkELSIF,      TkId,  "elsif",  EXPR_BEG],
+    [:TkELSE,     TkId,  "else",   EXPR_BEG],
+    [:TkCASE,     TkId,  "case",   EXPR_BEG],
+    [:TkWHEN,     TkId,  "when",   EXPR_BEG],
+    [:TkWHILE,      TkId,  "while",  EXPR_BEG, :TkWHILE_MOD],
+    [:TkUNTIL,      TkId,  "until",  EXPR_BEG, :TkUNTIL_MOD],
+    [:TkFOR,      TkId,  "for",    EXPR_BEG],
+    [:TkBREAK,      TkId,  "break",  EXPR_END],
+    [:TkNEXT,     TkId,  "next",   EXPR_END],
+    [:TkREDO,     TkId,  "redo",   EXPR_END],
+    [:TkRETRY,      TkId,  "retry",  EXPR_END],
+    [:TkIN,     TkId,  "in",     EXPR_BEG],
+    [:TkDO,     TkId,  "do",     EXPR_BEG],
+    [:TkRETURN,     TkId,  "return", EXPR_MID],
+    [:TkYIELD,      TkId,  "yield",  EXPR_END],
+    [:TkSUPER,      TkId,  "super",  EXPR_END],
+    [:TkSELF,     TkId,  "self",   EXPR_END],
+    [:TkNIL,      TkId,  "nil",    EXPR_END],
+    [:TkTRUE,     TkId,  "true",   EXPR_END],
+    [:TkFALSE,      TkId,  "false",  EXPR_END],
+    [:TkAND,      TkId,  "and",    EXPR_BEG],
+    [:TkOR,       TkId,  "or",     EXPR_BEG],
+    [:TkNOT,      TkId,  "not",    EXPR_BEG],
+    [:TkIF_MOD,     TkId],
+    [:TkUNLESS_MOD, TkId],
+    [:TkWHILE_MOD,  TkId],
+    [:TkUNTIL_MOD,  TkId],
+    [:TkALIAS,      TkId,  "alias",    EXPR_FNAME],
+    [:TkDEFINED,    TkId,  "defined?", EXPR_END],
+    [:TklBEGIN,     TkId,  "BEGIN",    EXPR_END],
+    [:TklEND,     TkId,  "END",      EXPR_END],
+    [:Tk__LINE__,   TkId,  "__LINE__", EXPR_END],
+    [:Tk__FILE__,   TkId,  "__FILE__", EXPR_END],
+
+    [:TkIDENTIFIER, TkId],
+    [:TkFID,      TkId],
+    [:TkGVAR,     TkId],
+    [:TkCVAR,     TkId],
+    [:TkIVAR,     TkId],
+    [:TkCONSTANT,   TkId],
+
+    [:TkINTEGER,    TkVal],
+    [:TkFLOAT,      TkVal],
+    [:TkSTRING,     TkVal],
+    [:TkXSTRING,    TkVal],
+    [:TkREGEXP,     TkVal],
+    [:TkSYMBOL,     TkVal],
+
+    [:TkDSTRING,    TkNode],
+    [:TkDXSTRING,   TkNode],
+    [:TkDREGEXP,    TkNode],
+    [:TkNTH_REF,    TkNode],
+    [:TkBACK_REF,   TkNode],
+
+    [:TkUPLUS,      TkOp,   "+@"],
+    [:TkUMINUS,     TkOp,   "-@"],
+    [:TkPOW,      TkOp,   "**"],
+    [:TkCMP,      TkOp,   "<=>"],
+    [:TkEQ,     TkOp,   "=="],
+    [:TkEQQ,      TkOp,   "==="],
+    [:TkNEQ,      TkOp,   "!="],
+    [:TkGEQ,      TkOp,   ">="],
+    [:TkLEQ,      TkOp,   "<="],
+    [:TkANDOP,      TkOp,   "&&"],
+    [:TkOROP,     TkOp,   "||"],
+    [:TkMATCH,      TkOp,   "=~"],
+    [:TkNMATCH,     TkOp,   "!~"],
+    [:TkDOT2,     TkOp,   ".."],
+    [:TkDOT3,     TkOp,   "..."],
+    [:TkAREF,     TkOp,   "[]"],
+    [:TkASET,     TkOp,   "[]="],
+    [:TkLSHFT,      TkOp,   "<<"],
+    [:TkRSHFT,      TkOp,   ">>"],
+    [:TkCOLON2,     TkOp],
+    [:TkCOLON3,     TkOp],
+    [:TkASSOC,      TkOp,   "=>"],
+    [:TkQUESTION,   TkOp,   "?"],  #?
+    [:TkCOLON,      TkOp,   ":"],        #:
+
+    [:TkfLPAREN],         # func( #
+    [:TkfLBRACK],         # func[ #
+    [:TkfLBRACE],         # func{ #
+    [:TkSTAR],            # *arg
+    [:TkAMPER],           # &arg #
+    [:TkSYMBEG],          # :SYMBOL
+
+    [:TkGT,     TkOp,   ">"],
+    [:TkLT,     TkOp,   "<"],
+    [:TkPLUS,     TkOp,   "+"],
+    [:TkMINUS,      TkOp,   "-"],
+    [:TkMULT,     TkOp,   "*"],
+    [:TkDIV,      TkOp,   "/"],
+    [:TkMOD,      TkOp,   "%"],
+    [:TkBITOR,      TkOp,   "|"],
+    [:TkBITXOR,     TkOp,   "^"],
+    [:TkBITAND,     TkOp,   "&"],
+    [:TkBITNOT,     TkOp,   "~"],
+    [:TkNOTOP,      TkOp,   "!"],
+
+    [:TkBACKQUOTE,  TkOp,   "`"],
+
+    [:TkASSIGN,     Token,  "="],
+    [:TkDOT,      Token,  "."],
+    [:TkLPAREN,     Token,  "("],  #(exp)
+    [:TkLBRACK,     Token,  "["],  #[arry]
+    [:TkLBRACE,     Token,  "{"],  #{hash}
+    [:TkRPAREN,     Token,  ")"],
+    [:TkRBRACK,     Token,  "]"],
+    [:TkRBRACE,     Token,  "}"],
+    [:TkCOMMA,      Token,  ","],
+    [:TkSEMICOLON,  Token,  ";"],
+
+    [:TkCOMMENT],
+    [:TkRD_COMMENT],
+    [:TkSPACE],
+    [:TkNL],
+    [:TkEND_OF_SCRIPT],
+
+    [:TkBACKSLASH,  TkUnknownChar,  "\\"],
+    [:TkAT,     TkUnknownChar,  "@"],
+    [:TkDOLLAR,     TkUnknownChar,  "$"],
+  ]
+
+  # {reading => token_class}
+  # {reading => [token_class, *opt]}
+  TkReading2Token = {}
+  TkSymbol2Token = {}
+
+  def RubyToken.def_token(token_n, super_token = Token, reading = nil, *opts)
+    token_n = token_n.id2name if token_n.kind_of?(Symbol)
+    if RubyToken.const_defined?(token_n)
+      IRB.fail AlreadyDefinedToken, token_n
+    end
+    token_c = eval("class #{token_n} < #{super_token}; end; #{token_n}")
+
+    if reading
+      if TkReading2Token[reading]
+        IRB.fail TkReading2TokenDuplicateError, token_n, reading
+      end
+      if opts.empty?
+        TkReading2Token[reading] = [token_c]
+      else
+        TkReading2Token[reading] = [token_c].concat(opts)
+      end
+    end
+    TkSymbol2Token[token_n.intern] = token_c
+  end
+
+  for defs in TokenDefinitions
+    def_token(*defs)
+  end
+end
+# :startdoc:

data/lib/proc_source.rb

@@ -1,24 +1,34 @@
-#--
+
+#
 # Based on:
-# http://github.com/imedo/background
+# https://github.com/imedo/background
+# https://github.com/imedo/background_lite
 # With improvements by:
 # https://github.com/notro/storable
-#++
+#
+
+begin
+  require 'irb/ruby-token'  # ruby <2.7
+rescue
+  require 'lib/core_ext'  # ruby >=2.7
+end
 
-require 'stringio'
 require 'irb/ruby-lex'
-#SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
+require 'stringio'
+
+SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
+
 
 class ProcString < String
   # 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")
@@ -31,7 +41,7 @@ class ProcString < String
     result.source = self
     result
   end
-  
+
   # Return a lambda
   def to_lambda
     to_proc "lambda"
@@ -39,100 +49,108 @@ class ProcString < String
 end
 
 class RubyToken::Token
-  
-    # These EXPR_BEG tokens don't have associated end tags
-  FAKIES = [RubyToken::TkWHEN, RubyToken::TkELSIF, RubyToken::TkELSE, RubyToken::TkTHEN]
-  
+
+  # These EXPR_BEG tokens don't have associated end tags
+  FAKIES = [
+    RubyToken::TkWHEN,
+    RubyToken::TkELSIF,
+    RubyToken::TkELSE,
+    RubyToken::TkTHEN,
+  ]
+
   def name
     @name ||= nil
   end
-  
+
   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 
+    is_open = (
+      (get_props[1] == RubyToken::EXPR_BEG) &&
+      (self.class.to_s !~ /_MOD/)  &&  # ignore onliner if, unless, etc...
+      (!FAKIES.member?(self.class))
+    )
+    is_open
   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=1, block_only=true)
     lines, lexer = nil, nil
     retried = 0
     loop do
       lines = get_lines(filename, start_line)
+      # binding.pry
       return nil if lines.nil?
-      #p [start_line, lines[0]]
       if !line_has_open?(lines.join) && start_line >= 0
-        start_line -= 1 and retried +=1 and redo 
+        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.name
-      
       if RubyToken::TkIDENTIFIER === token
-        #nothing
+        # 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 
+          etoken = token
           break
         end
         nesting -= 1
       elsif RubyToken::TkLBRACE === token
         nesting += 1
       elsif RubyToken::TkBITOR === token && stoken
-        #nothing
+        # nothing
       elsif RubyToken::TkNL === token && stoken && etoken
         break if nesting <= 0
       else
-        #p token
+        # nothing
       end
     end
-#     puts lines if etoken.nil?
+
+    # binding.pry
+
     lines = lines[stoken.line_no-1 .. etoken.line_no-1]
-    
-    # Remove the crud before the block definition. 
+
+    # 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.file = filename
+    ps.lines = 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 
+  # 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...). 
+  # new line or comment etc...).
   #
-  # NOTE: This won't work in cases where the 
-  # incorrect line also contains a "do". 
+  # 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'
+    return true unless RUBY_VERSION >= '1.9' && RUBY_VERSION < '2.0'
     lexer = RubyLex.new
     lexer.set_input(StringIO.new(str))
     success = false
@@ -157,20 +175,26 @@ module ProcSource
     end
     success
   end
-  
-  
+
   def self.get_lines(filename, start_line = 1)
     case filename
       when nil
         nil
-      when "(irb)"         # special "(irb)" descriptor?
+
+      # We're in irb
+      when "(irb)"
         IRB.conf[:MAIN_CONTEXT].io.line(start_line .. -2)
-      when /^\(eval.+\)$/  # special "(eval...)" descriptor?
+
+      # Or an eval
+      when /^\(eval.+\)$/
         EVAL_LINES__[filename][start_line .. -2]
-      else                 # regular file
+
+      # Or most likely a .rb 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
@@ -183,35 +207,42 @@ module ProcSource
   end
 end
 
-class Proc #:nodoc:
+class Proc  # :nodoc:
   attr_writer :source
-  
+  @@regexp = Regexp.new('^#<Proc:0x[0-9A-Fa-f]+@?\s*(.+):(\d+)(.+?)?>$')
+
   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
+    return [@file, @line] if @file && @line
+
+    source_location = nil
+    if RUBY_VERSION >= '2.7'
+      source_location = *self.source_location
+    else
+      inspection = inspect
+      md = @@regexp.match(inspection)
+      exmsg = 'Unable to parse proc inspect (%s)' % inspection
+      raise Exception, exmsg if md.nil?
+      source_location = md.captures
     end
-    @line = @line.to_i
-    [@file, @line]
+
+    file, line = *source_location
+    @file, @line = [file, line.to_i]
   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
@@ -220,7 +251,7 @@ class Proc #:nodoc:
     str = Marshal.dump(source)
     str
   end
-  
+
   # Load from Marshal format.
   #   p = Proc.new { false }
   #   Marshal.load Marshal.dump p
@@ -228,7 +259,7 @@ class Proc #:nodoc:
     @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?
@@ -237,7 +268,7 @@ class Proc #:nodoc:
       '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
@@ -245,8 +276,8 @@ class Proc #:nodoc:
     ps.lines = (min..max)
     ps.to_proc
   end
-  
-  # Create a Proc object from a string of Ruby code. 
+
+  # 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")
@@ -254,7 +285,7 @@ class Proc #:nodoc:
   def self.from_string(str)
     eval "Proc.new #{str}"
   end
-  
+
 end
 
 if $0 == __FILE__
@@ -267,17 +298,17 @@ if $0 == __FILE__
   end
 
   a = Proc.new() { |a|
-    puts  "Hello Rudy2" 
+    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/storable.gemspec

@@ -1,43 +1,23 @@
 @spec = Gem::Specification.new do |s|
   s.name = "storable"
-  s.rubyforge_project = "storable"
-  s.version = "0.8.9"
-  s.summary = "Storable: Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)"
-  s.description = s.summary
-  s.author = "Delano Mandelbaum"
-  s.email = "delano@solutious.com"
-  s.homepage = "http://github.com/delano/storable/"
-  
-  
-  # = EXECUTABLES =
-  # The list of executables in your project (if any). Don't include the path, 
-  # just the base filename.
-  s.executables = %w[]
-  
-  # = DEPENDENCIES =
-  # Add all gem dependencies
-  
-  # = MANIFEST =
-  # The complete list of files to be included in the release. When GitHub packages your gem, 
-  # it doesn't allow you to run any command that accesses the filesystem. You will get an
-  # error. You can ask your VCS for the list of versioned files:
-  # git ls-files
-  # svn list -R
+  s.version = "0.9-RC1"
+  s.summary = "Ruby classes as strings"
+  s.description = "Storable: Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)"
+  s.authors = ["Delano Mandelbaum"]
+  s.email = "gems@solutious.com"
+  s.homepage = "https://github.com/delano/storable/"
+  s.licenses = ["MIT"]  # https://spdx.org/licenses/MIT-Modern-Variant.html
   s.files = %w(
-  CHANGES.txt
-  LICENSE.txt
-  README.rdoc
-  Rakefile
-  lib/proc_source.rb
-  lib/storable.rb
-  lib/storable/orderedhash.rb
-  storable.gemspec
+    README.md
+    Rakefile
+    lib/core_ext.rb
+    lib/proc_source.rb
+    lib/storable.rb
+    lib/storable/orderedhash.rb
+    storable.gemspec
   )
-  
-  s.extra_rdoc_files = %w[README.rdoc LICENSE.txt]
-  s.has_rdoc = true
-  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.rdoc"]
+  s.extra_rdoc_files = %w[README.md]
+  s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.md"]
   s.require_paths = %w[lib]
-  s.rubygems_version = '1.3.0'
-
-end
+  s.rubygems_version = '3.2.21'
+end

metadata

@@ -1,68 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: storable
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.8.9
+version: !ruby/object:Gem::Version
+  version: 0.9.pre.RC1
 platform: ruby
-authors: 
+authors:
 - Delano Mandelbaum
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-21 00:00:00 -04:00
-default_executable: 
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies: []
-
-description: "Storable: Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)"
-email: delano@solutious.com
+description: 'Storable: Marshal Ruby classes into and out of multiple formats (yaml,
+  json, csv, tsv)'
+email: gems@solutious.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-- LICENSE.txt
-files: 
-- CHANGES.txt
-- LICENSE.txt
-- README.rdoc
+extra_rdoc_files:
+- README.md
+files:
+- README.md
 - Rakefile
+- lib/core_ext.rb
 - lib/proc_source.rb
 - lib/storable.rb
 - lib/storable/orderedhash.rb
 - storable.gemspec
-has_rdoc: true
-homepage: http://github.com/delano/storable/
-licenses: []
-
+homepage: https://github.com/delano/storable/
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --title
-- "Storable: Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)"
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options:
+- "--line-numbers"
+- "--title"
+- Ruby classes as strings
+- "--main"
+- README.md
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !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'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">"
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
-rubyforge_project: storable
-rubygems_version: 1.5.2
+rubygems_version: 3.2.14
 signing_key: 
-specification_version: 3
-summary: "Storable: Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)"
+specification_version: 4
+summary: Ruby classes as strings
 test_files: []
-

data/CHANGES.txt

@@ -1,168 +0,0 @@
-STORABLE, CHANGES
-
-* TODO: https://github.com/delano/storable/pull/2
-* TODO: Handle nested hashes and arrays.
-
-#### 0.8.9 (GREAT RAPTURE) ##########################
-
-* FIXED: Removed bad default value setting.
-
-#### 0.8.8 (2011-05-20) #############################
-
-* ADDED: Storable.field can now take and store Hash options (:default, :meth)
-
-#### 0.8.7 (2011-??-??) #############################
-
-* ?
-
-#### 0.8.6 (2010-12-31) #############################
-
-* ADDED: Re-added a default initialize that defers to the default init
-
-#### 0.8.5 (2010-12-29) #############################
-
-* FIXED: Added calls to preprocess in the to_FORMAT methods.
-* FIXED: Added calls to postprocess in from_delimited
-* CHANGE: Remove initialize completely
-* ADDED: Storable#from_array (instance method)
-* ADDED: Storable#init (a default for Familia objects)
-
-
-#### 0.8.4 (2010-12-23) #############################
-
-* CHANGE: Moved initialize logic to Storable.from_array. 
- 
-  NOTE: Classes that rely on this logic when creating
-  new instances will need to call from_array instead!
-
-
-#### 0.8.3 (2010-11-02) #############################
-
-* FIXED: Handling of Boolean fields when the value is null. 
-* CHANGE: from_hash explicitly checks field names as Symbols and Strings
-
-
-#### 0.8.2 (2010-09-05) #############################
-
-* FIXED: undefined method `each_pair' for nil:NilClass for hash_proc_processor
-
-#### 0.8.1 (2010-07-31) #############################
-
-* CHANGE: to_delimited and from_delimited are sensitive. This means you need to keep 
-  track of data that is sensitive. 
-
-#### 0.8.0 (2010-07-28) #############################
-
-* FIXED: from_delimited now gracefully handles String input by splitting it by $/
-* CHANGE: Removed field name magic from from_delimited 
-* CHANGE: Converted to Tryouts 2 
-* ADDED: Support for sensitive fields
-* ADDED: Supports inheritance
-* ADDED: Storable#to_array
-
-
-#### 0.7.4 (2010-05-01) #############################
-
-* FIXED: Check separately if getter and setter methods are already defined
-* ADDED: Call Storable#preprocessor after an object is initialized
-
-
-#### 0.7.3 (2010-04-10) #############################
-
-* ADDED: Allow anonymous objects via Storable.from_json etc.
-* ADDED: Enabled support for marshalling Proc objects in IRB sessions.
-* ADDED: Storable#call for calling Proc fields via instance_eval
-* ADDED: Support for Range field type (parse from a String when necessary) 
-
-
-#### 0.7.2 (2010-04-06) #############################
-
-* FIXED: Handle empty symbols like in Storable 0.6.4. Fixes "interning empty string" error. [Diego Elio 'Flameeyes' Pettenò]
-
-#### 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
-* FIXED: Possible error in from_hash when a value is nil
-* CHANGE: Remove unused "require 'fileutils'"
-* CHANGE: field_types is now a Hash
-* CHANGE: Set the instance variable if a setter method doesn't exist. 
-* CHANGE: Will grab the first element of an Array if there is only one
-  and a field type is defined that is not an Array. 
-* ADDED: Storable.debug
-* ADDED: Boolean class (candy for TrueClass fields)
-* ADDED: Automatically convert a Proc to a string of its source in to_hash
-* ADDED: Support for Symbol field type
-
-
-#### 0.6.5 (2010-03-23) #############################
-
-* ADDED: Use Yajl if it's available.
-
-#### 0.6.4 (2010-03-10) #############################
-
-* FIXED: Don't pull the first value out of an array if there is only one element.
-* FIXED: Stored Arrays were nested in another Array in some cases
-
-#### 0.6.2 (2010-02-12) #############################
-
-* CHANGE: Removed hanna dependency [Diego Elio 'Flameeyes' Pettenò]
-
-#### 0.6.1 (2010-01-15) #############################
-
-* ADDED: Default initialize for Storable objects which can set field values. 
-
-#### 0.6.0 (2009-11-27) #############################
-
-* FIXED: Undefined @@field_names error when no fields specified
-* ADDED: Support for field output processors
-* ADDED: Storable::DefaultProcessors
-
-
-#### 0.5.8 (2009-10-06) #############################
-
-* FIXED: "wrong argument type false (expected Hash)". I think
-  that's the last of it. 
-* CHANGE: Removed with_titles argument for Storable#dump.
-
-
-#### 0.5.7 (2009-09-15) #############################
-
-* FIXED: "wrong argument type String (expected Data)" in to_yaml (finally!)
-
-#### 0.5.6 (2009-07-19) #############################
-
-* ADDED: has_field?
-
-#### 0.5.5 (2009-07-17) #############################
-
-* FIXED: require 'time' for Time.parse. 
-
-#### 0.5.4 (2009-05-25) #############################
-
-* CHANGE: Removed RedCloth dependency from gemspec.
-
-#### 0.5.3 (2009-05-12) #############################
-
-* FIXED: Corrected error handling when json not available (ignore and continue)
-
-#### 0.5.2 (2009-05-12) #############################
-
-* CHANGE: Put OrderedHash into Storable namespace and imported merge fix from Caesars
-* FIXED: Circular dependency with Sysinfo
-
-
-#### 0.5.1 (2009-05-07) #############################
-
-* FIXED: Bug in from_hash which was incorrectly parsing some data types (incl. Integer)
-* ADDED: bin/example
-* ADDED: OrderedHash for Ruby 1.8.x (still unordered in JRuby. Need to investigate.)
-
-#### 0.5 (2009-05-07) ###############################
-
-* First public release. See commit history for solutious-stella, solutious-rudy, 
-and delano-delanotes for complete history of SysInfo (was SystemInfo).
-

data/LICENSE.txt

@@ -1,19 +0,0 @@
-Copyright (c) 2009 Delano Mandelbaum, Solutious Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.