excel_to_code 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2febec784c194d3e592c78776f535a15458009
-  data.tar.gz: 9e9a0c83fe42ba73acc0d0b579197194a0ee786b
+  metadata.gz: 48e91b5c946f7d5a9b1fb0ed62452f1055de78ec
+  data.tar.gz: 1495c00e8514be860b54d1e02ff4ffa9f82fa411
 SHA512:
-  metadata.gz: b141c54fa32c28b2d320885323c7ebf77f941758d07996e5fe435354c1f1d8c1cc3928ebc22f27c2051e31f46a28f6bc86a576696651704a39f6206b429f79c9
-  data.tar.gz: 7eaac74f6bb96cb5c00537b018d80b925f72704545be91e0d83c7e03e9e3cf8c6996cfa1efd8174871d26fe7fa311b293c4bbcb83feb38e6235f327a3b028cbd
+  metadata.gz: acb897ffbe48632d04fa246362ab284eb5bde0cb1bdeda11e8b8bb492e4500401695c1dadea82cf57e749087a8988a3f28963261a008a4fa3936f3689cd05eb5
+  data.tar.gz: 235f5dcf5325942c4d5fafd3e1e0eba396193c4a3bce23c22383b1588c2742cc9be22a94480c1d03a689311124ada0431d208db8ede166727f394e31357cdf8a

data/src/excel_to_code.rb

@@ -1,5 +1,5 @@
 class ExcelToCode
-  def self.version() "0.3.1" end
+  def self.version() "0.3.2" end
 end
 
 require_relative 'commands'

data/src/extract/extract_relationships.rb

@@ -1,6 +1,6 @@
-require 'nokogiri'
+require 'ox'
 
-class ExtractRelationships < Nokogiri::XML::SAX::Document 
+class ExtractRelationships < ::Ox::Sax
 
     attr_accessor :input, :output
   
@@ -8,16 +8,34 @@ class ExtractRelationships < Nokogiri::XML::SAX::Document
       self.new.extract(*args)
     end
 
-    def extract(input)
+    def extract(input_xml)
       @input, @output = input, {}
-      parser = Nokogiri::XML::SAX::Parser.new(self)
-      parser.parse(input)
+      @state = :not_in_relationship
+      Ox.sax_parse(self, input_xml, :convert_special => true)
       output
     end
   
-  def start_element(name,attributes)
-    return false unless name == "Relationship"
-    @output[attributes.assoc('Id').last] = attributes.assoc('Target').last
+  def start_element(name)
+    return false unless name == :Relationship
+    @state = :in_relationship
+  end
+
+  def attr(name, value)
+    return unless @state == :in_relationship
+    case name
+    when :Id
+      @id = value
+    when :Target
+      @target = value
+    end
+  end 
+
+  def end_element(name)
+    return unless @state == :in_relationship
+    return unless name == :Relationship
+    @output[@id] = @target
+    @state = :not_in_relationship
+    @id, @target = nil, nil
   end
   
 end

data/src/extract/extract_shared_strings.rb

@@ -1,30 +1,29 @@
-require 'nokogiri'
+require 'ox'
 
-class ExtractSharedStrings < Nokogiri::XML::SAX::Document 
+class ExtractSharedStrings < ::Ox::Sax
 
     def self.extract(input)
       self.new.extract(input)
     end
 
-    def extract(input)
-      @input, @output = input, []
+    def extract(input_xml)
+      @output = []
       @current = nil
-      parser = Nokogiri::XML::SAX::Parser.new(self)
-      parser.parse(input)
+      Ox.sax_parse(self, input_xml, :convert_special => true)
       @output
     end
 
-  def start_element(name,attributes)
-    @current = [] if name == "si"
+  def start_element(name)
+    @current = [] if name == :si
   end
   
   def end_element(name)
-    return unless name == "si"
+    return unless name == :si
     @output << [:string, @current.join]
     @current = nil
   end
   
