tb_events 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzAxNDliNzk5MTIzZjVjNDAwYzc5Y2M4NTRiNzFjMTg4YWQ2ZWJiYg==
+    ZmMyNDc4N2IzN2I4NWVlYTlkNTM5ODM3NTQ0YTVkY2ZiZjFhYWE3NA==
   data.tar.gz: !binary |-
-    ZjYzYTc4MTQ5ZWFkOGQ4ODUwNGY0YzEyYWU2MTgwNzQ0ZTMxOTFkNA==
+    NDgzMTViOGY5MjNkMGI1Zjg3ZDBjZDU4Y2M4ZjZiZWQwZTU5YzFkOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmJlMzgyYzZkZWEzYjliZWIzYmNkMDhlMzQwMjVlMjc4OTNhZjcxYTI2NzMz
-    NWQ3MWMzNTQ1MWFjZjQ1OGNmNjZlNWUwZjNiOGZlZGI2MjdiOWNkYTUxOWY0
-    ZGE5NTU1NTRjNTViYjMyZGY4MjhiNWFmODA3NzM2OTRkYTViNGU=
+    ZDAzOWU5ZDIwNDY1NDVkNWQ0ZDg2MzliYjA0Yjg0NzgxNWIxN2RiNDhlMzI5
+    Y2M2ODk2ODA4Yjg2ODg1OTk3OTc0ZTVjMjIyNTNkNWQ4MzQ1ZTY0YzhhZDNl
+    NmIxNzc4MTdmMTJjOTRlZjYyNzI3YmQ2N2Y3Njk1MzhjOGJjMWE=
   data.tar.gz: !binary |-
-    MjdkZWFlM2Q3ZjIxMjkxMTc0NDNmZGFlMzU2ZTdiMTFhMzVjMDk2NjVmY2Ux
-    ZDlhY2IyMjY0MjQwZmMwNjk4MmY2NGQwNGYwMDkzMGRjYTNmYzExMzJjMGVj
-    ZDY4NDNhNzk3MzEwNjI1Yzg4ZDI5ZTk1NTFhYzk2OGU3MGMxNDQ=
+    MzdhZWI5Yzk2NWY3ZmUyOGU5ZjNjMjliMDk3NjlhZGM0ZTU0Njk2YzBlYTA2
+    NGU5ZWYzOTM2ODEzZGM5MGQwYWUxZjZkNjQ0ZTU3NWU3NzVkN2IzNTgwM2Q4
+    NTg1NGM1NTExNDlkY2ZkODUzYTk5OTE0ZGI5Njg0ZDA1ZDg2ZDE=

data/app/helpers/calendars_helper.rb

@@ -17,9 +17,7 @@ module CalendarsHelper
     options = args.last.is_a?(Hash) ? args.pop : {}
     html_options = options[:html]
     builder = options[:builder] || Spud::Events::CalendarBuilder
-    calendar = options[:calendar] || Spud::Events::Calendar
-
-    content = with_output_buffer{block.call(builder.new(objects||[], self, calendar, options))}
+    content = with_output_buffer{block.call(builder.new(objects||[], self, options))}
     self.content_tag(:table, content, html_options, false)
   end
 

data/app/models/spud_calendar_event.rb

@@ -8,4 +8,14 @@ class SpudCalendarEvent < ActiveRecord::Base
     where(["spud_calendar_events.start_at <= ? AND spud_calendar_events.start_at >= ?", month.end_of_month, month.beginning_of_month])
   end
 
+  def days_span
+    return (end_at.to_date - start_at.to_date).to_i + 1
+  end
+
+  def falls_on?(day)
+    start_date = start_at.beginning_of_day.to_date
+    end_date = end_at.end_of_day.to_date
+    return day >= start_date && day <= end_date
+  end
+
 end

data/app/views/spud/admin/calendar_events/_calendar.html.erb

@@ -7,7 +7,7 @@
     <div class="spud_events_admin_calendar_date_container">
         <%= content_tag :span, day.day, :class => (tasks.count > 0 ? "spud_events_admin_calendar_date spud_events_admin_calendar_date_active" : "spud_events_admin_calendar_date") %>
     <% tasks.each do |task| %>
-      <%= link_to task.title[0,25], edit_spud_admin_calendar_event_path(task.id), :class => "spud_events_admin_calendar_event_marker spud_events_calendar_event_#{task.spud_calendar_id}", :style => "background-color: \##{task.spud_calendar.color}; color:\##{calendar_fore_color(task.spud_calendar.color)}" %>
+      <%= link_to truncate(task.title, :length => 25), edit_spud_admin_calendar_event_path(task.id), :class => "spud_events_admin_calendar_event_marker spud_events_calendar_event_#{task.spud_calendar_id}", :style => "background-color: \##{task.spud_calendar.color}; color:\##{calendar_fore_color(task.spud_calendar.color)}" %>
     <% end %>
     </div>
   <% end %>

data/lib/spud/events/calendar.rb

@@ -0,0 +1,85 @@
+module Spud
+  module Events
+    class Calendar
+      attr_accessor :first_weekday, :last_weekday, :month
+
+      def initialize(options={})
+        @year = options[:year] || Time.now.year
+        @month = options[:month] || Time.now.month
+        @first_day_of_week = options[:first_day_of_week] || 0
+        @first_weekday = first_day_of_week(@first_day_of_week)
+        @last_weekday = last_day_of_week(@first_day_of_week)
+        @first = Date.civil(@year, @month, 1)
+        @last = Date.civil(@year, @month, -1)           
+      end
+    
+      def each_day
+        first_day.upto(last_day) do |day|
+          yield(day)
+        end
+      end
+    
+      def last_day
+        last = @last
+        while(last.wday % 7 != @last_weekday % 7)
+          last = last.next
+        end   
+        last
+      end
+    
+      def first_day
+        first = @first - 6
+        while(first.wday % 7 != (@first_weekday) % 7)
+          first = first.next
+        end
+        first
+      end
+    
+      def objects_for_days(objects, day_method, end_method)
+        unless @objects_for_days
+          @objects_for_days = {}
+          days.each do |day|
+            tasks = []
+            objects.each do |object|
+              start_date = object.send(day_method.to_sym).beginning_of_day.to_date
+              end_date = object.send(end_method.to_sym).end_of_day.to_date
+              if day >= start_date && day <= end_date
+                tasks.push(object)
+              end
+            end
+            @objects_for_days[day.strftime("%Y-%m-%d")] = [day, tasks]
+          end
+        end
+        @objects_for_days
+      end
+    
+      def days
+        unless @days
+          @days = []
+          each_day{|day| @days << day} 
+        end
+        @days     
+      end    
+    
+      def mjdays
+        unless @mjdays
+          @mdays = []
+          each_day{|day| @days << day} 
+        end
+        @days     
+      end    
+    
+      def first_day_of_week(day)
+        day
+      end
+    
+      def last_day_of_week(day)
+        if day > 0
+          day - 1
+        else
+          6
+        end
+      end    
+    end
+  end
+end

data/lib/spud/events/calendar_builder.rb

@@ -0,0 +1,58 @@
+module Spud
+  module Events
+    class CalendarBuilder < Spud::Events::TableBuilder
+
+      def initialize(objects, template, options)
+        super(objects, template, options)
+        @calendar = Spud::Events::Calendar.new(options)
+        @today = options[:today] || Time.now
+      end    
+                
+      def day(*args,&block)
+          raise ArgumentError, "Missing block" unless block_given?
+          options = options_from_hash(args)
+          day_method = options.delete(:day_method) || :start_at
+          end_method = options.delete(:end_method) || :end_at
+          id_pattern = options.delete(:id)
+          activity_class = options.delete(:activity)
+          output = ""
+          @calendar.objects_for_days(@objects, day_method, end_method).to_a.sort{|a1, a2| a1.first <=> a2.first }.each do |o|
+              key, array = o
+              day, objects = array
+            
+              output << @template.tag(:tr,options,true) if (day.wday ==  @calendar.first_weekday)
+              output << @template.tag(:td,td_options(day, id_pattern, (objects.empty? ? nil: activity_class)), true)
+              output << @template.with_output_buffer{block.call(day, objects)}
+              output << '</td>'
+              output << '</tr>' if (day.wday ==  @calendar.last_weekday)
+          end
+          @template.content_tag(:tbody, output.html_safe, {}, false)  
+      end
+            
+      private
+            
+      def objects_for_days
+        @calendar.objects_for_days(@objects)
+      end
+                
+      def td_options(day, id_pattern, activity_class)
+        options = {}
+        if(day.strftime("%Y-%m-%d") ==  @today.strftime("%Y-%m-%d"))
+          options[:class] = 'today'
+        elsif(day.month != @calendar.month)
+          options[:class] = 'notmonth'
+        elsif(day.wday == 0 or day.wday == 6)
+          options[:class] = 'weekend'
+        elsif activity_class
+          options[:class] = activity_class
+        end
+        if id_pattern
+          options[:id] = day.strftime(id_pattern)
+        end
+            
+        options
+      end
+            
+    end
+  end
+end

data/lib/{spud_events → spud/events}/engine.rb

@@ -2,30 +2,25 @@ require 'tb_core'
 
 module Spud
 	module Events
-		 class Engine < Rails::Engine
+    class Engine < Rails::Engine
 			engine_name :tb_events
 
-			def self.require_model(model_name)
-        require "#{root}/app/models/#{model_name}"
-      end
+      config.autoload_paths << File.expand_path("../../..", __FILE__)
 
-      def self.require_controller(controller_name)
-        require "#{root}/app/controllers/#{controller_name}"
-      end
 			initializer :admin do
 				Spud::Core.configure do |config|
 				  config.admin_applications += [{:name => "Events", :thumbnail => "spud/admin/events_thumb.png", :url => "/spud/admin/events",:order => 10}]
 				end
 			end
+
 			initializer :assets do |config|
         Spud::Core.append_admin_javascripts('spud/admin/events')
         Spud::Core.append_admin_stylesheets('spud/admin/events')
-
 				Rails.application.config.assets.precompile += [
           "spud/events.*",
           "spud/admin/events.*"
 				]
-			 end
-		 end
+			end
+    end
 	end
 end

data/lib/{spud_events → spud/events}/table_builder.rb

@@ -14,7 +14,7 @@ module Spud
         else        
           @num_of_columns = args.size
           content = args.collect do |c|
-              @template.content_tag(:th,c)
+            @template.content_tag(:th, c)
           end.join("\n").html_safe
           @template.content_tag(:thead, @template.content_tag(:tr,content,{},false))
         end

data/lib/{spud_events → spud/events}/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Events
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
-end
+end

data/lib/tb_events.rb

@@ -1,8 +1,6 @@
 module Spud
 	module Events
-		require 'spud_events/configuration'
-		require 'spud_events/engine' if defined?(Rails)
-    require 'spud_events/table_builder'
-    require 'spud_events/calendar_builder'
+		require 'spud/events/configuration'
+		require 'spud/events/engine' if defined?(Rails)
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_events
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -224,11 +224,12 @@ files:
 - db/migrate/20120216191833_create_spud_calendars.rb
 - db/migrate/20120216192531_create_spud_calendar_events.rb
 - db/migrate/20130214131628_add_location_to_spud_calendar_event.rb
-- lib/spud_events/calendar_builder.rb
-- lib/spud_events/configuration.rb
-- lib/spud_events/engine.rb
-- lib/spud_events/table_builder.rb
-- lib/spud_events/version.rb
+- lib/spud/events/calendar.rb
+- lib/spud/events/calendar_builder.rb
+- lib/spud/events/configuration.rb
+- lib/spud/events/engine.rb
+- lib/spud/events/table_builder.rb
+- lib/spud/events/version.rb
 - lib/tb_events.rb
 - Rakefile
 - README.md
@@ -251,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Twice Baked Events engine

data/lib/spud_events/calendar_builder.rb

@@ -1,133 +0,0 @@
-module Spud
-  module Events
-    class CalendarBuilder < Spud::Events::TableBuilder
-      def initialize(objects, template, calendar, options)
-        super(objects, template, options)
-        @calendar = calendar.new(options)
-        @today = options[:today] || Time.now
-      end    
-                
-      def day(*args,&block)
-          raise ArgumentError, "Missing block" unless block_given?
-          options = options_from_hash(args)
-          day_method = options.delete(:day_method) || :start_at
-          id_pattern = options.delete(:id)
-          activity_class = options.delete(:activity)
-          output = ""
-          @calendar.objects_for_days(@objects, day_method).to_a.sort{|a1, a2| a1.first <=> a2.first }.each do |o|
-              key, array = o
-              day, objects = array
-            
-              output << @template.tag(:tr,options,true) if (day.wday ==  @calendar.first_weekday)
-              output << @template.tag(:td,td_options(day, id_pattern, (objects.empty? ? nil: activity_class)), true)
-              output << @template.with_output_buffer{block.call(day, objects)}
-              output << '</td>'
-              output << '</tr>' if (day.wday ==  @calendar.last_weekday)
-          end
-          @template.content_tag(:tbody, output.html_safe, {}, false)  
-      end
-            
-      private
-            
-      def objects_for_days
-        @calendar.objects_for_days(@objects)
-      end
-                
-      def td_options(day, id_pattern, activity_class)
-        options = {}
-        if(day.strftime("%Y-%m-%d") ==  @today.strftime("%Y-%m-%d"))
-          options[:class] = 'today'
-        elsif(day.month != @calendar.month)
-          options[:class] = 'notmonth'
-        elsif(day.wday == 0 or day.wday == 6)
-          options[:class] = 'weekend'
-        elsif activity_class
-          options[:class] = activity_class
-        end
-        if id_pattern
-          options[:id] = day.strftime(id_pattern)
-        end
-            
-        options
-      end
-            
-    end
-
-    class Calendar
-      attr_accessor :first_weekday, :last_weekday, :month
-      def initialize(options={})
-        @year = options[:year] || Time.now.year
-        @month = options[:month] || Time.now.month
-        @first_day_of_week = options[:first_day_of_week] || 0
-        @first_weekday = first_day_of_week(@first_day_of_week)
-        @last_weekday = last_day_of_week(@first_day_of_week)
-        @first = Date.civil(@year, @month, 1)
-        @last = Date.civil(@year, @month, -1)           
-      end
-    
-      def each_day
-        first_day.upto(last_day) do |day|
-          yield(day)
-        end
-      end
-    
-      def last_day
-        last = @last
-        while(last.wday % 7 != @last_weekday % 7)
-          last = last.next
-        end   
-        last
-      end
-    
-      def first_day
-        first = @first - 6
-        while(first.wday % 7 != (@first_weekday) % 7)
-          first = first.next
-        end
-        first
-      end      
-    
-      def objects_for_days(objects, day_method)
-        unless @objects_for_days
-          @objects_for_days = {}
-          days.each{|day| @objects_for_days[day.strftime("%Y-%m-%d")] = [day, []]}
-          objects.each do |o|
-            date = o.send(day_method.to_sym).strftime("%Y-%m-%d")
-            if @objects_for_days[date]
-              @objects_for_days[date][1] << o
-            end
-          end
-        end
-        @objects_for_days
-      end
-    
-      def days
-        unless @days
-          @days = []
-          each_day{|day| @days << day} 
-        end
-        @days     
-      end    
-    
-      def mjdays
-        unless @mjdays
-          @mdays = []
-          each_day{|day| @days << day} 
-        end
-        @days     
-      end    
-    
-      def first_day_of_week(day)
-        day
-      end
-    
-      def last_day_of_week(day)
-        if day > 0
-          day - 1
-        else
-          6
-        end
-      end    
-    end
-  end
-end