backports 1.16.4 → 1.16.5

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :build: 
 :minor: 16
-:patch: 4
+:patch: 5

data/backports.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{backports}
-  s.version = "1.16.4"
+  s.version = "1.16.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marc-Andr\303\251 Lafortune"]
-  s.date = %q{2010-04-11}
+  s.date = %q{2010-04-13}
   s.description = %q{      Essential backports that enable some of the really nice features of ruby 1.8.7, ruby 1.9 and rails from ruby 1.8.6 and earlier.
 }
   s.email = %q{github@marc-andre.ca}
@@ -108,6 +108,7 @@ Gem::Specification.new do |s|
      "test/method_test.rb",
      "test/module_test.rb",
      "test/object_test.rb",
+     "test/random_marshal_test.rb",
      "test/regexp_test.rb",
      "test/string_test.rb",
      "test/symbol_test.rb",
@@ -131,6 +132,7 @@ Gem::Specification.new do |s|
      "test/method_test.rb",
      "test/module_test.rb",
      "test/object_test.rb",
+     "test/random_marshal_test.rb",
      "test/regexp_test.rb",
      "test/string_test.rb",
      "test/symbol_test.rb",

data/lib/backports/1.9.2/random/MT19937.rb

@@ -5,8 +5,6 @@ class Random
     LAST_STATE = STATE_SIZE - 1
     PAD_32_BITS = 0xffffffff
 
-    attr_reader :state, :last_read
-
     # See seed=
     def initialize(seed)
       self.seed = seed

data/lib/backports/1.9.2/random/bits_and_bytes.rb

@@ -35,14 +35,32 @@ class Random
       random.pack("L" * nb_32_bits)[0, nb]
     end
 
-    def to_bignum
+    def state_as_bignum
       b = 0
-      state.each_with_index do |val, i|
+      @state.each_with_index do |val, i|
         b |= val << (32 * i)
       end
       b
     end
 
+    def left # It's actually the number of words left + 1, as per MRI...
+      MT19937::STATE_SIZE - @last_read
+    end
+
+    def marshal_dump
+      [state_as_bignum, left]
+    end
+
+    def marshal_load(ary)
+      b, left = ary
+      @last_read = MT19937::STATE_SIZE - left
+      @state = Array.new(STATE_SIZE)
+      STATE_SIZE.times do |i|
+        @state[i] = b & PAD_32_BITS
+        b >>= 32
+      end
+    end
+
     # Convert an Integer seed of arbitrary size to either a single 32 bit integer, or an Array of 32 bit integers
     def self.convert_seed(seed)
       seed = seed.abs

data/lib/backports/1.9.2/random/implementation.rb

@@ -46,13 +46,23 @@ class Random
         state == other.send(:state)
     end
 
+    def marshal_dump
+      @mt.marshal_dump << @seed
+    end
+
+    def marshal_load(ary)
+      @seed = ary.pop
+      @mt = MT19937.allocate
+      @mt.marshal_load(ary)
+    end
+
   private
     def state
-      @mt.to_bignum
+      @mt.state_as_bignum
     end
 
     def left
-      MT19937::STATE_SIZE - @mt.last_read
+      @mt.left
     end
 
     def _rand_range(limit)

data/test/random_marshal_test.rb

@@ -0,0 +1,33 @@
+# Run independently and with Ruby 1.9
+
+def get_randomizer
+  r = Random.new(42)
+  1000.times{r.rand}
+  r
+end
+
+def get_info(r)
+  Hash[
+    [:state, :left, :seed].map{|info| [info, r.send(info)]}
+  ]
+end
+
+MRIs = get_randomizer
+dump = Marshal.dump(MRIs)
+Object.send :remove_const, :Random # Kill original definition
+
+require_relative "../lib/backports/1.9.2"
+
+ours = get_randomizer
+
+puts "Info ok" if get_info(MRIs) == get_info(ours)
+if dump == (our_dump = Marshal.dump(get_randomizer))
+  puts "dump identical" 
+else
+  puts "Oups"
+end
+if get_info(MRIs) == get_info(Marshal.load(dump))
+  puts "load identical" 
+else
+  puts "Oups"
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 16
-  - 4
-  version: 1.16.4
+  - 5
+  version: 1.16.5
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-11 00:00:00 -04:00
+date: 2010-04-13 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -118,6 +118,7 @@ files:
 - test/method_test.rb
 - test/module_test.rb
 - test/object_test.rb
+- test/random_marshal_test.rb
 - test/regexp_test.rb
 - test/string_test.rb
 - test/symbol_test.rb
@@ -170,6 +171,7 @@ test_files:
 - test/method_test.rb
 - test/module_test.rb
 - test/object_test.rb
+- test/random_marshal_test.rb
 - test/regexp_test.rb
 - test/string_test.rb
 - test/symbol_test.rb