Ron 0.1.0 → 0.1.1

data/COPYING

@@ -0,0 +1,58 @@
+Sequence is copyrighted free software by Caleb Clausen 
+<sequence-owner @at@ inforadical .dot. net>.
+
+You can redistribute it and/or modify it under either the terms of the GPL
+version 2 (see the file GPL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/GPL

@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

data/History.txt

@@ -1,4 +1,13 @@
-== 1.0.0 / 2006-10-07
+=== 0.1.1 / 2009-08-05
+* 1 Major Enhancement:
+  * significant improvements and bugfixes in graphcopy 
+
+* 3 Minor Enhancements:
+  * use Sequence::WeakRefSet now instead of toplevel WeakRefSet
+  * ported to ruby 1.9
+  * rewrote Class#- to be more compatible with Reg
+
+=== 0.1.0 / 2006-10-07
 
 * 1 major enhancement
   * Birthday!

data/Makefile

@@ -0,0 +1,32 @@
+.PHONY: all test docs gem tar pkg email
+all: test
+
+test:
+	ruby -Ilib test/test_all.rb
+
+docs:
+	rdoc lib/*
+
+pkg: gem tar
+
+gem:
+	gem build ron.gemspec
+
+tar:
+	tar czf Ron-`ruby -r ./lib/ron/version.rb -e 'puts Ron::VERSION'`.tar.gz `git ls-files`
+
+email: README.txt History.txt
+	ruby -e ' \
+  require "rubygems"; \
+  load "./ron.gemspec"; \
+  spec= Gem::Specification.list.find{|x| x.name=="Ron"}; \
+  puts "\
+Subject: [ANN] Ron #{spec.version} Released \
+\n\nRon version #{spec.version} has been released! \n\n\
+#{Array(spec.homepage).map{|url| " * #{url}\n" }} \
+ \n\
+#{Ron::Description} \
+\n\nChanges:\n\n \
+#{Ron::Latest_changes} \
+"\
+'

data/README.txt

@@ -1,5 +1,6 @@
+=== DESCRIPTION
 Well, who needed another serialization format? Not me, but that's
-what I've made. Ruby Object Graph (Ron) is a textual format for
+what I've made. Ruby Object Notation (Ron) is a textual format for
 the representation of Ruby data structures. It's somewhat like
 YAML, XML, or (most of all) JSON. However, since it is defined 
 entirely within and as a subset of Ruby, it has the slick 

data/Rakefile

@@ -4,7 +4,17 @@ require 'rubygems'
 require 'hoe'
 require 'lib/ron/version.rb'
  
- 
+if $*==["test"]
+  #hack to get 'rake test' to stay in one process
+  #which keeps netbeans happy
+  $:<<"lib"
+#  require 'ron.rb'
+#  require "test/unit"
+  require "test/test_all.rb"
+  Test::Unit::AutoRunner.run
+  exit
+end
+
  
  
    Hoe.new("Ron", Ron::VERSION) do |_|

data/lib/ron.rb

@@ -1,7 +1,9 @@
+# Copyright (C) 2009  Caleb Clausen
+# Distributed under the terms of Ruby's license.
+
 #require 'warning'
 require 'ron/graphedge'
-
-
+require 'continuation' unless defined? Continuation
 
 #to_ron
 
@@ -108,11 +110,11 @@ SelfReferencing=Recursive        #old name alias
 SelfReferential=SelfReferencing  #old name alias
 
 def Recursive *args #marker='foo',data
-  marker,data=*case args.size
-  when 2: args
-  when 1: [::Ron::DefaultMarker,args.last]
-  else raise ArgumentError
-  end
+    marker,data=*case args.size
+    when 2; args
+    when 1; [::Ron::DefaultMarker,args.last]
+    else raise ArgumentError
+    end
 
     ::Ron::GraphWalk.graphwalk(data){|cntr,o,i,ty|
       if o.equal? marker 
@@ -126,6 +128,7 @@ def SelfReferencing #old name alias
   Recursive(v=Object.new, yield(v))
 end
 alias SelfReferential SelfReferencing  #old name alias
+def Ron.Recursive(*args); super end
 
 class Object
   def with_ivars(hash)
@@ -224,7 +227,7 @@ class Object
         result.last.replace "}"
       else
         #append instance_eval
-        ivars=instance_variables-::Ron::IGNORED_INSTANCE_VARIABLES[self.class]
+        ivars=instance_variables-::Ron::IGNORED_INSTANCE_VARIABLES[self.class.name]
         ivars.empty? or result.push ".with_ivars(", *ivars.map{|iv| 
           [":",iv.to_s,"=>",instance_variable_get(iv).to_ron_list2(session),', ']
         }.flatten[0...-1]<<")"
@@ -250,24 +253,24 @@ class Struct
   end
 end
 
-sets=[:Set,:SortedSet,:WeakRefSet]
-eval sets.map{|k| <<END }.to_s 
-class #{k} #{'< Set' if k==:SortedSet}
+class Set
   def to_ron_list session
-    ['#{k}[']+map{|i| i.to_ron_list2(session)<<', ' }.flatten<<"]"
+    [self.class.name,"[",
+      map{|i| i.to_ron_list2(session)<<", "},
+    "]"
+    ].flatten
   end
 end
-END
-Ron::IGNORED_INSTANCE_VARIABLES[Set]=%w[@hash]
-Ron::IGNORED_INSTANCE_VARIABLES[SortedSet]=%w[@hash @keys]
-Ron::IGNORED_INSTANCE_VARIABLES[WeakRefSet]=%w[@ids]
+Ron::IGNORED_INSTANCE_VARIABLES["Set"]=%w[@hash]
+Ron::IGNORED_INSTANCE_VARIABLES["SortedSet"]=%w[@hash @keys]
+Ron::IGNORED_INSTANCE_VARIABLES["Sequence::WeakRefSet"]=%w[@ids]
 
 class Range
   def to_ron_list session
 #    result=
-           ["(",*first.to_ron_list2(session).
-                  push( "..#{'.' if exclude_end?}" )+
-                  last.to_ron_list2(session)<<
+           ["Range.new(",first.to_ron_list2(session), ", ",
+                  last.to_ron_list2(session),
+                  (", true" if exclude_end?),
             ")"
            ]
 #    result.flatten!
@@ -303,7 +306,9 @@ class Binding
   end
   
   class<<self
-  def - h
+  def -(*args)
+    h=args.first
+    return super unless ::Hash===h
     h=h.dup
     the_self=h.delete :self
     the_block=(h.delete :yield) || nil
@@ -432,9 +437,11 @@ stmt=Recursive(stmt={},
 #Class#-
 class Class
   #construct an instance of a class from the data in hash
-  def - hash
+  def -(*args)
+    hash=args.first
     #name.empty? and huh
     Array===hash and return make( *hash )
+    return super unless ::Hash===hash
     allocate.instance_eval{
       hash.each{|(k,v)| 
         if ?@==k.to_s[0] 
@@ -454,7 +461,9 @@ class<<Struct
   def new *args
     result=new__no_minus_op(*args)
     class<<result
-  def - hash
+  def -(*args)
+    hash=args.first
+    return super unless ::Hash===hash
     name.empty? and huh
     result=allocate
     hash.each{|(k,v)| result[k]=v }

data/lib/ron/column_order.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2009  Caleb Clausen
+# Distributed under the terms of Ruby's license.
+
 module AttributeOrder
   def self.included(othermod)
     othermod.extend case othermod

data/lib/ron/graphedge.rb

@@ -1,3 +1,6 @@
+# Copyright (C) 2009  Caleb Clausen
+# Distributed under the terms of Ruby's license.
+
 require 'forwardable'
 require 'set'
 #require 'assert'
@@ -19,15 +22,34 @@ module Ron
   #--------------------------------
   module GraphWalk
     class<<self
+      #--------------------------------
+      def graphmodify!(obj)
+        root=nil
+        graphwalk(obj){|cntr,o,i,ty|
+          newo= yield cntr,o,i,ty,useit=[false]
+          useit.first or next
+          if Ron::GraphEdge::TopLevel===ty
+            root=newo
+          else
+            ty.new(cntr,i,1){newo}.replace
+          end
+        }
+        return root
+      end
+      
       #--------------------------------
       def graphcopy(obj)
         old2new={}
         root=nil
         graphwalk(obj){|cntr,o,i,ty|
           newo= block_given? && (yield cntr,o,i,ty,useit=[false]) 
-          useit.first or newo ||=
-            old2new[o.__id__] ||= root ||= o.dup
-          ty.new(old2new[cntr.__id__],i,1){newo}.replace
+          useit.first or newo= old2new[o.__id__] ||= o.clone rescue o
+          #IO objects really shouldn't be dup'd here
+          if Ron::GraphEdge::TopLevel==ty
+            root=newo
+          else
+            ty.new(old2new[cntr.__id__],i,1){newo}.replace
+          end
         }
         return root
       end
@@ -48,6 +70,20 @@ module Ron
         }
       end
     
+      #--------------------------------
+      def abortable_graphwalk(obj)
+        return unless yield nil,obj,nil,GraphEdge::TopLevel
+        todolist=[obj]
+        donelist=Set[]
+        todolist.each{|o|
+          traverse(o){|cntr,o2,i,ty|
+            unless donelist.include? [cntr.__id__,ty,i]
+              donelist<<[cntr.__id__,ty,i]
+              todolist<<o2 if yield cntr,o2,i,ty
+            end
+          }
+        }
+      end
       #--------------------------------
       def traverse(obj)
       #some other container types should be explicitly
@@ -55,29 +91,29 @@ module Ron
       #maybe others i don't know? sparse array/sparse matrix?
       #ordered hashes?
         case obj
-        when nil: #do nothing
-        when (Set if defined? Set),(WeakRefSet if defined? WeakRefSet):
+        when nil; #do nothing
+        when (Set if defined? Set)
           obj.each{|elem|
             yield(obj,elem, elem, GraphEdge::SetMember)
           }
-        when Struct:
+        when Struct;
           obj.members.each{|mem|
             yield(obj,obj[mem],mem, GraphEdge::BracketsValue)
           }
-        when Hash:
+        when Hash;
           obj.each{|(i,elem)| 
             yield(obj,elem,i, GraphEdge::HashValue)          
             yield(obj,i,i, GraphEdge::HashKey)
           }
-        when Array:
+        when Array;
           obj.each_with_index{|elem,i| 
             yield(obj,elem,i, GraphEdge::Array)
           }
-        when Range:
+        when Range;
           yield(obj,obj.first, :first, GraphEdge::ObjectMethValue)
           yield(obj,obj.last, :last, GraphEdge::ObjectMethValue)        
-        #when RBTree:  huh
-        when (ActiveRecord::Base if defined? ActiveRecord::Base): 
+        #when RBTree;  huh
+        when (ActiveRecord::Base if defined? ActiveRecord) 
           obj.columns.each{|mem|
             yield(obj,obj[mem],mem, GraphEdge::BracketsValue)
           }
@@ -309,11 +345,14 @@ module Ron
       end
       
       def replace(newval=new_value)
-        huh #can't really replace values in toplevel context...???
+        #can't really replace values in toplevel context...???
+        raise ReplaceAtTopLevel
       end
     
     end
     
+    class ReplaceAtTopLevel < RuntimeError; end
+    
     
   end
   

data/lib/ron/version.rb

@@ -1,3 +1,3 @@
 module Ron
-  VERSION="0.1.0"
+  VERSION="0.1.1"
 end

data/ron.gemspec

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+
+require './lib/ron/version'
+Ron::Description=open("README.txt"){|f| f.read[/^==+ ?description[^\n]*?\n *\n?(.*?\n *\n.*?)\n *\n/im,1] }
+Ron::Latest_changes="###"+open("History.txt"){|f| f.read[/\A===(.*?)(?====)/m,1] }
+
+Gem::Specification.new do |s|
+  s.name = "Ron"
+  s.version = Ron::VERSION
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Caleb Clausen"]
+  s.date = Time.now.strftime("%Y-%m-%d")
+  s.email = %q{caleb (at) inforadical (dot) net}
+  s.extra_rdoc_files = ["README.txt", "COPYING", "GPL"]
+  s.files = `git ls-files`.split
+  s.has_rdoc = true
+  s.homepage = %{http://github.com/coatl/ron}
+  s.rdoc_options = %w[--inline-source --main README.txt]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{ron}
+  s.rubygems_version = %q{1.3.0}
+  s.test_files = %w[test/test_all.rb]
+  s.summary = "Ruby Object Notation (Ron) is a ruby-based textual format for representing Ruby data."
+  s.description = Ron::Description
+
+=begin
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mime-types>, [">= 1.15"])
+      s.add_runtime_dependency(%q<diff-lcs>, [">= 1.1.2"])
+    else
+      s.add_dependency(%q<mime-types>, [">= 1.15"])
+      s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
+    end
+  else
+    s.add_dependency(%q<mime-types>, [">= 1.15"])
+    s.add_dependency(%q<diff-lcs>, [">= 1.1.2"])
+  end
+=end
+end

data/test/test_all.rb

@@ -15,8 +15,7 @@ rescue Exception
 end
 
 try_require 'rubygems' 
-try_require("sequence")
-try_require("weakrefset")
+try_require("sequence/weakrefset")
 try_require 'facets/more/superstruct' 
 
 $Verbose=true
@@ -112,7 +111,7 @@ data=[
  [1,2,3],
  {1=>2,3=>4},
  Set[1,2,3],
- (WeakRefSet[*%w[a b c]] rescue warn 'weakrefset test disabled'),
+ (Sequence::WeakRefSet[*%w[a b c]] rescue warn 'weakrefset test disabled'),
  A_Class.new,
  2,
  :symbol,
@@ -129,7 +128,7 @@ data.each{|datum|
   assert_equal internal_state(datum), internal_state(dup)
  
   if case datum
-     when Fixnum,Symbol,true,false,nil: false
+     when Fixnum,Symbol,true,false,nil; false
      else true
      end
   datum.instance_eval{@a,@b=1,2}
@@ -143,7 +142,7 @@ data.each{|datum|
 }
 data.each{|datum|
   if case datum
-     when Fixnum,Symbol,true,false,nil: false
+     when Fixnum,Symbol,true,false,nil; false
      else true
      end
   datum.instance_eval{@d=data}
@@ -169,7 +168,7 @@ data2.each{|datum|
   assert_equal internal_state(datum).to_yaml, internal_state(dup).to_yaml
  
   if case datum
-     when Fixnum,Symbol,true,false,nil: false
+     when Fixnum,Symbol,true,false,nil; false
      else true
      end
   datum.instance_eval{@a,@b=1,2}
@@ -181,13 +180,13 @@ data2.each{|datum|
   assert_equal internal_state(datum).to_yaml, internal_state(dup).to_yaml
   end
 }
-datum= ((w=WeakRefSet[];w<<w;w) rescue warn 'weakrefset test disabled')
+datum= ((w=Sequence::WeakRefSet[];w<<w;w) rescue warn 'weakrefset test disabled')
   assert_equal datum.inspect, datum.inspect
   assert_equal datum.inspect, ( dup=eval datum.to_ron ).inspect
   assert_equal internal_state(datum).inspect, internal_state(dup).inspect
  
   if case datum
-     when Fixnum,Symbol,true,false,nil: false
+     when Fixnum,Symbol,true,false,nil; false
      else true
      end
   datum.instance_eval{@a,@b=1,2}
@@ -201,7 +200,7 @@ datum= ((w=WeakRefSet[];w<<w;w) rescue warn 'weakrefset test disabled')
 
 data2.each{|datum| 
   if case datum
-     when Fixnum,Symbol,true,false,nil: false
+     when Fixnum,Symbol,true,false,nil; false
      else true
      end
   datum.instance_eval{@d=data;@e=data2}
@@ -213,7 +212,7 @@ data2.each{|datum|
 end
 
 def internal_state x
-  list=(x.instance_variables-::Ron::IGNORED_INSTANCE_VARIABLES[x.class]).sort
+  list=(x.instance_variables-::Ron::IGNORED_INSTANCE_VARIABLES[x.class.name]).sort
   [list]+list.map{|iv| x.instance_variable_get(iv)}
 end
 

metadata

@@ -1,63 +1,69 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: Ron
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2006-10-09 00:00:00 -07:00
-summary: Ron is a ruby-based serialization format for representing any ruby  object graph.
-require_paths: 
-- lib
-- test
-email: ron-owner @at@ inforadical .dot. net
-homepage: http://rubyforge.org/projects/ron
-rubyforge_project: ron
-description: Ron is very much like JSON, but based around Ruby instead of JavaScript. Stardard Ruby literal notation is extended to include an object literal and a way to create self-referencing data structures.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.1.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Caleb Clausen
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-08-05 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: Well, who needed another serialization format? Not me, but that's what I've made. Ruby Object Notation (Ron) is a textual format for the representation of Ruby data structures. It's somewhat like YAML, XML, or (most of all) JSON. However, since it is defined  entirely within and as a subset of Ruby, it has the slick  property that Ron expressions are legal Ruby. Thus it is very like JSON, except that it's Ruby-centered instead of being  JavaScript-centered.  Another way to look at Ron is as a purely declarative language  for creating (almost) any type of Ruby data structure.
+email: caleb (at) inforadical (dot) net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README.txt
+- COPYING
+- GPL
 files: 
+- COPYING
+- GPL
 - History.txt
+- Makefile
 - Manifest.txt
 - README.txt
 - Rakefile
 - lib/ron.rb
-- lib/ron/version.rb
-- lib/ron/graphedge.rb
 - lib/ron/column_order.rb
+- lib/ron/graphedge.rb
+- lib/ron/version.rb
+- ron.gemspec
 - test/test_all.rb
-test_files: 
-- test/test_all.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+has_rdoc: true
+homepage: http://github.com/coatl/ron
+post_install_message: 
+rdoc_options: 
+- --inline-source
+- --main
+- README.txt
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    version: 
+rubyforge_project: ron
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: Ruby Object Notation (Ron) is a ruby-based textual format for representing Ruby data.
+test_files: 
+- test/test_all.rb