stack-service-base 0.0.70 → 0.0.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8820950439a892f0528c436bcab27d328baa12dadd14b49ddebf19e9748cfef4
-  data.tar.gz: d13b77dd8b23103f493a0f0e68d75d24102ede20d607d53c7a81119e009d7b4d
+  metadata.gz: 7cb27ff22395eb1cb21ee8e075cf5a499a3088d9f0c8639170907732e3063e64
+  data.tar.gz: 74e05bf0e69494182abe3e4d281f8b1ac1d43f1013a1c47ac38234cf14859443
 SHA512:
-  metadata.gz: 8da8bd8be46746c598c2d4c0703e0d88a4abed5770955a5f57251921c8ba02d61da6f04512ac3e42659fa37355b08909af14caefefd6776dfeaed6e10fdb5199
-  data.tar.gz: 809be37ee84dd4512aa793208992bd92a5510a0bc217972c167a10fca545d73bcbff36a61077f41a2e2a2087202b90910f3d7cf3072fb7f60e9450813c55fca7
+  metadata.gz: 76aeeeacc371e3c2a87e375490f4bc4bba67530eda346abb8461d8df142f0f26a4f30d89b31f7a97fdb479991902e06dc598f495666b08559ac6a7f6067190e3
+  data.tar.gz: 4c744f89da1b1740cb751e834e32e3172934bfb296d9b0f2eb9640e429b7d7c1c6932309d99bc6b82b4d039faffc338fec9fe4b0fc1b5a1a6cabb898e92428b6

data/lib/stack-service-base/db_ext/geo_ext.rb

@@ -0,0 +1,93 @@
+require 'rgeo'
+require 'rgeo/geo_json'
+
+unless RGeo::Geos.capi_supported?
+  raise 'Install rgeo with CAIP support. apt install libgeos-dev, then gem install rgeo rgeo-geojson'
+end
+
+## Example usage:
+#   DB.create_table? :geoms do
+#     primary_key :id
+#     Geometry    :geom
+#   end
+#
+#   DB.execute "INSERT INTO geoms(geom) VALUES( ST_GeomFromText('POINT(-71.060316 48.432044)', 4326));"
+#
+#   gs = DB[:geoms].all
+#
+#   # Output as WKB format
+#   Sequel::Postgres::GeoDatabaseMethods::Geometry.to_json_format = :wkb
+#   p gs[0].to_json
+#
+#   # Output as GeoJSON format
+#   Sequel::Postgres::GeoDatabaseMethods::Geometry.to_json_format = :geojson
+#   p gs[0].to_json
+module Sequel
+  module Postgres
+    module GeoDatabaseMethods
+      class Geometry
+        # 4326 (WGS 84), 3857 (Web Mercator):
+        FACTORY = RGeo::Geos.factory(:native_interface => :capi)
+        PARSER = RGeo::WKRep::WKBParser.new(FACTORY, support_ewkb: true, default_srid: 4326)
+
+        class << self
+          attr_accessor :to_json_format # wkb, geojson
+        end
+        attr_accessor :wkb_string
+        def initialize(wkb_string)
+          @wkb_string = wkb_string
+        end
+
+        def to_json(*a)
+          @wkb_string.to_json
+        end
+
+        def as_json
+          @wkb_string.to_s
+        end
+      end
+
+      def self.extended(db)
+        db.instance_exec do
+          extend_datasets(GeoDatasetMethods)
+
+          geom_new = Geometry.method(:new)
+          add_conversion_proc 18046, geom_new
+          @schema_type_classes[:geometry] = Geometry
+        end
+      end
+
+      private
+
+      def schema_column_type(db_type)
+        db_type == 'geometry' ? Geometry : super
+      end
+
+      def typecast_value_geometry(value)
+        value
+      end
+
+      module GeoDatasetMethods
+
+        private
+        def literal_other_append(sql, value)
+          if value.is_a?(Geometry)
+            sql << "ST_SetSRID(ST_GeomFromWKB('\\x#{value.wkb_string}'),4326)"
+          else
+            super
+          end
+        end
+
+      end
+    end
+  end
+
+  Database.register_extension(:pg_geo, Postgres::GeoDatabaseMethods)
+end
+Geometry = Sequel::Postgres::GeoDatabaseMethods::Geometry
+
+# DB.extension :pg_geo
+Sequel::Database.after_initialize do |db|
+  pr = Sequel.synchronize { Sequel::Database::EXTENSIONS[:pg_geo] }
+  db.instance_eval { pr&.call(self) if !@loaded_extensions.include?(:pg_geo) && @loaded_extensions << :pg_geo }
+end

data/lib/stack-service-base/version.rb

@@ -1,3 +1,3 @@
 module StackServiceBase
-  VERSION = '0.0.70'
+  VERSION = '0.0.72'
 end

data/lib/stack-service-base.rb

@@ -1,3 +1,8 @@
+unless defined? RSpec
+  require 'dotenv'
+  Dotenv.load '.env.local' if File.exist? '.env.local'
+end
+
 require 'stack-service-base/version'
 require 'stack-service-base/logging'
 require 'stack-service-base/rack_helpers'
