barton 0.0.1 → 0.0.2

data/.gitignore

@@ -1,18 +1,5 @@
 *.gem
-*.rbc
 .bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+pkg/*
 .DS_Store
+*/.DS_Store

data/Gemfile

@@ -1,6 +1,4 @@
-source 'https://rubygems.org'
+source "http://rubygems.org"
 
 # Specify your gem's dependencies in barton.gemspec
-gem "tire"
-gem "sinatra"
-gem "trollop"
+gemspec

data/Gemfile.lock

@@ -0,0 +1,46 @@
+PATH
+  remote: .
+  specs:
+    barton (0.0.2)
+      json
+      sinatra (~> 1.3.2)
+      tire (~> 0.4.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
+      builder (~> 3.0.0)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.0)
+    hashr (0.0.21)
+    i18n (0.6.0)
+    json (1.7.3)
+    mime-types (1.19)
+    multi_json (1.3.6)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    rake (0.9.2.2)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+    tire (0.4.2)
+      activemodel (>= 3.0)
+      hashr (~> 0.0.19)
+      multi_json (~> 1.0)
+      rake
+      rest-client (~> 1.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  barton!

data/Rakefile

@@ -1,13 +1,14 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 require 'rake/testtask'
-require_relative 'lib/barton/core'
+require 'barton/core'
 
 Rake::TestTask.new do |t|
   ENV['RAKE_ENV'] = 'test'
-  Barton::Core.purge_es
-	Barton::Core.update_es( Barton::Core.parse_yaml( 'specs/data/data-processed.yaml' ) )
+  Barton.config
+  #Barton::Data.purge_es
+  Barton::Data.update_es( Barton::Setup.parse_yaml( 'specs/data/data-processed.yaml' ) )
   t.libs << "specs"
   t.test_files = FileList['specs/*_spec.rb']
-  #t.verbose = true
+  t.verbose = true
 end

data/barton.gemspec

@@ -1,22 +1,24 @@
 # -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-require 'barton/version'
+$:.push File.expand_path("../lib", __FILE__)
+require "barton/version"
 
-Gem::Specification.new do |gem|
-  gem.authors       = ["Dave Kinkead"]
-  gem.email         = ["dave@kinkead.com.au"]
-  gem.description   = "Barton is an API for Australian electorates and politicains"
-  gem.summary       = "Programmable political access"
-  gem.homepage      = "http://barton.experiementsindemocracy.org"
+Gem::Specification.new do |s|
+  s.name          = "barton"
+  s.version       = Barton::VERSION
+  s.authors       = ["Dave Kinkead"]
+  s.email         = ["dave@kinkead.com.au"]
+  s.homepage      = "http://barton.experimentsindemocracy.org"
+  s.description   = "Barton is an API for Australian electorates and politicains"
+  s.summary       = "Programmable political access"
+  
+  s.rubyforge_project = "barton"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(specs)/})
-  gem.name          = "barton"
-  gem.require_paths = ["lib"]
-  gem.version       = Barton::VERSION
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
   
-  gem.add_dependency 'sinatra', '~> 1.3.2'
-  gem.add_dependency 'trollop'
-  gem.add_dependency 'tire',    '~> 0.4.2'
+  s.add_dependency 'sinatra', '~> 1.3.2'
+  s.add_dependency 'tire',    '~> 0.4.2'
+  s.add_dependency 'json'
 end

data/bin/barton

@@ -1,38 +1,5 @@
 #!/usr/bin/env ruby
-require 'trollop'
+require 'barton/app'
 
-# Load data from yaml source file
-def load_file( filename, es=false )
-  puts "Loading data from #{filename}....."
-  electorates = Barton::Core.parse_yaml( filename )
-  puts "Failed to load #{filename}" if electorates.nil?
-  unless es
-    connected = Barton::Core.update_es( electorates )
-    abort "Connection to Elasticsearch failed" if connected.nil?
-  end
-end
-
-# Option parsing for setup
-opts = Trollop::options do
-  opt :setup,   "Reload data from yaml source files", :default => false              
-  opt :file,    "Only reload specified file",         :default => 'all'
-  opt :no_es,   "Turn off elasticsearch",             :default => false
-end
-
-# Action setup options
-if opts[:setup]
-  require 'barton/core'
-  unless opts[:no_es]
-    connected = Barton::Core.purge_es 
-    abort "Connection to Elasticsearch failed" if connected.nil?
-  end
-  if opts[:file] == 'all'
-    Dir['data/*.yaml'].each do |f|
-      load_file( f, opts[:no_es] )
-    end 
-  else
-    load_file( opts[:file], opts[:no_es] )
-  end
-else
-  require 'barton'
-end
+Barton.setup unless Barton.data_loaded
+Barton::App.run!

