storable 0.9.pre.RC1 → 0.9.pre.RC2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f22223588dad9fc35c869793a01e3bf186afd4a5ebdb0d4016a25ae75a317f18
-  data.tar.gz: 001b177ce5a50d59afe1123bb866591147bbddfe197a969c9cb01d80268cda31
+  metadata.gz: 1fe040169d9300d29f3a00c5e46e74580a6f5a124b6dabda16ad3a8132d5a6eb
+  data.tar.gz: 24de9dc3bf471ef05c6aad494482925131f0b00d3a4f3dff5f478eec4b655dee
 SHA512:
-  metadata.gz: a103e403fc9017f6dfeab08c0b5ce0f886bfacff25294f24d8c0cd292069a7f69e23c91c1aef550f73fdab40d852295158b1f673ef87dd099c48fb03c42ebd19
-  data.tar.gz: 308682df363bcdb31822e10ee8b023bb329eadf30cf8a70664c8819e514f0d3f123b51cf57c8059bf6bc8c5445df1bd68225e82541e86fe31fb14cce3d17a969
+  metadata.gz: fdaa8dc26da7cf8163dcb1d5d6249a894816445fdf0309bff690e0fc70cc13b637bf3d9ae0557d5eec2a6cabe32986b318a683b3529b0fdee466b733e1c11afb
+  data.tar.gz: 363d57e409178dac08aac9809768d6a1cfb7e4bccf2056be267da51718cc505219eb5a182a41cb3b87be2d5b4d569506dbbe473ee082e4ce8c3162f9cd9ccda7

data/README.md

@@ -1,4 +1,4 @@
-# Storable - v0.9-RC1
+# Storable - v0.9-RC2
 
 Marshal Ruby classes in to and out of multiple formats (yaml, json, csv, tsv).
 

data/lib/proc_source.rb

@@ -7,13 +7,15 @@
 # https://github.com/notro/storable
 #
 
-begin
-  require 'irb/ruby-token'  # ruby <2.7
-rescue
-  require 'lib/core_ext'  # ruby >=2.7
+# RubyToken was removed in Ruby 2.7
+if RUBY_VERSION < "2.7"
+  require 'irb/ruby-token'
+else
+  require './lib/core_ext.rb'
 end
 
 require 'irb/ruby-lex'
+require 'pry'
 require 'stringio'
 
 SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
@@ -23,11 +25,9 @@ class ProcString < String
   # Filename where the proc is defined
   attr_accessor :file
 
-  # Range of lines where the proc is defined
-  #   ex. (12..16)
+  # Range of lines where the proc is defined. e.g. (12..16)
   attr_accessor :lines
-
-  attr_accessor :arity, :kind     # :nodoc:  FIXME: Should be removed?
+  attr_accessor :arity, :kind
 
   # Return a Proc object
   # If #lines and #file is specified, these are tied to the proc.
@@ -49,7 +49,6 @@ class ProcString < String
 end
 
 class RubyToken::Token
-
   # These EXPR_BEG tokens don't have associated end tags
   FAKIES = [
     RubyToken::TkWHEN,
@@ -82,13 +81,11 @@ end
 # 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?
       if !line_has_open?(lines.join) && start_line >= 0
         start_line -= 1 and retried +=1 and redo
@@ -99,7 +96,18 @@ module ProcSource
     end
 
     stoken, etoken, nesting = nil, nil, 0
-    while token = lexer.token
+
+    binding.pry
+    if RUBY_VERSION < "2.7"
+      tokens = lexer.instance_variable_get '@OP'
+    else
+      lexer.lex
+      tokens = lexer.instance_variable_get '@tokens'
+    end
+
+    # tokens.each
+
+    while (token = lexer.token) do
       if RubyToken::TkIDENTIFIER === token
         # nothing
       elsif token.open_tag? || RubyToken::TkfLBRACE === token
@@ -122,8 +130,6 @@ module ProcSource
       end
     end
 
-    # binding.pry
-
     lines = lines[stoken.line_no-1 .. etoken.line_no-1]
 
     # Remove the crud before the block definition.
@@ -313,4 +319,3 @@ if $0 == __FILE__
   proc.call(1)
 end
 
-

data/storable.gemspec

@@ -1,6 +1,6 @@
 @spec = Gem::Specification.new do |s|
   s.name = "storable"
-  s.version = "0.9-RC1"
+  s.version = "0.9-RC2"
   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"]
@@ -10,12 +10,16 @@
   s.files = %w(
     README.md
     Rakefile
+    bin/example
+    bin/tryouts
     lib/core_ext.rb
     lib/proc_source.rb
     lib/storable.rb
     lib/storable/orderedhash.rb
     storable.gemspec
   )
+  s.executables = %w(
+  )
   s.extra_rdoc_files = %w[README.md]
   s.rdoc_options = ["--line-numbers", "--title", s.summary, "--main", "README.md"]
   s.require_paths = %w[lib]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: storable
 version: !ruby/object:Gem::Version
-  version: 0.9.pre.RC1
+  version: 0.9.pre.RC2
 platform: ruby
 authors:
 - Delano Mandelbaum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-07-04 00:00:00.000000000 Z
 dependencies: []
 description: 'Storable: Marshal Ruby classes into and out of multiple formats (yaml,
   json, csv, tsv)'