the_geom_geojson 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b923b316a16ae77ca598e803b10757e992adba8
-  data.tar.gz: e70e6840959521ef9375a61754d4290105cf4faa
+  metadata.gz: fc02ba580ac039493fc7228507036db38174680d
+  data.tar.gz: a2516ef9680f359defc7656ac113cacf8a43033c
 SHA512:
-  metadata.gz: 017a2f05ac92ad2d8722896f613f39066c77b95c445ad844c987a85c2705aa136e0510698112aa606bc29480de947357f2eb4a718c94c86a922fafefe29d1485
-  data.tar.gz: 247a8189a55c71b300e2b8f568c026302dda564da710e9bf2d6d839495bd51231a91a4ebf6f5058f5c2934415177350ab69bde16579e91aa3794e60566eed6f1
+  metadata.gz: 9a1ca14c7a817883c4f1f2576e1915f8392925c49bf59c4cca56db60676bb19e3e54974caa5151a200563653f133f6cbd24f429776eb434e7827ffa41e83f56e
+  data.tar.gz: 8c4c00f3e442d4d1473a864302d1564838b16ef29b92b37a2a881710cbb67b7ee48bddcb709eebb3a81619c004c58f0334f5a5aec57d5c275f5b2a04ed75b299

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.0.2 / 2014-07-22
+
+* Enhancements
+
+  * Support alternate primary keys set on ActiveRecord with `self.primary_key = X`
+
 0.0.1 / 2014-07-17
 
 initial release!

data/README.md

@@ -6,6 +6,8 @@ For PostGIS/PostgreSQL and ActiveRecord, provides `the_geom_geojson` getter and
 
 Web mapping libraries like [Leaflet](http://leafletjs.com/) often don't support PostGIS's native [Well-Known Binary (WKB) and Well-Known Text (WKT)](http://postgis.net/docs/using_postgis_dbmanagement.html#OpenGISWKBWKT) representation, but they do support [GeoJSON](http://geojson.org/), so this library helps translate between the two.
 
+<img src="https://www.nyu.edu/greyart/exhibits/cisneros/images/garcianew.jpg" alt="Composición constructiva 16" />
+
 ## Requirements
 
 * [PostgreSQL](postgresql.org) >=9

data/lib/the_geom_geojson/active_record.rb

@@ -27,7 +27,7 @@ module TheGeomGeoJSON
           memo << 'the_geom = ST_SetSRID(ST_GeomFromGeoJSON(?), 4326)'                                  if has_the_geom
           memo << ',' if has_the_geom && has_the_geom_webmercator
           memo << 'the_geom_webmercator  = ST_Transform(ST_SetSRID(ST_GeomFromGeoJSON(?), 4326), 3857)' if has_the_geom_webmercator
-          memo << ' WHERE id = ?'
+          memo << " WHERE #{model.quoted_primary_key} = ?"
           memo.join.freeze
         end)
         model.send :sanitize_sql_array, [sql, the_geom_geojson, the_geom_geojson, id]
@@ -48,7 +48,7 @@ module TheGeomGeoJSON
         @the_geom_geojson_change
       elsif id
         self.class.connection_pool.with_connection do |c|
-          c.select_value "SELECT ST_AsGeoJSON(the_geom) FROM #{self.class.quoted_table_name} WHERE id = #{c.quote(id)} LIMIT 1"
+          c.select_value "SELECT ST_AsGeoJSON(the_geom) FROM #{self.class.quoted_table_name} WHERE #{self.class.quoted_primary_key} = #{c.quote(id)} LIMIT 1"
         end
       end
     end

data/lib/the_geom_geojson/version.rb

@@ -1,3 +1,3 @@
 module TheGeomGeoJSON
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/the_geom_geojson/active_record_spec.rb

@@ -5,10 +5,16 @@ unless ENV['FAST'] == 'true'
   system 'dropdb', '--if-exists', dbname
   system 'createdb', dbname
   system 'psql', dbname, '--command', 'CREATE EXTENSION postgis'
+  system 'psql', dbname, '--command', 'CREATE EXTENSION "uuid-ossp"'
   system 'psql', dbname, '--command', 'CREATE TABLE pets (id serial primary key, the_geom geometry(Geometry,4326), the_geom_webmercator geometry(Geometry,3857))'
+  system 'psql', dbname, '--command', 'CREATE TABLE pet_alt_ids (alt_id serial primary key, the_geom geometry(Geometry,4326), the_geom_webmercator geometry(Geometry,3857))'
+  system 'psql', dbname, '--command', 'CREATE TABLE pet_text_ids (id text unique not null, the_geom geometry(Geometry,4326), the_geom_webmercator geometry(Geometry,3857))'
+  system 'psql', dbname, '--command', 'CREATE TABLE pet_uuids (id uuid unique not null, the_geom geometry(Geometry,4326), the_geom_webmercator geometry(Geometry,3857))'
+  system 'psql', dbname, '--command', 'CREATE TABLE pet_auto_uuids (id uuid unique not null default uuid_generate_v4(), the_geom geometry(Geometry,4326), the_geom_webmercator geometry(Geometry,3857))'
 end
 
 require 'active_record'
