forward-calendar 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 862009b8848681c1e0194d4542a9d3e9c02d0ec5
-  data.tar.gz: 55be0c0aa4df8e86a278365f9955123e9564c48d
+  metadata.gz: 8a12b64c81231b047dbba014ec6ca581322fcbe8
+  data.tar.gz: e79b9313e90499d7530a59e4da7d15eeeb54c2ba
 SHA512:
-  metadata.gz: f42238e2c8f2edad3b68f61f44714045fac80474ab5a83cbd563c19f5b520e30ae1758317aeab5a029fadf59d42b1dcb150d8084063c731f692a65322afef9a3
-  data.tar.gz: 99a34126b47f19d2034e31613849899eb8c9316d0e40eb3794ceca4296d43808270f3906157fa5754b40ebef1898331905c1c05010a86f461eb3f4ab900bb562
+  metadata.gz: 6f3eac055c4e1bf09f886bd152bc39491493077be3c8af7f346377754cb937eb1e7d90032aa2296c727d86b2076fbb251e838387e05d16bf2f7a887ba0a65d5d
+  data.tar.gz: 00cda194d2c52913d1360398c14cce3aee27306d75a5464353517284d8a2f9b4fc62e63f0686a9dc7d73d0c90be4abfdea4096acc7f64b90638446493b2e232e

data/forward-calendar.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name          = 'forward-calendar'
-  s.version       = '0.1.0'
-  s.date          = '2017-12-07'
+  s.version       = '0.1.1'
+  s.date          = '2017-12-11'
   s.summary       = 'Forward Calendar XML parser'
   s.description   = 'Parser for Forward Calendar XML files'
   s.homepage      = 'https://github.com/AlphaExchange/forward-calendar-rb'

data/lib/forward_calendar.rb

@@ -8,7 +8,7 @@ module ForwardCalendar
   end
 
   def self.parser_from_file(file_path)
-    xml = File.read(file_path)
+    xml = File.open(file_path)
     parser(xml)
   end
 end

data/lib/forward_calendar/event.rb

@@ -6,12 +6,17 @@ require_relative './location'
 require_relative './helper/normalized_string'
 
 module ForwardCalendar
+  class Locations < Node
+    include HappyMapper
+    tag 'eventLocations'
+
+    has_many :locations, Location, tag: 'eventLocation'
+  end
+
   class Event < Node
     include HappyMapper
     tag 'event'
 
-    has_many :locations, Location, tag: 'eventLocation', xpath: './eventLocations'
-
     element :id, Integer, tag: 'eventID'
     element :type, Helper::NormalizedString, tag: 'eventType'
     element :title, String, tag: 'eventTitle'
@@ -21,5 +26,10 @@ module ForwardCalendar
     element :start, Date, tag: 'start'
     element :end, Date, tag: 'end'
     element :url, String, tag: 'URL'
+    element :event_locations, Locations, tag: 'eventLocations'
+
+    def locations
+      event_locations&.locations
+    end
   end
 end

data/lib/forward_calendar/forward_calendar.rb

@@ -18,7 +18,7 @@ module ForwardCalendar
     def updated
       Nokogiri::XML::Reader(@file).each do |node|
         next unless node.name == 'updated' && node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
-        return Updated.parse(Nokogiri::XML(node.outer_xml))
+        return Updated.parse(Nokogiri::XML(node.outer_xml), single: true)
       end
     end
 
@@ -28,7 +28,7 @@ module ForwardCalendar
     def each_event
       Nokogiri::XML::Reader(@file).each do |node|
         next unless node.name == 'event' && node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
-        yield Event.parse(Nokogiri::XML(node.outer_xml))
+        yield Event.parse(Nokogiri::XML(node.outer_xml), single: true)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forward-calendar
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - João Simões
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-07 00:00:00.000000000 Z
+date: 2017-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler