the_geom_geojson 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe2d91489bee741cbeda1627076c563bc85b1ca
-  data.tar.gz: 95fefdd350e5e37490265361b35a2037ddd1a61a
+  metadata.gz: b0cb34abb081e5fdf3f64760adc9b8ed2a4b2690
+  data.tar.gz: c370e1e32937b9bdf8b0f668dfdea446f224df75
 SHA512:
-  metadata.gz: 13a6463a0e6fdba2ed50dc56d11294a7075c0814dd905c7222eccebf63c50d1277d6c21714e7140eb20ea95a3ee303fc6da1284e07220de65882730439794dc6
-  data.tar.gz: 594030fe91fda9ec7846577dc6c0f8f11968df166c33e5106b576dd195759c36af0fbe44ef191c6513ff0d368a5cfb31c9f86dc3c30cf6caf47353a73bf80114
+  metadata.gz: 7286bb6c4c26277a6e18a5c2598e8068e4e1057ad569e820cfa625e890263a6801866912ecf1d423b170908b1bbeb30514681c7c890de5135f004375ccf58f70
+  data.tar.gz: 43525ed84188d6306b38803a783912397b5260caf39781d3bebf6659e8d75b324b76dd218d0459dd631f1ceec34d7c21ef39202263aedff4b5e8ae2e6f29e6f3

data/CHANGELOG

@@ -1,3 +1,16 @@
+0.1.0 / 2014-10-19
+
+* Breaking changes
+
+  * Provide .with_geojson scope for faster #the_geom_geojson accesses (RGeo is WAY slower than ST_AsGeoJSON)
+
+* Enhancements
+
+  * Much faster than 0.0.5 if you use .with_geojson scope; unlike 0.0.4, works even if you don't
+  * Opportunistically use read_attribute(:the_geom_geojson) if the user has included it in their SELECT
+  * Provide TheGeomGeoJSON.ewkb_to_geojson(ewkb)
+  * Warn when EWKB->GeoJSON parsing is taking too long
+
 0.0.5 / 2014-10-17
 
 * Enhancements

data/lib/the_geom_geojson.rb

@@ -5,4 +5,11 @@ require 'rgeo/geo_json'
 
 module TheGeomGeoJSON
   Dirty = Class.new(RuntimeError)
+
+  class << self
+    def ewkb_to_geojson(ewkb)
+      parser = RGeo::WKRep::WKBParser.new nil, support_ewkb: true
+      JSON.dump RGeo::GeoJSON.encode(parser.parse(ewkb))
+    end
+  end
 end

data/lib/the_geom_geojson/active_record.rb

@@ -3,6 +3,8 @@ module TheGeomGeoJSON
     class << self
       def included(model)
         model.class_eval do
+          scope :with_geojson, -> { select('*', 'ST_AsGeoJSON(the_geom) AS the_geom_geojson') }
+
           after_save do
             if @the_geom_geojson_dirty
               raise "can't update the_geom without an id" if id.nil?
@@ -42,13 +44,19 @@ module TheGeomGeoJSON
       @the_geom_geojson_change = v
     end
 
-    # warning inefficient!
+    
     def the_geom_geojson
       if @the_geom_geojson_dirty
         @the_geom_geojson_change
+      elsif preselected = read_attribute(:the_geom_geojson)
+        preselected
       elsif the_geom
-        parser = RGeo::WKRep::WKBParser.new nil, support_ewkb: true
-        JSON.dump RGeo::GeoJSON.encode(parser.parse(the_geom))
+        started_at = Time.now
+        memo = TheGeomGeoJSON.ewkb_to_geojson the_geom
+        if (elapsed = Time.now - started_at) > 0.1
+          $stderr.puts "[the_geom_geojson] EWKB->GeoJSON parsing took #{elapsed}s, recommend using #{self.class.name}.with_geojson scope"
+        end
+        memo
       end
     end
 

data/lib/the_geom_geojson/version.rb

@@ -1,3 +1,3 @@
 module TheGeomGeoJSON
-  VERSION = '0.0.5'
+  VERSION = '0.1.0'
 end

data/spec/the_geom_geojson/active_record_spec.rb

@@ -89,6 +89,20 @@ describe TheGeomGeoJSON do
       it "lets you access the_geom_geojson" do
         expect(@pet.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington_point])
       end
+      it "can be loaded from db" do
+        if @pet.persisted?
+          reloaded = pet_model.find @pet.id
+          expect(reloaded.the_geom).to eq(the_geom_expected)
+          expect(reloaded.the_geom_webmercator).to eq(the_geom_webmercator_expected)
+          expect(reloaded.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington_point])
+        end
+      end
+      it "can be loaded with .with_geojson scope" do
+        if @pet.persisted?
+          reloaded = pet_model.with_geojson.find @pet.id
+          expect(reloaded.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington_point])
+        end
+      end
     end
 
     shared_examples 'different states of persistence' do
@@ -132,37 +146,38 @@ describe TheGeomGeoJSON do
       end
     end
 
+    def create_pet(attrs = {})
+      pet_model.create! attrs
+    end
+    def build_pet(attrs = {})
+      pet_model.new attrs
+    end
+
     describe "with autoincrement id" do
-      def create_pet(attrs = {})
-        Pet.create! attrs
-      end
-      def build_pet(attrs = {})
-        Pet.new attrs
+      def pet_model
+        Pet
       end
       it_behaves_like 'different states of persistence'
     end
 
     describe "with alt id" do
-      def create_pet(attrs = {})
-        PetAltId.create! attrs
-      end
-      def build_pet(attrs = {})
-        PetAltId.new attrs
+      def pet_model
+        PetAltId
       end
       it_behaves_like 'different states of persistence'
     end
 
     describe "with auto-generating uuid" do
-      def create_pet(attrs = {})
-        PetAutoUuid.create! attrs
-      end
-      def build_pet(attrs = {})
-        PetAutoUuid.new attrs
+      def pet_model
+        PetAutoUuid
       end
       it_behaves_like 'different states of persistence'
     end
 
     describe "with text id" do
+      def pet_model
+        PetTextId
+      end
       def create_pet(attrs = {})
         PetTextId.create! attrs.reverse_merge(id: rand.to_s)
       end
@@ -173,6 +188,9 @@ describe TheGeomGeoJSON do
     end
 
     describe "with uuid id" do
+      def pet_model
+        PetUuid
+      end
       def create_pet(attrs = {})
         PetUuid.create! attrs.reverse_merge(id: SecureRandom.uuid)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_geom_geojson
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord