event_cal 1.3.0 → 2.0.0

data/lib/event_cal/calendar.rb

@@ -1,7 +1,7 @@
 require 'event_cal/event'
 
 class EventCal::Calendar
-  attr_accessor :base_date, :start_on, :end_on, :events, :owner
+  attr_accessor :base_date, :start_on, :end_on, :events, :owner, :priority_events, :only_events, :except_events
 
   def initialize(date = Date.today, options = {} )
     parse_initializer_arguments(date, options)
@@ -17,7 +17,20 @@ class EventCal::Calendar
   end
 
   def fetch_events
-    @events = ::EventCal::Event.subclasses.map { |klass|
+
+    subclasses = if @only_events.present?
+      if @priority_events.present?
+        @priority_events & @only_events
+      else
+        @only_events
+      end
+    elsif @except_events.present?
+      (@priority_events | ::EventCal::Event.subclasses) - @except_events
+    else
+      @priority_events | ::EventCal::Event.subclasses
+    end
+
+    @events = subclasses.map { |klass|
       klass.fetch_events(self)
       }.flatten
   end
@@ -44,11 +57,24 @@ class EventCal::Calendar
     end
 
     opts.each do |key, value|
-      if key == :owner
+      case key
+      when :owner
         @owner = value
-      else
-        #ignore other keys
+      when :priority_events
+        @priority_events = value
+      when :only_events
+        @only_events = value
+      when :except_events
+        @except_events = value
       end
     end
+
+    if  @only_events.present? & @except_events.present?
+      raise ArgumentError.new("initializing EventCal::Calendar : you passed :only_events and :except_events at once !")
+    end
+
+    @priority_events = [] if @priority_events.nil?
+    @only_events = [] if @only_events.nil?
+    @except_events = [] if @except_events.nil?
   end
 end

data/lib/event_cal/version.rb

@@ -1,3 +1,3 @@
 module EventCal
-  VERSION = "1.3.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: event_cal
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -257,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3055257193317479361
+      hash: -2032213371060263587
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3055257193317479361
+      hash: -2032213371060263587
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24