836 geo markup

.gitignore

@@ -5,22 +5,13 @@
 *.tmproj
 tmtags
 
-## EMACS
-*~
-\#*
-.\#*
-
 ## VIM
 *.swp
 
 ## PROJECT::GENERAL
 .sass-cache
-coverage
-rdoc
-pkg
 
 ## PROJECT::SPECIFIC
-*.gem
-.rvmrc
 .bundle
-tmp/*
+tmp/
+bin/

.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

Gemfile

@@ -1,24 +1,30 @@
 source 'https://rubygems.org'
 
-gem "serve", "~> 1.5.1"
+gem "serve" #, github: "danielstutzman/serve",  require: false
 
 # Use the edge instead:
 # gem "serve", :git => "git://github.com/jlong/serve.git"
-gem "sinatra"
-gem "sinatra-contrib"
+
+gem "sinatra",                require: false
+gem "sinatra-contrib",        require: false, github: "ocapi/sinatra-contrib"
+gem "activesupport",          require: false
 
 # # Use Compass and Sass
-gem "coffee-script"
-gem "sinatra-asset-pipeline"
-gem "bourbon"
-gem "hashie"
+gem "coffee-script",          require: false
+gem "sinatra-asset-pipeline", require: false
+gem "bourbon",                require: false
+gem "hashie",                 require: false
+gem "mime-types",             require: false
 # gem "actionpack", "~> 3.2"
 # # gem "railties",   "~> 3.2"
-gem "nokogiri"
-#
+
+
 # # Markdown and Textile
-gem "mustache"
-gem "rdiscount" # Markdown
+gem "nokogiri",               require: false
+gem "mustache",               require: false
+gem "rdiscount",              require: false
+gem "fastimage",              require: false
+# Markdown
 # gem "RedCloth"  # Textile
 #
 # Other templating languages
@@ -29,9 +35,12 @@ gem "rdiscount" # Markdown
 # gem "less"
 #
 group :development, :test do
-
-  gem "guard-jasmine"
-  gem "guard-pow"
+  gem "rspec",                require: false
+  gem "guard-jasmine",        require: false
+  gem "guard-pow",            require: false
+  gem "awesome_print",        require: false
+  gem 'rspec-html-matchers',  require: false
   # gem "jasminerice", github: "bradphelan/jasminerice"
   # gem "jquery-rails"
 end
+

Gemfile.lock

@@ -1,62 +1,106 @@
+GIT
+  remote: git://github.com/ocapi/sinatra-contrib.git
+  revision: 840eb8a3e7c9826f29be070307ca818a74d84f08
+  specs:
+    sinatra-contrib (1.4.2)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (~> 1.3)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.6)
-      i18n (~> 0.6)
+    activesupport (3.2.21)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    backports (3.3.5)
+    addressable (2.3.8)
+    awesome_print (1.2.0)
     bourbon (3.1.8)
       sass (>= 3.2.0)
       thor
-    childprocess (0.3.9)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    childprocess (0.4.0)
       ffi (~> 1.0, >= 1.0.11)
-    coderay (1.0.9)
+    coderay (1.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)
+    diff-lcs (1.2.5)
     execjs (2.0.2)
-    ffi (1.4.0)
-    guard (1.6.2)
-      listen (>= 0.6.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      terminal-table (>= 1.4.3)
-      thor (>= 0.14.6)
-    guard-jasmine (1.5.0)
+    fastimage (1.6.8)
+      addressable (~> 2.3, >= 2.3.5)
+    ffi (1.9.3)
+    formatador (0.2.4)
+    guard (2.3.0)
+      formatador (>= 0.2.4)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-jasmine (1.19.0)
       childprocess
-      guard (>= 1.1.0)
+      guard (>= 2.0.0)
       multi_json
       thor
-    guard-pow (1.0.0)
-      guard (>= 1.1)
-    hashie (1.2.0)
+      tilt
+    guard-pow (2.0.0)
+      guard (~> 2.0)
+    hashie (2.0.5)
     hike (1.2.3)
-    i18n (0.6.5)
-    listen (0.7.3)
-    lumberjack (1.0.2)
-    method_source (0.8.1)
-    multi_json (1.8.2)
+    i18n (0.7.0)
+    listen (2.4.0)
+      celluloid (>= 0.15.2)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+    lumberjack (1.0.4)
+    method_source (0.8.2)
+    mime-types (2.1)
+    mini_portile (0.5.2)
+    multi_json (1.11.0)
     mustache (0.99.5)
-    nokogiri (1.5.10)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-protection (1.5.1)
+    rack-protection (1.5.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
     rdiscount (2.1.7)
-    sass (3.2.9)
-    serve (1.5.1)
-      activesupport (~> 3.0)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-html-matchers (0.7.0)
+      nokogiri (~> 1)
+      rspec (~> 3)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
+    sass (3.2.14)
+    serve (1.5.2)
+      activesupport (~> 3.2.12)
       i18n
-      rack (~> 1.2)
-      rack-test (~> 0.5)
-      tilt (~> 1.3)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+      tilt (~> 1.3.3)
       tzinfo
     sinatra (1.4.4)
       rack (~> 1.4)
@@ -70,15 +114,8 @@ GEM
       sprockets
       sprockets-helpers
       sprockets-sass
-    sinatra-contrib (1.4.2)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (~> 1.3)
-    slop (3.4.3)
-    sprockets (2.10.0)
+    slop (3.4.7)
+    sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -88,24 +125,32 @@ GEM
     sprockets-sass (1.0.2)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    terminal-table (1.4.5)
     thor (0.18.1)
-    tilt (1.4.1)
-    tzinfo (0.3.38)
+    thread_safe (0.3.5)
+    tilt (1.3.7)
+    timers (1.1.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
+  awesome_print
   bourbon
   coffee-script
+  fastimage
   guard-jasmine
   guard-pow
   hashie
+  mime-types
   mustache
   nokogiri
   rdiscount
-  serve (~> 1.5.1)
+  rspec
+  rspec-html-matchers
+  serve
   sinatra
   sinatra-asset-pipeline
-  sinatra-contrib
+  sinatra-contrib!

assets/javascripts/app/analytics.coffee

@@ -1,46 +1,46 @@
 # build data user
-unless window.client_geo_data
-  $.getJSON "http://smart-ip.net/geoip-json?callback=?", (data) ->
-    window.client_geo_data = data
-
-if not window.issue_uid or document.cookie.match("issue_uid")
-  window.issue_uid = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15)
-  document.cookie = "issue_uid=" + issue_uid + "; expires=Fri, 31 Dec " + ((new Date()).getFullYear() + 99) + " 23:59:59 GMT; path=/"
-
-# build environment
-tracking_env = (action, title, env) ->
-  env or env = {}
-  client_geo_data = window.client_geo_data or {}
-  user = window.App and App.user and App.user.toJSON()
-  $.extend
-    action: action
-    page: env["page"] or $("link[rel=canonical]").attr("href") or window.location.toString()
-
-    # Title: explicity set or default to document.title
-    title: title or document.title
-
-    # Magazine: magazine handle
-    magazine: null
-
-    # Issue: issue handle (short name)
-    issue: null
-
-    # Content page id
-    page_id: $("[data-page-id]").attr("data-page-id")
-
-    # Author
-    author: null
-
-    # User
-    user: user
-
-    # client device
-    url: window.location.toString()
-    uid: issue_uid
-    referer: document.referrer
-    agent: navigator.userAgent
-  , env, client_geo_data
-
-App.on "track", (action, title, data) ->
-  track_url = "//127.0.0.1:9200/analytics/events"
-  $.post track_url, JSON.stringify(tracking_env(action, title, data))
+#unless window.client_geo_data
+#  $.getJSON "http://smart-ip.net/geoip-json?callback=?", (data) ->
+#    window.client_geo_data = data
+#
+#if not window.issue_uid or document.cookie.match("issue_uid")
+#  window.issue_uid = Math.random().toString(36).substring(2, 15) + Math.random().toString(36).substring(2, 15)
+#  document.cookie = "issue_uid=" + issue_uid + "; expires=Fri, 31 Dec " + ((new Date()).getFullYear() + 99) + " 23:59:59 GMT; path=/"
+#
+## build environment
+#tracking_env = (action, title, env) ->
+#  env or env = {}
+#  client_geo_data = window.client_geo_data or {}
+#  user = window.App and App.user and App.user.toJSON()
+#  $.extend
+#    action: action
+#    page: env["page"] or $("link[rel=canonical]").attr("href") or window.location.toString()
+#    
+#    # Title: explicity set or default to document.title
+#    title: title or document.title
+#    
+#    # Magazine: magazine handle
+#    magazine: null
+#    
+#    # Issue: issue handle (short name)
+#    issue: null
+#
+#    # Content page id
+#    page_id: $("[data-page-id]").attr("data-page-id")
+#
+#    # Author
+#    author: null
+#    
+#    # User
+#    user: user
+#    
+#    # client device
+#    url: window.location.toString()
+#    uid: issue_uid
+#    referer: document.referrer
+#    agent: navigator.userAgent
+#  , env, client_geo_data
+#
+#App.on "track", (action, title, data) ->
+#  track_url = "//127.0.0.1:9200/analytics/events"
+#  $.post track_url, JSON.stringify(tracking_env(action, title, data))

assets/javascripts/app/core.coffee

@@ -23,6 +23,7 @@
 
     this.refresh()
     this.bindObservers()
+    this.updateLayout()
 
     this.trigger("loaded", document.title, url: window.location.toString())
 
@@ -79,6 +80,8 @@ Core = {
   # Support & feature detection
   support: {
 
+    embed: !!document.location.href.match(/\/embed\/|embed=1/)
+
     standalone: !!window.navigator.standalone
 
     touch: document.documentElement.hasOwnProperty("ontouchstart")