data/config.ru

@@ -1,4 +1,4 @@
-require './bin/barton'
+require 'barton/app'
 
-run baron --setup
-run barton
+Barton.setup unless Barton.data_loaded
+run Barton::App

data/data/geo/nsw-federal.yaml

@@ -8292,7 +8292,7 @@ d50f0c:
     south: -34.47949737615293
     east: 151.172
     west: 150.6909
-'3e6642':
+3e6642:
   boundaries:
   - 148.1986857989842,-36.79749335278837 148.822,-37.05 149.2,-37.201 149.501,-37.32
     149.976,-37.505 149.978,-37.502 149.974,-37.497 149.977,-37.49300000000001 149.974,-37.483

data/data/geo/nsw-local.yaml

@@ -89,7 +89,7 @@ ed94a7:
     south: -34.00280912983876
     east: 151.271
     west: 151.2071418887867
-'164e15':
+164e15:
   boundaries:
   - 151.2098793825532,-33.85430370756853 151.2097565073364,-33.85420653226068 151.2092845775925,-33.85389973141803
     151.2087100737579,-33.85345658325163 151.2081149749891,-33.85345651400181 151.2066458308784,-33.85371752872344
@@ -610,7 +610,7 @@ cea83f:
     south: -33.89010485586012
     east: 151.1966222696354
     west: 151.1448841036526
-'1e9598':
+1e9598:
   boundaries:
   - 151.1816,-33.9069 151.1782,-33.9005 151.1777999958937,-33.89899999094037 151.1796,-33.8967
     151.1812,-33.8957 151.1791,-33.891 151.1784,-33.8912 151.1766,-33.8868 151.1721,-33.8876
@@ -7674,7 +7674,7 @@ d8825d:
     south: -32.40874977597339
     east: 151.594
     west: 149.7916
-'039911':
+039911:
   boundaries:
   - 153.018,-30.563 153.023,-30.553 153.029,-30.546 153.026,-30.541 153.026,-30.529
     153.029,-30.52 153.03,-30.511 153.032,-30.503 153.032,-30.49800000000001 153.041,-30.476
@@ -23503,7 +23503,7 @@ c008b2:
     south: -36.6898928720222
     east: 149.6025575445871
     west: 148.5385544839686
-'25e836':
+25e836:
   boundaries:
   - 150.093,-36.35 150.106,-36.336 150.111,-36.331 150.117,-36.329 150.115,-36.327
     150.119,-36.324 150.123,-36.32100000000001 150.127,-36.32100000000001 150.129,-36.317
@@ -43995,7 +43995,7 @@ f7bb53:
     south: -35.57582205698602
     east: 147.233
     west: 146.3544639667793
-'372e79':
+372e79:
   boundaries:
   - 145.4251360552323,-34.44313504542419 145.4223732036359,-34.44352385627402 145.4206048557963,-34.44454178059068
     145.4191324985363,-34.44845689091537 145.4176155935558,-34.44940813098696 145.4150250714548,-34.44938483908386
@@ -49985,7 +49985,7 @@ dac48c:
     south: -33.94484413394265
     east: 151.201695149238
     west: 151.1658157003126
-'093529':
+093529:
   boundaries:
   - 151.2142724181714,-33.92442917729746 151.2127296849892,-33.92407249950207 151.2112147324045,-33.92354876407109
     151.201695149238,-33.92218866039233 151.2014125343224,-33.92332968166043 151.1996219941813,-33.92310316907097
@@ -70542,7 +70542,7 @@ d3bd84:
     south: -37.505
     east: 150.084
     west: 149.3564746918378
-'5e7689':
+5e7689:
   boundaries:
   - 148.822,-37.05 149.2,-37.201 149.3564746918378,-37.26286208377659 149.4019680784731,-37.11530223851265
     149.3986942156654,-37.02503264542202 149.3976562404854,-37.02218691691137 149.3980273527682,-37.02065623713841
@@ -74203,7 +74203,7 @@ a18a8a:
     south: -34.9074
     east: 148.670388
     west: 148.1421072823724
-'82e381':
+82e381:
   boundaries:
   - 149.5679537114042,-36.00857128602338 149.5692664351178,-36.00931912317167 149.5718991823523,-36.00889947295418
     149.5783507832786,-36.00731797609768 149.5830851246774,-36.00754129800762 149.5861222554103,-36.0041434254088

