crosscounter 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23bb8b769b17271893ecad937b0e452c9915f6d
-  data.tar.gz: 9430375da9fe90ffba3c47e9d0112f58ceb13e3d
+  metadata.gz: 1597840a6d492374dda49be70c7037fd43dd7220
+  data.tar.gz: f5631aec3a1ec0469e8bd088e7ddd146fd3fee95
 SHA512:
-  metadata.gz: d77812e65a457eed6efe99f1804c514e59cc4ade31a7b73d901e7d3b7050babca2a76826617fba7d4ae0e5582bf8dd12e060420c9b0bf3370e43b002be8e203b
-  data.tar.gz: d665c48e4584ec3bb2a2e44aa6b493f770d5b24f924483038c8ac2eddd6f81ee59d63b2e381d58e004bbdbc3ab1c13a1bcb3a742fa085d07dfb9dc1101189752
+  metadata.gz: 2d0e1f9820f5ca86203fec298bc52f12ab69e083eb31a20e63f99df374ae7078716514e8ddccf17d9713d0fd8940c964c230cea9ae03a35a1233f20fff5ac54b
+  data.tar.gz: 8a98d0599eb8e5b46ef4a0f35ab8f28eff3ca38250f068670b3e7ba2e802fc4d9a39a91bd3fb49580b77f2f8cca55d05b2f03ae0664866648b885239db4914f7

data/.travis.yml

@@ -3,3 +3,4 @@ cache: bundler
 rvm:
   - 1.9.3
   - 2.1.0
+  - jruby

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in crosscounter.gemspec
 gemspec
+
+platform :mri do
+  gem 'ruby-prof'
+end

data/bench/compute.rb

@@ -10,6 +10,8 @@ rows = JSON.load(IO.read('bench/rows.json'))
 cols = JSON.load(IO.read('bench/cols.json'))
 data = JSON.load(IO.read('bench/data.json'))
 
+sub_cols = { 'answers' => cols['answers'].take(1), 'tags' => cols['tags'].take(2) }
+
 if ENV['PROFILE']
   require 'ruby-prof'
 
@@ -21,8 +23,12 @@ if ENV['PROFILE']
   printer.print(STDOUT)
 else
   Benchmark.bmbm do |x|
-    x.report('compute_all' ) do
+    x.report('compute_all') do
       Crosscounter::Compute.compute_all(data, rows, cols)
     end
+
+    x.report('compute_sum') do
+      Crosscounter::Compute.compute_all(data, rows, sub_cols)
+    end
   end
 end

data/crosscounter.gemspec

@@ -20,5 +20,4 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake',  '~> 10.1'
   gem.add_development_dependency 'rspec', '~> 2.99.0.beta1'
-  gem.add_development_dependency 'ruby-prof'
 end

data/lib/crosscounter/compute.rb

@@ -4,6 +4,32 @@ module Crosscounter
   module Compute
     extend self
 
+    def compute_all(enumerable, rows, cols)
+      hashified = enumerable.map { |hash| Util.hashify(hash) }
+      string_cols = Util.stringify(cols)
+      string_rows = Util.stringify(rows)
+
+      string_rows.map! do |row|
+        initial = [row, compute(hashified, row)]
+
+        string_cols.each do |col|
+          initial << compute(hashified, row, col)
+        end
+
+        initial
+      end
+    end
+
+    def compute_sum(enumerable, rows, cols)
+      hashified = enumerable.map { |hash| Util.hashify(hash) }
+      string_rows = Util.stringify(rows)
+      string_cols = Util.stringify(cols)
+
+      string_rows.map! do |row|
+        computex(hashified, row, string_cols).unshift(row)
+      end
+    end
+
     def compute(hashes, prop_a, prop_b = nil)
       count = 0
       index = 0
@@ -20,19 +46,22 @@ module Crosscounter
       count
     end
 
-    def compute_all(enumerable, rows, columns)
-      setified = enumerable.map { |hash| Util.hashify(hash) }
-      scolumns = Util.stringify(columns)
-
-      Util.stringify(rows).map do |row|
-        initial = [row, compute(setified, row)]
+    def computex(hashes, base_prop, other_props)
+      count = 0
+      cross = 0
+      index = 0
+      length = hashes.length
 
