barton 0.0.1 → 0.0.2

data/data/nsw-state.yaml

@@ -23,7 +23,7 @@
   - State
   - Legaslative Assembly
   - Central Coast
-  id: '048630'
+  id: 048630
 - name: The Entrance
   tags:
   - New South Wales
@@ -37,14 +37,14 @@
   - State
   - Legaslative Assembly
   - Central Coast
-  id: '82e217'
+  id: 82e217
 - name: Coogee
   tags:
   - New South Wales
   - State
   - Legaslative Assembly
   - Eastern Suburbs
-  id: '164e90'
+  id: 164e90
 - name: Heffron
   tags:
   - New South Wales
@@ -422,7 +422,7 @@
   - State
   - Legaslative Assembly
   - Western Sydney Fringe
-  id: '2e2812'
+  id: 2e2812
 - name: Hawkesbury
   tags:
   - New South Wales

data/data/qld-federal.yaml

@@ -61,7 +61,7 @@
   - Federal
   - House of Representatives
   - Brisbane
-  id: '087739'
+  id: 087739
 - name: Capricornia
   tags:
   - Queensland
@@ -147,7 +147,7 @@
   - Federal
   - House of Representatives
   - Gold Coast
-  id: '081148'
+  id: 081148
 - name: McPherson
   tags:
   - Queensland

data/data/qld-state.yaml

@@ -178,7 +178,7 @@
   - State
   - Legislative Assembly
   - Brisbane South
-  id: '009702'
+  id: 009702
 - name: Indooroopilly
   tags:
   - Queensland
@@ -528,7 +528,7 @@
   - State
   - Legislative Assembly
   - SE Queensland
-  id: '769e84'
+  id: 769e84
 - name: Lockyer
   tags:
   - Queensland

data/data/vic-federal.yaml

@@ -86,7 +86,7 @@
 - name: McEwen
   tags:
   - Eastern Victoria
-  id: '9e0246'
+  id: 9e0246
 - name: McMillan
   tags:
   - Eastern Victoria

data/data/vic-local.yaml

@@ -96,7 +96,7 @@
   - local
   - LGA
   - North-East
-  id: '9890e8'
+  id: 9890e8
 - name: Darebin
   tags:
   - Victoria
@@ -446,7 +446,7 @@
   - local
   - LGA
   - North West
-  id: '086695'
+  id: 086695
 - name: Northern Grampians
   tags:
   - Victoria
@@ -1020,7 +1020,7 @@
   - local
   - ward
   - Mornington Peninsula
-  id: '756e19'
+  id: 756e19
 - name: Nepean
   tags:
   - Victoria
@@ -1363,7 +1363,7 @@
   - local
   - ward
   - Monash
-  id: '63e668'
+  id: 63e668
 - name: Mulgrave
   tags:
   - Victoria
@@ -1965,7 +1965,7 @@
   - local
   - ward
   - Hindmarsh
-  id: '2e9375'
+  id: 2e9375
 - name: North
   tags:
   - Victoria

data/data/vic-state.yaml

@@ -348,7 +348,7 @@
   - State
   - Legislative Assembly
   - South Eastern Metropolitan
-  id: '701e74'
+  id: 701e74
 - name: Lyndhurst
   tags:
   - Victoria

data/lib/barton.rb

@@ -1,3 +1,13 @@
-require "barton/app"
+require "barton/core"
 
-Barton::App.run!
+module Barton
+  class << self
+    def data_loaded
+      @@data_loaded ||= false
+    end
+    
+    def data_loaded=(bool)
+      @@data_loaded = bool
+    end
+  end
+end

data/lib/barton/app.rb

@@ -1,10 +1,11 @@
 require 'sinatra'
 require 'json'
+require 'barton'
 require 'barton/core'
 
 module Barton  
   class App < Sinatra::Base
-  
+    
     #   routes    
 		allowed_formats = ['', 'json']
 
@@ -22,12 +23,12 @@ module Barton
 			geo, tags, address = params[:geo], params[:tags], params[:address]
 			tags = tags.split(',') unless tags.nil?
 			raise Sinatra::NotFound unless allowed_formats.include?( format )
-      geo = Barton::Core.address( address ) if address
+      geo = Barton::Data.address( address ) if address
 			if not id.empty?
-				results = Barton::Core.electorates( {:id => id} )
+				results = Barton.electorates( {:id => id} )
 				prepare_response( results )
 			elsif geo or tags
-				results = Barton::Core.electorates( {:tags => tags, :geo => geo} )
+				results = Barton.electorates( {:tags => tags, :geo => geo} )
 				prepare_response( results )
 			else
 				prepare_response
@@ -63,6 +64,5 @@ module Barton
 			content_type 'application/json;charset=utf-8'
 			JSON.pretty_generate( response )
 		end
-  
   end
 end

data/lib/barton/core.rb

@@ -1,15 +1,111 @@
 require 'yaml'
 require 'digest/sha1'
 require 'tire'