data/data/geo/nsw-state.yaml

@@ -239,7 +239,7 @@ bcbe3f:
     south: -33.5829
     east: 151.3953
     west: 150.9842
-'048630':
+048630:
   boundaries:
   - 151.3933880058075,-33.42832122993632 151.3925158604013,-33.42896383873365 151.3920379919639,-33.42965978926647
     151.391955865436,-33.43068310003513 151.392002745656,-33.43126750265828 151.3916782742376,-33.43199942560669
@@ -500,7 +500,7 @@ bcbe3f:
     south: -33.42
     east: 151.5156462023187
     west: 151.2970681500458
-'82e217':
+82e217:
   boundaries:
   - 151.573,-33.291 151.57,-33.288 151.571,-33.286 151.575,-33.285 151.575,-33.283
     151.578,-33.283 151.579,-33.281 151.577,-33.28 151.574,-33.281 151.572,-33.279
@@ -581,7 +581,7 @@ bcbe3f:
     south: -33.36592571411578
     east: 151.5815683075395
     west: 151.4025454799637
-'164e90':
+164e90:
   boundaries:
   - 151.262,-33.927 151.258,-33.923 151.263,-33.917 151.261,-33.915 151.264,-33.915
     151.267,-33.916 151.268,-33.915 151.266,-33.91400000000001 151.2665,-33.91400000000001
@@ -5535,7 +5535,7 @@ a9f5da:
     south: -33.816115
     east: 150.982917
     west: 150.9154044189205
-'2e2812':
+2e2812:
   boundaries:
   - 150.5493206481002,-33.36613602219403 150.5496629143948,-33.36482391074615 150.5492216189221,-33.363769387072
     150.5481299413434,-33.36344538788779 150.5471710580237,-33.3635214944333 150.5463493120329,-33.36487167633499

data/data/geo/qld-federal.yaml

@@ -756,7 +756,7 @@ ca48a0:
     south: -27.70016120734079
     east: 153.1836
     west: 153.014871
-'087739':
+087739:
   boundaries:
   - 153.003,-27.47500000000001 153.0019,-27.4742 153.001,-27.4741 152.9994,-27.4731
     153.0003,-27.4723 152.9998,-27.47060000000002 152.9982,-27.46890000000001 152.9987,-27.4685
@@ -11862,7 +11862,7 @@ b3f1de:
     south: -27.741
     east: 153.547
     west: 153.1717
-'081148':
+081148:
   boundaries:
   - 153.261725,-27.799102 153.2629289965241,-27.80192351725872 153.2657146583228,-27.80599610737931
     153.2679704120473,-27.80846343858932 153.2725273888082,-27.81210632113799 153.2955427281062,-27.82395787584578

data/data/geo/qld-state.yaml

@@ -1962,7 +1962,7 @@ fb9318:
     south: -27.54028743523276
     east: 153.094011955625
     west: 153.040181
-'009702':
+009702:
   boundaries:
   - 152.988,-27.5702 152.9871,-27.5695 152.9867,-27.5687 152.987,-27.5684 152.9887,-27.5686
     152.9905,-27.5682 152.9891,-27.5673 152.9894,-27.567 152.9903,-27.5672 152.9908,-27.5668
@@ -15477,7 +15477,7 @@ a100d2:
     south: -27.678538
     east: 152.8292563162398
     west: 152.719331864359
-'769e84':
+769e84:
   boundaries:
   - 152.8562,-27.5826 152.8555,-27.5804 152.8554,-27.57880000000002 152.854,-27.5754
     152.8534,-27.5736 152.8519,-27.5705 152.8514,-27.5699 152.8501,-27.567 152.8495,-27.5645

data/data/geo/vic-federal.yaml

@@ -2841,7 +2841,7 @@ e8b8ca:
     south: -37.6294
     east: 148.221
     west: 145.1627806620593
-'9e0246':
+9e0246:
   boundaries:
   - 145.2248433248994,-37.45825644965087 145.2300829046973,-37.45917170599739 145.226898429695,-37.45338295888819
     145.2302186483618,-37.45064843556249 145.2306314572769,-37.44843872600255 145.2335817271366,-37.44668645648983

data/data/geo/vic-local.yaml

@@ -2841,7 +2841,7 @@ d66b65:
     south: -37.8345
     east: 145.0453
     west: 144.9615544156226
-'9890e8':
+9890e8:
   boundaries:
   - 145.143,-37.6868 145.1437,-37.6826 145.1375,-37.6831 145.1305,-37.686 145.1223,-37.6868
     145.1188,-37.6874 145.1168,-37.6879 145.1104,-37.6909 145.1045,-37.6922 145.0997,-37.69240000000001
@@ -10467,7 +10467,7 @@ baa428:
     south: -37.2245
     east: 142.574
     west: 141.6574079930136
-'086695':
+086695:
   boundaries:
   - 142.507,-34.749 142.508,-34.746 142.513,-34.743 142.512,-34.741 142.502,-34.741
     142.5,-34.739 142.502,-34.733 142.512,-34.723 142.513,-34.72 142.509,-34.714 142.519,-34.704
@@ -18812,7 +18812,7 @@ d41c8b:
     south: -38.30038778184499
     east: 145.1287275785401
     west: 144.9953671705406
-'756e19':
+756e19:
   boundaries:
   - 145.185,-38.372 145.193,-38.373 145.194,-38.367 145.196,-38.367 145.2,-38.37 145.201,-38.374
     145.209,-38.376 145.211,-38.379 145.215,-38.38000000000001 145.222,-38.378 145.222,-38.375
@@ -20711,7 +20711,7 @@ b94797:
     south: -37.8929
     east: 145.2003
     west: 145.1457
-'63e668':
+63e668:
   boundaries:
   - 145.1314,-37.8576 145.1140320879415,-37.85559805547781 145.0950896639592,-37.85334558648473
     145.0921,-37.8706 145.0921808241841,-37.87181188936618 145.0922,-37.8721 145.0905,-37.88190000000001
@@ -30925,7 +30925,7 @@ b981c0:
     south: -36.48287656187399
     east: 143.2952143388028
     west: 142.6008165240712
-'2e9375':
+2e9375:
   boundaries:
   - 142.1657419725659,-36.43254860379932 142.1649305804999,-36.36625649707261 142.1685113158012,-36.36626590588421
     142.1685193895224,-36.28849981650542 142.1506251964688,-36.30117920487832 142.1317362092689,-36.30758117399162

data/data/geo/vic-state.yaml

@@ -7397,7 +7397,7 @@ ac8cbb:
     south: -38.0037
     east: 145.2656055162517
     west: 145.1816539788258
-'701e74':
+701e74:
   boundaries:
   - 145.1692210302088,-38.156070985585 145.1730037273379,-38.14845256970227 145.1735840440754,-38.14445776748263
     145.1743369330139,-38.13524332411645 145.1629024721805,-38.13209801849608 145.1636105728066,-38.12782954738623

data/data/nsw-federal.yaml

@@ -173,7 +173,7 @@
   - Federal
   - House of Representitives
   - Southern NSW
-  id: '3e6642'
+  id: 3e6642
 - name: Gilmore
   tags:
   - New South Wales

data/data/nsw-local.yaml

@@ -19,7 +19,7 @@
   - Local
   - LGA
   - Eastern Suburbs
-  id: '164e15'
+  id: 164e15
 - name: Waverley
   tags:
   - New South Wales
@@ -75,7 +75,7 @@
   - Local
   - LGA
   - Inner West
-  id: '1e9598'
+  id: 1e9598
 - name: Strathfield
   tags:
   - New South Wales
@@ -383,7 +383,7 @@
   - Local
   - LGA
   - Mid-North Coast
-  id: '039911'
+  id: 039911
 - name: Clarence Valley
   tags:
   - New South Wales
@@ -628,7 +628,7 @@
   - Local
   - LGA
   - South-Eastern NSW
-  id: '25e836'
+  id: 25e836
 - name: Goulburn Mulwaree
   tags:
   - New South Wales
@@ -964,7 +964,7 @@
   - Local
   - LGA
   - Murrumbidgee
-  id: '372e79'
+  id: 372e79
 - name: Narrandera
   tags:
   - New South Wales
@@ -1097,7 +1097,7 @@
   - Local
   - Ward
   - Botany Bay
-  id: '093529'
+  id: 093529
 - name: Botany Bay 6
   tags:
   - New South Wales
@@ -2091,7 +2091,7 @@
   - Local
   - Ward
   - South-Eastern NSW
-  id: '5e7689'
+  id: 5e7689
 - name: Boorowa
   tags:
   - New South Wales
@@ -2133,7 +2133,7 @@
   - Local
   - Ward
   - South-Eastern NSW
-  id: '82e381'
+  id: 82e381
 - name: Queanbeyan
   tags:
   - New South Wales