data_spork 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWE4Y2U5ODQyMzI2YmQzYmJhYTdkY2IxYTBjNGMxMjliZWQxYjVlMA==
+    ODkyMWQ2NjNjMGJmY2M0MWZjZGZhNTlhYjhmMmJhZDA2NDJlMjQ2ZA==
   data.tar.gz: !binary |-
-    YjgwOWVjMmQ4NjRhODk4ZTAxNWI1NDVlZDMyNmQ5YTY0YzU1MWVhNw==
+    MWViN2E3NjJhYWIzNzJhZjZjMmI2N2RiODc2MmRlMWI1NjA2ZDMwMA==
 SHA512:
   metadata.gz: !binary |-
-    ZTZmOWRmYzY3ZTE2YWU3YjA0ZGM4ZDAyY2M5YzJiMzJiODg3NmE2ZjViZTM5
-    M2FmYjMwOGFmYTNiNTI4NGE0MzNiNmNjOThmYmU5N2E0NDI5YzQ3MjFlMDgx
-    ZWI3MjUwM2E0YTE3NjRhYmZiODYzMWM4NmRmZDBmOTQ1YjZiNmU=
+    ZWY4NTE3ZmM1YzY5YzNkNzIwOTZiNjdkN2NlOTg0NDc4Yjk5MGZiNDQ1MjYx
+    YzA4MWNhNTEzNTMxYjVhNDIzYTFlN2UyN2ZhZDMzYjgxZjExOGU4YTA4N2I3
+    NzhhN2I3OGExNTBmZTFiNzcwMThjZDY4NjY5MGNlYmUyYjk4ZDY=
   data.tar.gz: !binary |-
-    YzNjZTUzN2JjNWQzYTE4Y2Q2ZjY3YmI2ZWYzMTJmYmYyNGQ2OWQyN2ViY2Qy
-    MDY3ODBjNTIyZWE0MDI3N2Q5OWEzYzYzYmVkMzNkZWI4Yjg1NTA2MzgxMGM5
-    NTQyYzJkMzJkZGUyZjBkZGJjNjE3NDkzZGYyOWRkOWI1NTRmMDQ=
+    YjY0YWQ3MTRhNTkyZDk4MzFlNGVhYTAwOWQ4NDIxNjZhOGUzMGExMWEzYzQ5
+    ZDhhZjgwYTIxMTkyNTUyNzM5YmFlMWFmMzdiMTIzOTc3YWQwNzNmNDRiNTg5
+    NWNiYWI4Y2RjZTRiZWVmNzE1YzkwNWFmNGVhN2UwOGY4ZmU2OTI=

data/lib/data_spork/base_writer.rb

@@ -0,0 +1,46 @@
+module DataSpork
+  class BaseWriter
+    attr_accessor :started
+    attr_reader :owner
+
+    delegate :print, :print_error, :to => :owner
+    delegate :effective_date, :col_tags, :root_tag, :row_tag, :header, :col_value, :to => :owner
+
+    def initialize(owner)
+      @owner = owner
+      @started = false
+    end
+
+    def started?
+      started
+    end
+
+    # Start the document output - subclasses usually override :start_document instead.
+    def start
+      start_document
+      self.started = true
+    end
+
+    def start_document
+      # override this
+    end
+
+    def begin_put_row
+      # override this
+    end
+
+    def put_column
+      # override this
+    end
+
+    def end_put_row
+      # override this
+    end
+
+    # Close out the document.
+    def finish
+      # override this
+    end
+
+  end
+end

data/lib/data_spork/importer.rb

@@ -1,19 +1,21 @@
 require 'data_spork/base_reader'
+require 'data_spork/base_writer'
 require 'data_spork/xml_writer'
+require 'data_spork/json_writer'
 require 'data_spork/google_spreadsheet'
 
 module DataSpork
 
   class Importer
-    attr_reader :headers, :input_type, :options, :writer
+    attr_reader :headers, :input_type, :options, :writers
     attr_reader :row_num, :row, :col_map
-    attr_reader :root_tag, :row_tag, :xml_tags
+    attr_reader :root_tag, :row_tag, :col_tags
     attr_accessor :col_num, :setup_state, :blank_row
     attr_accessor :effective_date
 
-    # Entry point to convert the input menu and output it as a menu board.
+    # Entry point to convert the input document and output it to the selected format(s).
     #
-    # @param :input_type symbol indicating whether to output :xlsx or :csv
+    # @param :input_type symbol indicating whether to output :xlsx, :csv, or :json
     # @param :options hash with options to control the behavior of the conversion
     def self.convert(input_type, options = nil)
       self.new(input_type, options).convert
@@ -23,7 +25,7 @@ module DataSpork
     def initialize(input_type, options = nil)
       @input_type = input_type
       init_options options
-      @writer = XmlWriter.new(self)
+      init_writers
     end
 
     def init_options(options)
@@ -31,6 +33,15 @@ module DataSpork
       @options[:output_path] = @options[:source_path] if @options[:output_path].nil? and @options[:output_file]
     end
 
+    def init_writers
+      @writers = [ ]
+      add_writers
+    end
+
+    def add_writers
+      writers << XmlWriter.new(self)
+    end
+
     def effective_date_pattern
       /^[Ee]ffective [Dd]ate+/
     end
