selene 0.3.1 → 0.3.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a94d8b8e9a90bf2658c322521edc6e6a89ccab65
+  data.tar.gz: d54aa750eab708bd7ea60ac21be9201073be09d0
+SHA512:
+  metadata.gz: 525d85405335dcf90a579d1bde6d0a7c5472b96d91aa127606c0b81a19aabbc2cb2e33ab707201e884cb0d7a15c107616713f6c756a09d91763d7b2b1349529c
+  data.tar.gz: 70e1b7e2ce0a7651cb2c3526217107a53b092cc39dd9855d87d0358553615e56a038fe00c2ea40734aac2e3143e7a30ea9ad2c3b424b7bac261a462227a557e2

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/Guardfile

@@ -0,0 +1,4 @@
+guard :minitest, all_on_start: false do
+  watch(%r|^test/(.*)\/?(.*)_test\.rb|)
+  watch(%r|^lib/(.*)\.rb|) { |m| "test/#{m[1]}_test.rb" }
+end

data/Rakefile

@@ -1,5 +1,4 @@
 require 'bundler/gem_tasks'
-require 'debugger'
 require 'json'
 require 'pp'
 require 'rake/testtask'

data/lib/selene.rb

@@ -2,9 +2,7 @@ require 'selene/parser'
 require 'selene/version'
 
 module Selene
-
   def self.parse(string)
     Parser.parse(string)
   end
-
 end

data/lib/selene/alarm_builder.rb

@@ -1,4 +1,7 @@
 module Selene
   class AlarmBuilder < ComponentBuilder
+    def initialize
+      super('valarm')
+    end
   end
 end

data/lib/selene/calendar_builder.rb

@@ -1,9 +1,15 @@
 module Selene
   class CalendarBuilder < ComponentBuilder
+    property 'prodid', required: true, :multiple => false
+    property 'version', :required => true, :multiple => false
 
-    REQUIRED_PROPERTIES = %w(prodid version)
+    property 'calscale', :multiple => false
+    property 'method', :multiple => false
 
-    DISTINCT_PROPERTIES = %w(prodid version calscale method)
+    # Custom properties: x-prop, iana-prop
 
+    def initialize
+      super('vcalendar')
+    end
   end
 end

data/lib/selene/component_builder.rb

@@ -1,46 +1,130 @@
 module Selene
+  # This is the base class for all component builders.
+  #
+  # Properties are specified one per property with optional rules, e.g.:
+  #
+  # property 'version', :required => true, :multiple => false
+  #
+  # If :required is truthy, a component is not valid without that property.
+  # If :multiple is falsy, a component can only have one of that property
+  #
+  # Custom rules can be implemented by overriding can_add?(property) or valid?
   class ComponentBuilder
-    include ComponentRules
+    class ParseError < StandardError; end
 
-    attr_accessor :component, :parent, :errors
+    @property_rules = {}
 
-    REQUIRED_PROPERTIES = []
-    DISTINCT_PROPERTIES = []
-    EXCLUSIVE_PROPERTIES = []
+    class << self
+      attr_accessor :property_rules
+    end
 
-    def add(name, builder)
-      @component[name.downcase] << builder.component
-      builder.parent = self
+    attr_accessor :component, :errors, :name, :parent
+
+    def self.property(name, rules = {})
+      property_rules[name] = rules
     end
 
-    def initialize
+    def self.inherited(subclass)
+      subclass.instance_variable_set('@property_rules', @property_rules)
+    end
+
+    def initialize(name)
+      @name = name
       @component = Hash.new { |component, property| component[property] = [] }
-      @errors = []
-      @property_rules = property_rules(self)
-      @component_rules = component_rules(self)
+      @errors = Hash.new { |errors, property| errors[property] = [] }
     end
 
-    def parse(line)
-      return unless @property_rules.all? { |message, rule| rule.call(name(line), line, message) }
-      @component[name(line)] = value(line)
+    def add(name, builder)
+      @component[name] << builder.component
     end
 