-        scolumns.each do |col|
-          initial << compute(setified, row, col)
+      while index < length
+        if hashes[index].member?(base_prop)
+          count += 1
+          cross += 1 if other_props.any? && other_props.all? { |prop| hashes[index].member?(prop) }
         end
 
-        initial
+        index += 1
       end
+
+      [count, cross]
     end
   end
 end

data/lib/crosscounter/util.rb

@@ -1,17 +1,27 @@
 require 'set'
 
 module Crosscounter
+  DEFAULT_SEPARATOR = '|'
+
   module Util
     extend self
 
+    def separator=(sep)
+      @@separator = sep
+    end
+
+    def separator
+      @@separator ||= DEFAULT_SEPARATOR
+    end
+
     def hashify(hash)
       stringify(hash).inject({}) do |memo, key|
-        memo[key] = 0
+        memo[key] = true
         memo
       end
     end
 
-    def stringify(hash, sep = '|')
+    def stringify(hash, sep = separator)
       hash.flat_map do |key, value|
         if value.kind_of?(Enumerable)
           value.map { |elem| "#{key}#{sep}#{elem}" }

data/lib/crosscounter/version.rb

@@ -1,3 +1,3 @@
 module Crosscounter
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/spec/crosscounter/compute_spec.rb

@@ -11,10 +11,10 @@ describe Crosscounter::Compute do
         Set.new(['age-18', 'gender-male'])
       ]
 
-      computer.compute(enumerable, 'age-18').should == 2
-      computer.compute(enumerable, 'age-18', 'gender-male').should   == 2
-      computer.compute(enumerable, 'age-19', 'gender-male').should   == 0
-      computer.compute(enumerable, 'age-19', 'gender-female').should == 1
+      expect(computer.compute(enumerable, 'age-18')).to eq(2)
+      expect(computer.compute(enumerable, 'age-18', 'gender-male')).to eq(2)
+      expect(computer.compute(enumerable, 'age-19', 'gender-male')).to eq(0)
+      expect(computer.compute(enumerable, 'age-19', 'gender-female')).to eq(1)
     end
   end
 
@@ -32,7 +32,7 @@ describe Crosscounter::Compute do
         { tags: %w[happy sad mad] }
       )
 
-      computed.should == [
+      expect(computed).to eq([
         ['age|18',         2, 1, 2, 1],
         ['age|19',         2, 1, 1, 1],
         ['gender|male',    3, 1, 3, 1],
@@ -40,7 +40,33 @@ describe Crosscounter::Compute do
         ['tags|happy',     2, 2, 1, 1],
         ['tags|sad',       3, 1, 3, 1],
         ['tags|mad',       2, 1, 1, 2]
+      ])
+    end
+  end
+
+  describe '.compute_sum' do
+    it 'tabulates all rows against all columns combined' do
+      enumerable = [
+        { age: 18, gender: 'male',   tags: %w[happy sad] },
+        { age: 19, gender: 'female', tags: %w[happy mad] },
+        { age: 18, gender: 'male',   tags: %w[mad sad] },
+        { age: 19, gender: 'male',   tags: %w[happy sad] }
       ]
+
+      computed = computer.compute_sum(enumerable,
+        { age: [18, 19], gender: %w[male female], tags: %w[happy sad mad] },
+        { tags: %w[happy sad] }
+      )
+
+      expect(computed).to eq([
+        ['age|18',         2, 1],
+        ['age|19',         2, 1],
+        ['gender|male',    3, 2],
+        ['gender|female',  1, 0],
+        ['tags|happy',     3, 2],
+        ['tags|sad',       3, 2],
+        ['tags|mad',       2, 0]
+      ])
     end
   end
 end

data/spec/crosscounter/util_spec.rb

@@ -1,6 +1,17 @@
 require 'crosscounter/util'
 
 describe Crosscounter::Util do
+  describe '.separator=' do
+    after do
+      Crosscounter::Util.separator = Crosscounter::DEFAULT_SEPARATOR
+    end
+
+    it 'sets the separator for future usage' do
+      Crosscounter::Util.separator = '.::.'
+      expect(Crosscounter::Util.separator).to eq('.::.')
+    end
+  end
+
   describe '.stringify' do
     it 'unzips a hash into key-value strings' do
       expect(Crosscounter::Util.stringify(age: [18, 19, 20])).to eq([

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crosscounter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.99.0.beta1
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Functionally create cross tabulations
 email:
 - parker@sorentwo.com