crosscounter 0.3.0 → 0.4.0

data/bench/rows.json

@@ -0,0 +1 @@
+{"days":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"times":["12 AM","01 AM","02 AM","03 AM","04 AM","05 AM","06 AM","07 AM","08 AM","09 AM","10 AM","11 AM","12 PM","01 PM","02 PM","03 PM","04 PM","05 PM","06 PM","07 PM","08 PM","09 PM","10 PM","11 PM"],"answers":["Q4 This is a big step forward.","Q4 This is a little step forward.","Q4 This is a big step back.","Q4 This is a little step back.","Q4 I'm not sure yet!","Q6 Apple is leading.","Q6 Apple is following.","Q9 constantly (many times daily)","Q9 often (daily)","Q9 sometimes (at least once a week)","Q9 infrequently (less than once a week)","Q9 very rarely (or never)"],"scales":[],"group":["closed - awesome","closed - new address","closed - not awesome","partials"],"tags":["00: stuff","01: wacky","02: data","03: parking","0: parking lot","0: weird","1: air drop","1: battery life","1: control center","1: data detectors","1: fingerprint","1: folders","1: home screen","1: integration","1: lock screen","1: mulltitasking","1: notification center","1: other","1: ringtones","1: settings","1: siri","1: slide to","1: spotlight","2: app store","2: calendar","2: camera","2: clock","2: compass","2: facetime","2: game center","2: mail","2: maps","2: messages","2: music","2: notes","2: other","2: passbook","2: phone","2: photos","2: reminders","2: safari","2: videos","2: weather","3: backgrounds","3: colors","3: icons","3: motion","3: other","3: transparency","3: typography","4: bug/crash/etc","4: functionality","4: other","4: privacy","4: usability","5: aesthetics","5: integration","5: learning/context/automation","5: none","5: options/settings","5: other","5: revert","6: can't update","6: fantastic","6: gratuitious","at: android","at: apple","at: clean","at: color","at: control center","at: flashlight","at: flat","at: home","at: icon","at: multitasking","at: pretty","at: swipe","auto: color"],"scout":["Aaron M","Abby S","Albert Q","Allison M","Alyssa D","Alyssa S","Amber O","Andrea C","Andrew G","Andrew L","Andrew P","Ann C","Anna P","Anquinette B","Bekki H","Bianca B","Brett G","Brittany B","Brittany W","Bryant B","Carl C","Caroline H","Chris  H","Chris J","Christina H","Clayton B","Connor T","Dan W","Daniel S","Danielle D","David O","Denise T","Diane P","Drew M","Duncan K","Emilee M","Erin S","Faridah B","Flo C","Gina C","Glori M","Harry T","Irene O","Jamie C","Jamie N","Jeff P","Jennifer B","Jennifer B","Jennifer H","Jesse G","Jesse G","Joe H","Jonathan D","Jordan B","Jordan F","Jordan P","Jose R","Julia M","Julio  L","Katherine L","Laura G","Laura K","Lauren M","Leah Z","Lisa T","Lynn S","Marcus K","Maria A","Matt S","Mayling C","Megan B","Mehmet D","Melissa D","Melissa H","Melissa S","Meredith G","Meredith Y","Michael B","Michael H","Michael K","Michael L","Michelle G","Michelle M","Mike M","Nadyne R","Philip K","Rajeev D","Raman M","Rosalinda C","Ryan F","Sandra D","Scott F","Shannah S","Sharon E","Shawna M","Simon M","Stephen H","Steven S","Stevie S","Tysa S","Vincent C","Waqas M","francis r","grace d","jason s"],"gender":["male","female","NA"],"age":["Age 13","Age 14","Age 15","Age 16","Age 17","Age 18","Age 19","Age 20","Age 21","Age 22","Age 23","Age 24","Age 25","Age 26","Age 27","Age 28","Age 29","Age 30","Age 31","Age 32","Age 33","Age 34","Age 35","Age 36","Age 37","Age 38","Age 39","Age 40","Age 41","Age 42","Age 43","Age 44","Age 45","Age 46","Age 47","Age 48","Age 49","Age 50","Age 51","Age 52","Age 53","Age 54","Age 55","Age 56","Age 57","Age 58","Age 59","Age 60","Age 61","Age 62","Age 63","Age 64","Age 65","Age 66","Age 67","Age 68","Age 69","Age 70","Age 71","Age 72","Age 73","Age 74","Age 75","Age 76","Age 77","Age 78","Age 79","Age 80","Age NA"]}

data/crosscounter.gemspec

@@ -8,15 +8,17 @@ Gem::Specification.new do |gem|
   gem.version       = Crosscounter::VERSION
   gem.authors       = ['Parker Selbert']
   gem.email         = ['parker@sorentwo.com']
+  gem.homepage      = 'https://github.com/sorentwo/crosscounter'
   gem.description   = %(Functionally create cross tabulations)
   gem.summary       = %(
     Crosscounter allows you to create a simple pipeline for defining cross
     tabulated output)
-  gem.homepage      = 'https://github.com/sorentwo/crosscounter'
 
   gem.files         = `git ls-files`.split($/)
   gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'rspec', '~> 2.12.0'
+  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

@@ -2,31 +2,36 @@ require 'crosscounter/util'
 
 module Crosscounter
   module Compute
-    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.include?(value)
-          else
-            extracted == value
-          end
+    extend self
+
+    def compute(hashes, prop_a, prop_b = nil)
+      count = 0
+      index = 0
+      length = hashes.length
+
+      while index < length
+        if hashes[index].member?(prop_a) && (!prop_b || hashes[index].member?(prop_b))
+          count += 1
         end
+
+        index += 1
       end
+
+      count
     end
 
-    def self.compute_all(enumerable, rows, columns)
-      enumerable = Crosscounter::Util.stringify_all(enumerable)
+    def compute_all(enumerable, rows, columns)
+      setified = enumerable.map { |hash| Util.hashify(hash) }
+      scolumns = Util.stringify(columns)
 
-      Crosscounter::Util.tuplize(rows).map do |tuple|
-        initial = [tuple.last, compute(enumerable, tuple.first => tuple.last)]
+      Util.stringify(rows).map do |row|
+        initial = [row, compute(setified, row)]
 
-        Crosscounter::Util.tuplize(columns).inject(initial) do |rows, column|
-          rows << compute(enumerable,
-                          tuple.first => tuple.last,
-                          "_#{column.first}" => column.last)
+        scolumns.each do |col|
+          initial << compute(setified, row, col)
         end
+
+        initial
       end
     end
   end

data/lib/crosscounter/expansion.rb

@@ -1,13 +1,15 @@
 module Crosscounter
   module Expansion
-    def self.expand(keywords, expansions)
+    extend self
+
+    def expand(keywords, expansions)
       keywords.inject({}) do |hash, keyword|
         hash[keyword] = resolved(expansions, keyword)
         hash
       end
     end
 
-    def self.replace(enumerable, replacements)
+    def replace(enumerable, replacements)
       enumerable.map do |object|
         replacements.inject({}) do |hash, replacement|
           hash[replacement.first] = replacement.last.call(object)
@@ -17,7 +19,7 @@ module Crosscounter
       end
     end
 
-    def self.resolved(expansions, keyword)
+    def resolved(expansions, keyword)
       value = expansions.fetch(keyword)
 
       value.respond_to?(:call) ? value.call : value

data/lib/crosscounter/util.rb

@@ -1,22 +1,23 @@
+require 'set'
+
 module Crosscounter
   module Util
-    @@tuples  = {}
+    extend self
 
-    def self.stringify_keys(hash)
-      hash.keys.each do |key|
-        hash[key.to_s] = hash.delete(key)
+    def hashify(hash)
+      stringify(hash).inject({}) do |memo, key|
+        memo[key] = 0
+        memo
       end
-
-      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] }
+    def stringify(hash, sep = '|')
+      hash.flat_map do |key, value|
+        if value.kind_of?(Enumerable)
+          value.map { |elem| "#{key}#{sep}#{elem}" }
+        else
+          ["#{key}#{sep}#{value}"]
+        end
       end
     end
   end

data/lib/crosscounter/version.rb

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

data/lib/crosscounter.rb

@@ -1,6 +1,7 @@
-require 'crosscounter/version'
-require 'crosscounter/expansion'
 require 'crosscounter/compute'
+require 'crosscounter/expansion'
+require 'crosscounter/util'
+require 'crosscounter/version'
 
 module Crosscounter
 end