-    def name(line)
-      line.name
+    def parse(*properties)
+      properties.each do |property|
+        case property
+        when Line
+          @component[name(property)] = value(property) if can_add?(property)
+        when String
+          Line.split(property).each { |line| parse(line) }
+        else
+          raise ParseError, "Cannot parse argument of type #{property.class}"
+        end
+      end
     end
 
-    def value(line)
-      line.value
+    def to_ical(component)
+      lines = []
+      component.each_pair do |key, value|
+        keys = []
+        values = []
+        keys << key.upcase
+        case value
+        when Array
+          if value[1].is_a?(Hash)
+            value[1].each_pair do |pkey, pvalue|
+              keys << [pkey.upcase, pvalue].join('=')
+            end
+            values << value[0]
+          else
+            values += value
+          end
+        when Hash
+          value.each_pair do |vkey, vvalue|
+            values << [vkey.upcase, vvalue].join('=')
+          end
+        end
+
+        lines << [keys.join(';'), values.join(';')].join(':')
+      end
+
+      lines.join("\n")
     end
 
-    def a_component_rules
-      @component_rules
+    def name(property)
+      property.name
     end
 
-    def valid?
-      @component_rules.each { |message, rule| rule.call(message) }
+    def value(property)
+      property.value
+    end
+
+    def contains_property?(property)
+      @component.key?(property.to_s)
+    end
+
+    def can_contain?(component_name)
+      true
+    end
+
+    def error(property, message)
+      @errors[property] << message
+    end
+
+    def properties
+      self.class.property_rules.keys
+    end
+
+    def required?(property)
+      self.class.property_rules[property][:required]
+    end
+
+    def multiple?(property)
+      self.class.property_rules[property][:multiple]
+    end
+
+    def can_add?(property)
+      if contains_property?(property.name) && !multiple?(property.name)
+        error(property.name, "property '%s' must not occur more than once" % property.name)
+      end
       @errors.empty?
     end
 
+    def valid?
+      properties.select { |property| required?(property) }.each do |property|
+        if !contains_property?(property)
+          error(property, "missing required property '%s'" % property)
+        end
+      end
+      @errors.empty?
+    end
   end
 end

data/lib/selene/component_errors.rb

@@ -0,0 +1,7 @@
+module ComponentErrors
+
+  def containment_error(line)
+
+  end
+
+end

data/lib/selene/daylight_savings_time_builder.rb

@@ -1,5 +1,8 @@
 module Selene
   class DaylightSavingsTimeBuilder < ComponentBuilder
+    def initialize
+      super('daylight')
+    end
 
     def value(line)
       case line.name
@@ -9,6 +12,5 @@ module Selene
         super
       end
     end
-
   end
 end

data/lib/selene/event_builder.rb

@@ -1,29 +1,80 @@
 module Selene
   class EventBuilder < ComponentBuilder
 
-    # These properties are required
-    REQUIRED_PROPERTIES = %w(dtstamp uid)
+    # Required properties
+    property 'dtstamp', required: true, multiple: false
+    property 'uid', required: true, multiple: false
 
-    # 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)
+    # Optional properties
+    property 'class', multiple: false
+    property 'created', multiple: false
+    property 'description', multiple: false
+    property 'dtend', multiple: false
+    property 'dtstart', multiple: false
+    property 'duration', multiple: false
+    property 'geo', multiple: false
+    property 'last-mod', multiple: false
+    property 'location', multiple: false
+    property 'organizer', multiple: false
+    property 'priority', multiple: false
+    property 'recurid', multiple: false
+    property 'rrule' # The rrule property should not occur more than once (but can if necessary)
+    property 'seq', multiple: false
+    property 'status', multiple: false
+    property 'summary', multiple: false
+    property 'transp', multiple: false
+    property 'url', multiple: false
+    property 'attach'
+    property 'attendee'
+    property 'categories'
+    property 'comment'
+    property 'contact'
+    property 'exdate'
+    property 'rdate'
+    property 'related'
+    property 'related-to'
+    property 'resources'
+    property 'rstatus'
 
-    # These properties must not occur together in the same component
-    EXCLUSIVE_PROPERTIES = [
-      %w(dtend duration)
-    ]
+    # Custom properties: x-prop, iana-prop
 
