ms-binary-resources 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86da19e6dd64a8090ae6f58af1ee9389c064c2a4
-  data.tar.gz: 146e58a02d2cdb175ee62fbd09852646f7d4afab
+  metadata.gz: 100dddc9ccf90578d09c5388d236c990f0a1b511
+  data.tar.gz: 30361b6b3908cc88588281fc3ca1421d2b560d1f
 SHA512:
-  metadata.gz: d7a57c1f7c631d0169cedbee504e4fc4dbee44c66988fb94ef53c9bca9cf0a1ff659967bbde449a520b0ff2f69afd326ecc0af1156ff23431011b0684be9b2aa
-  data.tar.gz: 0995fe940c55880302f93f636a57785492c0bc238dce4d81e0699d4c705c095aadf43cea5af9fbb773640109394672d3c565f434898761e506664abd0d7f4bf3
+  metadata.gz: 71b1138e6df25a1cb079e44b1db14f1a3c7b0552bfd509636f9a2ba45fb34a817ebd8d54dc5a0bd52d409c004da7678e903b5cb3f40b990e6b3293a1b9f5a136
+  data.tar.gz: fcf741fe2dcee9ee98100256af6ecee0c0a148bb1e9321b236a212e8af39ae5e574f914e84e7f389c783b9390d96bf027a8dec2cfe31494370489435c49ccf3e

data/lib/ms/binary/resources/constants.rb

@@ -23,7 +23,7 @@ module Ms
       timespan: 16,
       bytearray: 32,
       stream: 33,
-      fistcustom: 64,
+      fistcustom: 64
     }
 
   end

data/lib/ms/binary/resources/reader.rb

@@ -8,15 +8,13 @@ module Ms
 
       include Enumerable
 
-      attr_reader :manager_magic, :manager_version, :manager_length, :resource_version,
-                  :resource_count, :type_count
+      attr_reader :manager_magic, :manager_version, :manager_length, :resource_version, :resource_count, :type_count
 
       def initialize(uri)
         @file = open(uri, 'rb')
         read_headers
       rescue => e
-        raise ArgumentError, "file does not appear to be a resources @file (#{e})"
-        @file.close
+        fail ArgumentError, "file does not appear to be a resources file (#{e})"
       end
 
       def each(&block)
@@ -34,7 +32,7 @@ module Ms
       def type_of(name)
         info = info_for_name(name)
         if info
-          type = RESOURCE_TYPES.find { |_,v| info.type_index == v }
+          type = RESOURCE_TYPES.find { |_, v| info.type_index == v }
           type && type.first
         end
       end
@@ -57,7 +55,7 @@ module Ms
 
       def read_headers
         @manager_magic = read_uint32
-        raise 'magic (%08X)' % manager_magic unless MAGIC_NUMBER == manager_magic
+        fail 'magic (%08X)' % manager_magic unless MAGIC_NUMBER == manager_magic
 
         @manager_version = read_uint32
         @manager_length = read_uint32
@@ -65,12 +63,12 @@ module Ms
         if 1 == manager_version
           @reader_class = @file.read(@manager_length)
         else
-          raise 'Unsupported manager version (%d)' % manager_version
+          fail 'Unsupported manager version (%d)' % manager_version
         end
 
         @resource_version = read_uint32
         unless [1, 2].include?(resource_version)
-          raise 'Unsupported resource version (%d)' % resource_version
+          fail 'Unsupported resource version (%d)' % resource_version
         end
 
         @resource_count = read_uint32
@@ -89,9 +87,8 @@ module Ms
         @data_section_offset = read_uint32
         @name_section_offset = @file.pos
 
+        # cache the file location and type of all resources
         @resource_infos = @positions.map { |pos| read_resource_info(pos) }
-
-        @file.seek(@name_section_offset)
       end
 
       def read_resource_info(name_position)
@@ -102,7 +99,7 @@ module Ms
         seek_to_data(read_uint32)
         type_index = read_7bit_encoded_int
 
-        OpenStruct.new name: name, value_position: @file.pos, type_index: type_index
+        OpenStruct.new(name: name, value_position: @file.pos, type_index: type_index)
       end
 
       def read(bytes)
@@ -140,7 +137,6 @@ module Ms
       def read_7bit_encoded_int
         ret = 0
         shift = 0
-        b = 0
 
         begin
           b = read_byte
@@ -167,7 +163,7 @@ module Ms
         when RESOURCE_TYPES[:int64];  read_int64
         when RESOURCE_TYPES[:uint64]; read_uint64
         else
-          raise 'Unsupported type index: %d' % resource_info.type_index
+          fail 'Unsupported type index: %d' % resource_info.type_index
         end
       end
 

data/lib/ms/binary/resources/version.rb

@@ -1,5 +1,5 @@
 module Ms
   module BinaryResources
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,10 @@ require 'awesome_print'
 require 'pathname'
 require 'ms/binary/resources'
 
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Pathname.new(File.dirname(__FILE__)).join('support/**/*.rb')].each { |f| require f }
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
@@ -19,14 +23,3 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 end
-
-def data_file(name)
-  File.expand_path("#{File.dirname(__FILE__)}/../support/data/#{name}")
-end
-
-def invalid_data_files
-  dir = "#{File.dirname(__FILE__)}/../support/data/invalid"
-  invalid = Dir.glob("#{dir}/**/*").select { |e| File.file? e }
-  invalid << __FILE__
-  invalid << 'not-really-a-file.resources'
-end

data/spec/support/data_files.rb

@@ -0,0 +1,10 @@
+def data_file(name)
+  File.expand_path("#{File.dirname(__FILE__)}/../../support/data/#{name}")
+end
+
+def invalid_data_files
+  dir = "#{File.dirname(__FILE__)}/../../support/data/invalid"
+  invalid = Dir.glob("#{dir}/**/*").select { |e| File.file? e }
+  invalid << __FILE__
+  invalid << 'not-really-a-file.resources'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ms-binary-resources
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nick Veys
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -201,6 +201,7 @@ files:
 - ms-binary-resources.gemspec
 - spec/reader_spec.rb
 - spec/spec_helper.rb
+- spec/support/data_files.rb
 - support/data/Example.resources
 - support/data/Example.txt
 - support/data/Example2.resources
@@ -234,4 +235,5 @@ summary: Read binary resource files
 test_files:
 - spec/reader_spec.rb
 - spec/spec_helper.rb
+- spec/support/data_files.rb
 has_rdoc: