wukong 3.0.1 → 4.0.0

data/spec/wukong/widget/logger_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe :logger do
+  it_behaves_like "a processor", :named => :logger
+
+  it "logs each event at the 'info' level by default" do
+    log = double("logger")
+    log.should_receive(:info).with('hi there')
+    log.should_receive(:info).with('buddy')
+    processor(:logger) do |proc|
+      proc.stub(:log).and_return(log)
+    end.given('hi there', 'buddy').should emit(0).records
+  end
+
+  it "logs each event at the a desired level set with an argument" do
+    log = double("logger")
+    log.should_receive(:debug).with('hi there')
+    log.should_receive(:debug).with('buddy')
+    processor(:logger, level: :debug) do |proc|
+      proc.stub(:log).and_return(log)
+    end.given('hi there', 'buddy').should emit(0).records
+  end
+end

data/spec/wukong/widget/operators_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "Operators" do
+
+  describe :map do
+    it_behaves_like 'a processor', :named => :map
+    it "performs an action on each input record" do
+      processor(:map, action: ->(input_record) { input_record.upcase }).given('snap', 'crackle', 'pop').should emit('SNAP', 'CRACKLE', 'POP')
+    end
+
+    it "can simultaneously filter out records" do
+      processor(:map, compact: true, action: ->(input_record) { input_record + 1 if input_record > 0 }).given(2, -4, 6).should emit(3, 7)
+    end
+  end
+
+  describe :flatten do
+    it_behaves_like 'a processor', :named => :flatten
+
+    it "yields each input record or its contents" do
+      processor(:flatten).given('foo', ['bar', 'baz'], 'bing').should emit('foo', 'bar', 'baz', 'bing')
+    end
+    
+  end
+  
+end

data/spec/wukong/widget/reducers/join_xml_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe "Reducers" do
+  describe :join_xml do
+    include_context "reducers"
+    it_behaves_like 'a processor', :named => :join_xml
+
+    it "joins XML spread out over multiple lines" do
+      processor(:join_xml).given('<xml>first line', 'second line', 'third line</xml>').should emit("<xml>first line\nsecond line\nthird line</xml>")
+    end
+    
+    it "joins XML one-per-line" do
+      processor(:join_xml).given('<xml>first line</xml>', '<xml>second line</xml>', '<xml>third line</xml>').should emit('<xml>first line</xml>', '<xml>second line</xml>', '<xml>third line</xml>')
+    end
+
+    it "joins XML split in the middle of a line" do
+      processor(:join_xml).given('<xml>first line', 'second</xml><xml> line', 'third line</xml>').should emit("<xml>first line\nsecond</xml>", "<xml> line\nthird line</xml>")
+    end
+
+    it "joins XML with a custom tag" do
+      processor(:join_xml, root: 'foobar').given('<foobar>first line', 'second line', 'third line</foobar>').should emit("<foobar>first line\nsecond line\nthird line</foobar>")
+    end
+    
+  end
+end

data/spec/wukong/wu-source_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'wu-source' do
+
+  let(:input) { %w[1 2 3] }
+  
+  context "without any arguments" do
+    subject { wu_source() }
+    it {should exit_with(:non_zero) }
+    it "displays help on STDERR" do
+      should have_stderr(/provide a processor.*to run/)
+    end
+  end
+
+  # FIXME -- it's hard to write an integration test for wu-source
+  # because it doesn't self-terminate under any conditions when run
+  # successfully.
+  #
+  # Options:
+  #
+  #   1) Add a --max (or similar) flag to wu-source allowing it to
+  #      exit after some number of records which could then be checked
+  #      by an integration test.
+  #
+  #   2) Launch it in a subprocess and wait a little while (how long?)
+  #   and ensure that it's produced a bunch of output in the meantime.
+  #   If the `per_sec` option is high, we shouldn't have to wait very
+  #   long to see a whole bunch of output records.  This is tricky b/c
+  #   what if the system is under load and we don't wait long enough
+  #   for the wu-source subprocess to boot up and start emitting?
+  
+end

data/spec/wukong/wu_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'wu' do
+
+  let(:input) { %w[1 2 3] }
+  
+  context "without any arguments" do
+    subject { wu() }
+    it {should exit_with(:non_zero) }
+    it "displays help on STDERR" do
+      should have_stderr(/provide a Wukong command to run/)
+    end
+  end
+end

data/wukong.gemspec

@@ -21,13 +21,12 @@ Gem::Specification.new do |gem|
 EOF
 
   gem.files         = `git ls-files`.split("\n").reject { |path| path =~ /^(data|docpages|notes|old)/ }
-  gem.executables   = ['wu-local']
+  gem.executables   = ['wu-local', 'wu-source', 'wu']
   gem.test_files    = gem.files.grep(/^spec/)
   gem.require_paths = ['lib']
 
   gem.add_dependency('configliere',             '>= 0.4.18')
   gem.add_dependency('multi_json',              '>= 1.3.6')
-  gem.add_dependency('vayacondios-client',      '>= 0.1.2')
   gem.add_dependency('gorillib',                '>= 0.4.2')
   gem.add_dependency('forgery')
   gem.add_dependency('uuidtools')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wukong
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -45,22 +45,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: vayacondios-client
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: gorillib
   requirement: !ruby/object:Gem::Requirement
@@ -149,6 +133,8 @@ description: ! "  Treat your dataset like a:\n\n      * stream of lines when it'
 email: coders@infochimps.com
 executables:
 - wu-local
+- wu-source
+- wu
 extensions: []
 extra_rdoc_files: []
 files:
@@ -174,6 +160,7 @@ files:
 - bin/tabchar
 - bin/uniq-ord
 - bin/uniqc
+- bin/wu
 - bin/wu-clean-encoding
 - bin/wu-date
 - bin/wu-datetime
@@ -181,6 +168,7 @@ files:
 - bin/wu-lign
 - bin/wu-local
 - bin/wu-plus
+- bin/wu-source
 - bin/wu-sum
 - diagrams/wu_local.dot
 - diagrams/wu_local.dot.png
@@ -215,6 +203,7 @@ files:
 - examples/geo/tile_fetcher.rb
 - examples/graph/implied_geolocation/README.md
 - examples/graph/minimum_spanning_tree/airfares_graphviz.rb
+- examples/improver/tweet_summary.rb
 - examples/loadable.rb
 - examples/munging/airline_flights/airline_flights.rake
 - examples/munging/airline_flights/airplane.rb
@@ -266,6 +255,7 @@ files:
 - examples/serverlogs/visit_paths/serverlogs-02-histograms-mapper.rb
 - examples/serverlogs/visit_paths/serverlogs-03-breadcrumbs-full.rb
 - examples/serverlogs/visit_paths/serverlogs-04-page_page_edges-full.rb
+- examples/splitter.rb
 - examples/string_reverser.rb
 - examples/text/pig_latin/pig_latinizer.rb
 - examples/text/pig_latin/pig_latinizer_widget.rb
@@ -273,6 +263,7 @@ files:
 - examples/text/regional_flavor/article_wordbags.pig
 - examples/text/regional_flavor/j01-article_wordbags.rb
 - examples/text/regional_flavor/simple_pig_script.pig
+- examples/twitter.rb
 - lib/hanuman.rb
 - lib/hanuman/graph.rb
 - lib/hanuman/graphvizzer.rb
@@ -281,6 +272,7 @@ files:
 - lib/hanuman/link.rb
 - lib/hanuman/registry.rb
 - lib/hanuman/stage.rb
+- lib/hanuman/tree.rb
 - lib/wu/geo.rb
 - lib/wu/geo/geo_grids.numbers
 - lib/wu/geo/geolocated.rb
@@ -297,11 +289,11 @@ files:
 - lib/wukong/doc_helpers/field_handler.rb
 - lib/wukong/doc_helpers/processor_handler.rb
 - lib/wukong/driver.rb
+- lib/wukong/driver/event_machine_driver.rb
+- lib/wukong/driver/wiring.rb
 - lib/wukong/local.rb
-- lib/wukong/local/event_machine_driver.rb
 - lib/wukong/local/runner.rb
 - lib/wukong/local/stdio_driver.rb
-- lib/wukong/local/tcp_driver.rb
 - lib/wukong/logger.rb
 - lib/wukong/model/faker.rb
 - lib/wukong/model/flatpack_parser/flat.rb
@@ -315,8 +307,12 @@ files:
 - lib/wukong/runner.rb
 - lib/wukong/runner/boot_sequence.rb
 - lib/wukong/runner/code_loader.rb
+- lib/wukong/runner/command_runner.rb
 - lib/wukong/runner/deploy_pack_loader.rb
 - lib/wukong/runner/help_message.rb
+- lib/wukong/source.rb
+- lib/wukong/source/source_driver.rb
+- lib/wukong/source/source_runner.rb
 - lib/wukong/spec_helpers.rb
 - lib/wukong/spec_helpers/integration_tests.rb
 - lib/wukong/spec_helpers/integration_tests/integration_test_matchers.rb
@@ -327,14 +323,19 @@ files:
 - lib/wukong/spec_helpers/unit_tests/unit_test_matchers.rb
 - lib/wukong/spec_helpers/unit_tests/unit_test_runner.rb
 - lib/wukong/version.rb
+- lib/wukong/widget/echo.rb
+- lib/wukong/widget/extract.rb
 - lib/wukong/widget/filters.rb
-- lib/wukong/widget/processors.rb
+- lib/wukong/widget/logger.rb
+- lib/wukong/widget/operators.rb
 - lib/wukong/widget/reducers.rb
 - lib/wukong/widget/reducers/accumulator.rb
 - lib/wukong/widget/reducers/bin.rb
 - lib/wukong/widget/reducers/count.rb
 - lib/wukong/widget/reducers/group.rb
 - lib/wukong/widget/reducers/group_concat.rb
+- lib/wukong/widget/reducers/improver.rb
+- lib/wukong/widget/reducers/join_xml.rb
 - lib/wukong/widget/reducers/moments.rb
 - lib/wukong/widget/reducers/sort.rb
 - lib/wukong/widget/reducers/uniq.rb
@@ -355,36 +356,44 @@ files:
 - spec/hanuman/hanuman_spec.rb
 - spec/hanuman/registry_spec.rb
 - spec/hanuman/stage_spec.rb
+- spec/hanuman/tree_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/example_test_helpers.rb
 - spec/support/hanuman_test_helpers.rb
 - spec/support/integration_helper.rb
 - spec/support/model_test_helpers.rb
+- spec/support/shared_context_for_graphs.rb
 - spec/support/shared_context_for_reducers.rb
 - spec/support/shared_examples_for_builders.rb
 - spec/support/shared_examples_for_shortcuts.rb
-- spec/wu/geo/geolocated_spec.rb
 - spec/wu/model/reconcilable_spec.rb
 - spec/wukong/dataflow_spec.rb
 - spec/wukong/driver_spec.rb
 - spec/wukong/local/runner_spec.rb
+- spec/wukong/local/stdio_driver_spec.rb
 - spec/wukong/local_spec.rb
 - spec/wukong/logger_spec.rb
 - spec/wukong/model/faker_spec.rb
 - spec/wukong/processor_spec.rb
 - spec/wukong/runner_spec.rb
+- spec/wukong/source_spec.rb
+- spec/wukong/widget/extract_spec.rb
 - spec/wukong/widget/filters_spec.rb
-- spec/wukong/widget/processors_spec.rb
+- spec/wukong/widget/logger_spec.rb
+- spec/wukong/widget/operators_spec.rb
 - spec/wukong/widget/reducers/bin_spec.rb
 - spec/wukong/widget/reducers/count_spec.rb
 - spec/wukong/widget/reducers/group_spec.rb
+- spec/wukong/widget/reducers/join_xml_spec.rb
 - spec/wukong/widget/reducers/moments_spec.rb
 - spec/wukong/widget/reducers/sort_spec.rb
 - spec/wukong/widget/serializers_spec.rb
 - spec/wukong/widget/sink_spec.rb
 - spec/wukong/widget/source_spec.rb
 - spec/wukong/wu-local_spec.rb
+- spec/wukong/wu-source_spec.rb
+- spec/wukong/wu_spec.rb
 - spec/wukong/wukong_spec.rb
 - wukong.gemspec
 homepage: https://github.com/infochimps-labs/wukong
