read_xls 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0b7f7a9fe0bc349e97f2bfebdd52f667d66b0d
-  data.tar.gz: d17fcbb0b353a085527b1c99e718541c973a7e3e
+  metadata.gz: 7359733a668f39eb9e9ac53611cdb4554dd61dac
+  data.tar.gz: 8626e2e68bd9182d18eb12563dbe9acaf6e1cd50
 SHA512:
-  metadata.gz: 077662dd44d4b1aaef8fc044977762a895cda469664ac310f2c425ec6b375b27f4fafcfa0b5bec8a5c6c0b4e66fcba618eb7a5ae1870f4e3cf04f90da4659155
-  data.tar.gz: 64d26284538dcafc6f09de637ba807068f1e490c6ef22021dd05e8dd8c4b1ac8be82a6c5ee4bf79dd075a4fb1602175a7b7347a5b57b73db6faf5662c2bc4335
+  metadata.gz: 4e12ef70d72a370ae60c1b81a5b5d757b64bc363b6b5cec2eeb89beaaa54f30cf687eca3876c07647ef42fc88d8c2a7f035e4a1b86b93e64be3799bfd934d635
+  data.tar.gz: 6d9ac42b3e7cb4ad3ce8cd0600bcd31831f55a3ff94fc90478ae65a4c6bdff9133c0ac2ebde31be3e17bf084afb9cac35048b8d3d05608fb77449cdfdaf18425

data/README.md

@@ -39,7 +39,7 @@ end
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 

data/lib/read_xls/record_handler.rb

@@ -122,6 +122,7 @@ module ReadXls
     BOOKEXT              = 0x0863
     COMPRESSPICTURES     = 0x089b
     COMPAT12             = 0x088c
+    STANDARDWIDTH        = 0x0099
     UNKNOWN1             = 0x105c
     UNKNOWN2             = 0x08d6
     UNKNOWN3             = 0x00ef
@@ -218,10 +219,15 @@ module ReadXls
       BOOKEXT              => Skip,
       COMPRESSPICTURES     => Skip,
       COMPAT12             => Skip,
+      STANDARDWIDTH        => Skip,
+      MULBLANK             => Skip,
+      SCL                  => Skip,
+      MERGEDCELLS          => Skip,
+      SUPBOOK              => Skip,
+      EXTERNSHEET          => Skip,
       UNKNOWN1             => Skip,
       UNKNOWN2             => Skip,
       UNKNOWN3             => Skip,
-      MULBLANK             => Skip,
 
       ARRAY                => NotImplemented,
       SHRFMLA              => NotImplemented,
@@ -232,7 +238,6 @@ module ReadXls
       EOF                  => NotImplemented,
       HLINK                => NotImplemented,
       LABEL                => NotImplemented,
-      MERGEDCELLS          => NotImplemented,
       RSTRING              => NotImplemented,
       SHAREDFMLA           => NotImplemented,
       UNCALCED             => NotImplemented,
@@ -240,13 +245,10 @@ module ReadXls
       SCENPROTECT          => NotImplemented,
       WRITEPROT            => NotImplemented,
       FILESHARING          => NotImplemented,
-      SUPBOOK              => NotImplemented,
       EXTERNNAME           => NotImplemented,
       XCT                  => NotImplemented,
       CRN                  => NotImplemented,
-      EXTERNSHEET          => NotImplemented,
       NAME                 => NotImplemented,
-      SCL                  => NotImplemented,
       PANE                 => NotImplemented,
       SORT                 => NotImplemented,
       NOTE                 => NotImplemented,

data/lib/read_xls/record_handler/boundsheet.rb

@@ -1,8 +1,6 @@
 module ReadXls
   module RecordHandler
     class Boundsheet < ::ReadXls::RecordHandler::Base
-      BYTE_LENGTH = 2
-
       attr_accessor :position
 
       def call
@@ -29,15 +27,15 @@ module ReadXls
       end
 
       def read_data(bytes)
-        val           = biff[position, bytes]
+        val           = biff.byteslice(position, bytes)
         self.position += bytes
         val
       end
 
 
       def read_byte
-        val           = biff[position, BYTE_LENGTH].unpack("v")
-        self.position += BYTE_LENGTH
+        val           = biff.byteslice(position, 2).unpack("v")
+        self.position += 2
         val.first || raise(ParsingFailedError, "expected to get value, got nil")
       end
     end

data/lib/read_xls/spreadsheet.rb

@@ -1,10 +1,9 @@
 module ReadXls
   class Spreadsheet
-    ParsingFailedError = Class.new(StandardError)
-    BYTE_LENGTH        = 2
-
     attr_accessor :biff, :position, :workbook
 
+    ParsingFailedError = Class.new(StandardError)
+
     def self.parse(xls_file_path)
       new(
         Ole::Storage.open(xls_file_path, "rb+")
@@ -27,10 +26,10 @@ module ReadXls
       workbook_builder = WorkbookBuilder.new(biff)
 
       loop do
-        record_number = read_byte
+        record_number = read_word
         break if record_number == ::ReadXls::RecordHandler::EOF
 
-        record_length = read_byte
+        record_length = read_word
         record_data   = read_data(record_length)
 
         ::ReadXls::RecordHandler.call(
@@ -45,15 +44,14 @@ module ReadXls
     end
 
     def read_data(bytes)
-      val           = biff[position, bytes]
+      val           = biff.byteslice(position, bytes)
       self.position += bytes
       val
     end
 
-
-    def read_byte
-      val           = biff[position, BYTE_LENGTH].unpack("v")
-      self.position += BYTE_LENGTH
+    def read_word
+      val           = biff.byteslice(position, 2).unpack("v")
+      self.position += 2
       val.first || raise(ParsingFailedError, "expected to get value, got nil")
     end
   end

data/lib/read_xls/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: read_xls
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - P2Binvestor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
@@ -77,6 +77,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
+- Excel97-2007BinaryFileFormat.xls.Specification.pdf
 - Gemfile
 - LICENSE
 - README.md