netrand 1.0.1 → 2.0.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+2.0.0
+========
+*Added list order randomizer
+*Changed the name of *Netrand.order* to *Netrand.sequence* to correspond with official random.org documentation
+*Some internal changes to make the code clearer
+
 1.0.1
 ======
 Changed package description. Stupid RubyGems.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    netrand (1.0.1)
+    netrand (2.0.0)
 
 GEM
   specs:

data/README.md

@@ -1,2 +1,3 @@
 Wrapper around Random.org random number and string generator.
-For more info look in the RDocs
+Pretty much every parameter has maximum of 10 000.
+For more info look in the RDocs.

data/bin/netrand

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
-require_relative "../lib/netrand.rb"
+require "Netrand"
+
 def self.loadstring
   upperalpha  = ARGV.include?("-ua")  ? :upperalpha : nil
   loweralpha  = ARGV.include?("-la")  ? :loweralpha : nil
@@ -9,10 +10,10 @@ def self.loadstring
 end
 
 def self.usage
-  puts "netrand int|uniqint|order|string"
+  puts "netrand int|sequence|string|list"
   puts "You provide additional arguments according to documentation in ri Netrand"
   puts "You can force int to provide unique numbers by using -u flag at the end of command."
-  puts "Only in string mode, there are some changes."
+  puts "String mode flags:"
   puts ":upperalpha is activated using -ua switch"
   puts ":loweralpha using -la"
   puts ":digits using -d"
@@ -21,14 +22,19 @@ end
 
 case ARGV[0]
   when "int"
-    puts Netrand.int(ARGV[1].to_i, ARGV[2].to_i, ARGV[3].to_i, if ARGV[4] == "-u" then :unique end)
-  when "uniqint"
-    puts Netrand.uniqint(ARGV[1].to_i, ARGV[2].to_i, ARGV[3].to_i)
-  when "order"
-    puts Netrand.uniqint(ARGV[1].to_i, ARGV[2].to_i)
+    out = Netrand.int(ARGV[1].to_i, ARGV[2].to_i, ARGV[3].to_i, if ARGV[4] == "-u" then :unique end)
+  when "sequence"
+    out = Netrand.uniqint(ARGV[1].to_i, ARGV[2].to_i)
+  when "list"
+    out = Netrand.list(ARGV[1])
   when "string"
-    puts self.loadstring
+    out = self.loadstring
   else
     self.usage
 end
 
+if out.class == Array
+  out.each {|i| print i + ","} 
+else 
+  puts out
+end

data/lib/functions/int.rb

@@ -0,0 +1,33 @@
+require "open-uri"
+require_relative "quota"
+module Netrand
+  
+  #Generates numget random numbers using random.org service.
+  #You must set maximum and can set minimum number. 
+  #Returns Array of numbers.
+  #If you use :unique flag, then there won't be two same numbers in the array.
+  
+  def Netrand.int(numget, max, min = 1, uniq = :notuniq)
+    if numget == 0  then raise ArgumentError, "You must ask for more numbers than 0" end
+    if max == 0     then raise ArgumentError, "Maximum number must be bigger than 0" end
+    if min > max    then raise ArgumentError, "max must be bigger than min!" end
+    self.check_quota
+    values = self.load_random_integers(numget, max, min)
+    if uniq == :unique
+      values.uniq!
+      while values.length != numget do
+        values << self.load_random_integers(numget - values.length, max, min)
+        values.uniq!
+      end
+    end
+    values
+  end
+  
+  def Netrand.load_random_integers(num, max, min)
+    values = []
+    open("http://www.random.org/integers/?num=#{num}&min=#{min}&max=#{max}&format=plain&col=1&base=10") do |c|
+      c.each_line {|l| values << l.chop.to_i}
+    end
+    values
+  end
+end

data/lib/functions/list.rb

@@ -0,0 +1,34 @@
+require_relative "sequence"
+module Netrand
+  
+  #Writes lines from file into randomized_file
+  #File must be shorter than 10000 lines
+  def Netrand.list(file)
+    src = File.new(file, "r")
+    out = File.new("randomized_#{file}", "w")
+    lines = countlines(file)
+    rand = self.sequence(lines)
+    rand.each do |pos|
+      (pos-1).times {src.gets}
+      line = src.gets
+      out.puts(line)
+      src.rewind
+    end
+    src.close
+    out.close
+  end
+  
+  #Counts lines in file
+  def Netrand.countlines(file_to_count)
+    count = 0
+    File.open(file_to_count, "r") do |f| 
+      ret = 0
+      until ret == nil
+        ret = f.gets
+        count += 1
+      end
+    end
+    count
+  end
+
+end

data/lib/functions/quota.rb

@@ -0,0 +1,16 @@
+require "open-uri"
+require_relative "quota"
+module Netrand
+  #Generates exception if quota of random.org is exhausted.
+  
+  def Netrand.check_quota
+    quota = nil
+    open("http://www.random.org/quota/?format=plain") do |c|
+      quota = c.read.to_i
+      if quota < 0 then raise QuotaExhaustedException, "Random.org quota exhausted, please try again after 0:00 UTC" end
+    end
+    quota
+  end
+  
+  class QuotaExhaustedException < RuntimeError; end
+end

data/lib/functions/sequence.rb

@@ -0,0 +1,16 @@
+require "open-uri"
+require_relative "quota"
+module Netrand
+  #Returns numbers from min to max in random order.
+  
+  def Netrand.sequence(max, min = 1)
+    if max == 0 then raise ArgumentError, "Maximum number must be bigger than 0" end
+    if min > max then raise ArgumentError, "max must be bigger than min!" end
+    self.check_quota
+    order = Array.new()
+    open("http://www.random.org/sequences/?min=#{min}&max=#{max}&col=1&format=plain&rnd=new") do |c|
+      c.each_line {|l| order << l.chop.to_i}
+    end
+    order
+  end
+end

data/lib/functions/string.rb

@@ -0,0 +1,23 @@
+require "open-uri"
+require_relative "quota"
+module Netrand
+  
+  #Generates num random strings of len length.
+  #They can contain digits, uppercase and lowercase letters.
+  #They can be set to be unique.
+  
+  def Netrand.string(num, len, *opts)
+    digits      = opts.include?(:digits)      ? "on" : "off"
+    upperalpha  = opts.include?(:upperalpha)  ? "on" : "off"
+    loweralpha  = opts.include?(:loweralpha)  ? "on" : "off"
+    unique      = opts.include?(:unique)      ? "on" : "off"
+    if len == 0 then raise ArgumentError, "Strings must be longer than 0 characters." end
+    if digits == "off" && upperalpha == "off" && loweralpha == "off" then raise ArgumentError, "You disabled every type of character." end
+    values = Array.new
+    self.check_quota
+    open("http://www.random.org/strings/?num=#{num}&len=#{len}&digits=#{digits}&upperalpha=#{upperalpha}&loweralpha=#{loweralpha}&unique=#{unique}&format=plain") do |c|
+      c.each_line {|l| values << l.chop}
+    end
+    values
+  end
+end

data/lib/netrand.rb

@@ -1,77 +1,4 @@
-require "open-uri"
-module Netrand
-  
-  #Generates numget random numbers using random.org service.
-  #You must set maximum and can set minimum number. 
-  #Returns Array of numbers.
-  #If you use :unique flag, then there won't be two same numbers in the array.
-  
-  def Netrand.int(numget, max, min = 1, uniq = :notuniq)
-    if numget == 0 then raise ArgumentError, "You must ask for more numbers than 0" end
-    if max == 0 then raise ArgumentError, "Maximum number must be bigger than 0" end
-    if min > max then raise ArgumentError, "max must be bigger than min!" end
-    values = Array.new
-    random = lambda do |num, max, min|
-      open("http://www.random.org/integers/?num=#{num}&min=#{min}&max=#{max}&format=plain&col=1&base=10") do |c|
-        c.each_line {|l| values << l.chop.to_i}
-      end
-    end
-    self.check_quota
-    random.call(numget, max, min)
-    if uniq == :unique
-      values.uniq!
-      while values.length != numget do
-        random.call(numget - values.length, max, min)
-        values.uniq!
-      end
-    end
-    values
-  end
-  
-  #Returns numbers from min to max in random order.
-  
-  def Netrand.order(max, min = 1)
-    if max == 0 then raise ArgumentError, "Maximum number must be bigger than 0" end
-    if min > max then raise ArgumentError, "max must be bigger than min!" end
-    self.check_quota
-    order = Array.new()
-    open("http://www.random.org/sequences/?min=#{min}&max=#{max}&col=1&format=plain&rnd=new") do |c|
-      c.each_line {|l| order << l.chop.to_i}
-    end
-    order
-  end
-  
-  #Generates num random strings of len length.
-  #They can contain digits, uppercase and lowercase letters.
-  #They can be set to be unique.
-  
-  def Netrand.string(num, len, *opts)
-    digits      = opts.include?(:digits)      ? "on" : "off"
-    upperalpha  = opts.include?(:upperalpha)  ? "on" : "off"
-    loweralpha  = opts.include?(:loweralpha)  ? "on" : "off"
-    unique      = opts.include?(:unique)      ? "on" : "off"
-    if len == 0 then raise ArgumentError, "Strings must be longer than 0 characters." end
-    if digits == "off" && upperalpha == "off" && loweralpha == "off" then raise ArgumentError, "You disabled every type of character." end
-    values = Array.new
-    self.check_quota
-    open("http://www.random.org/strings/?num=#{num}&len=#{len}&digits=#{digits}&upperalpha=#{upperalpha}&loweralpha=#{loweralpha}&unique=#{unique}&format=plain") do |c|
-      c.each_line {|l| values << l.chop}
-    end
-    values
-  end
-  
-  #Generates exception if quota of random.org is exhausted.
-  
-  def Netrand.check_quota
-    quota = nil
-    open("http://www.random.org/quota/?format=plain") do |c|
-      quota = c.read.to_i
-      if quota < 0 then raise QuotaExhaustedException, "Random.org quota exhausted, please try again after 0:00 UTC" end
-    end
-    quota
-  end
-  
-  class QuotaExhaustedException < RuntimeError
-  end
-  
-end
+require_relative "functions/string"
+require_relative "functions/sequence"
+require_relative "functions/int"
+require_relative "functions/list"

data/netrand.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.summary    = "Generate true random numbers using random.org"
   s.description= "Wrapper around Random.org random number and string generator."
   s.requirements =  [ 'Working internet connection' ]
-  s.version     = "1.0.1"
+  s.version     = "2.0.0"
   s.author      = "Róbert Selvek"
   s.email       = "me@sellweek.eu"
   s.homepage    = "http://github.com/sellweek/netrand"

data/tests/ZoznamOkresov.txt

@@ -0,0 +1,79 @@
+Banská Bystrica
+Banská Štiavnica
+Bardejov
+Bánovce nad Bebravou
+Brezno
+Bratislava I
+Bratislava II
+Bratislava III
+Bratislava IV
+Bratislava V
+Bytča
+Čadca
+Detva
+Dolný Kubín
+Dunajská Streda
+Galanta
+Gelnica
+Hlohovec
+Humenné
+Ilava
+Kežmarok
+Komárno
+Košice I
+Košice II
+Košice III
+Košice IV
+Košice-okolie
+Krupina
+Kysucké Nové Mesto
+Levice
+Levoča
+Liptovský Mikuláš
+Lučenec
+Malacky
+Martin
+Medzilaborce
+Michalovce
+Myjava
+Námestovo
+Nitra
+Nové Mesto nad Váhom
+Nové Zámky
+Partizánske
+Pezinok
+Piešťany
+Poltár
+Poprad
+Považská Bystrica
+Prešov
+Prievidza
+Púchov
+Revúca
+Rimavská Sobota
+Rožňava
+Ružomberok
+Sabinov
+Senec
+Senica
+Skalica
+Snina
+Sobrance
+Spišská Nová Ves
+Stará Ľubovňa
+Stropkov
+Svidník
+Šaľa
+Topoľčany
+Trebišov
+Trenčín
+Trnava
+Turčianske Teplice
+Tvrdošín
+Veľký Krtíš
+Vranov nad Topľou
+Zlaté Moravce
+Zvolen
+Žarnovica
+Žiar nad Hronom
+Žilina

data/tests/test.rb

@@ -1,4 +1,5 @@
-puts "WARNING: This can take looong time!"
-require_relative "Testint"
-require_relative "Testorder"
-require_relative "Teststring"
+puts "The Netrand.list tests are going to fail. Move them to folder you have write rights to and then try it."
+require_relative "test_int"
+require_relative "test_sequence"
+require_relative "test_string"
+require_relative "test_list"

data/tests/{Testint.rb → test_int.rb}

@@ -1,4 +1,5 @@
-require_relative "../lib/netrand.rb"
+require "Netrand"
+
 require "test/unit"
 class TestInt < MiniTest::Unit::TestCase
   

data/tests/test_list.rb

