matryoshka_view 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f44d84344c60d4c94323907e63d5ddeac87651ce
-  data.tar.gz: 8cf78233e816dd675d63f640d0391d3dd93220d5
+  metadata.gz: d33a23d2731d7f0e30c137531229374426ed23db
+  data.tar.gz: 865d5642e89137fd3c8f429c49c22fe0470e07ef
 SHA512:
-  metadata.gz: 1687c25e01224c0faad72ef30aa7fc0a4d40c0225a0a07c3e31081899dee9aa7024c691538871932b111f316cde4ba8e99680e45821994156e2784166c3c0770
-  data.tar.gz: 779939e738edc87c4539f8656ea32a84acb968e1f1c6bf0668c3e8d054326768073510e76c92db4b1b2ec8645a586283c50ea35354f10104d9eddca2bd402cd0
+  metadata.gz: 742c33963dc21a4f1352f988bef0b64f314944c30bcead9547ca300c7435786127f3c6234481f6e85744ed1003171c9e7ed1d4ba89c4df4ca5f82b95536bcaaf
+  data.tar.gz: 6b1195721ad3cb1e16cbd5e8dd1c0de008058a680644cd080aea4513d3010d080e10246c2adcf298ba0d63374a61f21934e3cfe3a45a16b10ec4c086f763db31

data/CHANGELOG

@@ -1,3 +1,9 @@
+2015-05-12 / 0.2.5
+
+* Enhancements
+
+  * Use geom_source.the_geom if geom_source has changed
+
 2014-10-19 / 0.2.4
 
 * Enhancements

data/lib/matryoshka_view.rb

@@ -47,9 +47,17 @@ class MatryoshkaView
   def lookup(geom_source: nil, the_geom_geojson: nil)
     # FIXME move to Record class method
     hit = if geom_source
-      Record.where("the_geom && (SELECT the_geom FROM #{geom_source.class.quoted_table_name} WHERE id = #{quote(geom_source.id)}) AND ST_Contains(ST_Buffer(the_geom, 0.00001), (SELECT the_geom FROM #{geom_source.class.quoted_table_name} WHERE id = #{quote(geom_source.id)}))").order("ST_Area(the_geom, false) ASC").first
+      with_connection do |c|
+        if geom_source.changed?
+          Record.where("(the_geom && #{c.quote geom_source.the_geom}) AND ST_Contains(ST_Buffer(the_geom, 0.00001), #{c.quote geom_source.the_geom})").order("ST_Area(the_geom, false) ASC").first
+        else
+          Record.where("(the_geom && (SELECT the_geom FROM #{geom_source.class.quoted_table_name} WHERE id = #{c.quote(geom_source.id)})) AND ST_Contains(ST_Buffer(the_geom, 0.00001), (SELECT the_geom FROM #{geom_source.class.quoted_table_name} WHERE id = #{c.quote(geom_source.id)}))").order("ST_Area(the_geom, false) ASC").first
+        end
+      end
     elsif the_geom_geojson
-      Record.where("the_geom && ST_SetSRID(ST_GeomFromGeoJSON(#{quote(the_geom_geojson)}), 4326) AND ST_Contains(ST_Buffer(the_geom, 0.00001), ST_SetSRID(ST_GeomFromGeoJSON(#{quote(the_geom_geojson)}), 4326))").order("ST_Area(the_geom, false) ASC").first
+      with_connection do |c|
+        Record.where("the_geom && ST_SetSRID(ST_GeomFromGeoJSON(#{c.quote the_geom_geojson}), 4326) AND ST_Contains(ST_Buffer(the_geom, 0.00001), ST_SetSRID(ST_GeomFromGeoJSON(#{c.quote the_geom_geojson}), 4326))").order("ST_Area(the_geom, false) ASC").first
+      end
     else
       raise "expecting geom_source or the_geom_geojson"
     end

data/lib/matryoshka_view/version.rb

@@ -1,3 +1,3 @@
 class MatryoshkaView
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/spec/matryoshka_view_spec.rb

@@ -108,5 +108,17 @@ describe MatryoshkaView do
     it_behaves_like 'OK'
   end
 
+  describe 'with the_geom' do
+    let(:burlington)          { world.spawn geom_source: place(:burlington) }
+    it "tells you what view to use inside boundaries (inclusive)" do
+      burlington
+      expect(world.lookup(geom_source: place(:burlington_point))).to eq(burlington)
+    end
+
+    it "falls back to original table outside boundaries" do
+      burlington
+      expect(world.lookup(geom_source: place(:montreal_canada))).to eq(world)
+    end
+  end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matryoshka_view
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord