spicy-proton 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d5b82dd948e56edbb58d997e133c9d280d4f269
-  data.tar.gz: f88ee4e26bdc9d6ab4572e1731df0beb67beabb5
+  metadata.gz: 40ebf7df25dfb926d8a332c8e207becd9df787c2
+  data.tar.gz: a8943410443bb9614db6a1627c7d209d9da64738
 SHA512:
-  metadata.gz: 6846f219c69ec864dcb872373f0a247734df8b2e0acca86e2568443a46ceec9580222f40c0b1cee2cf9a6482f8c321e0ac6443e2c5011becd41a6251b4dd5038
-  data.tar.gz: 60497c63be6c65376fe9920bd0013b51ecc4187f18de9275df608eba5b0396eb8bce66ba546fb3b96b697b88129a2b3d0c2be78cc9e91d6f1e0ab1b68f285bb9
+  metadata.gz: 57bb1914e746fc42c1ada4e994ef1e691488785ed7fef21085e3153e9fc52711c45504e6bf5ed877b7903e12d977e0cd446aa0dcf200db7bd7138622e8cc412d
+  data.tar.gz: 5675ab127bfb8cf9c377fcd6dd1dd2a7d4d2b5a2c79ce3955ed83cff890c505cb7e9a2b5445d47e7dcda1f8d282aa80b0d7bd65b65697fb0bfd96e9a7934dbbc

data/README.md

@@ -1,5 +1,5 @@
 # Spicy::Proton
-Generate a random adjective-noun pair.
+Generate a random adjective-noun word pair. Works with Ruby 1.9.x and newer.
 
 ## Quick Start
 
@@ -21,19 +21,18 @@ require 'spicy-proton'
 
 Spicy::Proton.adjective             # => "extreme"
 Spicy::Proton.noun                  # => "loan"
-Spicy::Proton.color                 # => "burgundy"
 Spicy::Proton.pair                  # => "opportune-spacesuit"
 Spicy::Proton.pair(':')             # => "hip:squash"
 Spicy::Proton.format('%a/%c/%n')    # => "slippery/ultramarine/rattler"
 
 # With length constraints.
-Spicy::Proton.adjective(max: 5)     # => "foamy"
 Spicy::Proton.noun(min: 10)         # => "translucence"
-Spicy::Proton.color(min: 5, max: 7) # => "indigo"
-Spicy::Proton.noun(length: 8)       # => "morality"
+Spicy::Proton.adjective(max: 5)     # => "foamy"
+Spicy::Proton.noun(min: 5, max: 7)  # => "target"
+Spicy::Proton.adjective(length: 8)  # => "medieval"
 ```
 
-When generating multiple specimens, instance methods are faster. The instance keeps the word corpus in memory. The instance methods are the same as their static counterparts.
+When generating multiple specimens, instance methods are faster. The instance keeps the word corpus in memory. The instance methods are the same as their class method counterparts.
 
 ```ruby
 require 'spicy-proton'
@@ -42,9 +41,8 @@ generator = Spicy::Proton.new
 1000.times do 
   generator.adjective
   generator.noun(min: 7)
-  generator.color(length: 4) 
   generator.pair
-  generator.pair(':')
+  generator.pair('.')
   generator.format('%a-%c-%n')
 end
 ```
@@ -54,7 +52,6 @@ Instances give you access to the raw word lists as well:
 ```ruby
 generator.adjectives    # => ["dreadful", "methodist", "necessary", "tough", ...]
 generator.nouns         # => ["rustling", "fiance", "infield", "chatter", ...]
