matryoshka_view 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d33a23d2731d7f0e30c137531229374426ed23db
-  data.tar.gz: 865d5642e89137fd3c8f429c49c22fe0470e07ef
+  metadata.gz: 0c855976ac7d5e8ef52a01986ce5a4343b086999
+  data.tar.gz: 0cff6196dca2f1358aed93334b8f8c2bdbc0103f
 SHA512:
-  metadata.gz: 742c33963dc21a4f1352f988bef0b64f314944c30bcead9547ca300c7435786127f3c6234481f6e85744ed1003171c9e7ed1d4ba89c4df4ca5f82b95536bcaaf
-  data.tar.gz: 6b1195721ad3cb1e16cbd5e8dd1c0de008058a680644cd080aea4513d3010d080e10246c2adcf298ba0d63374a61f21934e3cfe3a45a16b10ec4c086f763db31
+  metadata.gz: 6d1ee2c273696afbe48bbcbfc0ade125fc54fc5d0b9288b652cb860e7b2861c9de73756b274f950e300c8d149545a804ff7d76940bba66a57c2f1a0c47148064
+  data.tar.gz: c92678c5b41bb728f2df3b4248f3925ce17411e7d9a637736db15217925fb239e3c40e37f8d649a505e840fee90ad098e946ac80f6c78918e7005080f28c92a1

data/CHANGELOG

@@ -1,3 +1,9 @@
+2015-06-08 / 0.2.6
+
+* Bug fixes
+
+  * Restrict lookup to the same base
+
 2015-05-12 / 0.2.5
 
 * Enhancements

data/lib/matryoshka_view.rb

@@ -46,20 +46,18 @@ class MatryoshkaView
 
   def lookup(geom_source: nil, the_geom_geojson: nil)
     # FIXME move to Record class method
-    hit = if geom_source
-      with_connection do |c|
+    hit = with_connection do |c|
+      if geom_source
         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
+          Record.where("(base = #{c.quote base}) AND (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
+          Record.where("(base = #{c.quote base}) AND (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
+      elsif the_geom_geojson
+        Record.where("(base = #{c.quote base}) AND (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
+      else
+        raise "expecting geom_source or the_geom_geojson"
       end
-    elsif the_geom_geojson
-      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
     hit.try(:view) || self
   end

data/lib/matryoshka_view/version.rb

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

data/spec/matryoshka_view_spec.rb

@@ -119,6 +119,12 @@ describe MatryoshkaView do
       burlington
       expect(world.lookup(geom_source: place(:montreal_canada))).to eq(world)
     end
+
+    it "doesn't confuse bases" do
+      other_world = MatryoshkaView.new(base: 'gibberish')
+      burlington
+      expect(other_world.lookup(geom_source: place(:burlington_point))).to eq(other_world)
+    end
   end
 
 end

metadata

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