@@ -402,7 +411,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 719389029987495852
+      hash: -3691227993438066896
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -411,10 +420,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 719389029987495852
+      hash: -3691227993438066896
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Hadoop Streaming for Ruby. Wukong makes Hadoop so easy a chimpanzee can use
@@ -434,35 +443,43 @@ test_files:
 - spec/hanuman/hanuman_spec.rb
 - spec/hanuman/registry_spec.rb
 - spec/hanuman/stage_spec.rb
+- spec/hanuman/tree_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/example_test_helpers.rb
 - spec/support/hanuman_test_helpers.rb
 - spec/support/integration_helper.rb
 - spec/support/model_test_helpers.rb
+- spec/support/shared_context_for_graphs.rb
 - spec/support/shared_context_for_reducers.rb
 - spec/support/shared_examples_for_builders.rb
 - spec/support/shared_examples_for_shortcuts.rb
-- spec/wu/geo/geolocated_spec.rb
 - spec/wu/model/reconcilable_spec.rb
 - spec/wukong/dataflow_spec.rb
 - spec/wukong/driver_spec.rb
 - spec/wukong/local/runner_spec.rb
+- spec/wukong/local/stdio_driver_spec.rb
 - spec/wukong/local_spec.rb
 - spec/wukong/logger_spec.rb
 - spec/wukong/model/faker_spec.rb
 - spec/wukong/processor_spec.rb
 - spec/wukong/runner_spec.rb
+- spec/wukong/source_spec.rb
+- spec/wukong/widget/extract_spec.rb
 - spec/wukong/widget/filters_spec.rb
-- spec/wukong/widget/processors_spec.rb
+- spec/wukong/widget/logger_spec.rb
+- spec/wukong/widget/operators_spec.rb
 - spec/wukong/widget/reducers/bin_spec.rb
 - spec/wukong/widget/reducers/count_spec.rb
 - spec/wukong/widget/reducers/group_spec.rb
+- spec/wukong/widget/reducers/join_xml_spec.rb
 - spec/wukong/widget/reducers/moments_spec.rb
 - spec/wukong/widget/reducers/sort_spec.rb
 - spec/wukong/widget/serializers_spec.rb
 - spec/wukong/widget/sink_spec.rb
 - spec/wukong/widget/source_spec.rb
 - spec/wukong/wu-local_spec.rb
+- spec/wukong/wu-source_spec.rb
+- spec/wukong/wu_spec.rb
 - spec/wukong/wukong_spec.rb
 has_rdoc: 

data/lib/wukong/local/tcp_driver.rb

@@ -1,47 +0,0 @@
-require_relative('event_machine_driver')
-module Wukong
-  module Local
-    
-    # A class for driving processors over a TCP protocol.
-    class TCPDriver < EM::P::LineAndTextProtocol
-      include EventMachineDriver
-      include Processor::BufferedProcessor
-      include Logging
-
-      def self.start(label, settings = {})
-        host = (settings[:host] || Socket.gethostname) rescue 'localhost'
-        port = (settings[:port] || 9000).to_i          rescue 9000
-        EM.start_server(host, port, self, label, settings)
-        log.info "Server started on #{host} on port #{port}"
-        add_signal_traps
-      end
-
-      def post_init
-        port, ip = Socket.unpack_sockaddr_in(get_peername)
-        log.info "Connected to #{ip} on #{port}"
-        setup_dataflow
-      end
-
-      def receive_line line
-        @buffer = []      
-        operation = proc { driver.send_through_dataflow(line) }
-        callback  = proc { flush_buffer @buffer }
-        EM.defer(operation, callback)
-      rescue => e
-        EM.stop
-        raise Wukong::Error.new(e)
-      end
-
-      def flush_buffer records
-        send_data(records.join("\n") + "\n")
-        records.clear
-      end
-
-      def unbind
-        finalize_and_stop_dataflow
-        EM.stop
-      end
-      
-    end
-  end
-end

data/spec/wu/geo/geolocated_spec.rb

@@ -1,247 +0,0 @@
-require          'gorillib/data_munging'
-require          'wu/geo/geolocated'
-
-describe Wukong::Geolocated do
-  let(:aus_lng){   -97.759003 } # Austin, TX -- infochimps HQ
-  let(:aus_lat){    30.273884 }
-  let(:sat_lng){   -98.486123 } # San Antonio, TX
-  let(:sat_lat){    29.42575  }
-  let(:dpi){ 72 }
-  #
-  let(:aus_tile_x_3){  1.82758 } # zoom level 3
-  let(:aus_tile_y_3){  3.29356 }
-  let(:aus_pixel_x_3){ 468     }
-  let(:aus_pixel_y_3){ 843     }
-  #
-  let(:aus_tile_x_8){   58.48248675555555 } # zoom level 8
-  let(:aus_tile_y_8){  105.39405073699557 }
-  let(:aus_tile_x_11){ 467 } # zoom level 11
-  let(:aus_tile_y_11){ 843 }
-  #
-  let(:aus_quadkey  ){ "0231301203311211" }
-  let(:aus_quadkey_3){ "023"             }
-  let(:radius){      1_000_000 } # 1,000 km
-
-  context Wukong::Geolocated::ByCoordinates do
-    let(:point_klass) do
-      module Wukong
-        class TestPoint
-          include Gorillib::Model
-          include Wukong::Geolocated::ByCoordinates
-          field :name,       String, position: 0,   doc: "Name of this location"
-          field :longitude,  Float,  position: 1,   doc: "Longitude (X) of a point, in decimal degrees"
-          field :latitude,   Float,  position: 2,   doc: "Latitude (Y) of a point, in decimal degrees"
-        end
-      end
-      Wukong::TestPoint
-    end
-    subject{ point_klass.new("Infochimps HQ", aus_lng, aus_lat) }
-
-    context '#tile_xf' do
-      it "tile X coordinate, as a float" do
-        subject.tile_xf(3).should  be_within(0.0001).of( 1.82758)
-        subject.tile_xf(8).should  be_within(0.0001).of(58.48248)
-        subject.tile_xf(11).should be_within(0.0001).of(467.8598)
-      end
-    end
-    context '#tile_x' do
-      it "tile X coordinate, as an integer" do
-        subject.tile_x(3).should  ==   1
-        subject.tile_x(8).should  ==  58
-        subject.tile_x(11).should == 467
-      end
-    end
-    context '#tile_yf' do
-      it "tile Y coordinate, as a float" do
-        subject.tile_yf(3).should  be_within(0.0001).of(  3.29356)
-        subject.tile_yf(8).should  be_within(0.0001).of(105.394051)
-        subject.tile_yf(11).should be_within(0.0001).of(843.152406)
-      end
-    end
-    context '#tile_x' do
-      it "tile Y coordinate, as an integer" do
-        subject.tile_y(3).should  ==   3
-        subject.tile_y(8).should  == 105
-        subject.tile_y(11).should == 843
-      end
-    end
-    context '#quadkey' do
-      it "a string of 2-bit tile selectors" do
-        subject.quadkey(3).should  == "023"
-        subject.quadkey(16).should == "0231301203311211"
-      end
-    end
-  end
-
-  context Wukong::Geolocated do
-
-    it "gives private methods on including class as well as the methods on itself" do
-      klass = Class.new{ include Wukong::Geolocated }
-      klass.should be_private_method_defined(:lng_lat_zl_to_tile_xy)
-      klass.should be_private_method_defined(:haversine_distance)
-    end
-
-    #
-    # Tile coordinates
-    #
-
-    it "returns a map tile size given a zoom level" do
-      Wukong::Geolocated.map_tile_size(3).should == 8
-    end
-
-    it "returns a tile_x, tile_y pair given a longitude, latitude and zoom level" do
-      Wukong::Geolocated.lng_lat_zl_to_tile_xy(aus_lng, aus_lat,  8).should == [ 58, 105]
-      Wukong::Geolocated.lng_lat_zl_to_tile_xy(aus_lng, aus_lat, 11).should == [467, 843]
-    end
-
-    it "returns a longitude, latitude pair given tile_x, tile_y and zoom level" do
-      lng, lat = Wukong::Geolocated.tile_xy_zl_to_lng_lat(aus_tile_x_8, aus_tile_y_8, 8)
-      lng.should be_within(0.0001).of(aus_lng)
-      lat.should be_within(0.0001).of(aus_lat)
-    end
-
-    #
-    # Pixel coordinates
-    #
-
-    it "returns a map pizel size given a zoom level" do
-      Wukong::Geolocated.map_pixel_size(3).should == 2048
-    end
-
-    it "returns a pixel_x, pixel_y pair given a longitude, latitude and zoom level" do
-      Wukong::Geolocated.lng_lat_zl_to_pixel_xy(aus_lng, aus_lat, 3).should == [468, 843]
-    end
-
-    it "returns a longitude, latitude pair given pixel_x, pixel_y and zoom level" do
-      lng, lat = Wukong::Geolocated.pixel_xy_zl_to_lng_lat(aus_pixel_x_3, aus_pixel_y_3, 3)
-      lat.round(4).should ==  30.2970
-      lng.round(4).should == -97.7344
-    end
-
-    it "returns a tile x-y pair given a pixel x-y pair" do
-      Wukong::Geolocated.pixel_xy_to_tile_xy(aus_pixel_x_3, aus_pixel_y_3).should == [1,3]
-    end
-
-    it "returns a pixel x-y pair given a float tile x-y pair" do
-      Wukong::Geolocated.tile_xy_to_pixel_xy(aus_tile_x_3,      aus_tile_y_3     ).should == [467.86048, 843.15136]
-    end
-
-    it "returns a pixel x-y pair given an integer tile x-y pair" do
-      Wukong::Geolocated.tile_xy_to_pixel_xy(aus_tile_x_3.to_i, aus_tile_y_3.to_i).should == [256, 768]
-    end
-
-    #
-    # Quadkey coordinates
-    #
-
-    it "returns a quadkey given a tile x-y pair and a zoom level" do
-      Wukong::Geolocated.tile_xy_zl_to_quadkey(aus_tile_x_3,  aus_tile_y_3,  3).should == "023"
-      Wukong::Geolocated.tile_xy_zl_to_quadkey(aus_tile_x_8,  aus_tile_y_8,  8).should == "02313012"
-      Wukong::Geolocated.tile_xy_zl_to_quadkey(aus_tile_x_11, aus_tile_y_11,11).should == "02313012033"
-    end
-
-    it "returns a quadkey given a longitude, latitude and a zoom level" do
-      Wukong::Geolocated.lng_lat_zl_to_quadkey(aus_lng, aus_lat,  3).should == "023"
-      Wukong::Geolocated.lng_lat_zl_to_quadkey(aus_lng, aus_lat,  8).should == "02313012"
-      Wukong::Geolocated.lng_lat_zl_to_quadkey(aus_lng, aus_lat, 11).should == "02313012033"
-      Wukong::Geolocated.lng_lat_zl_to_quadkey(aus_lng, aus_lat, 16).should == "0231301203311211"
-    end
-
-    it "returns a packed quadkey (an integer) given a tile xy and zoom level" do
-      Wukong::Geolocated.tile_xy_zl_to_packed_qk(aus_tile_x_3.floor,  aus_tile_y_3.floor,  3).should == "023".to_i(4)
-      Wukong::Geolocated.tile_xy_zl_to_packed_qk(aus_tile_x_8.floor,  aus_tile_y_8.floor,  8).should == "02313012".to_i(4)
-      Wukong::Geolocated.tile_xy_zl_to_packed_qk(aus_tile_x_11.floor, aus_tile_y_11.floor,11).should == "02313012033".to_i(4)
-    end
-
-    context '.packed_qk_zl_to_tile_xy' do
-      let(:packed_qk){ "0231301203311211".to_i(4) }
-      it "returns a tile xy given a packed quadkey (integer)" do
-        Wukong::Geolocated.packed_qk_zl_to_tile_xy(packed_qk >> 26,  3).should == [  1,   3,  3]
-        Wukong::Geolocated.packed_qk_zl_to_tile_xy(packed_qk >> 16,  8).should == [ 58, 105,  8]
-        Wukong::Geolocated.packed_qk_zl_to_tile_xy(packed_qk >> 10, 11).should == [467, 843, 11]
-      end
-
-      it "defaults to zl=16 for packed quadkeys" do
-        Wukong::Geolocated.packed_qk_zl_to_tile_xy(packed_qk    ).should == [14971, 26980, 16]
-        Wukong::Geolocated.packed_qk_zl_to_tile_xy(packed_qk, 16).should == [14971, 26980, 16]
-      end
-    end
-
-    it "returns tile x-y pair and a zoom level given a quadkey" do
-      Wukong::Geolocated.quadkey_to_tile_xy_zl(aus_quadkey[0..2] ).should == [1, 3, 3]
-      Wukong::Geolocated.quadkey_to_tile_xy_zl(aus_quadkey[0..7] ).should == [aus_tile_x_8.floor,  aus_tile_y_8.floor,  8]
-      Wukong::Geolocated.quadkey_to_tile_xy_zl(aus_quadkey[0..10]).should == [aus_tile_x_11.floor, aus_tile_y_11.floor, 11]
-    end
-
-    it "allows '' to be a quadkey (whole map)" do
-      Wukong::Geolocated.quadkey_to_tile_xy_zl("").should == [0, 0, 0]
-    end
-
-    it "maps tile xyz [0,0,0] to quadkey ''" do
-      Wukong::Geolocated.tile_xy_zl_to_quadkey(0,0,0).should == ""
-    end
-
-    it "throws an error if a bad quadkey is given" do
-      expect{ Wukong::Geolocated.quadkey_to_tile_xy_zl("bad_key") }.to raise_error(ArgumentError, /Quadkey.*characters/)
-    end
-
-    it "returns a bounding box given a quadkey" do
-      left, btm, right, top = Wukong::Geolocated.quadkey_to_bbox(aus_quadkey_3)
-      left.should  be_within(0.0001).of(-135.0)
-      right.should be_within(0.0001).of(- 90.0)
-      btm.should   be_within(0.0001).of(   0.0)
-      top.should   be_within(0.0001).of(  40.9799)
-    end
-
-    it "returns the smallest quadkey containing two points" do
-      Wukong::Geolocated.quadkey_containing_bbox(aus_lng, aus_lat, sat_lng, sat_lat).should == "023130"
-    end
-
-    it "returns a bounding box given a point and radius" do
-      left, btm, right, top = Wukong::Geolocated.lng_lat_rad_to_bbox(aus_lng, aus_lat, radius)
-
-      left.should  be_within(0.0001).of(-108.1723)
-      right.should be_within(0.0001).of(- 87.3457)
-      btm.should   be_within(0.0001).of(  21.2807)
-      top.should   be_within(0.0001).of(  39.2671)
-    end
-
-    it "returns a centroid given a bounding box" do
-      mid_lng, mid_lat = Wukong::Geolocated.bbox_centroid([aus_lng, sat_lat], [sat_lng, aus_lat])
-      mid_lng.should be_within(0.0001).of(-98.1241)
-      mid_lat.should be_within(0.0001).of( 29.8503)
-    end
-
-    it "returns a pixel resolution given a latitude and zoom level" do
-      Wukong::Geolocated.pixel_resolution(aus_lat, 3).should be_within(0.0001).of(16880.4081)
-    end
-
-    it "returns a map scale given a latitude, zoom level and dpi" do
-      Wukong::Geolocated.map_scale_for_dpi(aus_lat, 3, dpi).should be_within(0.0001).of(47849975.8302)
-    end
-
-    it "calculates the haversine distance between two points" do
-      Wukong::Geolocated.haversine_distance(aus_lng, aus_lat, sat_lng, sat_lat).should be_within(0.0001).of(117522.1219)
-    end
-
-    it "calculates the haversine midpoint between two points" do
-      lng, lat = Wukong::Geolocated.haversine_midpoint(aus_lng, sat_lat, sat_lng, aus_lat)
-      lng.should be_within(0.0001).of(-98.1241)
-      lat.should be_within(0.0001).of( 29.8503)
-    end
-
-    it "calculates the point a given distance directly north from a lat/lng" do
-      lng, lat = Wukong::Geolocated.point_north(aus_lng, aus_lat, 1000000)
-      lng.should be_within(0.0001).of(-97.7590)
-      lat.should be_within(0.0001).of( 39.2671)
-    end
-
-    it "calculates the point a given distance directly east from a lat/lng" do
-      lng, lat = Wukong::Geolocated.point_east(aus_lng, aus_lat, 1000000)
-      lng.should be_within(0.0001).of(-87.3457)
-      lat.should be_within(0.0001).of( 30.2739)
-    end
-
-
-  end # module methods
-end