selene 0.3.0 → 0.3.1

data/.gitignore

@@ -1,18 +1,6 @@
 *.gem
-*.rbc
 .bundle
-.config
-.yardoc
+.rvmrc
 Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
 doc/
-lib/bundler/man
-notes.md
 pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/README.md

@@ -1,8 +1,6 @@
 # Selene
 
-Selene is an iCalendar parser for Ruby. It takes a string in iCalendar format (RFC 5545) and outputs a hash.
-
-![Selene](http://corykaufman.com/images/selene.png)
+Selene is an iCalendar parser for Ruby. It takes a string in iCalendar format (RFC 5545) and outputs a serializable hash.
 
 ## Installation
 
@@ -24,6 +22,12 @@ Or install it yourself as:
 ical = Selene.parse(File.read('calendar.ics'))
 ```
 
+## Demo
+
+I wrote a quick little ical to json Heroku app:
+
+http://ical-to-json.herokuapp.com/
+
 ## Contributing
 
 1. Fork it
@@ -31,3 +35,9 @@ ical = Selene.parse(File.read('calendar.ics'))
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Namesake
+
+Selene is the Greek goddess of the moon, and also happens to be a vampire from the excellent film Underworld:
+
+![Selene](http://corykaufman.com/images/selene.png)

data/Rakefile

@@ -11,11 +11,6 @@ Rake::TestTask.new do |t|
 end
 
 task :meetup do
-  require 'selene'
-  require 'json'
-  require 'pp'
-  require 'debugger'
-
   File.open('test/fixtures/meetup.json', 'wb') do |file|
     feed = Selene.parse(File.read('test/fixtures/meetup.ics'))
     pp feed

data/lib/selene/alarm_builder.rb

@@ -1,17 +1,4 @@
 module Selene
-  class AlarmBuilder
-
-    def initialize
-      @component = {}
-    end
-
-    def component
-      @component
-    end
-
-    def parse(line)
-      @component[line.name.downcase] = line.value
-    end
-
+  class AlarmBuilder < ComponentBuilder
   end
 end

data/lib/selene/calendar_builder.rb

@@ -1,34 +1,9 @@
 module Selene
-  class CalendarBuilder
+  class CalendarBuilder < ComponentBuilder
 
-    def initialize
-      @errors = []
-      @component = Hash.new { |component, property| component[property] = [] }
-    end
+    REQUIRED_PROPERTIES = %w(prodid version)
 
-    def parse(line)
-      set_property line.name, line.value
-    end
+    DISTINCT_PROPERTIES = %w(prodid version calscale method)
 
-    def set_property(name, value)
-      @component[name.downcase] = value
-    end
-
-    def name(line)
-      line.name.downcase
-    end
-
-    def append(builder)
-      case builder
-      when EventBuilder
-        @component['events'] << builder.component
-      when TimeZoneBuilder
-        @component['time_zones'] << builder.component
-      end
-    end
-
-    def component
-      @component
-    end
   end
 end

data/lib/selene/component_builder.rb

@@ -0,0 +1,46 @@
+module Selene
+  class ComponentBuilder
+    include ComponentRules
+
+    attr_accessor :component, :parent, :errors
+
+    REQUIRED_PROPERTIES = []
+    DISTINCT_PROPERTIES = []
+    EXCLUSIVE_PROPERTIES = []
+
+    def add(name, builder)
+      @component[name.downcase] << builder.component
+      builder.parent = self
+    end
+
+    def initialize
+      @component = Hash.new { |component, property| component[property] = [] }
+      @errors = []
+      @property_rules = property_rules(self)
+      @component_rules = component_rules(self)
+    end
+
+    def parse(line)
+      return unless @property_rules.all? { |message, rule| rule.call(name(line), line, message) }
+      @component[name(line)] = value(line)
+    end
+
+    def name(line)
+      line.name
+    end
+
+    def value(line)
+      line.value
+    end
+
+    def a_component_rules
+      @component_rules
+    end
+
+    def valid?
+      @component_rules.each { |message, rule| rule.call(message) }
+      @errors.empty?
+    end
+
+  end
+end

data/lib/selene/component_rules.rb

@@ -0,0 +1,38 @@
+module Selene
+  module ComponentRules
+
+    def property_rules(component)
+      {}.tap do |rules|
+        rules["property %s must not occur more than once"] = lambda do |property, line, message|
+          invalid = @component.key?(property) && component.class::DISTINCT_PROPERTIES.include?(property)
+          !invalid.tap { @errors << { :message => message % property } if invalid }
+        end 
+
+        rules["properties '%s' and '%s' cannot occur in the same component"] = lambda do |property, line, message|
+          passed = true
+          component.class::EXCLUSIVE_PROPERTIES.each do |properties|
+            other_property = properties.find { |p| @component.key?(p) && p != property }
+            next unless other_property
+            passed = false
+            @errors << { :message => message % [property, other_property] }
+          end
+        end
+      end
+    end
+
+    def component_rules(component)
+      {}.tap do |rules|
+        rules["missing required property '%s'"] = lambda do |message|
+          passed = true
+          component.class::REQUIRED_PROPERTIES.each do |required|
+            next if @component.key?(required)
+            passed = false
+            @errors << { :message => message % required }
+          end
+          passed
+        end
+      end
+    end
+
+  end
+end

data/lib/selene/daylight_savings_time_builder.rb

@@ -1,21 +1,14 @@
 module Selene
-  class DaylightSavingsTimeBuilder
+  class DaylightSavingsTimeBuilder < ComponentBuilder
 
-    def initialize
-      @component = {}
-    end
-
-    def component
-      @component
-    end
-
-    def parse(line)
-      @component[line.name.downcase] = case line.name
-      when 'RRULE'
-        Hash[line.value.split(';').map { |vs| k, v = vs.split('=', 2); [k.downcase, v] }]
+    def value(line)
+      case line.name
+      when 'rrule'
+        line.rrule
       else
-        line.value
+        super
       end
     end
+
   end
 end

data/lib/selene/event_builder.rb

@@ -1,29 +1,45 @@
 module Selene
-  class EventBuilder
+  class EventBuilder < ComponentBuilder
 
-    def initialize
-      @component = Hash.new { |component, property| component[property] = [] }
-    end
+    # These properties are required
+    REQUIRED_PROPERTIES = %w(dtstamp uid)
 
-    def component
-      @component
-    end
+    # These properties must not occur more than once
+    DISTINCT_PROPERTIES = %w(dtstamp uid dtstart class created description geo
+      last-mod location organizer priority seq status summary
+      transp url recurid)
+
+    # These properties must not occur together in the same component
+    EXCLUSIVE_PROPERTIES = [
+      %w(dtend duration)
+    ]
 
-    def parse(line)
-      component[line.name.downcase] = case line.name
-      when 'DTSTAMP', 'DTSTART', 'DTEND'
+    # single_property :rrule, :except => when?
+    # if dtstart is a date, dtend has to be too
+    # multi-day durations must be 'dur-day' or 'dur-week'
+
+    def value(line)
+      case line.name
+      when 'dtstamp', 'dtstart', 'dtend'
         line.value_with_params
-      when 'GEO'
-        line.value.split(';')
+      when 'geo'
+        line.values
       else
-        line.value
+        super
       end
     end
 
-    def append(builder)
-      case builder
-      when AlarmBuilder
-        @component['alarms'] << builder.component
+    def parent=(builder)
+      raise Exception.new("Event components cannot be nested inside anything but a calendar component") unless builder.is_a?(CalendarBuilder)
+      super(builder)
+    end
+
+    def component_rules(component)
+      super(component).tap do |rules|
+        rules["Property 'dtstart' required if the calendar does not specify a 'method' property"] = lambda do |message|
+          return if @component.key?('dtstart') || parent && parent.component.key?('method')
+          @errors << { :message => message }
+        end
       end
     end
 

data/lib/selene/feed_builder.rb

@@ -0,0 +1,13 @@
+module Selene
+  class FeedBuilder < Builder
+
+    def initialize
+      @component = { 'vcalendar' => [] }
+    end
+
+    def component
+      @component
+    end
+
+  end
+end

data/lib/selene/line.rb

@@ -29,7 +29,7 @@ module Selene
       end
     end
 
-
+    # Parse a param string into a hash
     def self.parse_params(params_string)
       {}.tap do |params|
         return params unless params_string
@@ -42,17 +42,17 @@ module Selene
     end
 
     def initialize(name, params, value)
-      self.name = name.upcase
+      self.name = name.downcase
       self.params = params || {}
       self.value = value
     end
 
     def begin_component?
-      name == 'BEGIN'
+      name == 'begin'
     end
 
     def end_component?
-      name == 'END'
+      name == 'end'
     end
 
     def params?
@@ -63,9 +63,12 @@ module Selene
       params? ? [value, params] : value
     end
 
-    def ==(line)
-      super(line) unless line.is_a?(Hash)
-      members.all? { |key| line[key] == self.send(key) }
+    def rrule
+      Hash[values.map { |values| k, v = values.split('=', 2); [k.downcase, v] }]
+    end
+
+    def values
+      value.split(';')
     end
 
   end

data/lib/selene/parser.rb

@@ -1,8 +1,11 @@
+require 'selene/line'
+require 'selene/component_rules'
+require 'selene/component_builder'
+
 require 'selene/alarm_builder'
 require 'selene/calendar_builder'
 require 'selene/daylight_savings_time_builder'
 require 'selene/event_builder'
-require 'selene/line'
 require 'selene/standard_time_builder'
 require 'selene/time_zone_builder'
 
@@ -10,35 +13,32 @@ module Selene
   module Parser
 
     def self.builder(component)
-      case component
-      when 'VCALENDAR' then CalendarBuilder
-      when 'VTIMEZONE' then TimeZoneBuilder
-      when 'DAYLIGHT' then DaylightSavingsTimeBuilder
-      when 'STANDARD' then StandardTimeBuilder
-      when 'VEVENT' then EventBuilder
-      when 'VALARM' then AlarmBuilder
-      else raise "Unknown component #{component}"
+      case component.downcase
+      when 'vcalendar' then CalendarBuilder
+      when 'vtimezone' then TimeZoneBuilder
+      when 'daylight' then DaylightSavingsTimeBuilder
+      when 'standard' then StandardTimeBuilder
+      when 'vevent' then EventBuilder
+      when 'valarm' then AlarmBuilder
+      else ComponentBuilder
       end
     end
 
     def self.parse(string)
-      { 'calendars' => [] }.tap do |feed|
-        stack = []
-        Line.split(string).each do |line|
-          if line.begin_component?
-            stack << builder(line.value).new
-          elsif line.end_component?
-            builder = stack.pop
-            if !stack.empty?
-              stack[-1].append(builder)
-            else
-              feed['calendars'] << builder.component
-            end
-          else
-            stack[-1].parse(line)
-          end
+      stack = []
+      stack << builder('feed').new
+      Line.split(string).each do |line|
+        if line.begin_component?
+          builder = builder(line.value).new
+          stack[-1].add(line.value, builder) unless stack.empty?
+          stack << builder
+        elsif line.end_component?
+          stack.pop
+        else
+          stack[-1].parse(line)
         end
       end
+      stack[-1].component
     end
 
   end

data/lib/selene/standard_time_builder.rb

@@ -1,16 +1,4 @@
 module Selene
-  class StandardTimeBuilder
-
-    def initialize
-      @component = {}
-    end
-
-    def component
-      @component
-    end
-
-    def parse(line)
-      @component[line.name.downcase] = line.value
-    end
+  class StandardTimeBuilder < ComponentBuilder
   end
 end

data/lib/selene/time_zone_builder.rb

@@ -1,24 +1,4 @@
 module Selene
-  class TimeZoneBuilder
-
-    def initialize
-      @component = Hash.new { |component, property| component[property] = [] }
-    end
-
-    def component
-      @component
-    end
-
-    def parse(line)
-      @component[line.name.downcase] = line.value
-    end
-
-    def append(builder)
-      case builder
-      when DaylightSavingsTimeBuilder
-        @component['daylight'] << builder.component
-      end
-    end
-
+  class TimeZoneBuilder < ComponentBuilder
   end
 end

data/lib/selene/version.rb

@@ -1,3 +1,3 @@
 module Selene
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/fixtures/meetup.json

@@ -1,5 +1,5 @@
 {
-  "calendars": [
+  "vcalendar": [
     {
       "version": "2.0",
       "prodid": "-//Meetup//RemoteApi//EN",
@@ -7,7 +7,7 @@
       "method": "PUBLISH",
       "x-original-url": "http://www.meetup.com/DetroitRuby/events/ical/DetroitRuby/",
       "x-wr-calname": "Events - DetroitRuby",
-      "time_zones": [
+      "vtimezone": [
         {
           "tzid": "America/New_York",
           "tzurl": "http://tzurl.org/zoneinfo-outlook/America/New_York",
@@ -24,10 +24,19 @@
                 "byday": "2SU"
               }
             }
+          ],
+          "standard": [
+            {
+              "tzoffsetfrom": "-0400",
+              "tzoffsetto": "-0500",
+              "tzname": "EST",
+              "dtstart": "19701101T020000",
+              "rrule": "FREQ=YEARLY;BYMONTH=11;BYDAY=1SU"
+            }
           ]
         }
       ],
-      "events": [
+      "vevent": [
         {
           "dtstamp": "20121231T093631Z",
           "dtstart": [

data/test/selene/alarm_builder_test.rb

@@ -1,7 +1,11 @@
 require 'test_helper'
 
 module Selene
-  class AlarmBuilderTest < TestCase
+  class AlarmBuilderTest < MiniTest::Unit::TestCase
+    include BuilderTestHelper
+
+    def setup
+    end
 
     def builder
       @builder ||= AlarmBuilder.new

data/test/selene/calendar_builder_test.rb

@@ -1,7 +1,8 @@
 require 'test_helper'
 
 module Selene
-  class CalendarBuilderTest < TestCase
+  class CalendarBuilderTest < MiniTest::Unit::TestCase
+    include BuilderTestHelper
 
     def builder
       @builder ||= CalendarBuilder.new
@@ -16,40 +17,55 @@ module Selene
     end
 
     def test_parse_prodid
-      parse_line('PRODID', '', '-//Meetup//RemoteApi//EN')
+      parse_line('PRODID', {}, '-//Meetup//RemoteApi//EN')
       assert_equal builder.component['prodid'], '-//Meetup//RemoteApi//EN'
     end
 
     def test_parse_version
-      parse_line('VERSION', '', '2.0')
+      parse_line('VERSION', {}, '2.0')
       assert_equal @builder.component['version'], '2.0'
     end
 
     def test_parse_calscale
-      parse_line('CALSCALE', '', 'Gregorian')
+      parse_line('CALSCALE', {}, 'Gregorian')
       assert_equal builder.component['calscale'], 'Gregorian'
     end
 
     def test_parse_method
-      parse_line('METHOD', '', 'Publish')
+      parse_line('METHOD', {}, 'Publish')
       assert_equal builder.component['method'], 'Publish'
     end
 
     def test_parse_x_prop
-      parse_line('X-ORIGINAL-URL', '', 'http://www.google.com')
+      parse_line('X-ORIGINAL-URL', {}, 'http://www.google.com')
       assert_equal builder.component['x-original-url'], 'http://www.google.com'
     end
 
     def test_append_event_builder
       event_builder.stub :component, { 'summary' => "Bluth's Best Party" }
-      builder.append(event_builder)
-      assert_equal builder.component['events'].first['summary'], "Bluth's Best Party"
+      builder.add('vevent', event_builder)
+      assert_equal builder.component['vevent'].first['summary'], "Bluth's Best Party"
     end
 
     def test_append_time_zone_builder
       time_zone_builder.stub :component, { 'tzid' => 'America/Detroit' }
-      builder.append(time_zone_builder)
-      assert_equal builder.component['time_zones'].first, { 'tzid' => 'America/Detroit' }
+      builder.add('vtimezone', time_zone_builder)
+      assert_equal builder.component['vtimezone'].first, { 'tzid' => 'America/Detroit' }
+    end
+
+    # Validation
+
+    %w(prodid version).each do |property|
+      define_method "test_#{property}_required" do
+        assert_required property
+      end
+    end
+
+    %w(prodid version calscale method).each do |property|
+      define_method "test_#{property}_cant_be_defined_more_than_once" do
+        assert_single property
+        assert_multiple_values_do_not_overwrite property
+      end
     end
 
   end

data/test/selene/daylight_savings_time_builder_test.rb

@@ -1,13 +1,14 @@
 require 'test_helper'
 
 module Selene
-  class DaylightSavingsTimeBuilderTest < TestCase
+  class DaylightSavingsTimeBuilderTest < MiniTest::Unit::TestCase
+    include BuilderTestHelper
 
     def builder
       @builder ||= DaylightSavingsTimeBuilder.new
     end
 
-    def test_parses_rrule 
+    def test_parses_rrule
       parse_line('RRULE', '', 'FREQ=YEARLY;BYMONTH=3;BYDAY=2SU')
       assert_equal builder.component['rrule'], { 'freq' => 'YEARLY', 'bymonth' => '3', 'byday' => '2SU' }
     end

data/test/selene/event_builder_test.rb

@@ -1,20 +1,25 @@
 require 'test_helper'
 
 module Selene
-  class EventBuilderTest < TestCase
+  class EventBuilderTest < MiniTest::Unit::TestCase
+    include BuilderTestHelper
 
     def builder
       @builder ||= EventBuilder.new
     end
 
+    def builder_with_parent
+      builder.tap { |b| b.parent = CalendarBuilder.new }
+    end
+
     def test_parses_dtstart
-      expected = ['20130110T183000', { 'tzid' => 'America/New_York' }]
       parse_line('DTSTART', { 'tzid' => 'America/New_York' }, '20130110T183000')
-      assert_equal builder.component['dtstart'], expected
+      assert_equal builder.component['dtstart'],
+        ['20130110T183000', { 'tzid' => 'America/New_York' }]
     end
 
     def test_parses_dtstamp
-      parse_line('DTSTAMP', nil, '20121231T093631Z')
+      parse_line('DTSTAMP', {}, '20121231T093631Z')
       assert_equal builder.component['dtstamp'], '20121231T093631Z'
     end
 
@@ -24,65 +29,93 @@ module Selene
     end
 
     def test_parses_dtend
-      expected = ['20130110T183000', { 'tzid' => 'America/New_York' }]
       parse_line('DTEND', { 'tzid' => 'America/New_York' }, '20130110T183000')
-      assert_equal builder.component['dtend'], expected
+      assert_equal builder.component['dtend'], ['20130110T183000', { 'tzid' => 'America/New_York' }]
     end
 
     def test_parses_dtstart_without_tzid
-      parse_line('DTEND', nil, '20130110T183000')
+      parse_line('DTEND', {}, '20130110T183000')
       assert_equal builder.component['dtend'], '20130110T183000'
     end
 
     def test_parses_status
-      parse_line('STATUS', nil, 'CONFIRMED')
+      parse_line('STATUS', {}, 'CONFIRMED')
       assert_equal builder.component['status'], 'CONFIRMED'
     end
 
     def test_parses_summary
-      parse_line('SUMMARY', nil, 'DetroitRuby: 2012 Plan + Lightning talks')
+      parse_line('SUMMARY', {}, 'DetroitRuby: 2012 Plan + Lightning talks')
       assert_equal builder.component['summary'], 'DetroitRuby: 2012 Plan + Lightning talks'
     end
 
     def test_parses_description
-      parse_line('DESCRIPTION', nil, 'DetroitRuby\nThursday\, January 10 at 6:30 PM\n\n')
+      parse_line('DESCRIPTION', {}, 'DetroitRuby\nThursday\, January 10 at 6:30 PM\n\n')
       assert_equal builder.component['description'], 'DetroitRuby\nThursday\, January 10 at 6:30 PM\n\n'
     end
 
     def test_parses_class
-      parse_line('CLASS', nil, 'PUBLIC')
+      parse_line('CLASS', {}, 'PUBLIC')
       assert_equal builder.component['class'], 'PUBLIC'
     end
 
     def test_parses_created
-      parse_line('CREATED', nil, '20120106T161509Z')
+      parse_line('CREATED', {}, '20120106T161509Z')
       assert_equal builder.component['created'], '20120106T161509Z'
     end
 
     def test_parses_geo
-      parse_line('GEO', nil, '42.33;-83.05')
+      parse_line('GEO', {}, '42.33;-83.05')
       assert_equal builder.component['geo'], ['42.33', '-83.05']
     end
 
     def test_parses_location
-      parse_line('LOCATION', nil, 'Compuware Building (One Campus Martius\, Detroit\, MI 48226)')
+      parse_line('LOCATION', {}, 'Compuware Building (One Campus Martius\, Detroit\, MI 48226)')
       assert_equal builder.component['location'], 'Compuware Building (One Campus Martius\, Detroit\, MI 48226)'
     end
 
     def test_parses_url
-      parse_line('URL', nil, 'http://www.meetup.com/DetroitRuby/events/93346412/')
+      parse_line('URL', {}, 'http://www.meetup.com/DetroitRuby/events/93346412/')
       assert_equal builder.component['url'], 'http://www.meetup.com/DetroitRuby/events/93346412/'
     end
 
     def test_parses_last_modified
-      parse_line('LAST-MODIFIED', nil, '20120106T161509Z')
+      parse_line('LAST-MODIFIED', {}, '20120106T161509Z')
       assert_equal builder.component['last-modified'], '20120106T161509Z'
     end
 
     def test_parses_uid
-      parse_line('UID', nil, 'event_qgkxkcyrcbnb@meetup.com')
+      parse_line('UID', {}, 'event_qgkxkcyrcbnb@meetup.com')
       assert_equal builder.component['uid'], 'event_qgkxkcyrcbnb@meetup.com'
     end
 
+    def test_sets_parent_calendar
+      assert builder_with_parent.parent.is_a?(CalendarBuilder), "Must be able to set the parent calendar builder"
+    end
+
+    # Validation
+
+    %w(dtstamp uid).each do |property|
+      define_method "test_#{property}_required" do
+        assert_required property
+      end
+    end
+
+    %w(dtstamp uid dtstart class created description geo last-mod location organizer priority seq status summary transp url recurid).each do |property|
+      define_method "test_#{property}_cant_be_defined_more_than_once" do
+        assert_single property
+        assert_multiple_values_do_not_overwrite property
+      end
+    end
+
+    def test_adding_to_non_calendar_raises_exception
+      assert_raises Exception do
+        builder.parent = TimeZoneBuilder.new
+      end
+    end
+
+    def test_dtstart_required_if_no_calendar_method
+      builder_with_parent.valid?
+      assert builder.errors.any? { |e| e[:message] == "Property 'dtstart' required if the calendar does not specify a 'method' property" }
+    end
   end
 end

data/test/selene/line_test.rb

@@ -1,24 +1,24 @@
 require 'test_helper'
 
 module Selene
-  class LineTest < TestCase
+  class LineTest < MiniTest::Unit::TestCase
 
     def test_lines_are_unfolded_before_splitting
       assert_equal Line.split("TEST:This is a\r\n  test").first.value, "This is a test"
     end
 
     def test_parses_content_line
-      assert_equal Line.parse('VERSION:2.0'), { :name => 'VERSION', :params => {}, :value => '2.0' }
+      assert_equal Line.parse('VERSION:2.0'), Line.new('VERSION', {}, '2.0')
     end
 
     def test_parses_url
-      expected = { :name => 'TZURL', :params => {}, :value => 'http://www.meetup.com/DetroitRuby/events/ical/DetroitRuby/' }
-      assert_equal Line.parse('TZURL:http://www.meetup.com/DetroitRuby/events/ical/DetroitRuby/'), expected
+      assert_equal Line.parse('TZURL:http://www.meetup.com/DetroitRuby/events/ical/DetroitRuby/'),
+        Line.new('TZURL', {}, 'http://www.meetup.com/DetroitRuby/events/ical/DetroitRuby/')
     end
 
     def test_parses_params
-      expected = { :name => 'DTSTART', :params => { 'tzid' => 'America/New_York' }, :value => '20130110T183000' }
-      assert_equal Line.parse('DTSTART;TZID=America/New_York:20130110T183000'), expected
+      assert_equal Line.parse('DTSTART;TZID=America/New_York:20130110T183000'),
+        Line.new('DTSTART', { 'tzid' => 'America/New_York' }, '20130110T183000')
     end
   end
 end

data/test/selene/parser_test.rb

@@ -2,19 +2,21 @@ require 'test_helper'
 require 'json'
 
 module Selene
-  class ParserTest < TestCase
+  class ParserTest < MiniTest::Unit::TestCase
+    include FixtureHelper
 
     def test_parses_blank_string
-      assert_equal Selene::Parser.parse(""), { 'calendars' => [] }
+      assert_equal Selene::Parser.parse(""), {}
     end
 
     def test_parses_simple_calendar
-      assert_equal Selene::Parser.parse("BEGIN:VCALENDAR\r\nSUMMARY:Meetups\r\nEND:VCALENDAR"), { 'calendars' => [{ 'summary' => 'Meetups' }] }
+      assert_equal Selene::Parser.parse("BEGIN:VCALENDAR\r\nSUMMARY:Meetups\r\nEND:VCALENDAR"),
+        { 'vcalendar' => [{ 'summary' => 'Meetups' }] }
     end
 
     def test_parses_meetup_calendar
-      expected = JSON.parse(fixture('meetup.json'))
-      assert_equal Selene::Parser.parse(fixture('meetup.ics')), expected
+      assert_equal Selene::Parser.parse(fixture('meetup.ics')),
+        JSON.parse(fixture('meetup.json'))
     end
   end
 end

data/test/selene/time_zone_builder_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Selene
-  class TimeZoneBuilderTest < TestCase
+  class TimeZoneBuilderTest < MiniTest::Unit::TestCase
 
     def builder
       @builder ||= TimeZoneBuilder.new

data/test/test_helper.rb

@@ -6,36 +6,60 @@ require 'minitest/mock'
 require 'selene'
 
 module Selene
-  class TestCase < MiniTest::Unit::TestCase
+  module Stubbable
 
+    # Allowed syntax options:
+    #
+    # stub :method => 'value'
+    # stub :method, 'value'
+    # stub :method { 'value' }
+
+    def stub(hash_or_method, value_or_block = nil)
+      if hash_or_method.is_a?(Hash)
+        hash_or_method.each { |method, value| stub method, Proc.new { value } }
+      elsif !value_or_block.is_a?(Proc)
+        stub hash_or_method, Proc.new { value_or_block }
+      else
+        define_singleton_method hash_or_method, value_or_block
+      end
+    end
+
+  end
+
+  module FixtureHelper
     def fixture(filename)
       File.read(File.join(File.dirname(__FILE__), 'fixtures', filename))
     end
+  end
+
+  module BuilderTestHelper
 
     # This is a helper method that takes a name, params and a value, turns them into a proper line hash,
     # and passes them to the builder to be parsed.
     def parse_line(name, params, value)
-      raise "Must define builder method in test case" unless builder
       builder.parse(Line.new(name, params, value))
     end
 
-  end
-end
-
-module Stubbable
+    def assert_required property
+      builder.valid?
+      message = "missing required property '#{property}'"
+      assert builder.errors.any? { |e| e[:message] =~ /#{message}/ }, message
+    end
 
-  # stub :method => 'value'
-  # stub :method, 'value'
-  # stub :method { 'value' }
+    def assert_single property
+      parse_line(property, {}, 'Some Value')
+      n = builder.errors.count
+      parse_line(property, {}, 'Another Value')
+      n = builder.errors.count - n
+      assert_equal n, 1, "Cannot have more than one #{property}"
+    end
 
-  def stub(hash_or_method, value_or_block = nil)
-    if hash_or_method.is_a?(Hash)
-      hash_or_method.each { |method, value| stub method, Proc.new { value } }
-    elsif !value_or_block.is_a?(Proc)
-      stub hash_or_method, Proc.new { value_or_block }
-    else
-      define_singleton_method hash_or_method, value_or_block
+    def assert_multiple_values_do_not_overwrite property
+      parse_line(property, {}, 'Some Value')
+      value = builder.component[property].dup
+      parse_line(property, {}, 'Another Value')
+      assert_equal builder.component[property], value
     end
-  end
 
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selene
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
@@ -69,7 +69,6 @@ files:
 - .gitattributes
 - .gitignore
 - .rspec
-- .rvmrc
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -77,8 +76,11 @@ files:
 - lib/selene.rb
 - lib/selene/alarm_builder.rb
 - lib/selene/calendar_builder.rb
+- lib/selene/component_builder.rb
+- lib/selene/component_rules.rb
 - lib/selene/daylight_savings_time_builder.rb
 - lib/selene/event_builder.rb
+- lib/selene/feed_builder.rb
 - lib/selene/line.rb
 - lib/selene/parser.rb
 - lib/selene/standard_time_builder.rb
@@ -109,7 +111,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4237878709699740480
+      hash: 500821961400754664
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4237878709699740480
+      hash: 500821961400754664
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@selene --create