bitmap 0.0.2 → 0.0.3.1

data/lib/bitmap.rb

@@ -12,25 +12,40 @@
 
 class Bitmap < Hash
   class Value
-    def initialize (value, names)
-      @value = value.to_i
-      @names = names
+    attr_reader :bitmap
+
+    def initialize (bitmap, value, names)
+      @bitmap = bitmap
+      @value  = value.to_i
+      @names  = names
     end
 
-    def has? (name)
-      @names.member?(name)
+    def has? (mask)
+      if mask.is_a?(Value)
+        (@names.to_a & mask.to_a) == mask.to_a
+      else
+        @names.member?(mask.to_s.to_sym)
+      end
     end
 
     def to_a
       @names
     end
 
+    def + (*what)
+      bitmap[*(@names + what.flatten.compact)]
+    end
+
+    def - (*what)
+      bitmap[*(@names - what.flatten.compact)]
+    end
+
     def to_i
       @value
     end
 
     def to_s
-      to_a.join(' | ')
+      to_a.join '|'
     end
   end
 
@@ -44,13 +59,13 @@ class Bitmap < Hash
     args.compact!
 
     if args.length == 1 && args.first.is_a?(Integer)
-      Value.new(args.first, args.first.to_s(2).reverse.chars.each_with_index.map {|bit, index|
+      Value.new(self, args.first, args.first.to_s(2).reverse.chars.each_with_index.map {|bit, index|
         next if bit.to_i.zero?
 
         key("#{bit}#{'0' * index}".to_i(2)) or raise ArgumentError, "unknown bit at #{index}"
       }.compact)
     else
-      Value.new(args.map {|arg|
+      Value.new(self, args.map {|arg|
         super(arg) or super(arg.to_s.to_sym) or raise ArgumentError, "unknown symbol #{arg}"
       }.inject {|a, b|
         a | b
@@ -59,7 +74,7 @@ class Bitmap < Hash
   end
 
   def all
-    Value.new(values.inject {|a, b|
+    Value.new(self, values.inject {|a, b|
       a | b
     }, keys)
   end

metadata

@@ -1,46 +1,54 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: bitmap
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.3.1
 platform: ruby
-authors:
+authors: 
 - meh.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-11 00:00:00.000000000Z
+
+date: 2011-08-21 00:00:00 Z
 dependencies: []
+
 description: 
 email: meh@paranoici.org
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/bitmap.rb
 homepage: http://github.com/meh/ruby-bitmap
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: Simple and stupid bitmap implementation (bitmap as in bitset, not bitmap
-  image)
+summary: Simple and stupid bitmap implementation (bitmap as in bitset, not bitmap image)
 test_files: []
+