bitmap 0.0.3.2 → 0.0.4

data/lib/bitmap.rb

@@ -2,84 +2,86 @@
 #           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 #                   Version 2, December 2004
 #
-#  Copyleft meh. [http://meh.paranoid.pk | meh@paranoici.org]
-#
 #           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 #  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 #
 #  0. You just DO WHAT THE FUCK YOU WANT TO.
 #++
 
-class Bitmap < Hash
-  class Value
-    attr_reader :bitmap
+class Bitmap
+	class Value
+		attr_reader :bitmap
+
+		def initialize (bitmap, value, names)
+			@bitmap = bitmap
+			@value  = value.to_i
+			@names  = names
+		end
 
-    def initialize (bitmap, value, names)
-      @bitmap = bitmap
-      @value  = value.to_i
-      @names  = names
-    end
+		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 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 to_a
-      @names
-    end
+		def + (*what)
+			bitmap[*(@names + what.flatten.map {|piece|
+				piece.to_a rescue piece
+			}).flatten.compact]
+		end
 
-    def + (*what)
-      bitmap[*(@names + what.flatten.map {|piece|
-        piece.to_a rescue piece
-      }).flatten.compact]
-    end
+		def - (*what)
+			bitmap[*(@names - what.flatten.map {|piece|
+				piece.to_a rescue piece
+			}).flatten.compact]
+		end
 
-    def - (*what)
-      bitmap[*(@names - what.flatten.map {|piece|
-        piece.to_a rescue piece
-      }).flatten.compact]
-    end
+		def to_i
+			@value
+		end
 
-    def to_i
-      @value
-    end
+		def to_s
+			to_a.join '|'
+		end
+	end
 
-    def to_s
-      to_a.join '|'
-    end
-  end
+	def initialize (data)
+		@bits = data
+		@bits.freeze
+	end
 
-  def initialize (data)
-    merge!(data)
-    freeze
-  end
+	def [] (*args)
+		args.flatten!
+		args.compact!
 
-  def [] (*args)
-    args.flatten!
-    args.compact!
+		if args.length == 1 && args.first.is_a?(Integer)
+			Value.new(self, args.first, args.first.to_s(2).reverse.chars.each_with_index.map {|bit, index|
+				next if bit.to_i.zero?
 
-    if args.length == 1 && args.first.is_a?(Integer)
-      Value.new(self, args.first, args.first.to_s(2).reverse.chars.each_with_index.map {|bit, index|
-        next if bit.to_i.zero?
+				@bits.key("#{bit}#{'0' * index}".to_i(2)) or raise ArgumentError, "unknown bit at #{index}"
+			}.compact)
+		else
+			Value.new(self, args.map {|arg|
+				@bits[arg] or @bits[arg.to_s.to_sym] or raise ArgumentError, "unknown symbol #{arg}"
+			}.inject {|a, b|
+				a | b
+			}, args)
+		end
+	end
 
-        key("#{bit}#{'0' * index}".to_i(2)) or raise ArgumentError, "unknown bit at #{index}"
-      }.compact)
-    else
-      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
-      }, args)
-    end
-  end
+	def all
+		Value.new(self, @bits.values.inject {|a, b|
+			a | b
+		}, @bits.keys)
+	end
 
-  def all
-    Value.new(self, values.inject {|a, b|
-      a | b
-    }, keys)
-  end
+	def inspect
+		"#<#{self.class.name}: #{@bits.map { |name, bit| "#{bit.to_s(16)}=#{name}" }.join ' '}>"
+	end
 end

metadata

@@ -1,54 +1,46 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bitmap
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  version: 0.0.3.2
 platform: ruby
-authors: 
+authors:
 - meh.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-21 00:00:00 Z
+date: 2012-07-17 00:00:00.000000000 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.5
+rubygems_version: 1.8.24
 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: []
-