-generator.colors        # => ["alizarin", "amaranth", "amber", "amethyst", ...]
 ```
 
 ## License

data/lib/disk-corpus.rb

@@ -18,10 +18,6 @@ module Spicy::Disk
     def self.nouns
       @@nouns ||= File.join(dir, 'nouns.bin')
     end
-
-    def self.colors
-      @@colors ||= File.join(dir, 'colors.bin')
-    end
   end
 
   class Header < BinData::Record
@@ -87,10 +83,6 @@ module Spicy::Disk
       generate(:nouns, *args)
     end
 
-    def color(*args)
-      generate(:colors, *args)
-    end
-
     private
 
     def generate(type, *args)

data/lib/memory-corpus.rb

@@ -17,10 +17,6 @@ module Spicy::Memory
     def self.nouns
       @@nouns ||= File.join(dir, 'nouns.yaml')
     end
-
-    def self.colors
-      @@colors ||= File.join(dir, 'colors.yaml')
-    end
   end
 
   class WordList
@@ -49,7 +45,6 @@ module Spicy::Memory
       dir = File.dirname(__FILE__)
       @adjectives = WordList.new(Files.adjectives)
       @nouns = WordList.new(Files.nouns)
-      @colors = WordList.new(Files.colors)
     end
 
     def adjective(*args)
@@ -60,10 +55,6 @@ module Spicy::Memory
       @nouns.word(*args)
     end
 
-    def color(*args)
-      @colors.word(*args)
-    end
-
     def pair(separator = '-')
       "#{self.adjective}#{separator}#{self.noun}"
     end

data/lib/seek.rb

@@ -2,7 +2,9 @@ require 'securerandom'
 
 module Spicy
   module Seek
-    def seek(min: nil, max: nil, length: nil, &found)
+    def seek(opts = {}, &found)
+      min, max, length = opts[:min], opts[:max], opts[:length]
+
       if !length.nil? && (!min.nil? || !max.nil?)
         raise ArgumentError.new('length cannot be specified if min or max are specified.')
       end
@@ -16,7 +18,9 @@ module Spicy
 
       rand_min = @cumulative[min - 1] || 0
       rand_max = @cumulative[max] || @cumulative[@max]
-      index = SecureRandom.random_number(rand_min...rand_max)
+
+      range = rand_max - rand_min + 1
+      index = rand_min + SecureRandom.random_number(range)
 
       min.upto(max) do |len|
         if @cumulative[len] > index

data/lib/spicy-proton.rb

@@ -22,12 +22,6 @@ module Spicy
       end
     end
 
-    def self.color(*args)
-      Disk::Corpus.use do |c|
-        c.color(*args)
-      end
-    end
-
     def self.pair(separator = '-')
       Disk::Corpus.use do |c|
         "#{c.adjective}#{separator}#{c.noun}"
@@ -44,7 +38,7 @@ module Spicy
       self.class.format_with(self, format)
     end
 
-    def_delegators :@corpus, :adjective, :noun, :color, :pair, :adjectives, :nouns, :colors
+    def_delegators :@corpus, :adjective, :noun, :pair, :adjectives, :nouns
 
     private
 
@@ -55,8 +49,6 @@ module Spicy
           source.adjective
         when 'n'
           source.noun
-        when 'c'
-          source.color
         when '%'
           '%'
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spicy-proton
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Schmich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
-description: Generate a random adjective-noun pair.
+description: ''
 email: schmch@gmail.com
 executables: []
 extensions: []
@@ -48,8 +48,6 @@ files:
 - README.md
 - lib/corpus/adjectives.bin
 - lib/corpus/adjectives.yaml
-- lib/corpus/colors.bin
-- lib/corpus/colors.yaml
 - lib/corpus/nouns.bin
 - lib/corpus/nouns.yaml
 - lib/disk-corpus.rb
@@ -68,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -79,5 +77,5 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Generate a random adjective-noun pair.
+summary: Generate a random adjective-noun word pair.
 test_files: []

data/lib/corpus/colors.yaml

@@ -1,157 +0,0 @@
----
-cumulative:
-  3: 3
-  4: 28
-  5: 56
-  6: 78
-  7: 95
-  8: 115
-  9: 128
-  10: 135
-  11: 136
-words:
-  3:
-  - red
-  - sky
-  - tan
-  4:
-  - aqua
-  - blue
-  - buff
-  - corn
-  - cyan
-  - ecru
-  - fern
-  - flax
-  - gold
-  - gray
-  - jade
-  - lime
-  - mint
-  - moss
-  - navy
-  - pear
-  - pine
-  - pink
-  - plum
-  - puce
-  - rose
-  - ruby
-  - rust
-  - sand
-  - teal
-  5:
-  - amber
-  - azure
-  - beige
-  - black
-  - brass
-  - brown
-  - coral
-  - cream
-  - denim
-  - green
-  - ivory
-  - khaki
-  - lemon
-  - lilac
-  - linen
-  - mauve
-  - ochre
-  - olive
-  - peach
-  - sepia
-  - slate
-  - smalt
-  - steel
-  - taupe
-  - tawny
-  - umber
-  - wheat
-  - white
-  6:
-  - auburn
-  - bistre
-  - bronze
-  - carrot
-  - cerise
-  - cherry
-  - cobalt
-  - copper
-  - forest
-  - indigo
-  - maroon
-  - myrtle
-  - orange
-  - orchid
-  - purple
-  - russet
-  - salmon
-  - sienna
-  - silver
-  - tomato
-  - violet
-  - yellow
-  7:
-  - apricot
-  - carmine
-  - celadon
-  - crimson
-  - emerald
-  - fuchsia
-  - gamboge
-  - magenta
-  - mustard
-  - olivine
-  - pumpkin
-  - saffron
-  - sangria
-  - scarlet
-  - thistle
-  - xanthic
-  - zucchin
-  8:
-  - alizarin
-  - amaranth
-  - amethyst
-  - burgundy
-  - cardinal
-  - cerulean
-  - charcoal
-  - chestnut
-  - cinnabar
-  - cinnamon
-  - eggplant
-  - lavender
-  - magnolia
-  - midnight
-  - platinum
-  - sapphire
-  - seashell
-  - titanium
-  - viridian
-  - wisteria
-  9:
-  - asparagus
-  - champagne
-  - chocolate
-  - dandelion
-  - firebrick
-  - goldenrod
-  - harlequin
-  - malachite
-  - persimmon
-  - sea green
-  - tangerine
-  - turquoise
-  - vermilion
-  10:
-  - aquamarine
-  - camouflage
-  - chartreuse
-  - cornflower
-  - heliotrope
-  - periwinkle
-  - terracotta
-  11:
-  - ultramarine