bit_mask 0.0.1 → 0.0.2

data/README.rdoc

@@ -63,7 +63,7 @@ When writing these config maps. Try to put the mose used options first so the st
 
 * Impliment more tests
 * Storage of strings?
-* If binary options and default 1, user inverse
+* Allow for embeded bit_masks
 * create javascript version for easy communication between ruby and javascript
 
 == Contributing to bit_mask

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bit_mask.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bit_mask}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Ryan Ong}]
-  s.date = %q{2011-07-18}
+  s.date = %q{2011-07-21}
   s.description = %q{bit_mask creates a simple api to create bit mask models. By bit masking dataing you can compress the amount of data that needs to be sent between servers and clients}
   s.email = %q{ryanong@gmail.com}
   s.extra_rdoc_files = [

data/lib/bit_mask.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext/class/attribute'
 
 class BitMask
-  CHARACTER_SET = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ'
+  CHARACTER_SET = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
   class_attribute :fields, :defaults, :base
   def self.inherited(sub)
     sub.fields = []
@@ -22,12 +22,12 @@ class BitMask
   alias_method :attributes=, :replace
 
   def [](field)
-    raise "#{field} is an invalid key" unless self.class.keys.include? field.to_sym
+    raise "#{field} is an invalid key" unless self.respond_to?(field)
     self.send(field)
   end
 
   def []=(field,value)
-    raise "#{field} is an invalid key" unless self.class.keys.include? field.to_sym
+    raise "#{field} is an invalid key" unless self.respond_to?("#{field}=")
     self.send("#{field}=",value)
   end
 
@@ -50,8 +50,15 @@ class BitMask
   def to_bin
     self.fields.reverse.map do |field,conf|
       val = self.read_attribute(field)
-      val = conf[:values].index(val) if conf[:values].respond_to? :index
-      val.to_i.to_s(2).rjust(conf[:bits],'0')
+      if conf[:nil] && val.nil?
+        val = 0
+      elsif conf[:values].respond_to? :index
+        val = conf[:values].index(val)
+        val += 1 if conf[:nil]
+      end
+      val = val.to_i.to_s(2)
+      val = val.rjust(conf[:bits],'0') if conf[:bits] > 0
+      val
     end.join('').sub(/\A0+/,'')
   end
 
@@ -119,7 +126,7 @@ class BitMask
       end
 
       int_val = 0
-      string.reverse.split(//).each_with_index do |char,index|
+      string.reverse.split('').each_with_index do |char,index|
         raise ArgumentError, "Character #{char} at index #{index} is not a valid character for to_insane Base #{radix} String." unless char_index = char_ref.index(char)
         int_val += (char_index)*(radix**(index))
       end
@@ -139,7 +146,11 @@ class BitMask
         value = (conf[:bits] == -1) ? binary_array : binary_array.pop(conf[:bits])
         break if value.nil?
         value = value.join('').to_i(2)
-        if conf[:values].respond_to?(:at)
+        value -= 1 if conf[:nil]
+
+        if conf[:nil] && value == -1
+          value = nil
+        elsif conf[:values].respond_to?(:at)
           value = conf[:values].at(value)
         elsif conf[:values].respond_to?(:from_i)
           value = conf[:values].from_i(value)
@@ -172,9 +183,15 @@ class BitMask
           elsif opts[:values].respond_to? :bit_length
             opts[:bits] = opts[:values].bit_length
           elsif opts[:values].kind_of? Integer
-            opts[:limit] = opts[:values]
+            if opts[:values] == -1
+              opts[:bits] = -1
+            else
+              opts[:limit] = opts[:values]
+              opts[:limit] += 1 if opts[:nil]
+            end
           else
             opts[:limit] = opts[:values].size
+            opts[:limit] += 1 if opts[:nil]
           end
         end
         opts[:bits] ||= (opts[:limit].to_i-1).to_s(2).length

data/spec/bit_mask_spec.rb

@@ -84,4 +84,24 @@ describe BitMask do
     new = CarSearch.from_s(modified_conf.to_s('qwerty'),'qwerty')
     new.attributes.should == modified_conf.attributes
   end
+
+  it "should have defaul nil values" do
+    search = DealershipSearch.new
+    search.zip.should == nil
+  end
+
+  it "should have defaul nil values" do
+    search = DealershipSearch.new
+    search.makes = 'honda'
+    search.zip.should == nil
+    new = DealershipSearch.from_s(search.to_s)
+    new.attributes.should == search.attributes
+  end
+
+  it "should allow for infinite values" do
+    search = DealershipSearch.new
+    search.distance = 9999999999999
+    loaded = DealershipSearch.from_bin(search.to_bin)
+    loaded.distance.should == search.distance
+  end
 end

data/spec/models/dealership_search.rb

@@ -1,5 +1,5 @@
 class DealershipSearch < BitMask
-  field :makes, :values => ['honda','toyota','ford']
-  field :zip, :values => 99999
+  field :makes, :values => ['honda','toyota','ford'], :nil => true
+  field :zip, :values => 99999, :nil => true
   field :distance, :values => -1
 end

metadata

@@ -2,7 +2,7 @@
 name: bit_mask
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Ryan Ong
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 Z
+date: 2011-07-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -114,7 +114,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3458846048979533380
+      hash: 4147955215867335187
       segments: 
       - 0
       version: "0"