isitopencoffeetomorrow 0.1.0 → 0.2.0

data/Gemfile

@@ -17,7 +17,7 @@ gem 'foreman'
 group :development do
   gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.0"
+  gem "bundler", "~> 1.2"
   gem "jeweler", "~> 1.8.4"
   gem "simplecov", ">= 0"
 end

data/README.md

@@ -0,0 +1,33 @@
+Is It Open Coffee Tomorrow?
+===========================
+
+What is this?
+-------------
+
+A simple, embedded sinatra util-a-joke app to show when an Open Coffee event is
+happening.
+
+How?
+----
+
+To see a real usage visit https://github.com/ecoffey/isitbocctomorrow
+
+The app assumes that the Open Coffee event happens every two weeks, but
+lets you configure the seed date, hash tag, official site, and time
+zone.
+
+Deploy To Heroku
+----------------
+
+```
+$ mkdir my-shiny-util-a-joke-app && cd my-shiny-util-a-joke-app
+$ gem install heroku
+$ heroku login
+$ heroku create
+$ echo -e "source :rubygems\n\ngem 'isitopencoffeetomorrow'"
+$ bundle
+$ git init
+$ git add .
+$ git commit -m 'Yay util-a-joke!'
+$ git push heroku master
+```

data/README.rdoc

@@ -1,6 +1,6 @@
 = isitopencoffeetomorrow
 
-Description goes here.
+An embedded sinatra app for Open Coffee Club events.
 
 == Contributing to isitopencoffeetomorrow
  

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/isitopencoffeetomorrow.gemspec

@@ -5,21 +5,23 @@
 
 Gem::Specification.new do |s|
   s.name = "isitopencoffeetomorrow"
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eoin Coffey"]
-  s.date = "2012-07-08"
+  s.date = "2012-12-22"
   s.description = "Embedded sinatra app for answering the is it tomorrow question"
   s.email = "ecoffey@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
+    "README.md",
     "README.rdoc"
   ]
   s.files = [
     ".document",
     "Gemfile",
     "LICENSE.txt",
+    "README.md",
     "README.rdoc",
     "Rakefile",
     "VERSION",
@@ -49,7 +51,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<foreman>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
@@ -61,7 +63,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<foreman>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.2"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
     end
@@ -74,7 +76,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<foreman>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.1.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.2"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])
   end

data/lib/isitopencoffeetomorrow.rb

@@ -6,6 +6,7 @@ module IsItOpenCoffeeTomorrow
   class Application < Sinatra::Base
 
     def self.configure
+      set :skip_dates, []
       yield self
     end
 
@@ -20,6 +21,7 @@ module IsItOpenCoffeeTomorrow
       time_zone = settings.time_zone
       @hash_tag = settings.hash_tag
       @official_site = settings.official_site
+      @ga_token = settings.ga_token
 
       now = Time.now.utc.in_time_zone(time_zone).to_date
       tomorrow = now.tomorrow.to_date
@@ -30,6 +32,9 @@ module IsItOpenCoffeeTomorrow
       last_occ = now - diff_days_now
       next_occ = last_occ.advance(:days => 14)
 
+      last_occ = occ_from last_occ, :days => -14
+      next_occ = occ_from next_occ, :days => 14
+
       days_till_next_occ = (next_occ - now).to_i
       @days_till_next_occ =
         days_till_next_occ > 1 ? "#{days_till_next_occ} days" : "#{days_till_next_occ} day"
@@ -40,5 +45,15 @@ module IsItOpenCoffeeTomorrow
 
       erb :index
     end
+
+    def occ_from occ_date, by
+      skip_dates = settings.skip_dates
+
+      while skip_dates.include? occ_date.strftime('%Y-%m-%d')
+        occ_date = occ_date.advance by
+      end
+
+      occ_date
+    end
   end
 end

data/lib/views/index.erb

@@ -3,17 +3,19 @@
   <head>
     <title>is it <%= @hash_tag %> tomorrow?</title>
     <link href="/css/main.css" rel="stylesheet" />
-    <script type="text/javascript">
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-22550563-1']);
-      _gaq.push(['_trackPageview']);
+    <% if @ga_token %>
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(['_setAccount', '<%= @ga_token %>']);
+        _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>
+        (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>
+    <% end %>
   </head>
   <body>
     <div class="status">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isitopencoffeetomorrow
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -193,11 +193,13 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
+- README.md
 - README.rdoc
 files:
 - .document
 - Gemfile
 - LICENSE.txt
+- README.md
 - README.rdoc
 - Rakefile
 - VERSION
@@ -223,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 84980687
+      hash: -2378244022103286004
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: