davidrichards-just_enumerable_stats 0.0.15 → 0.0.16

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 15
+:patch: 16

data/lib/just_enumerable_stats.rb

@@ -289,9 +289,9 @@ module Enumerable
     if defined?(Dictionary)
       @_jes_range_hash = Dictionary.new
       @_jes_range_hash.merge!(hash)
-      @_jes_categories = @_jes_range_hash.keys
+      @_jes_categories = @_jes_range_hash.keys.dup
     else
-      @_jes_categories = hash.keys
+      @_jes_categories = hash.keys.dup
       @_jes_range_hash = hash
     end
     @_jes_category_values = nil
@@ -304,13 +304,19 @@ module Enumerable
   # Allows you to add one category at a time.  You can actually add more
   # than one category at a time, but it won't disrupt any previously-set
   # categories. 
-  def _jes_add_category(hash)
+  def _jes_add_category(hash, &block)
     _jes_init_range_hash
-    hash.each do |k, v|
-      @_jes_range_hash[k] = v
+    if hash.is_a?(Hash)
+      hash.each do |k, v|
+        @_jes_range_hash[k] = v
+        @_jes_categories << k
+      end
+      @_jes_category_values = nil
+      hash
+    # Allows the syntax a.add_category(:two_or_three) {|e| e == 2 or e == 3}
+    elsif block
+      _jes_add_category(hash => block)
     end
-    @_jes_category_values = nil
-    hash
   end
   safe_alias :_jes_add_category
   
@@ -391,6 +397,42 @@ module Enumerable
   end
   safe_alias :_jes_category_values
 
+  # Returns the first category of a value.  Example:
+  # a = [1,2,3]
+  # a.first_category(2) # => 2
+  # a.add_category(:small) {|e| e <= 1}
+  # a.add_category(:large) {|e| e > 1}
+  # a.first_category(2) # => :large
+  def _jes_first_category(value)
+    return value unless self.range_hash
+    self._jes_range_hash.each do |cat, block|
+      return cat if block.call(value)
+    end
+    return nil
+  end
+  safe_alias :_jes_first_category
+  safe_alias :category, :_jes_first_category
+  
+  def _jes_all_categories(value)
+    return [value] unless self.range_hash
+    self._jes_range_hash.inject([]) do |list, e|
+      cat = e.first
+      block = e.last
+      list << cat if block.call(value)
+      list
+    end
+  end
+  safe_alias :_jes_all_categories
+  
+  def _jes_category_map(reset=false)
+    @_jes_category_map = nil if reset
+    return @_jes_category_map if @_jes_category_map
+    @_jes_category_map = self.inject([]) do |list, e|
+      list << self._jes_first_category(e)
+    end
+  end
+  safe_alias :_jes_category_map
+
   # When creating a range, what class will it be?  Defaults to Range, but
   # other classes are sometimes useful. 
   def _jes_range_class

data/spec/just_enumerable_stats_spec.rb

@@ -250,6 +250,12 @@ describe "JustEnumerableStats" do
   end
   
   it "should be able to add a category" do
+    @a.add_category({">= 2" => lambda{ |e| e >= 2}})
+    @a.categories.sort.should eql([">= 2"].sort)
+    @a.category_values[">= 2"].should eql([2,3])
+  end
+  
+  it "should be able to add a category with categories already set" do
     @a.set_categories({
       "<= 2" => lambda{ |e| e <= 2 },
       "== 2" => lambda{ |e| e == 2 }
@@ -270,6 +276,29 @@ describe "JustEnumerableStats" do
     @a.category_values["> 2"].should eql([3])
   end
   
+  it "should be able to return the first category a value belongs to" do
+    @a.first_category(2).should eql(2)
+    @a.category(2).should eql(2)
+    @a.add_category(:small) {|e| e <= 2}
+    @a.add_category(:large) {|e| e >= 2}
+    @a.first_category(2).should eql(:small)
+    @a.category(2).should eql(:small)
+  end
+  
+  it "should be able to return all categories a value belongs to" do
+    @a.all_categories(2).should eql([2])
+    @a.add_category(:small) {|e| e <= 2}
+    @a.add_category(:large) {|e| e >= 2}
+    @a.all_categories(2).should eql([:small, :large])
+  end
+  
+  it "should be able to return a map of each item's category" do
+    @a.category_map.should eql([1,2,3])
+    @a.add_category(:small) {|e| e <= 1}
+    @a.add_category(:large) {|e| e > 1}
+    @a.category_map(true).should eql([:small, :large, :large])
+  end
+  
   it "should be able to get categories with dot notation" do
     @a.set_range({
       :small => lambda{ |e| e <= 2 },

data/spec/spec_helper.rb

@@ -45,6 +45,9 @@ class BusyClass
   def dichotomize(split_value, first_label, second_label); raise ArgumentError, "Should not be called"; end
   def count_if(&block); raise ArgumentError, "Should not be called"; end
   def category_values(reset=false); raise ArgumentError, "Should not be called"; end
+  def first_category(value); raise ArgumentError, "Should not be called"; end
+  def all_categories(value); raise ArgumentError, "Should not be called"; end
+  def category_map(reset=false); raise ArgumentError, "Should not be called"; end
   def range_class; raise ArgumentError, "Should not be called"; end
   def range_as_range(&block); raise ArgumentError, "Should not be called"; end
   def new_sort(&block); raise ArgumentError, "Should not be called"; end

data/spec/unobtrusive_just_enumerable_stats_spec.rb

@@ -92,6 +92,18 @@ describe "JustEnumerableStats" do
       lambda{@a._jes_category_values}.should_not raise_error
     end
     
+    it "should not use the native first_category" do
+      lambda{@a._jes_first_category(1)}.should_not raise_error
+    end
+    
+    it "should not use the native all_categories" do
+      lambda{@a._jes_all_categories(1)}.should_not raise_error
+    end
+    
+    it "should not use the native category_map" do
+      lambda{@a._jes_category_map}.should_not raise_error
+    end
+    
     it "should not use the native range_class" do
       lambda{@a._jes_range_class}.should_not raise_error
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: davidrichards-just_enumerable_stats
 version: !ruby/object:Gem::Version 
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors: 
 - David Richards
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2009-08-24 00:00:00 -07:00
 default_executable: jes
 dependencies: []