data/spec/crosscounter/compute_spec.rb

@@ -6,38 +6,15 @@ describe Crosscounter::Compute do
   describe '.compute' do
     it 'counts the number of cross occurring values between all properties' do
       enumerable = [
-        { 'age' => 18, 'gender' => 'male' },
-        { 'age' => 19, 'gender' => 'female' },
-        { 'age' => 18, 'gender' => 'male' }
+        Set.new(['age-18', 'gender-male']),
+        Set.new(['age-19', 'gender-female']),
+        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
-    end
-
-    it 'matches against regular expressions' do
-      enumerable = [
-        { 'age' => 18, 'tags' => %w[happy sad] },
-        { 'age' => 19, 'tags' => %w[happy mad] },
-        { 'age' => 18, 'tags' => %w[mad sad] },
-        { 'age' => 18, 'tags' => %w[sad] }
-      ]
-
-      computer.compute(enumerable, 'age' => 18, 'tags' => 'sad').should   == 3
-      computer.compute(enumerable, 'age' => 18, 'tags' => 'happy').should == 1
-    end
-
-    it 'compensates for duplicate keys by normalizing leading underscores' do
-      enumerable = [
-        { 'age' => '18', 'tags' => %w[happy sad] },
-        { 'age' => '19', 'tags' => %w[happy mad] },
-        { 'age' => '18', 'tags' => %w[mad sad] },
-        { 'age' => '18', 'tags' => %w[sad] }
-      ]
-
-      computer.compute(enumerable, 'tags' => 'sad', '_tags' => 'happy').should == 1
+      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
     end
   end
 
@@ -56,13 +33,13 @@ describe Crosscounter::Compute do
       )
 
       computed.should == [
-        [18,       2, 1, 2, 1],
-        [19,       2, 1, 1, 1],
-        ['male',   3, 1, 3, 1],
-        ['female', 1, 1, 0, 1],
-        ['happy',  2, 2, 1, 1],
-        ['sad',    3, 1, 3, 1],
-        ['mad',    2, 1, 1, 2]
+        ['age|18',         2, 1, 2, 1],
+        ['age|19',         2, 1, 1, 1],
+        ['gender|male',    3, 1, 3, 1],
+        ['gender|female',  1, 1, 0, 1],
+        ['tags|happy',     2, 2, 1, 1],
+        ['tags|sad',       3, 1, 3, 1],
+        ['tags|mad',       2, 1, 1, 2]
       ]
     end
   end

data/spec/crosscounter/expansion_spec.rb

@@ -19,8 +19,8 @@ describe Crosscounter::Expansion do
 
   describe '.replace' do
     it 'replaces all objects with mapped values' do
-      male_object   = mock(gender: 'male')
-      female_object = mock(gender: 'female')
+      male_object   = double(gender: 'male')
+      female_object = double(gender: 'female')
 
       replaced = expansion.replace([male_object, female_object],
                                    gender: -> object { object.gender.downcase })

data/spec/crosscounter/util_spec.rb

@@ -1,9 +1,18 @@
 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]]
+  describe '.stringify' do
+    it 'unzips a hash into key-value strings' do
+      expect(Crosscounter::Util.stringify(age: [18, 19, 20])).to eq([
+        'age|18', 'age|19', 'age|20'
+      ])
+    end
+
+    it 'unzips a key/value hash into key/value tuples' do
+      expect(Crosscounter::Util.stringify(gender: 'male', name: 'Tom')).to eq([
+        'gender|male',
+        'name|Tom'
+      ])
     end
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.order = 'random'
+end

metadata

@@ -1,32 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: crosscounter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Parker Selbert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2014-01-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.99.0.beta1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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: 2.12.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '0'
 description: Functionally create cross tabulations
 email:
 - parker@sorentwo.com
@@ -34,13 +59,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - NOTES.txt
 - README.md
 - Rakefile
+- bench/cols.json
+- bench/compute.rb
+- bench/data.json
+- bench/rows.json
 - crosscounter.gemspec
 - lib/crosscounter.rb
 - lib/crosscounter/compute.rb
@@ -53,33 +83,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/sorentwo/crosscounter
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2417517050912310752
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2417517050912310752
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Crosscounter allows you to create a simple pipeline for defining cross tabulated
   output
 test_files: