gedcom_ruby 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d0045ecaf38d4b17a327420824cbd443e34680
-  data.tar.gz: 12f7533caa6b10d388b646851346eac98d8bb87d
+  metadata.gz: 42866a57868acd57302baaa15c34da3ee628efae
+  data.tar.gz: 1d9ea35ed03626c8c246bf2e7af1e12638a90566
 SHA512:
-  metadata.gz: d31e0cb2feccff47205a872d29384af6d908e200e5128e65af9eb457f28c7b178aab7b99b39833ca467fadd83c0a18ae7e1c0c54f2b546454fea3ae330d869af
-  data.tar.gz: 49839581e48e33da2e0a31d3426f6afc1bc709dfc0c2db79b02cdd97c0955b352c5db2f49ef3e4082f547cc7e1728216c56bfff867a249837e181dea8bd28392
+  metadata.gz: 29e7b96122f3964984543612057151c56d639895b440cab466cf4f0dde6e9861c25ac1b3ed6228008fbae652db9af5bfb080b1073bfb8a3a28e5ebabb566a3eb
+  data.tar.gz: 40fb3f8ac4fae584f9cc23c655c39bc24095a6c0578533db3d5f1b2dce516b7d005f031b10b69f48cff1e5ddb70fa2612e6798c532ec43005ca8213fdd5f61d9

data/lib/gedcom_ruby.rb

@@ -20,16 +20,19 @@
 #require '_gedcom'
 require 'gedcom_ruby/date'
 require 'stringio'
+require 'byebug'
 
 module GEDCOM
-  attr_accessor :auto_concat
-  ANY = [:any]
 
   class Parser
+    attr_accessor :auto_concat
+    attr_reader :callbacks
+    ANY = [:any]
+
     def initialize(&block)
       @callbacks = {
-        :before => Hash.new{|h,k| h[k] = []}, # Default to an empty array
-        :after  => Hash.new{|h,k| h[k] = []}  # Default to an empty array
+        :before => {},
+        :after  => {}
       }
 
       @context_stack = []
@@ -39,17 +42,27 @@ module GEDCOM
       @auto_concat = true
 
       instance_eval(&block) if block_given?
+
+      after_initialize
+    end
+
+    def after_initialize
+      # Template
     end
 
     def before(tags, callback=nil, &block)
       tags = [tags].flatten
       callback = check_proc_or_block(callback, &block)
+
+      @callbacks[:before][tags] = default_empty(@callbacks[:before][tags])
       @callbacks[:before][tags].push(callback)
     end
 
     def after(tags, callback=nil, &block)
       tags = [tags].flatten
       callback = check_proc_or_block(callback, &block)
+
+      @callbacks[:after][tags] = default_empty(@callbacks[:after][tags])
       @callbacks[:after][tags].push(callback)
     end
 
@@ -75,6 +88,10 @@ module GEDCOM
 
     protected
 
+    def default_empty(arr)
+      arr || []
+    end
+
     def check_proc_or_block(proc, &block)
       unless proc or block_given?
         raise ArgumentError.new("proc or block required")
@@ -95,12 +112,13 @@ module GEDCOM
 
     def parse_io(io)
       io.each_line do |line|
-        level, tag, rest = line.chop.split( ' ', 3 )
-        next if level.nil? or tag.nil?
+        line = line.rstrip!
+        next if line.empty?
+        level, tag, rest = line.match(/^(\d) (\S+) ?(.*)$/).captures
         level = level.to_i
 
         if (tag == 'CONT' || tag == 'CONC') and @auto_concat
-          concat_data tag, rest
+          concat_data(tag, rest)
           next
         end
 
@@ -114,7 +132,7 @@ module GEDCOM
 
         do_callbacks(:before, @context_stack, rest)
       end
-      unwind_to -1
+      unwind_to(-1)
     end
 
     def unwind_to(level)
@@ -127,24 +145,20 @@ module GEDCOM
     end
 
     def concat_data(tag, rest)
-      if @data_stack[-1].nil?
-        @data_stack[-1] = rest
-      else
-        if @context_stack[-1] == 'BLOB'
-          @data_stack[-1] << rest
-        else
-          if tag == 'CONT'
-            @data_stack[-1] << "\n" + (rest || "")
-          elsif tag == 'CONC'
-            old = @data_stack[-1].chomp
-            @data_stack[-1] = old + (rest || "")
-          end
-        end
+      rest = rest || "" # Handle nil case
+      @data_stack[-1] = case
+      when @data_stack.last.empty?       then rest
+      when @context_stack.last == 'BLOB' then "#{@data_stack.last}#{rest}"
+      when tag == 'CONT'                 then "#{@data_stack.last}\n#{rest}"
+      when tag == 'CONC'                 then "#{@data_stack.last}#{rest}"
       end
     end
 
     def do_callbacks(context_sym, tags, data)
-      relevant_callbacks = @callbacks[context_sym][tags] + @callbacks[context_sym][ANY]
+      return if tags == []
+      tag_cbs = default_empty(@callbacks[context_sym][tags])
+      any_cbs = default_empty(@callbacks[context_sym][ANY])
+      relevant_callbacks = tag_cbs + any_cbs
       relevant_callbacks.each do |callback|
         callback.call(data)
       end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: gedcom_ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Derek Kniffin
+- Phillip Davies
 autorequire: 
 bindir: bin
 cert_chain: []