@@ -43,6 +54,10 @@ module DataSpork
       $stderr.puts str
     end
 
+    def write(msg)
+      writers.each {|writer| writer.send msg }
+    end
+
     def source_name
       base = DEFAULT_INPUT_NAME
       modifier = ''
@@ -108,12 +123,11 @@ module DataSpork
       end
       @row_num = 0
       @headers = []
-      self.setup_state = :setup_writer
+      self.setup_state = :setup_writers
     end
 
     def finish
-      writer.finish
-      finish_capture
+      write :finish
     end
 
     # Appends the specified row to the output.
@@ -182,39 +196,6 @@ module DataSpork
       !headers.empty?
     end
 
-    def begin_menu_group(name)
-      self.menu_group_name = name
-      id = menu_board.size + 1
-      self.menu_group = { id: id, name: name, display_order: id, choices: [] }
-      menu_board[name] = menu_group
-    end
-
-    def capture_row
-      order = menu_group[:choices].size + 1
-      self.menu_choice = { id: row_num, display_order: order, menu_group_id: menu_group[:id], options: { } }
-      self.menu_group[:choices] << menu_choice
-    end
-
-    def capture_column
-      key = case header
-              when 'ingredients'
-                'description'
-              when 'trademarked'
-                'is_trademarked'
-              else
-                header
-            end
-      if %w(trademarked image_url).include?(key)
-        menu_choice[:options][key.to_sym] = col_value
-      else
-        menu_choice[key.to_sym] = col_value
-      end
-    end
-
-    def finish_capture
-      # empty - subclass should override
-    end
-
     # Output the current row of data, which were parsed from the CSV input.
     def output
       unless reject?.tap { |r| print "rejected #{row_num}: #{row}" if r and VERBOSE }
@@ -242,8 +223,8 @@ module DataSpork
     end
 
     # Initializes the xml document and transfers setup_state to :setup
-    def setup_writer
-      writer.start
+    def setup_writers
+      write :start
       self.setup_state = :setup
       send setup_state  # automatically transition to next state
     end
@@ -268,21 +249,31 @@ module DataSpork
 
     # Answer true when the current column should be included in the output.
     def output_column?
-      xml_tags.include? header
+      col_tags.include? header
+    end
+
+    def on_begin_row
+      write :begin_put_row
+    end
+
+    def on_output_column
+      write :put_column
+    end
+
+    def on_end_row
+      write :end_put_row
     end
 
     # Output the current row, one column at a time.
     def put_row
-      writer.begin_put_row
-      capture_row
+      on_begin_row
       row.each_index do |index|
         self.col_num = index
         if output_column?
-          writer.put_column
-          capture_column
+          on_output_column
         end
       end
-      writer.end_put_row
+      on_end_row
     end
 
   end

data/lib/data_spork/json_writer.rb

@@ -0,0 +1,2 @@
+class DataSpork::JsonWriter < DataSpork::BaseWriter
+end

data/lib/data_spork/version.rb

@@ -1,3 +1,3 @@
 module DataSpork
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/data_spork/xml_writer.rb

@@ -1,43 +1,23 @@
-class DataSpork::XmlWriter
-
-  attr_accessor :started
-  attr_reader :owner
-
-  delegate :print, :print_error, :to => :owner
-  delegate :effective_date, :xml_tags, :root_tag, :row_tag, :header, :col_value, :to => :owner
-
-  def initialize(owner)
-    @owner = owner
-    @started = false
-  end
-
-  # Output the XML preface.
-  def start
-    start_document
-    start_schema
-    self.started = true
-  end
+class DataSpork::XmlWriter < DataSpork::BaseWriter
 
   # Output the XML document preface.
   def start_document
     print '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>'
+    start_schema
   end
 
   # Output the schema with the root tag.
   def start_schema
-    if owner.respond_to?(:xml_start_schema)
-      print owner.xml_start_schema(self)
-    else
-      print begin_tag %Q(#{root_tag} #{schema_uri} effective_date="#{effective_date}")
-    end
+    print begin_tag(build_schema_tag)
   end
 
-  def schema_uri
-    %q(xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance")
+  # Output the schema with the root tag.
+  def build_schema_tag
+    %Q(#{root_tag} #{schema_uri} effective_date="#{effective_date}")
   end
 
-  def started?
-    started
+  def schema_uri
+    %q(xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance")
   end
 
   # Close out the XML document.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_spork
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Brian Jackson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -89,8 +89,10 @@ extra_rdoc_files: []
 files:
 - lib/data_spork.rb
 - lib/data_spork/base_reader.rb
+- lib/data_spork/base_writer.rb
 - lib/data_spork/google_spreadsheet.rb
 - lib/data_spork/importer.rb
+- lib/data_spork/json_writer.rb
 - lib/data_spork/version.rb
 - lib/data_spork/xml_writer.rb
 homepage: http://bitbucket.org/leadbaxter/data_spork
@@ -116,5 +118,6 @@ rubyforge_project:
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
-summary: Import CSV, Excel [.XLS, .XLSX] and Google Drive Spreadsheets.
+summary: Import CSV, Excel [.XLS, .XLSX] and Google Drive Spreadsheets. Output to
+  XML or JSON (more formats to come!)
 test_files: []