crosscounter 0.2.0 → 0.3.0

data/lib/crosscounter/compute.rb

@@ -2,16 +2,13 @@ require 'crosscounter/util'
 
 module Crosscounter
   module Compute
-    @@values = {}
-    @@tuples = {}
-
     def self.compute(enumerable, properties)
       enumerable.count do |object|
         properties.all? do |key, value|
           extracted = (object[key] || object[key.sub('_', '')])
 
           if extracted.kind_of?(Array)
-            extracted.join("\t") =~ regexify(value)
+            extracted.include?(value)
           else
             extracted == value
           end
@@ -20,27 +17,17 @@ module Crosscounter
     end
 
     def self.compute_all(enumerable, rows, columns)
-      enumerable.map! { |object| Crosscounter::Util.stringify_keys(object) }
+      enumerable = Crosscounter::Util.stringify_all(enumerable)
 
-      tuplize(rows).map do |tuple|
+      Crosscounter::Util.tuplize(rows).map do |tuple|
         initial = [tuple.last, compute(enumerable, tuple.first => tuple.last)]
 
-        tuplize(columns).inject(initial) do |rows, column|
+        Crosscounter::Util.tuplize(columns).inject(initial) do |rows, column|
           rows << compute(enumerable,
                           tuple.first => tuple.last,
                           "_#{column.first}" => column.last)
         end
       end
     end
-
-    def self.regexify(value)
-      @@values[value] ||= /(\A|\t)#{value}(\Z|\t)/
-    end
-
-    def self.tuplize(hash)
-      @@tuples[hash] ||= hash.flat_map do |tuple|
-        tuple.last.map { |value| [tuple.first.to_s, value] }
-      end
-    end
   end
 end

data/lib/crosscounter/util.rb

@@ -1,5 +1,7 @@
 module Crosscounter
   module Util
+    @@tuples  = {}
+
     def self.stringify_keys(hash)
       hash.keys.each do |key|
         hash[key.to_s] = hash.delete(key)
@@ -7,5 +9,15 @@ module Crosscounter
 
       hash
     end
+
+    def self.stringify_all(array)
+      array.map { |object| Crosscounter::Util.stringify_keys(object) }
+    end
+
+    def self.tuplize(hash)
+      @@tuples[hash] ||= hash.flat_map do |tuple|
+        tuple.last.map { |value| [tuple.first.to_s, value] }
+      end
+    end
   end
 end

data/lib/crosscounter/version.rb

@@ -1,3 +1,3 @@
 module Crosscounter
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/crosscounter/compute_spec.rb

@@ -66,10 +66,4 @@ describe Crosscounter::Compute do
       ]
     end
   end
-
-  describe '.tuplize' do
-    it 'unzips the hash into key/value tuples' do
-      computer.tuplize(age: [18, 19, 20]).should == [['age', 18], ['age', 19], ['age', 20]]
-    end
-  end
 end

data/spec/crosscounter/util_spec.rb

@@ -0,0 +1,9 @@
+require 'crosscounter/util'
+
+describe Crosscounter::Util do
+  describe '.tuplize' do
+    it 'unzips the hash into key/value tuples' do
+      Crosscounter::Util.tuplize(age: [18, 19, 20]).should == [['age', 18], ['age', 19], ['age', 20]]
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crosscounter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -49,6 +49,7 @@ files:
 - lib/crosscounter/version.rb
 - spec/crosscounter/compute_spec.rb
 - spec/crosscounter/expansion_spec.rb
+- spec/crosscounter/util_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sorentwo/crosscounter
 licenses: []
@@ -64,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2051450551277427890
+      hash: -2417517050912310752
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -73,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2051450551277427890
+      hash: -2417517050912310752
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -84,4 +85,5 @@ summary: Crosscounter allows you to create a simple pipeline for defining cross
 test_files:
 - spec/crosscounter/compute_spec.rb
 - spec/crosscounter/expansion_spec.rb
+- spec/crosscounter/util_spec.rb
 - spec/spec_helper.rb