bitfields 0.1.4 → 0.1.5

data/README.markdown

@@ -38,6 +38,10 @@ Update all users
 Delete the shop when a user is no longer a seller
     before_save :delete_shop, :if => lambda{|u| u.changes['seller'] == [true, false]}
 
+TODO
+====
+ - convenient named scope `User.with_bitfields(:xxx=>true, :yy=>false)`
+
 Author
 ======
 [Michael Grosser](http://pragmatig.wordpress.com)  

data/Rakefile

@@ -1,16 +1,11 @@
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new {|t| t.spec_opts = ['--color']}
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = '--backtrace --color'
+end
 
 task :default do
-  # test with 2.x
-  puts `VERSION='~>2' rake spec`
-
-  # gem 'activerecord', '>=3' did not work for me, but just require gets the right version...
-  require 'active_record'
-  if ActiveRecord::VERSION::MAJOR >= 3
-    puts `rake spec`
-  else
-    'install rails 3 to get full test coverage...'
+  [2,3].each do |version|
+    sh "VERSION='~>#{version}' rake spec" rescue nil
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/benchmark/1.rb

@@ -0,0 +1,144 @@
+bit_counts = [2,3,4,5,6,7,8,9,10,11,12,13,14]
+record_counts = (1..20).to_a.map{|i| i * 50_000 }
+use_index = true
+database = ARGV[0]
+
+puts "running#{' with index' if use_index} on #{database}"
+
+$LOAD_PATH.unshift File.expand_path('lib')
+require 'rubygems'
+gem 'gchartrb'
+require 'google_chart'
+require 'active_record'
+require 'bitfields'
+
+def benchmark
+  t = Time.now.to_f
+  yield
+  Time.now.to_f - t
+end
+
+def create(bit_counts, count)
+  count.times do |i|
+    columns = bit_counts.map do |bits_count|
+      ["bit_#{bits_count}", rand(2**(bits_count-1))]
+    end
+    User.create!(Hash[columns])
+  end
+end
+
+def connect(db)
+  if db == 'mysql'
+    puts 'using mysql'
+    ActiveRecord::Base.establish_connection(
+      :adapter => "mysql",
+      :database => "bitfields_benchmark"
+    )
+  else
+    puts 'using sqlite'
+    ActiveRecord::Base.establish_connection(
+      :adapter => "sqlite3",
+        :database => ":memory:"
+    )
+  end
+end
+
+def create_model_table(bit_counts, use_index)
+  ActiveRecord::Schema.define(:version => 2) do
+    drop_table :users rescue nil
+    create_table :users do |t|
+      bit_counts.each do |bit_count|
+        t.integer "bit_#{bit_count}", :default => 0, :null => false
+      end
+    end
+
+    if use_index
+      bit_counts.each do |bit_count|
+        add_index :users, "bit_#{bit_count}"
+      end
+    end
+  end
+end
+
+def create_model_fields(bit_counts)
+  puts "creating model"
+  User.class_eval do
+    include Bitfields
+
+    # this takes long for 15/20 bits, maybe needs to be optimized..
+    bit_counts.each do |bits_count|
+      bits = {}
+      0.upto(bits_count-1) do |bit|
+        bits[2**bit] = "bit_#{bits_count}_#{bit}"
+      end
+
+      bitfield "bit_#{bits_count}", bits
+    end
+  end
+end
+
+def test_speed(bit_counts, query_mode)
+  result = bit_counts.map do |bit_count|
+    sql = User.bitfield_sql({"bit_#{bit_count}_1" => true}, :query_mode => query_mode)
+#    puts sql[0..100]
+    time = benchmark do
+      User.count sql
+    end
+    puts "#{bit_count} -> #{time}"
+    [bit_count, time]
+  end
+  Hash[result]
+end
+
+#determines a unique color based on a name
+def color_for(name)
+  name = name.inspect + "some randomness for fun"
+  hash = (name.hash % 1_000_000_000).to_s #get a hash of a constant size
+  colors = [hash[0..1], hash[2..3], hash[4..5]].map{|c| c.to_f / 100.0 * 16} #use 3 parts of the hash to get numbers from 0 to 15.99
+  palette = ('0'..'9').to_a + ('a'..'f').to_a #hex values 0..f
+  colors.map{|c| palette[c.floor].to_s * 2} * '' #each color is duplicated and the joined
+end
+
+connect(database)
+create_model_table(bit_counts, use_index)
+class User < ActiveRecord::Base
+end
+create_model_fields(bit_counts)
+
+puts "creating test data"
+last = 0
+
+graphs = {:bit => {}, :in => {}}
+data = record_counts.map do |record_count|
+  create(bit_counts, record_count-last)
+  puts User.count
+  last = record_count
+
+  puts "testing with #{record_count} records -- bit_operator"
+  graphs[:bit][record_count] = test_speed(bit_counts, :bit_operator)
+
+  puts "testing with #{record_count} records -- in_list"
+  graphs[:in][record_count] = test_speed(bit_counts, :in_list)
+
+end
+
+colors = {:bit => '00xx00', :in => 'xx0000'}
+alpha_num = (('0'..'9').to_a + ('a'..'f').to_a).reverse
+title = "bit-operator vs IN() -- #{use_index ? 'with' : 'without'} index"
+url = GoogleChart::LineChart.new('600x500', title, false) do |line|
+  max = 0
+  graphs.each do |type, line_data|
+    bit_counts.each do |bit_count|
+      data = record_counts.map{|rc| line_data[rc][bit_count] }
+      name = "#{bit_count}bits (#{type})"
+      color = colors[type].sub('xx', alpha_num[bit_count]*2)
+      line.data(name, data, color)
+      max = [data.max, max].max
+    end
+  end
+
+  line.axis :x, :labels => record_counts.map{|c|"#{c/1000}K"}
+  line.axis :y, :labels => ['0', "%.3f" % [max*100]]
+end.to_url
+
+puts url

data/bitfields.gemspec

@@ -1,45 +1,44 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bitfields}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-04-25}
+  s.date = %q{2011-01-19}
   s.email = %q{grosser.michael@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "bitfields.gemspec",
-     "lib/bitfields.rb",
-     "spec/bitfields_spec.rb",
-     "spec/database.rb",
-     "spec/spec_helper.rb"
+    "Rakefile",
+    "VERSION",
+    "benchmark/1.rb",
+    "bitfields.gemspec",
+    "lib/bitfields.rb",
+    "spec/bitfields_spec.rb",
+    "spec/database.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/grosser/bitfields}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Save migrations and columns by storing multiple booleans in a single integer.}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/bitfields_spec.rb",
-     "spec/database.rb"
+    "spec/bitfields_spec.rb",
+    "spec/database.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/bitfields.rb

@@ -58,20 +58,20 @@ module Bitfields
       found.first
     end
 
-    def bitfield_sql(bit_values)
-      bits = group_bits_by_column(bit_values)
-      bits.map{|column, bit_values| bitfield_sql_by_column(column, bit_values) } * ' AND '
+    def bitfield_sql(bit_values, options={})
+      bits = group_bits_by_column(bit_values).sort_by{|c,v| c.to_s }
+      bits.map{|column, bit_values| bitfield_sql_by_column(column, bit_values, options) } * ' AND '
     end
 
     def set_bitfield_sql(bit_values)
-      columns = group_bits_by_column(bit_values)
-      columns.map{|column, bit_values| set_bitfield_sql_by_column(column, bit_values) } * ', '
+      bits = group_bits_by_column(bit_values).sort_by{|c,v| c.to_s }
+      bits.map{|column, bit_values| set_bitfield_sql_by_column(column, bit_values) } * ', '
     end
 
     private
 
-    def bitfield_sql_by_column(column, bit_values)
-      mode = (bitfield_options[column][:query_mode] || :in_list)
+    def bitfield_sql_by_column(column, bit_values, options={})
+      mode = options[:query_mode] || (bitfield_options[column][:query_mode] || :in_list)
       case mode
       when :in_list then
         max = (bitfields[column].values.max * 2) - 1

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bitfields
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 +02:00
+date: 2011-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +31,7 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- benchmark/1.rb
 - bitfields.gemspec
 - lib/bitfields.rb
 - spec/bitfields_spec.rb
@@ -40,32 +42,36 @@ homepage: http://github.com/grosser/bitfields
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Save migrations and columns by storing multiple booleans in a single integer.
 test_files: 
-- spec/spec_helper.rb
 - spec/bitfields_spec.rb
 - spec/database.rb
+- spec/spec_helper.rb