storable 0.5.1 → 0.5.2

data/CHANGES.txt

@@ -1,6 +1,12 @@
 STORABLE, CHANGES
 
 
+#### 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)

data/README.rdoc

@@ -46,6 +46,7 @@ or via download:
 == Credits
 
 * Delano Mandelbaum (delano@solutious.com)
+* OrderedHash implementation by Jan Molic
 
 == License
 

data/lib/storable.rb

@@ -5,7 +5,7 @@
 
 
 USE_ORDERED_HASH = (RUBY_VERSION =~ /1.9/).nil?
-require 'orderedhash' if USE_ORDERED_HASH
+
 require 'json' rescue nil
 
 require 'yaml'
@@ -16,6 +16,7 @@ require 'fileutils'
 # Storable.field method which tells Storable the order and 
 # name.
 class Storable
+  require 'storable/orderedhash' if USE_ORDERED_HASH
   unless defined?(SUPPORTED_FORMATS) # We can assume all are defined
     VERSION = 0.5
     NICE_TIME_FORMAT  = "%Y-%m-%d@%H:%M:%S".freeze 
@@ -167,7 +168,7 @@ class Storable
   # Return the object data as a hash
   # +with_titles+ is ignored. 
   def to_hash(with_titles=true)
-    tmp = USE_ORDERED_HASH ? OrderedHash.new : {}
+    tmp = USE_ORDERED_HASH ? Storable::OrderedHash.new : {}
     field_names.each do |fname|
       tmp[fname] = self.send(fname)
     end
@@ -187,10 +188,9 @@ class Storable
   end
   
   # Create a new instance of the object from a JSON string. 
-  # +from+ a JSON string split into an array by line.
-  def self.from_json(from=[])
-    # from is an array of strings
-    from_str = from.join('')
+  # +from+ a YAML String or Array (split into by line). 
+  def self.from_json(*from)
+    from_str = [from].flatten.compact.join('')
     tmp = JSON::load(from_str)
     hash_sym = tmp.keys.inject({}) do |hash, key|
        hash[key.to_sym] = tmp[key]

data/lib/storable/orderedhash.rb

@@ -0,0 +1,199 @@
+# AUTHOR
+#    jan molic /mig/at/1984/dot/cz/
+#
+# DESCRIPTION
+#    Hash with preserved order and some array-like extensions
+#    Public domain. 
+#
+# THANKS
+#    Andrew Johnson for his suggestions and fixes of Hash[],
+#    merge, to_a, inspect and shift
+class Storable::OrderedHash < ::Hash
+    attr_accessor :order
+
+    class << self
+        def [] *args
+          hsh = Storable::OrderedHash.new
+          if Hash === args[0]
+            hsh.replace args[0]
+          elsif (args.size % 2) != 0
+            raise ArgumentError, "odd number of elements for Hash"
+          else
+            0.step(args.size - 1, 2) do |a|
+              b = a + 1
+              hsh[args[a]] = args[b]
+            end
+          end
+          hsh
+        end
+    end
+    def initialize(*a, &b)
+      super
+      @order = []
+    end
+    def store_only a,b
+        store a,b
+    end
+    alias orig_store store    
+    def store a,b
+        @order.push a unless has_key? a
+        super a,b
+    end
+    alias []= store
+    def == hsh2
+        return false if @order != hsh2.order
+        super hsh2
+    end
+    def clear
+        @order = []
+        super
+    end
+    def delete key
+        @order.delete key
+        super
+    end
+    def each_key
+        @order.each { |k| yield k }
+        self
+    end
+    def each_value
+        @order.each { |k| yield self[k] }
+        self
+    end
+    def each
+        @order.each { |k| yield k,self[k] }
+        self
+    end
+    alias each_pair each    
+    def delete_if
+        @order.clone.each { |k| 
+            delete k if yield(k)
+        }
+        self
+    end
+    def values
+        ary = []
+        @order.each { |k| ary.push self[k] }
+        ary
+    end
+    def keys
+        @order
+    end
+    def first
+      {@order.first => self[@order.first]}
+    end
+    def last
+      {@order.last => self[@order.last]}
+    end
+    def invert
+        hsh2 = Hash.new    
+        @order.each { |k| hsh2[self[k]] = k }
+        hsh2
+    end
+    def reject &block
+        self.dup.delete_if &block
+    end
+    def reject! &block
+        hsh2 = reject &block
+        self == hsh2 ? nil : hsh2
+    end
+    def replace hsh2
+        @order = hsh2.keys 
+        super hsh2
+    end
+    def shift
+        key = @order.first
+        key ? [key,delete(key)] : super
+    end
+    def unshift k,v
+        unless self.include? k
+            @order.unshift k
+            orig_store(k,v)
+            true
+        else
+            false
+        end
+    end
+    def push k,v
+        unless self.include? k
+            @order.push k
+            orig_store(k,v)
+            true
+        else
+            false
+        end
+    end
+    def pop
+        key = @order.last
+        key ? [key,delete(key)] : nil
+    end
+    def to_a
+        ary = []
+        each { |k,v| ary << [k,v] }
+        ary
+    end
+    def to_s
+        self.to_a.to_s
+    end
+    def inspect
+        ary = []
+        each {|k,v| ary << k.inspect + "=>" + v.inspect}
+        '{' + ary.join(", ") + '}'
+    end
+    def update hsh2
+        hsh2.each { |k,v| self[k] = v }
+        self
+    end
+    alias :merge! update
+    def merge hsh2
+        ##self.dup update(hsh2)   ## 2009-05-12 -- delano
+        update hsh2               ## dup doesn't take an argument
+                                  ## and there's no need for it here
+    end
+    def select
+        ary = []
+        each { |k,v| ary << [k,v] if yield k,v }
+        ary
+    end
+    def class
+      Hash
+    end
+    def __class__
+      Storable::OrderedHash
+    end
+
+    attr_accessor "to_yaml_style"
+    def yaml_inline= bool
+      if respond_to?("to_yaml_style")
+        self.to_yaml_style = :inline
+      else
+        unless defined? @__yaml_inline_meth
+          @__yaml_inline_meth =
+            lambda {|opts|
+              YAML::quick_emit(object_id, opts) {|emitter|
+                emitter << '{ ' << map{|kv| kv.join ': '}.join(', ') << ' }'
+              }
+            }
+          class << self
+            def to_yaml opts = {}
+              begin
+                @__yaml_inline ? @__yaml_inline_meth[ opts ] : super
+              rescue
+                @to_yaml_style = :inline
+                super
+              end
+            end
+          end
+        end
+      end
+      @__yaml_inline = bool
+    end
+    def yaml_inline!() self.yaml_inline = true end
+
+    def each_with_index
+      @order.each_with_index { |k, index| yield k, self[k], index }
+      self
+    end
+end # class Storable::OrderedHash
+
+

data/storable.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
 	s.name = "storable"
   s.rubyforge_project = "storable"
-	s.version = "0.5.1"
+	s.version = "0.5.2"
 	s.summary = "Storable: Marshal Ruby classes into and out of multiple formats (yaml, json, csv, tsv)"
 	s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -16,8 +16,7 @@
   
   # = DEPENDENCIES =
   # Add all gem dependencies
-  s.add_dependency 'sysinfo', '>= 0.5.0'
-    
+  
   # = 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
@@ -30,6 +29,7 @@
   README.rdoc
   Rakefile
   lib/storable.rb
+  lib/storable/orderedhash.rb
   storable.gemspec
   )
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: storable
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,19 +9,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 -04:00
+date: 2009-05-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: sysinfo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
   type: :runtime
@@ -47,6 +37,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/storable.rb
+- lib/storable/orderedhash.rb
 - storable.gemspec
 has_rdoc: true
 homepage: http://solutious.com/