@@ -0,0 +1,49 @@
+require "Netrand"
+
+require "test/unit"
+class TestList < MiniTest::Unit::TestCase
+  def test_randomization
+    original   = Array.new
+    randomized = Array.new
+    line = 0
+    File.open("ZoznamOkresov.txt", "r") do |f|
+      until line == nil
+        line = f.gets
+        original << line
+      end
+    end
+    
+    Netrand.list("ZoznamOkresov.txt")
+    File.open("randomized_ZoznamOkresov.txt", "r") do |f|
+      until line == nil
+        line = f.gets
+        randomized << line
+      end
+    end
+    refute_equal(randomized, original)
+  end
+  
+  def test_not_same
+    rand1 = Array.new
+    rand2 = Array.new
+    line = 0
+    Netrand.list("ZoznamOkresov.txt")
+    File.open("randomized_ZoznamOkresov.txt", "r") do |f|
+      until line == nil
+        line = f.gets
+        rand1 << line
+      end
+    end
+    
+    Netrand.list("ZoznamOkresov.txt")
+    File.open("randomized_ZoznamOkresov.txt", "r") do |f|
+      until line == nil
+        line = f.gets
+        rand2 << line
+      end
+    end
+    refute_equal(rand1, rand2)
+  end
+  
+  
+end

data/tests/test_sequence.rb

@@ -0,0 +1,21 @@
+require "Netrand"
+
+require "test/unit"
+class TestSequence < MiniTest::Unit::TestCase
+  def test_randomization
+    ref = (1..953).to_a
+    refute_equal(ref, Netrand.sequence(953, 1))
+  end
+  
+  def test_not_same
+    nums1 = Netrand.sequence(10)
+    nums2 = Netrand.sequence(10)
+    refute_equal(nums1, nums2)
+  end
+  
+  def test_error_handling
+    assert_raises(ArgumentError) {Netrand.sequence(3, 10)}
+    assert_raises(ArgumentError) {Netrand.sequence(0)}
+  end
+  
+end

data/tests/{Teststring.rb → test_string.rb}

@@ -1,4 +1,5 @@
-require_relative "../lib/netrand.rb"
+require "Netrand"
+
 require "test/unit"
 class TestString < MiniTest::Unit::TestCase
   def test_not_same

metadata

@@ -2,7 +2,7 @@
 name: netrand
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors: 
 - "R\xC3\xB3bert Selvek"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-23 00:00:00 Z
+date: 2011-04-28 00:00:00 Z
 dependencies: []
 
 description: Wrapper around Random.org random number and string generator.
@@ -24,18 +24,24 @@ extra_rdoc_files: []
 files: 
 - bin/netrand
 - CHANGELOG
-- Examples/random.rb
 - Gemfile
 - Gemfile.lock
+- lib/functions/int.rb
+- lib/functions/list.rb
+- lib/functions/quota.rb
+- lib/functions/sequence.rb
+- lib/functions/string.rb
 - lib/netrand.rb
 - LICENSE
 - netrand.gemspec
 - Rakefile
 - README.md
 - tests/test.rb
-- tests/Testint.rb
-- tests/Testorder.rb
-- tests/Teststring.rb
+- tests/test_int.rb
+- tests/test_list.rb
+- tests/test_sequence.rb
+- tests/test_string.rb
+- tests/ZoznamOkresov.txt
 homepage: http://github.com/sellweek/netrand
 licenses: []
 
@@ -55,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1058495667687168366
+      hash: 1609978401844798295
       segments: 
       - 0
       version: "0"

data/Examples/random.rb

@@ -1,2 +0,0 @@
-require_relative "../lib/netrand.rb"
-print Netrand.uniqint(100, 10000)

data/tests/Testorder.rb

@@ -1,20 +0,0 @@
-require_relative "../lib/netrand.rb"
-require "test/unit"
-class Testorder < MiniTest::Unit::TestCase
-  def test_randomization
-    ref = (1..953).to_a
-    refute_equal(ref, Netrand.order(953, 1))
-  end
-  
-  def test_not_same
-    nums1 = Netrand.order(10)
-    nums2 = Netrand.order(10)
-    refute_equal(nums1, nums2)
-  end
-  
-  def test_error_handling
-    assert_raises(ArgumentError) {Netrand.order(3, 10)}
-    assert_raises(ArgumentError) {Netrand.order(0)}
-  end
-  
-end