selene 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a94d8b8e9a90bf2658c322521edc6e6a89ccab65
-  data.tar.gz: d54aa750eab708bd7ea60ac21be9201073be09d0
+SHA256:
+  metadata.gz: a7327895d75318126155ef90f53ed6947798227f92066d61d82b38e9a7189d20
+  data.tar.gz: abd28599b4fdd3fd5d53f5b1dfe7797a6062421503ac9a1ef3939db97c7e355e
 SHA512:
-  metadata.gz: 525d85405335dcf90a579d1bde6d0a7c5472b96d91aa127606c0b81a19aabbc2cb2e33ab707201e884cb0d7a15c107616713f6c756a09d91763d7b2b1349529c
-  data.tar.gz: 70e1b7e2ce0a7651cb2c3526217107a53b092cc39dd9855d87d0358553615e56a038fe00c2ea40734aac2e3143e7a30ea9ad2c3b424b7bac261a462227a557e2
+  metadata.gz: 80738a49e57cb5346990d8c48598aea5234b46129839273d2ec10045c8fab4b246367b4ddff15ff98727f3548bee00957d66863d47ec76ce24235e24d1f432eb
+  data.tar.gz: efda1236b74295332b7d01e3f27b1c44cb5ee93ca5b6ce94783d1145bad094537fc4474a9c5941211ef0937e8126870e6a3658ebec2e3e2d07dc1500f6ee70cf

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Cory Kaufman-Schofield
+Copyright (c) 2012-2019 Cory Kaufman-Schofield
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/selene/component_builder.rb

@@ -1,37 +1,27 @@
+require 'selene/component_validator'
+
 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
+  # 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
-    class ParseError < StandardError; end
+    include ComponentValidator
 
-    @property_rules = {}
-
-    class << self
-      attr_accessor :property_rules
-    end
+    class ParseError < StandardError; end
 
     attr_accessor :component, :errors, :name, :parent
 
-    def self.property(name, rules = {})
-      property_rules[name] = rules
-    end
-
-    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 = Hash.new { |errors, property| errors[property] = [] }
+      @component = Hash.new { |h, k| h[k] = [] }
+      @errors = Hash.new { |h, k| h[k] = [] }
     end
 
     def add(name, builder)
@@ -87,44 +77,8 @@ module Selene
       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?
+    def contains?(property)
+      @component.key?(property)
     end
   end
 end

data/lib/selene/component_validator.rb

@@ -0,0 +1,64 @@
+module Selene
+  module ComponentValidator
+    module ClassMethods
+      def properties
+        @properties ||= Hash.new({})
+      end
+
+      def properties=(properties)
+        @properties = properties
+      end
+
+      def property(name, rules = {})
+        properties[name] = rules
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def self.inherited(subclass)
+      subclass.properties = properties
+    end
+
+    def properties
+      self.class.properties.keys
+    end
+
+    # Determine whether this property is required. Defauls to false.
+    def required?(property_name)
+      self.class.properties[property_name].fetch(:required, false)
+    end
+
+    # Determine whether this property can be set more than once. Defaults
+    # to true.
+    def multiple?(property_name)
+      self.class.properties[property_name].fetch(:multiple, true)
+    end
+
+    def can_contain?(property)
+      true
+    end
+
+    def can_add?(property)
+      if contains?(property.name) && !multiple?(property.name)
+        error(property.name, "property '%s' must not occur more than once" % property.name)
+      end
+      @errors.empty?
+    end
+
+    def error(property_name, message)
+      @errors[property_name] << message
+    end
+
+    def valid?
+      properties.select { |property_name| required?(property_name) }.each do |property_name|
+        if !contains?(property_name)
+          error(property_name, "missing required property '%s'" % property_name)
+        end
+      end
+      @errors.empty?
+    end
+  end
+end

data/lib/selene/event.rb

@@ -0,0 +1,28 @@
+module Selene
+  class Component
+    def initialize(properties = {})
+      @properties = properties
+    end
+
+    def to_h
+      @properties
+    end
+
+    def to_ical
+    end
+  end
+
+  class Event < Component
+    def initialize(properties = {})
+    end
+
+    def to_ical
+      lines = []
+      if @properties['exdate'] && @properties['exdate'].count > 0
+        exdate_values = @exdate.map { |time| time.strftime('%Y%m%dT%H%M%S') }
+        lines << "EXDATE;TZID=America/Detroit:#{exdate_values.join(',')}"
+      end
+      lines.join("\n")
+    end
+  end
+end

data/lib/selene/event_builder.rb

@@ -86,16 +86,16 @@ module Selene
     end
 
     def can_add?(property)
-      if property.name == 'dtend' && contains_property?('duration')
+      if property.name == 'dtend' && contains?('duration')
         error('dtend', "The 'dtend' property cannot be set if the 'duration' property already exists")
-      elsif property.name == 'duration' && contains_property?('dtend')
+      elsif property.name == 'duration' && contains?('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')
+      if !contains?('dtstart') && parent && !parent.contains?('method')
         error('dtstart', "The 'dtstart' property is required if the calendar does not have a 'method' property")
       end
       super

data/lib/selene/line.rb

@@ -17,15 +17,19 @@ module Selene
     PARAM_KEY_VALUE = /(?<key>[^=]+)=(?<value>.*)/
 
     # Split a string into content lines
-    def self.split(string)
-      delimiter = string.scan(/\r\n?|\n/).first || "\r\n"
-      string.gsub(/#{delimiter}\s/, '').split(delimiter).map { |line| parse(line) }
+    def self.split(string, &block)
+      separator = string.match(/\r\n|\r|\n/, &:to_s) || "\r\n"
+      string.gsub("#{separator}\s", '').split(separator).map do |line_string|
+        parse(line_string).tap do |line|
+          block.call(line) if line && block
+        end
+      end
     end
 
-    # 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], match[:value], parse_params(match[:params]))
+    # convert line string into line object
+    def self.parse(line_string)
+      line_string.match(/#{NAME}#{PARAMS}?:#{VALUE}/) do |match|
+        new(match[:name], match[:value], parse_params(match[:params]))
       end
     end
 

data/lib/selene/parser.rb

@@ -11,18 +11,22 @@ require 'selene/time_zone_builder'
 
 module Selene
   class Parser
-    def self.parse(string)
-      new(string).parse
+    def self.parse(data)
+      new(data).parse
     end
 
-    def initialize(string)
-      @string = string
+    def initialize(data)
+      @data = encode(data)
+    end
+
+    def encode(data)
+      data.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
     end
 
     def parse
       feed = FeedBuilder.new
       stack = [feed]
-      Line.split(@string).each do |line|
+      Line.split(@data) do |line|
         if line.begin_component?
           builder = create_builder(line.component_name)
           stack[-1].add(line.component_name, builder)

data/lib/selene/version.rb

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

data/test/selene/calendar_builder_test.rb

@@ -20,7 +20,7 @@ module Selene
       assert_equal builder.component['vtimezone'].first, { 'tzid' => 'America/Detroit' }
     end
 
-    # Test properties with :required => true
+    # Test properties with required: true
     %w(prodid version).each do |property|
       define_method "test_#{property}_required" do
         assert_required(CalendarBuilder.new, property)
@@ -33,6 +33,5 @@ module Selene
         assert_single(CalendarBuilder.new, property)
       end
     end
-
   end
 end

data/test/selene/component_builder_test.rb

@@ -4,7 +4,7 @@ module Selene
   class ComponentBuilderTest < MiniTest::Test
     def test_sets_property_rules
       ComponentBuilder.property :version, :required => true
-      assert_equal({ :required => true }, ComponentBuilder.property_rules[:version])
+      assert_equal({ :required => true }, ComponentBuilder.properties[:version])
     end
   end
 end

data/test/selene/line_test.rb

@@ -17,8 +17,8 @@ module Selene
     end
 
     def test_parses_params
-      assert_equal Line.parse('DTSTART;TZID=America/New_York:20130110T183000'),
-        Line.new('DTSTART', '20130110T183000', 'tzid' => 'America/New_York')
+      assert_equal Line.new('DTSTART', '20130110T183000', 'tzid' => 'America/New_York'),
+        Line.parse('DTSTART;TZID=America/New_York:20130110T183000')
     end
   end
 end

data/test/selene/parser_test.rb

@@ -7,17 +7,15 @@ module Selene
     include FixtureHelper
 
     def test_parses_blank_string
-      assert_equal Parser.parse(""), {}
+      assert_equal({}, Parser.parse(""))
     end
 
     def test_parses_simple_calendar
-      assert_equal Parser.parse("BEGIN:VCALENDAR\r\nSUMMARY:Meetups\r\nEND:VCALENDAR"),
-        { 'vcalendar' => [{ 'summary' => 'Meetups' }] }
+      assert_equal({ 'vcalendar' => [{ 'summary' => 'Meetups' }] }, Parser.parse("BEGIN:VCALENDAR\r\nSUMMARY:Meetups\r\nEND:VCALENDAR"))
     end
 
     def test_parses_meetup_calendar
-      assert_equal Parser.parse(fixture('meetup.ics')),
-        JSON.parse(fixture('meetup.json'))
+      assert_equal JSON.parse(fixture('meetup.json')), Parser.parse(fixture('meetup.ics'))
     end
 
     def test_contain_error

data/test/test_helper.rb

@@ -1,7 +1,8 @@
 require 'bundler/setup'
+require 'byebug'
 require 'minitest/autorun'
-require 'minitest/reporters'
 require 'minitest/mock'
+require 'minitest/reporters'
 require 'selene'
 
 Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new
@@ -34,9 +35,7 @@ module Selene
   end
 
   module BuilderTestHelper
-
     def assert_required builder, property
-      builder.valid?
       assert_error builder, property, "missing required property '#{property}'"
     end
 
@@ -49,6 +48,7 @@ module Selene
     end
 
     def assert_error builder, property, message
+      builder.valid?
       assert builder.errors[property].any? { |e| e =~ /#{message}/ }, "#{builder.class.name}: #{message}"
     end
   end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: selene
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Cory Kaufman-Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube
   requirement: !ruby/object:Gem::Requirement
     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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   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: rake
   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
   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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Selene is an iCalendar parser for Ruby
@@ -101,8 +101,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitattributes
-- .gitignore
+- ".gitattributes"
+- ".gitignore"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -113,7 +113,9 @@ files:
 - lib/selene/calendar_builder.rb
 - lib/selene/component_builder.rb
 - lib/selene/component_errors.rb
+- lib/selene/component_validator.rb
 - lib/selene/daylight_savings_time_builder.rb
+- lib/selene/event.rb
 - lib/selene/event_builder.rb
 - lib/selene/feed_builder.rb
 - lib/selene/line.rb
@@ -143,17 +145,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Selene is an iCalendar parser for Ruby