storable 0.7.2 → 0.7.3

data/CHANGES.txt

@@ -3,6 +3,14 @@ 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.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ò]

data/README.rdoc

@@ -26,6 +26,33 @@ Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)
     puts mac2.position.class        # => Fixnum
 
 
+== 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
+    
+    mat1 = Maths.new 2.0, 3.0
+    mat1.calculate = Proc.new { @x * @y }
+    
+    mat1.calculate.source            # => "{ @x * @y }"
+    mat1.call :calculate             # => 6.0
+    
+    dump = mat1.to_json
+    
+    mat2 = Maths.from_json dump
+    mat2.call :calculate             # => 6.0
+    
+    
+Anything is possible when you keep your mind open and you use Ruby. 
+
+
 == Installation
 
 Via Rubygems, one of:
@@ -40,7 +67,7 @@ or via download:
 
 == Prerequisites
 
-* Ruby 1.8, Ruby 1.9, or JRuby 1.2
+* Ruby 1.8, Ruby 1.9, or JRuby 1.2+
 
 
 == Thanks

data/lib/proc_source.rb

@@ -48,6 +48,7 @@ module ProcSource
     retried = 0
     loop do
       lines = get_lines(filename, start_line)
+      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 
@@ -135,15 +136,11 @@ module ProcSource
     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
+      when "(irb)"         # special "(irb)" descriptor?
+        IRB.conf[:MAIN_CONTEXT].io.line(start_line .. -2)
+      when /^\(eval.+\)$/  # special "(eval...)" descriptor?
+        EVAL_LINES__[filename][start_line .. -2]
+      else                 # regular file
         # Ruby already parsed this file? (see disclaimer above)
         if defined?(SCRIPT_LINES__) && SCRIPT_LINES__[filename]
           SCRIPT_LINES__[filename][(start_line - 1) .. -1]

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.2"
+    VERSION = "0.7.3"
     NICE_TIME_FORMAT  = "%Y-%m-%d@%H:%M:%S".freeze 
     SUPPORTED_FORMATS = [:tsv, :csv, :yaml, :json, :s, :string].freeze 
   end
@@ -100,7 +100,9 @@ class Storable
         next
       end
       
-      define_method(m) do instance_variable_get("@#{m}") end
+      define_method(m) do 
+        instance_variable_get("@#{m}") 
+      end
       define_method("#{m}=") do |val| 
         instance_variable_set("@#{m}",val)
       end
@@ -162,16 +164,28 @@ class Storable
     format ||= @format
     Storable.write_file(file_path, dump(format, with_titles))
   end
-
+  
   # Create a new instance of the object from a hash.
   def self.from_hash(from={})
     return nil if !from || from.empty?
-    me = self.new
-    me.from_hash(from)
+    if self == Storable
+      Storable::Anonymous.new from
+    else
+      new.from_hash(from)
+    end
+  end
+  
+  def call(fname)
+    unless field_types[fname.to_sym] == Proc &&
+           Proc === self.send(fname)
+           raise "Field #{fname} is not a Proc"
+    end
+    self.instance_eval &self.send(fname)
   end
   
   def from_hash(from={})
     fnames = field_names
+    return from if fnames.nil? || fnames.empty?
     fnames.each_with_index do |fname,index|
       ftype = field_types[fname]
       value_orig = from[fname] || from[fname.to_s]
@@ -197,6 +211,23 @@ class Storable
           value = value_orig.to_i
         elsif ftype == Symbol
           value = value_orig.to_s.to_sym
+        elsif ftype == Range
+          if Range === value_orig
+            value = value_orig
+          elsif Numeric === value_orig
+            value = value_orig..value_orig
+          else
+            value_orig = value_orig.to_s
+            if    value_orig.match(/\.\.\./)
+              el = value_orig.split('...')
+              value = el.first.to_f...el.last.to_f
+            elsif value_orig.match(/\.\./)
+              el = value_orig.split('..')
+              value = el.first.to_f..el.last.to_f
+            else
+              value = value_orig..value_orig
+            end
+          end
         elsif ftype == Proc && String === value_orig
           value = Proc.from_string value_orig           
         end
@@ -374,6 +405,19 @@ class Storable
     end
     File.chmod(0600, path)
   end
+  
+  class Anonymous
+    def initialize from
+      @hash = from
+    end
+    def [](key)
+      @hash[meth.to_sym]
+    end
+    def method_missing(meth,*args)
+      @hash[meth.to_sym]
+    end
+  end
+  
 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.2"
+  s.version = "0.7.3"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: storable
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 -04:00
+date: 2010-04-11 00:00:00 -04:00
 default_executable: 
 dependencies: []