-require 'rest_client'
-require 'uri'
 require 'json'
+require 'barton/app'
 
 module Barton
-  class Core
-    
-    @api_url = 'http://barton.experiementsindemocracy.org/api'
-    
+  
+  #  Returns an array of electorates matching the search criteria
+  #    Accepts a hash of criteria
+  #      :id
+  #      :tags
+  #      :geo
+  #      :address
+  #    Returns an array of hashes
+  def Barton.electorates( query = {} )
+    Find.electorates( query )
+  end
+  
+  #  Returns an array of member matching the search criteria
+  #    Accepts a hash of criteria
+  #    Returns an array of hashes				
+  def members
+    # TBA
+  end
+   
+    #  Loads electoral data from the yaml files into elasticsearch
+  def self.setup
+    Data.config
+    Data.purge_es
+    Dir['data/*.yaml'].each do |f|
+      Setup.load_file( f )
+    end
+    Barton.data_loaded = true
+  end
+  
+  #  Configuration options for the Gem
+  def self.config
+    #puts ENV['RAKE_ENV']
+    #Data.config
+  end
+  
+  module Find
+		def self.electorates( query={} )
+      results = Array.new
+      terms = ["id:#{query[:id]}"] if query.has_key?( :id )
+      terms = query[:tags] if query.has_key?( :tags )
+      geo = query[:geo] if query.has_key?( :geo )
+      geo = self.address( query[:address] ) if query.has_key?( :address ) and not query.has_key?( :geo )
+      s = Data.search( terms, geo )
+      s.results.each do |e|
+        e = e.to_hash
+        e.keys.each { |k| e.delete( k ) if k.match( /_|geobox|boundaries|highlight|sort/ ) }
+        e[:url] = "#{@api_url}/electorates/#{e[:id]}"
+        results.push( e )
+      end
+      results
+		end
+		
+		#   Geocode lookup to google
+		def self.address( address )
+      # http://maps.googleapis.com/maps/api/geocode/json?address=address&sensor=false&region=au
+      begin
+        google = RestClient.get "http://maps.googleapis.com/maps/api/geocode/json?address=#{URI.escape( address )}&sensor=false&region=au"
+        json = JSON.parse( google )
+        if json['status'] == 'OK'
+          #puts google
+          return "#{json['results'][0]['geometry']['location']['lng']},#{json['results'][0]['geometry']['location']['lat']}"
+        else
+          return nil
+        end
+      rescue => e
+        puts e
+      end
+		end
+		
+ 		#	  Ray casting algorithm to find if point is in polygon
+		def self.point_in_poly?( geo, boundaries )
+			#	get pairs of points of boundaries
+			long, lat = geo.split( ',' )
+			long, lat = long.to_f, lat.to_f
+			boundaries.each do |b|
+				coords = b.split( ' ' )
+				length = coords.length
+				first, second = coords.shift, coords.shift
+				cuts = 0
+				while length > 1
+					cuts += self.crosses?( first, second, lat, long )
+					first = second
+					second = coords.shift
+					length -= 1
+				end
+				return cuts.odd? ? true : false
+			end
+		end
+
+		#	  this fails edge cases where lat,long < ax,by & > bx,ay
+		#		  ie when it crosses just in front or behind diagonally
+		def self.crosses?( a, b, lat, long )
+			ay, ax = a.split( ',' )
+			by, bx = b.split( ',' )
+			ax, ay, bx, by = ax.to_f, ay.to_f, bx.to_f, by.to_f
+			return 0 if ay < long and by < long
+			return ( ( ax < lat and lat < bx ) or ( bx < lat and lat < ax ) ) ? 1 : 0
+		end		
+  end
+  
+  module Setup
     #   Parses a electorate yaml file, merges it with a geo yaml file,
     #     loads them to the datastore and resaves the yaml files
     def self.parse_yaml( filename )
@@ -44,36 +140,62 @@ module Barton
       end
     end
     
- 		#		Creates a minimum bounded box encapsulating the boundary polygons
-		def self.create_geobox( boundaries )
+    #		Creates a minimum bounded box encapsulating the boundary polygons
+    def self.create_geobox( boundaries )
       return nil unless boundaries.instance_of? Array
       box = Hash.new
       boundaries.each do |b|
