splashy 0.0.1 → 0.0.2

data/README.markdown

@@ -43,6 +43,13 @@ buckets.select
 #   }
 ```
 
+Changelog
+=========
+
+* 0.0.2 - Raise `ArgumentError` when trying to add to a bucket that doesn't 
+exist, don't consider an empty bucket "satisfied".
+* 0.0.1 - Initial release.
+
 Contributing
 ============
 

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/splashy/buckets.rb

@@ -10,8 +10,9 @@ module Splashy
       end
       @wanted_distribution = wanted_distribution
       @wanted_count = wanted_count
-      @buckets = Hash.new do |hash, name|
-        hash[name] = Bucket.new( name )
+      @buckets = {}
+      @wanted_distribution.keys.each do |bucket_name|
+        @buckets[bucket_name] = Bucket.new( bucket_name )
       end
       @total_count = 0
     end
@@ -42,6 +43,9 @@ module Splashy
     
     # Public: Add a single element to a bucket.
     def add( bucket_name, element )
+      unless @wanted_distribution[bucket_name]
+        raise ArgumentError.new( "#{bucket_name.inspect} is not a valid bucket." )
+      end
       @buckets[bucket_name] << element
       @total_count += 1
     end
@@ -130,6 +134,13 @@ module Splashy
         )
       end
       
+      empty_buckets = @buckets.keys.select{ |name| @buckets[name].empty? }
+      unless empty_buckets.empty?
+        raise DistributionUnsatisfiedError.new(
+          "The following buckets are empty: #{empty_buckets.map{|b| b}.join(', ')}."
+        )
+      end
+      
       if @wanted_count
         if @total_count < @wanted_count
           raise DistributionUnsatisfiedError.new(

data/splashy.gemspec

@@ -0,0 +1,58 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{splashy}
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tyson Tate"]
+  s.date = %q{2011-12-09}
+  s.description = %q{Simple distribution-based sampling of arbitrary objects from any number of buckets. Splashy. Buckets. Get it!?}
+  s.email = %q{tyson@tysontate.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.markdown"
+  ]
+  s.files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "buckets.gemspec",
+    "lib/splashy.rb",
+    "lib/splashy/bucket.rb",
+    "lib/splashy/buckets.rb",
+    "splashy.gemspec",
+    "test/helper.rb",
+    "test/test_splashy_buckets.rb"
+  ]
+  s.homepage = %q{http://github.com/tysontate/splashy}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.4.2}
+  s.summary = %q{Simple distribution-based sampling of arbitrary objects from buckets.}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<minitest>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+    else
+      s.add_dependency(%q<minitest>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    end
+  else
+    s.add_dependency(%q<minitest>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+  end
+end
+

data/test/test_splashy_buckets.rb

@@ -61,6 +61,22 @@ describe Splashy::Buckets do
         @buckets.select
       end
     end
+    
+    it "fails when trying to add to an invalid bucket" do
+      @buckets = Splashy::Buckets.new({ :a => 0.80, :b => 0.2 } )
+      assert_raises( ArgumentError ) do
+        @buckets.add( :x, "oops" )
+      end
+    end
+    
+    it "fails with distribution being such that desired count can't be met" do
+      @buckets = Splashy::Buckets.new({ :a => 0.80, :b => 0.1, :c => 0.10 } )
+      fill_with_counts( 1, 2, 0 )
+      assert !@buckets.satisfied?
+      assert_raises( Splashy::DistributionUnsatisfiedError ) do
+        @buckets.select
+      end
+    end
   end
   
   describe "success" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: splashy
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Tyson Tate
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 -08:00
+date: 2011-12-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - lib/splashy.rb
 - lib/splashy/bucket.rb
 - lib/splashy/buckets.rb
+- splashy.gemspec
 - test/helper.rb
 - test/test_splashy_buckets.rb
 has_rdoc: true