jsanders-bitfields 0.2.8 → 0.3.0

data/lib/bitfields.rb

@@ -1,21 +1,22 @@
 require File.dirname(__FILE__) + '/bits'
 
 class BitFields
-  
+
   # Class methods
-  
+
   def self.template(template_name, &block)
     template_name = symbol_if_string(template_name)
     templates[template_name] = block
     nil
   end
- 
+
   def self.create(template_name, params = {})
     template_name = symbol_if_string(template_name)
     if templates[template_name]
       instance = self.new
       templates[template_name].call(instance)
       params.each_pair { | field_name, value | instance[field_name] = value }
+      regexs[ instance.regex ] ||= template_name
       instance
     else
       warn "BitFields: No template named #{template_name}"
@@ -23,23 +24,31 @@ class BitFields
     end
   end
 
-  def self.decode(template_name, value)
-    template_name = symbol_if_string(template_name)
-    if templates[template_name]
-      instance = self.new
-      templates[template_name].call(instance)
-      bit_string = Bits.new(value, instance.total_length).bit_string
-      current_index = 0
-      instance.field_names.each_with_index do |field_name, index|
-        length = instance.field_lengths[index]
-        instance[field_name] = bit_string[current_index, length].to_i(2)
-        current_index += length
+  # +message+ is assumed to be a string of 1's and 0's representing a binary number
+  # TODO: determine format of message and convert to a consistent representation
+  def self.decode( message )
+    template_name = nil
+    regexs.detect do | key, value |
+      if message[ key ]
+        template_name = value
+        break
       end
-      instance
-    else
-      warn "BitFields: No template named #{template_name}"
-      nil
     end
+
+    _, *matches = $~.to_a
+    generate_instance_from_match_data template_name, matches
+  end
+
+  def self.decode_from_template_name(template_name, message)
+    regexs.each do | key, value |
+      if value == template_name
+        message[ key ]
+        break
+      end
+    end
+
+    _, *matches = $~.to_a
+    generate_instance_from_match_data template_name, matches
   end
 
   def self.compose(&block)
@@ -49,7 +58,7 @@ class BitFields
   end
 
   # Object methods
-  
+
   def integer; get_bits.integer end
   def bit_string; get_bits.bit_string end
   def hex_string; get_bits.hex_string end
@@ -64,15 +73,7 @@ class BitFields
     if instance
       field_names << field_name
       field_values << instance.get_bits
-    end
-  end
-
-  def bring(template_name, params = {})
-    template_name = BitFields.symbol_if_string(template_name)
-    instance = BitFields.create(template_name, params)
-    if instance
-      field_names << template_name
-      field_values << instance.get_bits
+      field_regexs += instance.field_regexes.dup
     end
   end
 
@@ -83,6 +84,8 @@ class BitFields
     field_names << field_name
     field_values << Bits.new(value, length)
     field_lengths << length
+    l = length != 0 ? "{#{length},#{length}}" : "*?"
+    field_regexs << "([01]#{l})"
   end
 
   def get_bits
@@ -112,16 +115,44 @@ class BitFields
     @field_lengths ||= Array.new
   end
 
+  def field_regexs
+    @field_regexs ||= Array.new
+  end
+
+  def regex
+    Regexp.new('^' + field_regexs.join + '$')
+  end
+
+
   private
 
   def self.templates
     @@templates ||= Hash.new
   end
 
+  def self.regexs
+    @@regexs ||= Hash.new
+  end
+
   # Helpers
 
   def self.symbol_if_string(name)
     name.kind_of?(String) ? name.to_sym : name
   end
+
+  def self.generate_instance_from_match_data( template_name, matches = [] )
+    return nil if matches.empty?
+
+    instance = self.new
+    templates[ template_name ].call(instance)
+    fields = instance.field_names
+
+    fields.each do | item |
+      instance[ item ] = matches.shift.to_i(2)
+    end
+
+    instance
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsanders-bitfields
 version: !ruby/object:Gem::Version 
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors: 
 - James Sanders
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -08:00
+date: 2009-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: []