snapa 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77360d09b9abb1525c943151e0bfa58f3920311e
-  data.tar.gz: 260ce2e0c9ef71ec8456344b95ed8243ef2e760c
+  metadata.gz: 246b9ac64748bb2d3558fc97f747f0643d44338e
+  data.tar.gz: 884e28a1fe988ed530b6fae5645081d0f81ee051
 SHA512:
-  metadata.gz: 12be7dc97c63d0d7ab31b10c36e254f8db982cbdf9ed1f2b636d8c3fccfb330f0d772c9f5209617c704178c5c09330695b3992849afe01d801fa3542615d1910
-  data.tar.gz: 99c7b6b2959403c6400d7ba5bf3a2f5ea98a6db48d95fbbdee50042ea6a19ca61e1fd95dfc6750133d631c96cbf868c36357bc9aa7ee8b349459f1e1956b1192
+  metadata.gz: bf6e5d6b3b8bbad94e662b7aa555e5dd7175edd576365cb3a351d1bdfdfe2eda628a310e03066d28cdb9b0af6cfcfad645d9b54c8aa461170936a372e042ca50
+  data.tar.gz: 9bdaaa489cba4b16d04969b00a8e52cb257d20d0b52462958799117a7bb18c6eda20ac53d2dfff876f6f7f001365ad318d087807809a3c675e7d824ee476fc7b

data/.buildpacks

@@ -0,0 +1,2 @@
+https://github.com/heroku/heroku-buildpack-ruby.git
+https://github.com/stomita/heroku-buildpack-phantomjs.git

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage

data/Gemfile

@@ -1,4 +1,7 @@
 source 'https://rubygems.org'
+ruby '2.0.0'
 
 # Specify your gem's dependencies in snapa.gemspec
 gemspec
+
+gem 'thin'

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    snapa (0.0.2)
+      rack
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    daemons (1.1.9)
+    eventmachine (1.0.3)
+    rack (1.5.2)
+    rake (10.1.0)
+    thin (1.5.1)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3)
+  rake
+  snapa!
+  thin

data/Procfile

@@ -0,0 +1 @@
+web: bundle exec rackup -p $PORT

data/config.ru

@@ -1,2 +1,8 @@
-require ::File.expand_path('../lib/snapa',  __FILE__)
-run Snapa::File.new(:map)
+$:.unshift ::File.expand_path('../lib',  __FILE__)
+
+use Rack::Static,
+  :urls => ['/countries.json', '/d3.v3.min.js', '/favicon.ico', '/map.html', '/topojson.v1.min.js'],
+  :root => 'public'
+
+require 'snapa'
+run Snapa::File.new('public/map.html')

data/lib/snapa.rb

@@ -3,36 +3,31 @@ require 'rack/file'
 
 module Snapa
   class File < Rack::File
-    def query_string(env)
-      env["QUERY_STRING"].to_s
-    end
 
     def cmd
       'phantomjs'
     end
 
     def script
-      ::File.expand_path('../snapa.js', __FILE__)
-    end
-
-    def map
-      ::File.expand_path('../../public/map.html', __FILE__)
+      F.expand_path('../snapa.js', __FILE__)
     end
 
-    def url(env)
-      [@root === :map ? map : @root, query_string(env)].join('?')
+    def url(request)
+      [@root, request.query_string].join('?')
     end
 
-    def build(env)
-      system [cmd, script, "'#{url(env)}'", "'#{@path}'"].join(' ')
+    def build(request)
+      system [cmd, script, "'#{url(request)}'", "'#{@path}'"].join(' ')
     end
 
-    def path(env)
-      @path ||= ::File.join('tmp', query_string(env) + '.png')
+    def path(request)
+      @path ||= F.join('/tmp/snapa', request.query_string + '.png')
     end
 
     def _call(env)
-      build(env) unless F.file?(path(env))
+      request = ::Rack::Request.new(env)
+
+      build(request) unless F.file?(path(request))
 
       serving(env)
     end

data/lib/snapa/version.rb

@@ -1,3 +1,3 @@
 module Snapa
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/public/map.html

@@ -9,7 +9,7 @@ body {
 .subunit {
   fill: #D7D7D7;
   stroke: #F2F2F2;
-  stroke-width: 2;
+  stroke-width: 1.5;
 }
 .subunit.highlight {
   fill: #658436;
@@ -32,9 +32,10 @@ function getParameterByName(name) {
 var countries = (getParameterByName('c') || 'TZ').toUpperCase().split(','),
     width = getParameterByName('w') || 380,
     height = getParameterByName('h') || 230,
-    rotation = getParameterByName('r') || 0,
-    percent = getParameterByName('p') || .95,
-    maxScale = getParameterByName('m') || 300;
+    rotation = getParameterByName('r').split(','),
+    scale = getParameterByName('s'),
+    percent = getParameterByName('p') || .80,
+    highlight;
 
 var svg = d3.select("body").append("svg")
     .attr("width", width)
@@ -42,33 +43,39 @@ var svg = d3.select("body").append("svg")
 
 var projection = d3.geo.mercator()
     .scale(1)
-    .rotate(rotation)
-    .translate([0, 0]);
+    .translate([width / 2, height / 2]);
 
 var path = d3.geo.path()
     .projection(projection);
 
 d3.json("countries.json", function(error, world) {
-  var bounds = [[Number.MAX_VALUE, Number.MAX_VALUE], [Number.MIN_VALUE, Number.MIN_VALUE]],
-      features = topojson.feature(world, world.objects.countries).features;
+  var features = topojson.feature(world, world.objects.countries).features;
 
   for (var i = 0; i < features.length; i++) {
     if (countries.indexOf(features[i].id) !== -1) {
-      var b = path.bounds(features[i]);
-      bounds = [
-        [Math.min(bounds[0][0], b[0][0]), Math.min(bounds[0][1], b[0][1])],
-        [Math.max(bounds[1][0], b[1][0]), Math.max(bounds[1][1], b[1][1])]
-      ];
+      if (highlight === undefined) {
+        highlight = JSON.parse(JSON.stringify(features[i]));
+      } else {
+        highlight.geometry.coordinates = d3.merge([highlight.geometry.coordinates, features[i].geometry.coordinates])
+      }
     }
   }
 
-  var scale = percent / Math.max((bounds[1][0] - bounds[0][0]) / width, (bounds[1][1] - bounds[0][1]) / height),
-      scale = Math.min(scale, maxScale),
-      translate = [(width - scale * (bounds[1][0] + bounds[0][0])) / 2, (height - scale * (bounds[1][1] + bounds[0][1])) / 2];
+  if (rotation[0] === '') {
+    var centroid = d3.geo.centroid(highlight);
+    rotation = [-centroid[0], -centroid[1]]
+  }
+
+  projection
+      .rotate(rotation);
+
+  if (scale === '') {
+    var bounds = path.bounds(highlight);
+    scale = percent / Math.max((bounds[1][0] - bounds[0][0]) / width, (bounds[1][1] - bounds[0][1]) / height);
+  }
 
   projection
-      .scale(scale)
-      .translate(translate);
+      .scale(scale);
 
   svg.selectAll("path")
       .data(features)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snapa
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ben Tillman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -59,9 +59,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .buildpacks
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
+- Procfile
 - README.md
 - Rakefile
 - config.ru
@@ -70,6 +73,7 @@ files:
 - lib/snapa/version.rb
 - public/countries.json
 - public/d3.v3.min.js
+- public/favicon.ico
 - public/map.html
 - public/topojson.v1.min.js
 - snapa.gemspec