Woo upgraded to Ruby 2.5.3

Author: Joel Courtney

.gitignore

@@ -0,0 +1,51 @@
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+/.sass-cache/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc

Gemfile

@@ -0,0 +1,10 @@
+ruby '2.5.3'
+
+source 'https://rubygems.org' do
+  gem 'coffee-script'
+  gem 'haml'
+  gem 'linguistics'
+  gem 'rack'
+  gem 'sass'
+  gem 'sinatra'
+end

Gemfile.lock

@@ -0,0 +1,51 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    execjs (2.7.0)
+    ffi (1.9.25)
+    haml (5.0.4)
+      temple (>= 0.8.0)
+      tilt
+    linguistics (2.1.0)
+      loggability (~> 0.11)
+    loggability (0.14.0)
+    mustermann (1.0.3)
+    rack (2.0.6)
+    rack-protection (2.0.4)
+      rack
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    sass (3.7.2)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sinatra (2.0.4)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.4)
+      tilt (~> 2.0)
+    temple (0.8.0)
+    tilt (2.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coffee-script!
+  haml!
+  linguistics!
+  rack!
+  sass!
+  sinatra!
+
+RUBY VERSION
+   ruby 2.5.3p105
+
+BUNDLED WITH
+   1.17.1

config.ru

@@ -1,2 +1,3 @@
-require 'jmc_calendar'
-run Sinatra::Application
+require_relative './jmc_calendar'
+
+run Sinatra::Application

jmc_calendar.rb

@@ -2,7 +2,7 @@
 require 'sinatra'
 
 require 'haml'
-  set :haml, :format => :html5
+  set :haml, format: :html5
 require 'sass'
 require 'coffee-script'
 
@@ -28,14 +28,14 @@
     @start = Date.new(@today.year,@today.month-1,1)
   end
   @end = @start>>(12)
-  
+
   haml :index
 end
 
 # ----------------------------------
 # Year - calendar for a particular year
 # ----------------------------------
-get %r{/(\d+)$} do
+get %r{\/(\d+)} do
   # TODO: use of GMT over server timezone; Localised timezone support
   params[:tz] ||= 0
   # /TODO

views/annual.haml

@@ -27,29 +27,29 @@
 			- for month_number in 1..12
 				- last_day = Date.parse("#{@year+1}-01-01")
 				- last_day = Date.parse("#{@year}-#{month_number + 1}-01") if month_number < 12
-				%li{:class => " month #{'past' if last_day < today } #{'current' if last_day == today } #{'future' if last_day >  today }" }
+				%li{class: " month #{'past' if last_day < today } #{'current' if last_day == today } #{'future' if last_day >  today }" }
 					%dl
-						%dt{:class => " month #{'past' if last_day <  today } #{'current' if last_day == today } #{'future' if last_day >  today }" }
+						%dt{class: " month #{'past' if last_day <  today } #{'current' if last_day == today } #{'future' if last_day >  today }" }
 							= Date.parse("#{@year}-#{month_number}-01").strftime('%B')
 						- # While this is the same month
 						- for day in 1..(Date.new(@year,12,31)<<(12-month_number)).day
 							- d = Date.parse("#{@year}-#{month_number}-#{day}")
-							%dd{:class => " day #{'past' if d < today } #{'current' if d == today } #{'future' if d > today } commercial-day-#{d.cwday} #{ 'fifteen' if day == 15 } #{'row-1' if day <= 15} #{'row-2' if day > 15}", :title => d.strftime }
+							%dd{class: " day #{'past' if d < today } #{'current' if d == today } #{'future' if d > today } commercial-day-#{d.cwday} #{ 'fifteen' if day == 15 } #{'row-1' if day <= 15} #{'row-2' if day > 15}", title: d.strftime }
 								= d.strftime('%e')
 								%span.overlay &middot;
 		.navigation
 			.column.span-3
 				.prev
-					%a{ :href => "/#{@year-1}"}
+					%a{ href: "/#{@year-1}"}
 						= "&larr; #{@year-1}"
 			.coumn.span-12
 				.content
 					A collaboration between
-					%a{ :href => "http://pecorarodesign.com/" } Stephen Pecoraro
+					%a{ href: "http://pecorarodesign.com/" } Stephen Pecoraro
 					and
-					%a{ :href => "http://euphemize.net/" } Joel Courtney
+					%a{ href: "http://euphemize.net/" } Joel Courtney
 					\.
 			.column.span-3.last
 				.next
-					%a{ :href => "/#{@year+1}"}
-						= "#{@year+1} &rarr;"
+					%a{ href: "/#{@year+1}"}
+						= "#{@year+1} &rarr;"

views/index.haml

@@ -21,35 +21,35 @@
 		.hidden
 			= @year
 	.column.span-18.last
-		%ol{ :style => "counter-reset: item #{@start.month - 1}" }
+			%ol{ style: "counter-reset: item #{@start.month - 1}" }
 			- day = @start
 			- while ( day >= @start && day < @end )
 				- last_day = Date.new(day.year, day.month, (Date.new(day.year,12,31)<<(12-day.month)).day)
 				- if day.day == 1
-					%li{ :class => " month #{'past' if ( last_day < @today ) } #{'current' if last_day == @today } #{'future' if last_day > @today }", :style => "#{ 'counter-reset: item 0' if day.year != @start.year && day.month == 1 }" }
+					%li{ class: " month #{'past' if ( last_day < @today ) } #{'current' if last_day == @today } #{'future' if last_day > @today }", style: "#{ 'counter-reset: item 0' if day.year != @start.year && day.month == 1 }" }
 						%dl
-							%dt{:class => " month #{'past' if last_day <  @today } #{'current' if last_day == @today } #{'future' if last_day > @today }" }
+							%dt{class: " month #{'past' if last_day <  @today } #{'current' if last_day == @today } #{'future' if last_day > @today }" }
 								= day.strftime('%B')
 							- while ( day <= last_day )
 								- # While this is the same month
-								%dd{:class => " day #{'past' if day < @today } #{'current' if day == @today } #{'future' if day > @today } commercial-day-#{day.cwday} #{ 'fifteen' if day.day == 15 } #{'row-1' if day.day <= 15} #{'row-2' if day.day > 15}", :title => day.strftime }
+								%dd{class: " day #{'past' if day < @today } #{'current' if day == @today } #{'future' if day > @today } commercial-day-#{day.cwday} #{ 'fifteen' if day.day == 15 } #{'row-1' if day.day <= 15} #{'row-2' if day.day > 15}", title: day.strftime }
 									= day.strftime('%e')
 									%span.overlay &middot;
 								- day = day.next()
 
 		.navigation
 			.column.span-3
 				.prev
-					%a{ :href => "/#{@year}"}
+					%a{ href: "/#{@year}"}
 						= "&larr; #{@year}"
 			.coumn.span-12
 				.content
 					A collaboration between
-					%a{ :href => "http://pecorarodesign.com/" } Stephen Pecoraro
+					%a{ href: "https://www.behance.net/specoraro" } Stephen Pecoraro
 					and
-					%a{ :href => "http://euphemize.net/" } Joel Courtney
+					%a{ href: "https://github.com/jufemaiz" } Joel Courtney
 					\.
 			.column.span-3.last
 				.next
-					%a{ :href => "/#{@year+1}"}
-						= "#{@year+1} &rarr;"
+					%a{ href: "/#{@year+1}"}
+						= "#{@year+1} &rarr;"

views/layout.haml

@@ -3,22 +3,22 @@
 	%head
 		%title
 			= "#{@year} Calendar"
-		
+
 		%meta(http-equiv="content-type" content="html/text; charset=utf-8")
-		%meta{:charset => 'utf-8'}
+		%meta{charset: 'utf-8'}
 		%meta(name="MSSmartTagsPreventParsing" content="true")
 		%meta(name="robots" content="noindex, nofollow")
 		%meta(name="description" content="A cute little calendar")
 		%meta(name="keywords" content="2011 Calendar")
 		%meta(name="author" content="Joel Courtney, http://euphemize.net")
 		%meta(name="author" content="Stephen Pecoraro, http://pecorarodesign.com/")
-		
-		%link{ :type => 'text/css', :rel => 'stylesheet', :media => 'screen,handheld,projection', :title => 'standard', :href => '/css/blueprint/screen.css' }
-		%link{ :type => 'text/css', :rel => 'stylesheet', :media => 'screen,handheld,projection', :title => 'standard', :href => '/css/styles.css' }
 
-		%script{ :type => "text/javascript", :src => "/js/jquery/jquery.min.js" }
+		%link{ type: 'text/css', rel: 'stylesheet', media: 'screen,handheld,projection', title: 'standard', href: '/css/blueprint/screen.css' }
+		%link{ type: 'text/css', rel: 'stylesheet', media: 'screen,handheld,projection', title: 'standard', href: '/css/styles.css' }
+
+		%script{ type: "text/javascript", src: "/js/jquery/jquery.min.js" }
 
-		%script{ :type => "text/javascript", :src => "/js/test.coffee.js"}
+		%script{ type: "text/javascript", src: "/js/test.coffee.js"}
 
 		%body.home
 
@@ -32,13 +32,13 @@
 			<!-- Footer -->
 			#footer
 				.container
-					&copy 2010 - 
+					&copy 2010 -
 					= Time.now.year
-					%a{ :href => "http://euphemize.net/" }
+					%a{ href: "http://euphemize.net/" }
 						Joel Courtney
 					&amp;
-					%a{ :href => "http://pecorarodesign.com/" }
+					%a{ href: "http://pecorarodesign.com/" }
 						Stephen Pecoraro
-					
-			
-			<script type="text/javascript"> var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-113700-16']); _gaq.push(['_trackPageview']); (function() { var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); </script>
+
+
+			<script type="text/javascript"> var _gaq = _gaq || []; _gaq.push(['_setAccount', 'UA-113700-16']); _gaq.push(['_trackPageview']); (function() { var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); </script>