+require 'securerandom'
 
 ActiveRecord::Base.establish_connection "postgresql://127.0.0.1/#{dbname}"
 
@@ -22,6 +28,30 @@ class Pet < ActiveRecord::Base
   include TheGeomGeoJSON::ActiveRecord
 end
 
+class PetAltId < ActiveRecord::Base
+  include TheGeomGeoJSON::ActiveRecord
+  self.primary_key = 'alt_id'
+end
+
+class PetTextId < ActiveRecord::Base
+  include TheGeomGeoJSON::ActiveRecord
+  self.primary_key = 'id'
+end
+
+class PetUuid < ActiveRecord::Base
+  include TheGeomGeoJSON::ActiveRecord
+  self.primary_key = 'id'
+end
+
+class PetAutoUuid < ActiveRecord::Base
+  include TheGeomGeoJSON::ActiveRecord
+  self.primary_key = 'id'
+  
+  before_save do
+    self.id ||= SecureRandom.uuid
+  end
+end
+
 if ENV['PRY'] == 'true'
   require 'pry'
   require 'logger'
@@ -61,43 +91,95 @@ describe TheGeomGeoJSON do
       end
     end
 
-    describe "creating" do
-      before do
-        @pet = Pet.create! the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington_point]
+    shared_examples 'different states of persistence' do
+      describe "creating" do
+        before do
+          @pet = create_pet the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington_point]
+        end
+        it_behaves_like 'the_geom_geojson=(geojson)'
+      end
+
+      describe "building and saving" do
+        before do
+          @pet = build_pet the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington_point]
+          @pet.save!
+        end
+        it_behaves_like 'the_geom_geojson=(geojson)'
       end
-      it_behaves_like 'the_geom_geojson=(geojson)'
+
+      describe "modifying" do
+        before do
+          @pet = create_pet
+          @pet.the_geom_geojson = TheGeomGeoJSON::EXAMPLES[:burlington_point]
+          @pet.save!
+        end
+        it_behaves_like 'the_geom_geojson=(geojson)'
+      end
+
+      describe "building (without saving)" do
+        before do
+          @pet = build_pet the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington_point]
+        end
+        it "raises exception if you try to access the_geom" do
+          expect{@pet.the_geom}.to raise_error(TheGeomGeoJSON::Dirty)
+        end
+        it "raises exception if you try to access the_geom_webmercator" do
+          expect{@pet.the_geom_webmercator}.to raise_error(TheGeomGeoJSON::Dirty)
+        end
+        it "lets you access the_geom_geojson" do
+          expect(@pet.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington_point])
+        end
+      end
+    end
+
+    describe "with autoincrement id" do
+      def create_pet(attrs = {})
+        Pet.create! attrs
+      end
+      def build_pet(attrs = {})
+        Pet.new attrs
+      end
+      it_behaves_like 'different states of persistence'
     end
 
-    describe "building and saving" do
-      before do
-        @pet = Pet.new the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington_point]
-        @pet.save!
+    describe "with alt id" do
+      def create_pet(attrs = {})
+        PetAltId.create! attrs
+      end
+      def build_pet(attrs = {})
+        PetAltId.new attrs
       end
-      it_behaves_like 'the_geom_geojson=(geojson)'
+      it_behaves_like 'different states of persistence'
     end
 
-    describe "modifying" do
-      before do
-        @pet = Pet.create!
-        @pet.the_geom_geojson = TheGeomGeoJSON::EXAMPLES[:burlington_point]
-        @pet.save!
+    describe "with auto-generating uuid" do
+      def create_pet(attrs = {})
+        PetAutoUuid.create! attrs
       end
-      it_behaves_like 'the_geom_geojson=(geojson)'
+      def build_pet(attrs = {})
+        PetAutoUuid.new attrs
+      end
+      it_behaves_like 'different states of persistence'
     end
 
-    describe "building (without saving)" do
-      before do
-        @pet = Pet.new the_geom_geojson: TheGeomGeoJSON::EXAMPLES[:burlington_point]
+    describe "with text id" do
+      def create_pet(attrs = {})
+        PetTextId.create! attrs.reverse_merge(id: rand.to_s)
       end
-      it "raises exception if you try to access the_geom" do
-        expect{@pet.the_geom}.to raise_error(TheGeomGeoJSON::Dirty)
+      def build_pet(attrs = {})
+        PetTextId.new attrs.reverse_merge(id: rand.to_s)
       end
-      it "raises exception if you try to access the_geom_webmercator" do
-        expect{@pet.the_geom_webmercator}.to raise_error(TheGeomGeoJSON::Dirty)
+      it_behaves_like 'different states of persistence'
+    end
+
+    describe "with uuid id" do
+      def create_pet(attrs = {})
+        PetUuid.create! attrs.reverse_merge(id: SecureRandom.uuid)
       end
-      it "lets you access the_geom_geojson" do
-        expect(@pet.the_geom_geojson).to eq(TheGeomGeoJSON::EXAMPLES[:burlington_point])
+      def build_pet(attrs = {})
+        PetUuid.new attrs.reverse_merge(id: SecureRandom.uuid)
       end
+      it_behaves_like 'different states of persistence'
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_geom_geojson
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-18 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord