Add Podcast, update gems and ruby

phrug · Dec 16, 2014 · e667c4a · e667c4a
1 parent ea49ffb
commit e667c4a
Show file tree

Hide file tree

Showing 7 changed files with 142 additions and 38 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.1.1
+2.1.5
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.2.8)
     actionmailer (4.1.7)
       actionpack (= 4.1.7)
       actionview (= 4.1.7)
@@ -78,46 +79,78 @@ GEM
       launchy (~> 2.1)
       mail (~> 2.2)
     erubis (2.7.0)
-    excon (0.41.0)
+    excon (0.42.1)
     execjs (2.2.2)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
     ffi (1.9.6)
-    fog (1.24.0)
-      fog-brightbox
-      fog-core (~> 1.23)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.26.0)
+      fog-atmos
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.27, >= 1.27.1)
+      fog-ecloud
       fog-json
+      fog-profitbricks
       fog-radosgw (>= 0.0.2)
       fog-sakuracloud (>= 0.0.4)
       fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-    fog-brightbox (0.6.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-brightbox (0.7.1)
       fog-core (~> 1.22)
       fog-json
-      inflecto
-    fog-core (1.24.0)
+      inflecto (~> 0.0.2)
+    fog-core (1.27.1)
       builder
       excon (~> 0.38)
       formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
+    fog-ecloud (0.0.2)
+      fog-core
+      fog-xml
     fog-json (1.0.0)
       multi_json (~> 1.0)
+    fog-profitbricks (0.0.1)
+      fog-core
+      fog-xml
+      nokogiri
     fog-radosgw (0.0.3)
       fog-core (>= 1.21.0)
       fog-json
       fog-xml (>= 0.0.1)
     fog-sakuracloud (0.1.1)
       fog-core
       fog-json
-    fog-softlayer (0.3.24)
+    fog-softlayer (0.3.25)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.0)
       fog-core
       fog-json
+    fog-terremark (0.0.3)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.0.1)
+      fission
+      fog-core
+    fog-voxel (0.0.2)
+      fog-core
+      fog-xml
     fog-xml (0.1.1)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
@@ -128,42 +161,54 @@ GEM
       activerecord (>= 4.0.0)
     gmaps4rails (2.1.2)
     growl (1.0.3)
-    guard (2.8.2)
+    guard (2.10.3)
       formatador (>= 0.2.4)
       listen (~> 2.7)
       lumberjack (~> 1.0)
+      nenv (~> 0.1)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-bundler (2.0.0)
+    guard-bundler (2.1.0)
       bundler (~> 1.0)
       guard (~> 2.2)
+      guard-compat (~> 1.1)
+    guard-compat (1.1.0)
     guard-puma (0.3.1)
       guard (~> 2.8)
       puma
-    guard-rspec (4.3.1)
+    guard-rspec (4.5.0)
       guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
-    guard-spork (1.5.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    guard-spork (2.1.0)
       childprocess (>= 0.2.3)
-      guard (>= 1.1)
+      guard (~> 2.0)
+      guard-compat (~> 1.0)
       spork (>= 0.8.4)
-    haml (4.0.5)
+    haml (4.1.0.beta.1)
       tilt
-    haml-rails (0.5.3)
+    haml-rails (0.6.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
+      html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hike (1.2.3)
     hitimes (1.2.2)
+    hpricot (0.8.6)
+    html2haml (1.0.1)
+      erubis (~> 2.7.0)
+      haml (>= 4.0.0.rc.1)
+      hpricot (~> 0.8.6)
+      ruby_parser (~> 3.1.1)
     i18n (0.6.11)
-    icalendar (2.2.0)
+    icalendar (2.2.1)
     inflecto (0.0.2)
     ipaddress (0.8.0)
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.2)
+    jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
     json (1.8.1)
     kaminari (0.16.1)
@@ -173,7 +218,7 @@ GEM
       addressable (~> 2.3)
     libnotify (0.8.4)
       ffi (>= 1.0.11)
-    listen (2.7.12)
+    listen (2.8.3)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -192,13 +237,14 @@ GEM
       open4 (~> 1.3.4)
       rake
     mini_portile (0.6.1)
-    minitest (5.4.3)
+    minitest (5.5.0)
     multi_json (1.10.1)
+    nenv (0.1.1)
     nested_form (0.3.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     open4 (1.3.4)
     orm_adapter (0.5.0)
@@ -248,11 +294,11 @@ GEM
       activesupport (= 4.1.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.2.0)
+    redcarpet (3.2.2)
     remotipart (1.2.1)
     responders (1.1.2)
       railties (>= 3.2, < 4.2)
@@ -276,20 +322,23 @@ GEM
       rspec-mocks (~> 3.1.0)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
+    ruby_parser (3.1.3)
+      sexp_processor (~> 4.1)
     safe_yaml (1.0.4)
     sass (3.2.19)
-    sass-rails (4.0.4)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
+      sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
+    sexp_processor (4.4.4)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
     shoulda-context (1.2.1)
     shoulda-matchers (2.7.0)
       activesupport (>= 3.0.0)
-    simple_form (3.0.2)
+    simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
     simplecov (0.9.1)
@@ -301,13 +350,13 @@ GEM
       builder
     slop (3.6.0)
     spork (0.9.2)
-    spring (1.1.3)
-    sprockets (2.11.3)
+    spring (1.2.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -320,7 +369,7 @@ GEM
       hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.6.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     underscore-rails (1.7.0)

diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
@@ -29,7 +29,7 @@
 
 .front-columns {
   text-align: center;
-  .col-md-4 {
+  .col-md-6 {
     p {
       font-size: 16px;
       line-height: 1.5;

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -24,6 +24,7 @@
         .navbar-collapse.collapse
           %ul.nav.navbar-nav
             %li{ :class => (controller_name == "events" ? "active" : "") }= link_to "Events", events_url
+            %li{ :class => (action_name == "podcasts" ? "active" : "") }= link_to "Podcasts", podcasts_url
             %li{ :class => (controller_name == "users" ? "active" : "") }= link_to "Users", users_url
             %li{ :class => (action_name == "learn" ? "active" : "") }= link_to "Learn Ruby", learn_url
           = form_tag search_path, method: :get, class: "navbar-form navbar-right" do

diff --git a/app/views/pages/index.html.haml b/app/views/pages/index.html.haml
@@ -13,8 +13,7 @@
   = link_to "Visit the official site for more details.", "http://rubyconf.ph"
 
 .row.front-columns
-
-  .col-md-4
+  .col-md-6
     %h2 Know the local scene
     %p 
       Want to know who uses Ruby in the Philippines? Connect with the community via:
@@ -37,18 +36,24 @@
         = link_to "https://groups.google.com/forum/#!forum/ruby-phil" do
           %span.fa.fa-envelope
           Google Group
-
-  .col-md-4
+  .col-md-6
     %h2 Join our meetups
     %p We hold meetups every third Thursday of the month. 
     %p There we talk about all things related to Ruby and Rails, network over pizza, and afterwards we go out for a drink.
     %p 
       Our next meetup is on
       %strong= next_meetup(@next_meetup)
     %p= link_to "Find out more about our events", events_url, :class => "btn btn-default btn-lg"
-
-  .col-md-4
+
+.row.front-columns
+  .col-md-6
+    %h2 Listen to the podcasts
+    %p Traffic preventing you from joining the meetups?
+    %p We're experimenting on having a podcast every two weeks.
+    %p= link_to "Find out more about our podcasts", podcasts_url, :class => "btn btn-default btn-lg"
+  .col-md-6
     %h2 Learn Ruby and Rails
     %p Want to learn Ruby and Rails but don't know which among the many online resources out there are actually good? 
     %p= link_to "We've got you covered.", learn_url, :class => "btn btn-default btn-lg"
+
 
diff --git a/app/views/pages/podcasts.html.haml b/app/views/pages/podcasts.html.haml
@@ -0,0 +1,48 @@
+- build_meta_tags title: "Podcasts"
+
+%h1 Podcasts
+
+%h3 Next Podcast - Episode 004
+
+%p
+  2014-12-17 8:00pm - 9:00pm PHT
+
+%p
+  Part 2 of the Rails controllers talk
+  %a{ href: "https://plus.google.com/events/caubgjjhkmo11efo0vra6kevd0g" } Join the podcast here.
+
+%h2 Archive
+
+%h3 Episode 001: Remote Work (2014-11-06)
+
+%p Every two weeks, members of the Philippine Ruby Users Group discuss topics on Ruby and software development. This week, they discuss tips and tricks on doing remote work.
+
+%p
+  %a{ href: "https://archive.org/details/phrug-podcast-episode-001-remote-work" }
+    %span.glyphicon.glyphicon-play
+    Listen at Archive.org
+
+%h3 Episode 002: Functional Programming (2014-11-21)
+
+%p Every two weeks, members of the Philippine Ruby Users Group discuss topics on Ruby and software development. This week they cover Arne Brasseus's "Functional programming for Rubyists" talk at Arrr Camp 2014.
+
+%p
+  %a{ href: "https://archive.org/details/phrug-podcast-episode-002-functional-programming_official" }
+    %span.glyphicon.glyphicon-play
+    Listen at Archive.org
+
+%h3 Episode 003 (2014-12-11)
+
+%p Rails controllers have been called the sweaty armpit of every Rails application. In the next episode, we'll discuss ways to keep your controllers clean and fresh. Some techniques we can cover are 
+
+%ul
+  %li Service objects and other POROs
+  %li Resource routes
+  %li instance variables versus helper methods
+  %li decent_exposure and other controller-related gems
+  %li Alternative Rails architectures
+
+%p
+  %a{ href: "https://www.youtube.com/watch?v=_anpnqErqPE" }
+    %span.glyphicon.glyphicon-film
+    Watch at YouTube
diff --git a/config/routes.rb b/config/routes.rb
@@ -12,5 +12,6 @@
 
   root :to => "pages#index"
   get "/learn", :to => "pages#learn", :as => 'learn'
+  get "/podcasts", :to => "pages#podcasts", :as => 'podcasts'
 
 end