xbd 0.1.0 → 0.1.1

data/lib/xbd/asi.rb

@@ -1,5 +1,5 @@
 # encoding: BINARY
-$ruby_inline=true
+$ruby_inline=false
 require "inline" if $ruby_inline
 require "stringio"
 

data/lib/xbd/version.rb

@@ -1,3 +1,3 @@
 module Xbd
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/xbd/xbd.rb

@@ -23,8 +23,6 @@ And run:
   require "xbd.rb"
   puts Xbd.load_from_file("your_xbd_filename.xbd")
 
-Master verison of this file lives in: imikimi_plugin_source/xbd/xbd.rb
-
 =end
 require File.join(File.dirname(__FILE__),"asi")
 require File.join(File.dirname(__FILE__),"xbd_dictionary")

data/lib/xbd/xbd_dictionary.rb

@@ -12,9 +12,11 @@ module Xbd
     def initialize(initial_values=[])
       @hash={}
       @array=[]
-      initial_values.each {|v| self<<(v)}
+      initial_values.each {|v| add v, false}
     end
 
+    def length; @array.length end
+
     # return String given an ID, or ID given a String
     def [](i) @hash[i] end
 
@@ -26,14 +28,7 @@ module Xbd
     end
 
     # add a String to the dictionary
-    def <<(str)
-      str = Dictionary.sanitize_string str
-      @hash[str] ||= begin
-        new_id = @array.length
-        @array << @hash[new_id] = str
-        new_id
-      end
-    end
+    def <<(str) add str end
 
     # convert to binary string
     def to_binary
@@ -48,5 +43,18 @@ module Xbd
       strings = lengths.collect {|len| encoded_dictionary.read len}
       [Dictionary.new(strings), index]
     end
+
+    private
+    # enforce_unique == false during loading, since technically, and xbd dictionary COULD have duplicate entries.
+    # Duplicate entries only reduces efficiency. It shouldn't break anything.
+    # XBD files shouldn't have dupes, but the current C++ implementation DOES create them rarely (bug).
+    def add(str, enforce_unique = true)
+      str = Dictionary.sanitize_string str
+      return @hash[str] if @hash[str] && enforce_unique
+
+      @hash[str] = new_id = @array.length
+      @array << @hash[new_id] = str
+    end
+
   end
 end

data/lib/xbd/xbd_tag.rb

@@ -167,8 +167,8 @@ module Xbd
         attr_byte_size-=(index-i)
         n=attrsd[name_id]
         v=valuesd[value_id]
-        raise "attribute name id(#{name_id}) not in attribute-names dictionary" if !n
-        raise "attribute value id(#{value_id}) not in attribue-values dictionary" if !v
+        raise "attribute name id(#{name_id}) not in attribute-names dictionary (max value = #{attrsd.length})" if !n
+        raise "attribute value id(#{value_id}) not in attribute-values dictionary (max value = #{valuesd.length})" if !v
         attrs_hash[n]=v
       end
       tag_length-=(index-tag_start_index)

data/xbd.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'RubyInline', '~> 3.11.0'
+  # s.add_dependency 'RubyInline', '~> 3.11.0'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 2.6.0'
 end

metadata

@@ -1,78 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: xbd
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Shane Brinkman-Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: RubyInline
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 3
-        - 11
-        - 0
-        version: 3.11.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+date: 2014-06-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id003
-description: The XBD gem allows you to create, load and save XBD files. XBD files are arbitrary, self-describing, hierarchical, binary data structures consisting of "tags", "attributes", and "sub-tags".
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+description: The XBD gem allows you to create, load and save XBD files. XBD files
+  are arbitrary, self-describing, hierarchical, binary data structures consisting
+  of "tags", "attributes", and "sub-tags".
+email:
 - shanebdavis@imikimi.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.TXT
@@ -92,38 +71,29 @@ files:
 - xbd.gemspec
 homepage: https://github.com/Imikimi-LLC/xbd
 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 
-      hash: 3
-      segments: 
-      - 0
-      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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: xbd
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A fast, simplified, XML-inspired binary file format.
-test_files: 
+test_files:
 - spec/xbd_asi_spec.rb
 - spec/xbd_dictionary_spec.rb
 - spec/xbd_tag_spec.rb