packed-model 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/packed_model/base.rb

@@ -44,7 +44,8 @@ module PackedModel
       case options[:type]
       when :string
         options[:strip] = true
-        options[:pack_directive] = 'Z*' # null terminated string
+        options[:null] = true
+        options[:pack_directive] = 'Z*'
       when :integer, :int
         options[:default] ||= 0 # pack 'N' directive requires a value for an integer
         options[:bytesize] = 4
@@ -58,12 +59,16 @@ module PackedModel
         options[:default] = options[:value]
         options[:bytesize] = 4
         options[:pack_directive] = 'N' # network byte order
+        options[:unpack_callback] ||= create_marker_unpack_callback(options[:index], options[:value])
       when :custom
         raise "missing pack_directive for #{name}" unless options[:pack_directive]
       else
         raise "Unknown type #{options[:type]}"
       end
 
+      add_unpack_callback(options[:unpack_callback]) if options[:unpack_callback].is_a?(Proc)
+      add_unpack_callback(create_strip_unpack_callback(options[:index], options[:null])) if options[:strip]
+
       class_eval do
         attrs = self.fields << options
         ks = self.keys << options[:name]
@@ -212,21 +217,20 @@ module PackedModel
 
     def unpack(str)
       @values = str.unpack(self.class.pack_string)
-      self.fields.each do |field|
-        case field[:type]
-        when :string
-          if @values[field[:index]].empty?
-            @values[field[:index]] = nil
-          else
-            @values[field[:index]].strip!
-          end
-        when :char
-          @values[field[:index]].strip! if field[:strip]
-        when :marker
-          marker_value = @values[field[:index]]
-          raise BadMarkerException.new("unpack failed, invalid marker value (#{marker_value}) expected #{field[:value]}") unless marker_value == field[:value]
-        end
-      end
+      self.unpack_callbacks.each { |c| c.call self } if self.unpack_callbacks
+    end
+
+    def self.add_unpack_callback(callback)
+      @unpack_callbacks ||= []
+      @unpack_callbacks << callback
+    end
+
+    def self.unpack_callbacks
+      @unpack_callbacks
+    end
+
+    def unpack_callbacks
+      self.class.unpack_callbacks
     end
 
     private
@@ -242,6 +246,28 @@ module PackedModel
     def self.pack_string
       ""
     end
+
+    def self.create_marker_unpack_callback(index, value)
+      Proc.new do |m|
+        raise BadMarkerException.new("unpack failed, invalid marker value (#{m.values[index]}) expected #{value}") unless m.values[index] == value
+      end
+    end
+
+    def self.create_strip_unpack_callback(index, null)
+      if null
+        Proc.new do |m|
+          if m.values[index].empty?
+            m.values[index] = nil
+          else
+            m.values[index].strip!
+          end
+        end
+      else
+        Proc.new do |m|
+          m.values[index].strip!
+        end
+      end
+    end
   end
 end
 

data/packed-model.gemspec

@@ -0,0 +1,66 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{packed-model}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Doug Youch"]
+  s.date = %q{2013-05-15}
+  s.description = %q{Used to minimize storage space required to store list of data}
+  s.email = %q{doug@sessionm.com}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/packed_model.rb",
+    "lib/packed_model/base.rb",
+    "lib/packed_model/errors.rb",
+    "lib/packed_model/list.rb",
+    "packed-model.gemspec",
+    "spec/helper.rb",
+    "spec/packed_model/base_spec.rb",
+    "spec/packed_model/list_spec.rb",
+    "test/helper.rb",
+    "test/test_packed_model_base.rb"
+  ]
+  s.homepage = %q{http://github.com/dyouch5@yahoo.com/packed-model}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{PackedModel stores model data in a binary string}
+
+  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
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+    else
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Doug Youch
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-02 00:00:00 -04:00
+date: 2013-05-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - lib/packed_model/base.rb
 - lib/packed_model/errors.rb
 - lib/packed_model/list.rb
+- packed-model.gemspec
 - spec/helper.rb
 - spec/packed_model/base_spec.rb
 - spec/packed_model/list_spec.rb