@@ -7,13 +12,50 @@ require 'stack-service-base/sinatra_ext'
 require 'stack-service-base/debugger'
 require 'stack-service-base/async_helpers'
 
-unless defined? RSpec
-  require 'dotenv'
-  Dotenv.load '.env.local' if File.exist? '.env.local'
-end
-
 module StackServiceBase
   class << self
+    def pre_init()
+      if defined? Sequel
+        require 'stack-service-base/database'
+
+        Sequel::Database.after_initialize { _1.loggers << LOGGER }
+
+        attempts= 10
+        sleep_interval= 1
+
+        mod = Module.new do
+          define_method(:connect) do |*args, **opts, &blk|
+            tries = attempts
+            begin
+              super(*args, **opts, &blk)
+            rescue Sequel::DatabaseConnectionError, Sequel::DatabaseError => e
+              if (tries -= 1) > 0
+                LOGGER.warn "DB connect failed (#{e.message}), retrying in #{sleep_interval}s… (#{tries} left)"
+                sleep sleep_interval
+                retry
+              end
+              raise
+            end
+          end
+        end
+
+        Sequel.singleton_class.prepend(mod)
+
+        require 'sequel/adapters/postgres'
+        PG::Connection.singleton_class.prepend(Module.new{
+          def connect_to_hosts(*args)
+            stack_name = ENV['STACK_NAME'] || 'undefined_stack'
+            service_name = ENV['STACK_SERVICE_NAME'] || 'undefined_service'
+            args[0][:fallback_application_name] ||= "#{stack_name}_#{service_name}"
+            super *args
+          end
+        })
+
+        require_relative 'stack-service-base/fiber_pool'
+      end
+      @pre_init = :done
+    end
+
     def rack_setup app
       # skip if called within Rspec task
       # TODO: warn if called not within Rspec task but with a wrong app class
@@ -30,15 +72,6 @@ module StackServiceBase
 
         RackHelpers.rack_setup app
 
-        # Sinatra?
-        # disable :show_exceptions unless ENV['DEBUG']
-        # error do
-        #   status 500
-        #   $stderr.puts "Exception: #{env['sinatra.error']}"
-        #   $stderr.puts "Exception backtrace: #{env['sinatra.error'].backtrace[0..10].join("\n")}"
-        #   { error: "Internal server error", message: env['sinatra.error'].message }.to_json
-        # end
-
         if ENV.fetch('PROMETHEUS_METRICS_EXPORT', 'true') == 'true'
           require 'stack-service-base/prometheus'
 
@@ -47,44 +80,15 @@ module StackServiceBase
           use Prometheus::Middleware::Exporter
         end
 
-        if defined? Sequel
-          require 'stack-service-base/database'
-
-          Sequel::Database.after_initialize { _1.loggers << LOGGER }
-
-          attempts= 10
-          sleep_interval= 1
-
-          mod = Module.new do
-            define_method(:connect) do |*args, **opts, &blk|
-              tries = attempts
-              begin
-                super(*args, **opts, &blk)
-              rescue Sequel::DatabaseConnectionError, Sequel::DatabaseError => e
-                if (tries -= 1) > 0
-                  LOGGER.warn "DB connect failed (#{e.message}), retrying in #{sleep_interval}s… (#{tries} left)"
-                  sleep sleep_interval
-                  retry
-                end
-                raise
-              end
-            end
-          end
-
-          Sequel.singleton_class.prepend(mod)
-
-          require 'sequel/adapters/postgres'
-          PG::Connection.singleton_class.prepend(Module.new{
-            def connect_to_hosts(*args)
-              stack_name = ENV['STACK_NAME'] || 'undefined_stack'
-              service_name = ENV['STACK_SERVICE_NAME'] || 'undefined_service'
-              args[0][:fallback_application_name] ||= "#{stack_name}_#{service_name}"
-              super *args
-            end
-          })
-
-          require_relative 'stack-service-base/fiber_pool'
-        end
+        # Sinatra?
+        # disable :show_exceptions unless ENV['DEBUG']
+        # error do
+        #   status 500
+        #   $stderr.puts "Exception: #{env['sinatra.error']}"
+        #   $stderr.puts "Exception backtrace: #{env['sinatra.error'].backtrace[0..10].join("\n")}"
+        #   { error: "Internal server error", message: env['sinatra.error'].message }.to_json
+        # end
+        StackServiceBase.pre_init unless @pre_init == :done
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stack-service-base
 version: !ruby/object:Gem::Version
-  version: 0.0.70
+  version: 0.0.72
 platform: ruby
 authors:
 - Artyom B
@@ -412,6 +412,7 @@ files:
 - lib/stack-service-base/command_init.rb
 - lib/stack-service-base/command_line.rb
 - lib/stack-service-base/database.rb
+- lib/stack-service-base/db_ext/geo_ext.rb
 - lib/stack-service-base/debugger.rb
 - lib/stack-service-base/examples/mcp_config.ru
 - lib/stack-service-base/fiber_pool.rb