excelxml 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 231b7f58c44f4a4b8b2139332fa1dcdcdff0a4f8
-  data.tar.gz: 975f58c882c3ce58a2a95416eae60f0f76b8df95
+  metadata.gz: 1c4eb7cecd2cb4b642faebecc545b14760e9c274
+  data.tar.gz: fc9215986ce901f91f3ea256f6d837fd694773f7
 SHA512:
-  metadata.gz: 936a3f99d7a689065a327e4ec700c229e82dc06c3598e053749362726bb76a62aa151f21e147f25010b771132d9e11ef54c4c01d204723eeb6152435587db3a2
-  data.tar.gz: c3ac14007d6f65aac80d02ca5796a4ac0d9c2984ae08dea5a5b2bf8fb49bd18d5a34a941e9487050035d850218abbbf5f0ff2f8563b9a54aa464146d101742ec
+  metadata.gz: 8db3fd70f0be9fdf230f8d4b5b46c687d73d28a98dca2add94aba0fedb138c6cabc81092ae8c1127693838db5e4c55f49ecc975b9d490de6a95de8238fd8981b
+  data.tar.gz: ba7a943235fba4b9c526983c083515fc61350d358ae403f3b2383e1ba5f4cacc02fa0b0b5947fd6eb76e1c62e15ebc27a506431dd87b56fc1fcd7916f58691f0

data/lib/excelxml/version.rb

@@ -1,3 +1,3 @@
 module ExcelXml
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/excelxml/workbook.rb

@@ -12,13 +12,13 @@ module ExcelXml
     class Parser
       attr_reader :unidentified_worksheets
       def initialize workbook_xml, opts={}
-        only_these_worksheets = [opts.delete(:only_these_worksheets)].flatten.compact if opts[:only_these_worksheets]
+        only_these_worksheets = [opts.delete(:only_these_worksheets)].flatten.compact
         @worksheet_parser_classes = [opts.delete(:worksheet_parsers)].flatten.compact
         @worksheet_parser_hash = @worksheet_parser_classes.each_with_object({}) {|wspc, hsh| hsh[wspc] = [] }
         raise ArgumentError, "unknown options #{opts.keys.inspect}" unless opts.empty?
         @unidentified_worksheets = []
         ExcelXml::Workbook.parse(workbook_xml, single: true).worksheets.each do |worksheet|
-          next if only_these_worksheets and !only_these_worksheets.include?(worksheet.name)
+          next if !only_these_worksheets.empty? and !only_these_worksheets.include?(worksheet.name)
           worksheet_identified = false
           worksheet.rows.each_with_index do |row, row_idx|
             worksheet_identifiers.each do |wsp|

data/lib/excelxml/worksheet.rb

@@ -21,7 +21,7 @@ module ExcelXml
             grid_col_idx = cell.index ?  cell.index - 1 : grid_col_idx + 1
             (0..cell.merge_down).each do |down|
               (0..cell.merge_across).each do |across|
-                grid[grid_row_idx+down][grid_col_idx+across] = cell.data
+                grid[grid_row_idx+down][grid_col_idx+across] = Field.new(cell.data || "")
               end
             end
             grid_col_idx += cell.merge_across
@@ -43,11 +43,15 @@ module ExcelXml
       def rows
         @rows ||= begin
           @worksheet.rows[(header_row_index+1)..-1].collect do |fields|
-            Fields.new(fields, index_to_header_map)
+            Fields.new(self, fields)
           end
         end
       end
 
+      def has_header? header
+        index_to_header_map.find {|e| e.match header }
+      end
+
       def index_to_header_map
         @index_to_header_map ||= @worksheet.rows[header_row_index].collect {|h| h ? h.strip : nil }
       end
@@ -61,7 +65,7 @@ module ExcelXml
       end
 
       def is_header? row_number, fields
-        return true if mandatory_columns.all? {|mc| fields.any? {|f| next unless f; f.match mc } }
+        return true if mandatory_columns.all? {|mc| fields.compact.any? {|f| f.match mc } }
         return false
       end
 
@@ -69,30 +73,35 @@ module ExcelXml
   end
 
   class Fields < Array
-    def initialize *args
-      super(*args[0..-2])
-      @index_to_header_map = args.last
+    def initialize parser, raw_fields
+      super(raw_fields)
+      @parser = parser
     end
-    def [] regexp
-      return super unless regexp.is_a? Regexp
-      idx = @index_to_header_map.find_index {|e| e.match regexp }
-      raise "#{regexp.inspect} not found in #{@index_to_header_map.inspect}." if idx.nil?
-      super(idx).extend Field
+    def has_header? header
+      @parser.has_header? header
+    end
+    def [] key
+      if idx = @parser.instance_eval { index_to_header_map.find_index {|e| e.match key } }
+        self[idx] = super(idx) || Field.new
+      end
     end
   end
 
-  module Field
+  class Field < String
     def fixnum? 
       return Integer(self)
     rescue
       return false
     end
     def content?
-      return (self.is_a?(String) and !self.empty?)
+      return !self.empty?
     end
     def string? 
       return (self.content? and !self.fixnum?)
     end
+    def to_nil
+      self.empty? ? nil : self
+    end
   end
 
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: excelxml
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ben Delsol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: happymapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: ''
@@ -58,7 +58,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -84,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Parses the data out of Excel XML 2003 workbooks/sheets.