-				b.split( ' ' ).each do |c|
-					coords = c.split( ',' )
-					box['north'] = coords[1].to_f if box['north'].nil? or coords[1].to_f > box['north']
-					box['south'] = coords[1].to_f if box['south'].nil? or coords[1].to_f < box['south']
-					box['east'] = coords[0].to_f if box['east'].nil? or coords[0].to_f > box['east']
-					box['west'] = coords[0].to_f if box['west'].nil? or coords[0].to_f < box['west']
-				end
-			end
-			box
-		end
-		
+        b.split( ' ' ).each do |c|
+          coords = c.split( ',' )
+          box['north'] = coords[1].to_f if box['north'].nil? or coords[1].to_f > box['north']
+          box['south'] = coords[1].to_f if box['south'].nil? or coords[1].to_f < box['south']
+          box['east'] = coords[0].to_f if box['east'].nil? or coords[0].to_f > box['east']
+          box['west'] = coords[0].to_f if box['west'].nil? or coords[0].to_f < box['west']
+        end
+      end
+      box
+    end
+    
+    # Load data from yaml source file
+    def self.load_file( filename )
+      puts "Loading data from #{filename}....."
+      electorates = self.parse_yaml( filename )
+      puts "Failed to load #{filename}" if electorates.nil?
+      connected = Data.update_es( electorates )
+      abort "Connection to Elasticsearch failed" if connected.nil?
+    end
+  end
+  
+  
+  module Data
+    
+    @index_name = ENV['RAKE_ENV']
+    
+    #  Set elasticsearch config
+    def self.config
+      @index_name = ENV['RAKE_ENV']
+      if ENV['BONSAI_INDEX_URL']
+        Tire.configure do
+          url "http://index.bonsai.io"
+        end
+        @index_name = ENV['BONSAI_INDEX_URL'][/[^\/]+$/]
+      end
+    end
+    
 		#   Purge electorate data from elasticsearch
 		def self.purge_es
       self.query_es( 'purge' )
 		end
 		
 		#   Load electorate data to elasticsearch
-		def self.update_es( electorates )
-      self.query_es( 'update', electorates )
+		def self.update_es( data )
+      self.query_es( 'update', data )
 		end
 		
 		#   Query elasticsearch
 		def self.query_es( action, data=nil )
        begin
-        Tire.index "#{ENV['RAKE_ENV']}electorates" do
+        Tire.index "#{@index_name}-electorates" do
           delete if action == 'purge'
           create if action == 'purge'
           import data if action == 'update' and not data.nil?
@@ -84,18 +206,8 @@ module Barton
       end     
 		end
 		
-    #   Returns an array of electorates
-    #     :id
-    #     :tags
-    #     :geo
-    #     :address
-		def self.electorates( query={} )
-      results = Array.new
-      terms = ["id:#{query[:id]}"] if query.has_key?( :id )
-      terms = query[:tags] if query.has_key?( :tags )
-      geo = query[:geo] if query.has_key?( :geo )
-      geo = self.address( query[:address] ) if query.has_key?( :address ) and not query.has_key?( :geo )
-      s = Tire.search "#{ENV['RAKE_ENV']}electorates" do
+		def self.search( terms, geo )
+      s = Tire.search "#{@index_name}-electorates" do
  				query do
 					boolean do
 						if geo
@@ -115,60 +227,7 @@ module Barton
 				end
 				size 100
       end
-      s.results.each do |e|
-        e = e.to_hash
-        e.keys.each { |k| e.delete( k ) if k.match( /_|geobox|boundaries|highlight|sort/ ) }
-        e[:url] = "#{@api_url}/electorates/#{e[:id]}"
-        results.push( e )
-      end
-      results
-		end
-		
-		#   Geocode lookup to google
-		def self.address( address )
-      # http://maps.googleapis.com/maps/api/geocode/json?address=address&sensor=false&region=au
-      begin
-        google = RestClient.get "http://maps.googleapis.com/maps/api/geocode/json?address=#{URI.escape( address )}&sensor=false&region=au"
-        json = JSON.parse( google )
-        if json['status'] == 'OK'
-          puts google
-          return "#{json['results'][0]['geometry']['location']['lng']},#{json['results'][0]['geometry']['location']['lat']}"
-        else
-          return nil
-        end
-      rescue => e
-        puts e
-      end
-		end
-		
- 		#	  Ray casting algorithm to find if point is in polygon
-		def self.point_in_poly?( geo, boundaries )
-			#	get pairs of points of boundaries
-			long, lat = geo.split( ',' )
-			long, lat = long.to_f, lat.to_f
-			boundaries.each do |b|
-				coords = b.split( ' ' )
-				length = coords.length
-				first, second = coords.shift, coords.shift
-				cuts = 0
-				while length > 1
-					cuts += self.crosses?( first, second, lat, long )
-					first = second
-					second = coords.shift
-					length -= 1
-				end
-				return cuts.odd? ? true : false
-			end
-		end
-
-		#	  this fails edge cases where lat,long < ax,by & > bx,ay
-		#		  ie when it crosses just in front or behind diagonally
-		def self.crosses?( a, b, lat, long )
-			ay, ax = a.split( ',' )
-			by, bx = b.split( ',' )
-			ax, ay, bx, by = ax.to_f, ay.to_f, bx.to_f, by.to_f
-			return 0 if ay < long and by < long
-			return ( ( ax < lat and lat < bx ) or ( bx < lat and lat < ax ) ) ? 1 : 0
-		end
-	end
-end
+      s
+    end
+  end
+end