-    # 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'
+    # TODO: if dtstart is a date, dtend must be as well
+    # TODO: multi-day durations must be 'dur-day' or 'dur-week'
 
-    def value(line)
-      case line.name
+    def self.update(component, properties)
+      new('vevent', component).update_properties(properties)
+    end
+
+    def initialize
+      super('vevent')
+    end
+
+    def update_properties(properties)
+      properties.inject(self.component) do |component, (name, value)|
+        component = update_property(component, name, value)
+        component
+      end
+    end
+
+    def update_property(component, name, value)
+      case name
+      when 'dtstart'
+        component.merge('dtstart' => [value.strftime('%Y%m%dT%H%M%S'), component['dtstart'][1]])
+      else
+        component
+      end
+    end
+
+    def value(property)
+      case property.name
       when 'dtstamp', 'dtstart', 'dtend'
-        line.value_with_params
+        property.value_with_params
+      when 'exdate'
+        property.values_with_params
       when 'geo'
-        line.values
+        property.values
+      when 'rrule'
+        property.rrule
       else
         super
       end
@@ -34,14 +85,20 @@ module Selene
       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
+    def can_add?(property)
+      if property.name == 'dtend' && contains_property?('duration')
+        error('dtend', "The 'dtend' property cannot be set if the 'duration' property already exists")
+      elsif property.name == 'duration' && contains_property?('dtend')
+        error('duration', "The 'duration' property cannot be set if the 'dtend' property already exists")
       end
+      super(property)
     end
 
+    def valid?
+      if !contains_property?('dtstart') && !parent.contains_property?('method')
+        error('dtstart', "The 'dtstart' property is required if the calendar does not have a 'method' property")
+      end
+      super
+    end
   end
 end

data/lib/selene/feed_builder.rb

@@ -1,13 +1,15 @@
 module Selene
-  class FeedBuilder < Builder
-
+  class FeedBuilder < ComponentBuilder
     def initialize
-      @component = { 'vcalendar' => [] }
+      super('feed')
     end
 
-    def component
-      @component
+    def can_contain?(builder)
+      !%w(vevent vtimezone valarm standard daylight).include?(builder.name)
     end
 
+    def error(message) 
+      @component['errors'] << message
+    end
   end
 end

data/lib/selene/line.rb

@@ -1,5 +1,5 @@
 module Selene
-  class Line < Struct.new(:name, :params, :value)
+  class Line < Struct.new(:name, :value, :params)
 
     # Match everything until we hit ';' (parameter separator) or ':' (value separator)
     NAME = /(?<name>[^:\;]+)/
@@ -13,7 +13,7 @@ module Selene
     # Match everything that is not ';' (parameter separator)
     PARAM = /[^\;]+/
 
-    # Match everything before '='
+    # Match parameter key and value
     PARAM_KEY_VALUE = /(?<key>[^=]+)=(?<value>.*)/
 
     # Split a string into content lines
@@ -25,7 +25,7 @@ module Selene
     # Parse a content line into a line object
     def self.parse(content_line)
       content_line.match(/#{NAME}#{PARAMS}?:#{VALUE}/) do |match|
-        return new(match[:name], parse_params(match[:params]), match[:value])
+        return new(match[:name], match[:value], parse_params(match[:params]))
       end
     end
 
@@ -41,35 +41,40 @@ module Selene
       end
     end
 
-    def initialize(name, params, value)
-      self.name = name.downcase
-      self.params = params || {}
-      self.value = value
+    def initialize(name, value, params = {})
+      super(name.downcase, value, params)
     end
 
     def begin_component?
       name == 'begin'
     end
 
+    def component_name
+      value.downcase
+    end
+
     def end_component?
       name == 'end'
     end
 
     def params?
-      params && !params.empty?
+      !params.empty?
     end
 
     def value_with_params
       params? ? [value, params] : value
     end
 
+    def values_with_params
+      params? ? [values, params] : values
+    end
+
     def rrule
       Hash[values.map { |values| k, v = values.split('=', 2); [k.downcase, v] }]
     end
 
     def values
-      value.split(';')
+      value.split(/[;,]/)
     end
-
   end
 end

data/lib/selene/parser.rb

@@ -1,36 +1,31 @@
 require 'selene/line'
-require 'selene/component_rules'
-require 'selene/component_builder'
 
+require 'selene/component_builder'
 require 'selene/alarm_builder'
 require 'selene/calendar_builder'
 require 'selene/daylight_savings_time_builder'
 require 'selene/event_builder'
+require 'selene/feed_builder'
 require 'selene/standard_time_builder'
 require 'selene/time_zone_builder'
 
 module Selene
-  module Parser
+  class Parser
+    def self.parse(string)
+      new(string).parse
+    end
 
-    def self.builder(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
+    def initialize(string)
+      @string = string
     end
 
-    def self.parse(string)
-      stack = []
-      stack << builder('feed').new
-      Line.split(string).each do |line|
+    def parse
+      feed = FeedBuilder.new
+      stack = [feed]
+      Line.split(@string).each do |line|
         if line.begin_component?
-          builder = builder(line.value).new
-          stack[-1].add(line.value, builder) unless stack.empty?
+          builder = create_builder(line.component_name)
+          stack[-1].add(line.component_name, builder)
           stack << builder
         elsif line.end_component?
           stack.pop
@@ -38,8 +33,19 @@ module Selene
           stack[-1].parse(line)
         end
       end
-      stack[-1].component
+      feed.component
     end
 
+    def create_builder(name)
+      case name
+      when 'daylight' then DaylightSavingsTimeBuilder.new
+      when 'standard' then StandardTimeBuilder.new
+      when 'valarm' then AlarmBuilder.new
+      when 'vcalendar' then CalendarBuilder.new
+      when 'vevent' then EventBuilder.new
+      when 'vtimezone' then TimeZoneBuilder.new
+      else ComponentBuilder.new(name)
+      end
+    end
   end
 end

data/lib/selene/standard_time_builder.rb

@@ -1,4 +1,7 @@
 module Selene
   class StandardTimeBuilder < ComponentBuilder
+    def initialize
+      super('standard')
+    end
   end
 end

data/lib/selene/time_zone_builder.rb

@@ -1,4 +1,7 @@
 module Selene
   class TimeZoneBuilder < ComponentBuilder
+    def initialize
+      super('vtimezone')
+    end
   end
 end

data/lib/selene/version.rb

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

data/selene.gemspec

@@ -17,7 +17,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'debugger'
-  gem.add_development_dependency 'minitest-colorize'
+  gem.add_dependency 'ice_cube'
+
+  gem.add_development_dependency 'byebug'
+  gem.add_development_dependency 'minitest-reporters'
   gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'guard'
+  gem.add_development_dependency 'guard-minitest'
 end

data/test/helper.rb

@@ -0,0 +1,6 @@
+require 'minitest/autorun'
+require 'minitest/reporters'
+
+Minitest::Reporters.use!
+
+require_relative 'support/fixtures_helper'

data/test/selene/alarm_builder_test.rb

@@ -1,20 +1,17 @@
 require 'test_helper'
 
 module Selene
-  class AlarmBuilderTest < MiniTest::Unit::TestCase
+  class AlarmBuilderTest < MiniTest::Test
     include BuilderTestHelper
 
-    def setup
+    def test_parses_action
+      builder.parse(Line.new('ACTION', 'AUDIO'))
+      assert_equal builder.component['action'], 'AUDIO'
     end
 
+    private
     def builder
       @builder ||= AlarmBuilder.new
     end
-
-    def test_parses_action
-      parse_line 'ACTION', {}, 'AUDIO'
-      assert_equal builder.component['action'], 'AUDIO'
-    end
-
   end
 end

data/test/selene/calendar_builder_test.rb

@@ -1,70 +1,36 @@
 require 'test_helper'
 
 module Selene
-  class CalendarBuilderTest < MiniTest::Unit::TestCase
+  class CalendarBuilderTest < MiniTest::Test
     include BuilderTestHelper
 
-    def builder
-      @builder ||= CalendarBuilder.new
-    end
-
-    def event_builder
-      @event_builder ||= EventBuilder.new.extend(Stubbable)
-    end
-
-    def time_zone_builder
-      @time_zone_builder ||= TimeZoneBuilder.new.extend(Stubbable)
-    end
-
-    def test_parse_prodid
-      parse_line('PRODID', {}, '-//Meetup//RemoteApi//EN')
-      assert_equal builder.component['prodid'], '-//Meetup//RemoteApi//EN'
-    end
-
-    def test_parse_version
-      parse_line('VERSION', {}, '2.0')
-      assert_equal @builder.component['version'], '2.0'
-    end
-
-    def test_parse_calscale
-      parse_line('CALSCALE', {}, 'Gregorian')
-      assert_equal builder.component['calscale'], 'Gregorian'
-    end
-
-    def test_parse_method
-      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')
-      assert_equal builder.component['x-original-url'], 'http://www.google.com'
-    end
-
     def test_append_event_builder
+      builder = CalendarBuilder.new
+      event_builder = EventBuilder.new.extend(Stubbable)
       event_builder.stub :component, { '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
+      builder = CalendarBuilder.new
+      time_zone_builder = TimeZoneBuilder.new.extend(Stubbable)
       time_zone_builder.stub :component, { 'tzid' => 'America/Detroit' }
       builder.add('vtimezone', time_zone_builder)
       assert_equal builder.component['vtimezone'].first, { 'tzid' => 'America/Detroit' }
     end
 
-    # Validation
-
+    # Test properties with :required => true
     %w(prodid version).each do |property|
       define_method "test_#{property}_required" do
-        assert_required property
+        assert_required(CalendarBuilder.new, property)
       end
     end
 
+    # Test properties with :multiple => false
     %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
+      define_method "test_#{property}_cannot_be_defined_more_than_once" do
+        assert_single(CalendarBuilder.new, property)
       end
     end
 

data/test/selene/component_builder_test.rb

@@ -0,0 +1,10 @@
+require 'test_helper'
+
+module Selene
+  class ComponentBuilderTest < MiniTest::Test
+    def test_sets_property_rules
+      ComponentBuilder.property :version, :required => true
+      assert_equal({ :required => true }, ComponentBuilder.property_rules[:version])
+    end
+  end
+end

data/test/selene/daylight_savings_time_builder_test.rb

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

data/test/selene/event_builder_test.rb

@@ -1,121 +1,73 @@
 require 'test_helper'
 
 module Selene
-  class EventBuilderTest < MiniTest::Unit::TestCase
+  class EventBuilderTest < MiniTest::Test
     include BuilderTestHelper
 
-    def builder
-      @builder ||= EventBuilder.new
-    end
-
-    def builder_with_parent
-      builder.tap { |b| b.parent = CalendarBuilder.new }
-    end
-
-    def test_parses_dtstart
-      parse_line('DTSTART', { 'tzid' => 'America/New_York' }, '20130110T183000')
-      assert_equal builder.component['dtstart'],
-        ['20130110T183000', { 'tzid' => 'America/New_York' }]
-    end
-
-    def test_parses_dtstamp
-      parse_line('DTSTAMP', {}, '20121231T093631Z')
-      assert_equal builder.component['dtstamp'], '20121231T093631Z'
-    end
-
-    def test_parses_dtstart_without_tzid
-      parse_line('DTSTART', {}, '20130110T183000')
-      assert_equal builder.component['dtstart'], '20130110T183000'
-    end
-
-    def test_parses_dtend
-      parse_line('DTEND', { 'tzid' => 'America/New_York' }, '20130110T183000')
-      assert_equal builder.component['dtend'], ['20130110T183000', { 'tzid' => 'America/New_York' }]
-    end
-
-    def test_parses_dtstart_without_tzid
-      parse_line('DTEND', {}, '20130110T183000')
-      assert_equal builder.component['dtend'], '20130110T183000'
-    end
-
-    def test_parses_status
-      parse_line('STATUS', {}, 'CONFIRMED')
-      assert_equal builder.component['status'], 'CONFIRMED'
-    end
-
-    def test_parses_summary
-      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', {}, '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', {}, 'PUBLIC')
-      assert_equal builder.component['class'], 'PUBLIC'
-    end
-
-    def test_parses_created
-      parse_line('CREATED', {}, '20120106T161509Z')
-      assert_equal builder.component['created'], '20120106T161509Z'
+    # Test properties that can contain property parameters
+    %w(dtstamp dtstart dtend).each do |property|
+      define_method "test_parses_#{property}_with_property_parameters" do
+        builder = EventBuilder.new
+        builder.parse(Line.new(property.upcase, '20130110T183000', 'tzid' => 'America/New_York'))
+        assert_equal ['20130110T183000', { 'tzid' => 'America/New_York' }],
+          builder.component[property]
+      end
     end
 
-    def test_parses_geo
-      parse_line('GEO', {}, '42.33;-83.05')
+    def test_parses_geo_with_multiple_values
+      builder = EventBuilder.new
+      builder.parse(Line.new('GEO', '42.33;-83.05'))
       assert_equal builder.component['geo'], ['42.33', '-83.05']
     end
 
-    def test_parses_location
-      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', {}, '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', {}, '20120106T161509Z')
-      assert_equal builder.component['last-modified'], '20120106T161509Z'
-    end
-
-    def test_parses_uid
-      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
-
+    # Test properties with :required => true 
     %w(dtstamp uid).each do |property|
       define_method "test_#{property}_required" do
-        assert_required property
+        builder = EventBuilder.new
+        builder.parent = CalendarBuilder.new
+        assert_required(builder, 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
+    # Test properties with :multiple => false
+    %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}_cannot_be_defined_more_than_once" do
+        assert_single(EventBuilder.new, property)
       end
     end
 
-    def test_adding_to_non_calendar_raises_exception
+    def test_invalid_parent
       assert_raises Exception do
-        builder.parent = TimeZoneBuilder.new
+        EventBuilder.new.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" }
+      builder = EventBuilder.new
+      builder.parent = CalendarBuilder.new
+      builder.valid?
+      assert_error builder, 'dtstart', "The 'dtstart' property is required if the calendar does not have a 'method' property"
+    end
+
+    def test_dtend_invalid_if_duration
+      builder = EventBuilder.new
+      builder.parse(Line.new('DURATION', {}, 'PT15M'))
+      builder.parse(Line.new('DTEND', {}, '19970903T190000Z'))
+      assert_error builder, 'dtend', "The 'dtend' property cannot be set if the 'duration' property already exists"
+    end
+
+    def test_duration_invalid_if_dtend
+      builder = EventBuilder.new
+      builder.parse(Line.new('DTEND', {}, '19970903T190000Z'))
+      builder.parse(Line.new('DURATION', {}, 'PT15M'))
+      assert_error builder, 'duration', "The 'duration' property cannot be set if the 'dtend' property already exists"
+    end
+
+    def test_exdate
+      builder = EventBuilder.new
+      builder.parse("EXDATE;VALUE=DATE-TIME;TZID=America/Detroit:19960402T010000,19960403T010000,19960404T010000")
+      assert_equal builder.component['exdate'], [['19960402T010000','19960403T010000','19960404T010000'], { 'value' => 'DATE-TIME', 'tzid' => 'America/Detroit' }]
     end
   end
 end

data/test/selene/line_test.rb

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

data/test/selene/parser_test.rb

@@ -1,22 +1,29 @@
-require 'test_helper'
+require_relative '../test_helper'
 require 'json'
+require 'selene/parser'
 
 module Selene
-  class ParserTest < MiniTest::Unit::TestCase
+  class ParserTest < MiniTest::Test
     include FixtureHelper
 
     def test_parses_blank_string
-      assert_equal Selene::Parser.parse(""), {}
+      assert_equal Parser.parse(""), {}
     end
 
     def test_parses_simple_calendar
-      assert_equal Selene::Parser.parse("BEGIN:VCALENDAR\r\nSUMMARY:Meetups\r\nEND:VCALENDAR"),
+      assert_equal Parser.parse("BEGIN:VCALENDAR\r\nSUMMARY:Meetups\r\nEND:VCALENDAR"),
         { 'vcalendar' => [{ 'summary' => 'Meetups' }] }
     end
 
     def test_parses_meetup_calendar
-      assert_equal Selene::Parser.parse(fixture('meetup.ics')),
+      assert_equal Parser.parse(fixture('meetup.ics')),
         JSON.parse(fixture('meetup.json'))
     end
+
+    def test_contain_error
+      skip
+      ical = Parser.parse("BEGIN:VEVENT\r\nEND:VEVENT")
+      assert ical['errors'].any? { |e| e.include? "can't contain" }, "Feed can't contain a vevent"
+    end
   end
 end

data/test/selene/time_zone_builder_test.rb

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

data/test/test_helper.rb

@@ -1,10 +1,11 @@
 require 'bundler/setup'
-require 'debugger'
 require 'minitest/autorun'
-require 'minitest/colorize'
+require 'minitest/reporters'
 require 'minitest/mock'
 require 'selene'
 
+Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new
+
 module Selene
   module Stubbable
 
@@ -34,32 +35,21 @@ module Selene
 
   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)
-      builder.parse(Line.new(name, params, value))
-    end
-
-    def assert_required property
+    def assert_required builder, property
       builder.valid?
-      message = "missing required property '#{property}'"
-      assert builder.errors.any? { |e| e[:message] =~ /#{message}/ }, message
+      assert_error builder, property, "missing required property '#{property}'"
     end
 
-    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}"
+    def assert_single builder, property
+      builder.parse(Line.new(property, 'First Value'))
+      original_value = builder.component[property]
+      builder.parse(Line.new(property, 'Second Value'))
+      assert_error builder, property, "property '#{property}' must not occur more than once"
+      assert_equal original_value, builder.component[property]
     end
 
-    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
+    def assert_error builder, property, message
+      assert builder.errors[property].any? { |e| e =~ /#{message}/ }, "#{builder.class.name}: #{message}"
     end
-
   end
 end

metadata

@@ -1,62 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: selene
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.3.4
 platform: ruby
 authors:
 - Cory Kaufman-Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: ice_cube
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-colorize
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Selene is an iCalendar parser for Ruby
@@ -68,8 +103,8 @@ extra_rdoc_files: []
 files:
 - .gitattributes
 - .gitignore
-- .rspec
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -77,7 +112,7 @@ files:
 - lib/selene/alarm_builder.rb
 - lib/selene/calendar_builder.rb
 - lib/selene/component_builder.rb
-- lib/selene/component_rules.rb
+- lib/selene/component_errors.rb
 - lib/selene/daylight_savings_time_builder.rb
 - lib/selene/event_builder.rb
 - lib/selene/feed_builder.rb
@@ -89,8 +124,10 @@ files:
 - selene.gemspec
 - test/fixtures/meetup.ics
 - test/fixtures/meetup.json
+- test/helper.rb
 - test/selene/alarm_builder_test.rb
 - test/selene/calendar_builder_test.rb
+- test/selene/component_builder_test.rb
 - test/selene/daylight_savings_time_builder_test.rb
 - test/selene/event_builder_test.rb
 - test/selene/line_test.rb
@@ -99,39 +136,34 @@ files:
 - test/test_helper.rb
 homepage: https://github.com/allspiritseve/selene
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 500821961400754664
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 500821961400754664
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Selene is an iCalendar parser for Ruby
 test_files:
 - test/fixtures/meetup.ics
 - test/fixtures/meetup.json
+- test/helper.rb
 - test/selene/alarm_builder_test.rb
 - test/selene/calendar_builder_test.rb
+- test/selene/component_builder_test.rb
 - test/selene/daylight_savings_time_builder_test.rb
 - test/selene/event_builder_test.rb
 - test/selene/line_test.rb

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/lib/selene/component_rules.rb

@@ -1,38 +0,0 @@
-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