-  def characters(string)
+  def text(string)
     return unless @current
     # FIXME: SHOULDN'T ELINMATE NEWLINES
     @current << string.gsub("\n","")

data/src/extract/extract_table.rb

@@ -1,12 +1,12 @@
-require 'nokogiri'
+require 'ox'
 
-class ExtractTable < Nokogiri::XML::SAX::Document 
+class ExtractTable < ::Ox::Sax
 
     def self.extract(*args)
       self.new.extract(*args)
     end
 
-    def extract(sheet_name, input)
+    def extract(sheet_name, input_xml)
       @sheet_name = sheet_name
       @output = {} 
       @table_name = nil
@@ -14,24 +14,55 @@ class ExtractTable < Nokogiri::XML::SAX::Document
       @table_total_rows = nil
       @table_columns = nil
 
-      @parsing = false
-      Nokogiri::XML::SAX::Parser.new(self).parse(input)
+      @state = :not_parsing
+      Ox.sax_parse(self, input_xml, :convert_special => true)
       @output
     end
     
-  def start_element(name,attributes)
-    if name == "table"
-      @table_name = attributes.assoc('displayName').last
-      @table_ref = attributes.assoc('ref').last
-      @table_total_rows = attributes.assoc('totalsRowCount').try(:last) || "0"
+  def start_element(name)
+    case name
+    when :table
+      @table_name = nil
+      @table_ref = nil
+      @table_total_rows = nil
       @table_columns = []
-    elsif name == "tableColumn"
-      @table_columns << attributes.assoc('name').last
+      @state = :parsing_table
+    when :tableColumn
+      @state = :parsing_table_column
+    else
+      @state = :not_parsing
+    end
+  end
+
+  def attr(name, value)
+    case @state
+    when :not_parsing
+      return
+    when :parsing_table_column
+      case name
+      when :name
+        @table_columns << value
+      end
+    when :parsing_table
+      case name
+      when :displayName
+        @table_name = value
+      when :ref
+        @table_ref = value
+      when :totalsRowCount
+        @table_total_rows = value
+      end
     end
   end
   
   def end_element(name)
-    return unless name == "table"
-    @output[@table_name] = [@sheet_name, @table_ref, @table_total_rows, *@table_columns]
+    case name
+    when :tableColumn
+      @state = :parsing_table
+    when :table
+      @output[@table_name] = [@sheet_name, @table_ref, @table_total_rows || "0", *@table_columns]
+      @state = :not_parsing
+    end
+
   end  
 end

data/src/extract/extract_worksheet_names.rb

@@ -1,23 +1,39 @@
-require 'nokogiri'
+require 'ox'
 
-class ExtractWorksheetNames < Nokogiri::XML::SAX::Document 
+class ExtractWorksheetNames < ::Ox::Sax
 
-    attr_accessor :input, :output
+    attr_accessor :output
   
     def self.extract(*args)
       self.new.extract(*args)
     end
 
-    def extract(input)
-      @input, @output = input, {}
-      parser = Nokogiri::XML::SAX::Parser.new(self)
-      parser.parse(input)
-      output
+    def extract(input_xml)
+      @output = {}
+      @state = :not_parsing
+      Ox.sax_parse(self, input_xml, :convert_special => true)
+      @output
     end
   
-  def start_element(name,attributes)
-    return false unless name == "sheet"
-    output[attributes.assoc('name').last] = attributes.assoc('r:id').last
+  def start_element(name)
+    return false unless name == :sheet
+    @state = :parsing
+  end
+
+  def attr(attr_name, value)
+    return unless @state == :parsing
+    case attr_name
+    when :name
+      @name = value
+    when :"r:id"
+      @rid = value
+    end
+  end
+
+  def end_element(name)
+    return false unless name == :sheet
+    output[@name] = @rid
+    @state = :not_parsing
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -24,26 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement