ffi-ogr 0.1.0 → 0.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a3a8d64038c8ee681dc456b3639a3ba21d4fe2b
-  data.tar.gz: 5363e299ae53a198be3772c21742b63b6707a534
+  metadata.gz: 1d359d65c42a28d7194576e4834893a2a64e5847
+  data.tar.gz: 2ad3c809859e739fd1819943283d68dcee6aa9ae
 SHA512:
-  metadata.gz: d91119cd6f24f8a516fa8b47728328a8b8d8310c48ab277669c713a23346e36cc96ff0e31a242039f78f85520acff23d2d32ac8584a0607114678ffd6b5d49a2
-  data.tar.gz: fe146c60301d9555e9b004968d5d176f050d4cfe7384a722253794c720d51cd8cb3d5711a2ac9becd238a3afffce4484510eb8f8d224fc2d6963563b7d59ac65
+  metadata.gz: 80e832cece980b1505bea4aed6726bfb4e299287bcdc64941a549f5f8f6048702792f2eb558a766c2a3210f8997c0f99a835f01238b2f8f79d15d65453002aa5
+  data.tar.gz: 06b14aee210c8d543ee1e7f44205173529fc9492d1d8d971e45073b19b45117795fd11b26c60fd6485f3ed30fd543f6e2c7a9f15e4f5803349733c589cdc421f

data/README.md

@@ -38,6 +38,33 @@ data.to_csv '~/Desktop/github_to_csv.csv'
 => nil
 ```
 
+To read from a PostGIS table:
+
+```ruby
+pg_options = {
+  'dbname' => 'my_db',
+  'host' => 'localhost',
+  'port' => 5432,
+  'user' => 'user',
+  'password' => 'p@$$w0rd'
+}
+# => {"dbname"=>"my_db", "host"=>"localhost", "port"=>5432, "user"=>"user", "password"=>"p@$$w0rd"}
+
+# pg_options may also be a string path to a YAML file
+pg_reader = OGR::PostgisReader.new pg_options
+# => #<OGR::PostgisReader:0x007fce88943b90 @db_config="PG:dbname='my_db' host='localhost' port='5432' user='user' password='p@$$w0rd'", @driver=#<FFI::Pointer address=0x007fce8a22d8f0>, @type="PostgreSQL">
+
+query = "select * from table_name where id = '49649d69-25a5-4dde-926d-b43a88c47d17'"
+# => "select * from table_name where id = '49649d69-25a5-4dde-926d-b43a88c47d17'"
+
+# output type of executed query is Layer
+layer = pg_reader.execute_query query
+# => #<OGR::Layer:0x007fce88b08390 @ptr=#<FFI::AutoPointer address=0x007fce8a20e0d0>>
+
+layer.features
+# => [#<OGR::Feature:0x007fce88af8008 @ptr=#<FFI::AutoPointer address=0x007fce8a2653b0>>, #<OGR::Feature:0x007fce88af3eb8 @ptr=#<FFI::AutoPointer address=0x007fce884e27b0>>]
+```
+
 To read a shapefile:
 
 ```ruby

data/lib/ffi-ogr.rb

@@ -16,6 +16,7 @@ module OGR
 
   autoload :Reader, File.join(OGR_BASE, 'reader')
   autoload :HttpReader, File.join(OGR_BASE, 'http_reader')
+  autoload :PostgisReader, File.join(OGR_BASE, 'postgis_reader')
   autoload :Writer, File.join(OGR_BASE, 'writer')
   autoload :DataSource, File.join(OGR_BASE, 'data_source')
   autoload :Shapefile, File.join(OGR_BASE, 'shapefile')

data/lib/ffi-ogr/data_source.rb

@@ -154,11 +154,11 @@ module OGR
     end
 
     def to_shp(output_path, options={})
-      to_format('shapefile', output_path)
+      to_format('shapefile', output_path, options)
     end
 
     def to_csv(output_path, options={})
-      to_format('csv', output_path)
+      to_format('csv', output_path, options)
     end
 
     def to_kml(output_path, options={})

data/lib/ffi-ogr/http_reader.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'securerandom'
 require 'faraday'
+require 'faraday_middleware'
 
 module OGR
   class HttpReader
@@ -26,7 +27,13 @@ module OGR
         end
       end
 
-      http_data = Faraday.get(url).body
+      connection = Faraday.new url do |conn|
+        conn.use FaradayMiddleware::FollowRedirects
+        conn.adapter Faraday.default_adapter
+      end
+
+      http_data = connection.get.body
+
       ogr_driver = OGR::FFIOGR::OGRGetDriverByName driver
       data_source = OGR::FFIOGR::OGR_Dr_Open ogr_driver, http_data, TF_MAP[writeable]
       OGR::Tools.cast_data_source data_source

data/lib/ffi-ogr/postgis_reader.rb

@@ -0,0 +1,61 @@
+require 'yaml'
+
+module OGR
+  class PostgisReader
+    include OGR::FFIOGR
+
+    attr_accessor :db_config
+
+    TF_MAP = {
+      true => 1,
+      false => 0,
+      1 => true,
+      0 => false
+    }
+
+    def initialize(db_config_file)
+      @db_config = parse_db_config db_config_file
+      @driver = OGRGetDriverByName 'PostgreSQL'
+      @type = 'PostgreSQL'
+    end
+
+    def parse_db_config(db_config_file)
+      conf =
+        if db_config_file.instance_of? String
+          YAML.load_file(File.expand_path(db_config_file))
+        elsif db_config_file.instance_of? Hash
+          db_config_file
+        end
+
+      db_config = 'PG:'
+      
+      if conf['dbname']
+        db_config = db_config + "dbname='#{conf['dbname']}'"
+        if conf['host']
+          db_config = db_config + " host='#{conf['host']}'"
+          if conf['port']
+            db_config = db_config + " port='#{conf['port']}'"
+            db_config = db_config + " user='#{conf['user']}'" if conf['user']
+            db_config = db_config + " password='#{conf['password']}'" if conf['password']
+          else
+            raise RuntimeError.new 'port must be specified'
+          end
+        else
+          raise RuntimeError.new 'host must be specified'
+        end
+      else
+        raise RuntimeError.new 'dbname must be specified'
+      end
+
+      db_config
+    end
+
+    def execute_query(query, writeable = false)
+      pg_driver = OGR_Dr_Open @driver, @db_config, TF_MAP[writeable]
+      result_set = OGR_DS_ExecuteSQL pg_driver, query, nil, nil
+      OGR::Tools.cast_layer result_set
+      # result_set is OGRLayer
+      # must call OGR_DS_ReleaseResultSet(pg_driver, result_set) to clean up
+    end
+  end
+end

data/lib/ffi-ogr/version.rb

@@ -1,3 +1,3 @@
 module OGR
-  VERSION = '0.1.0'
+  VERSION = '0.2.0.pre'
 end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: ffi-ogr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.pre
 platform: ruby
 authors:
 - Scooter Wadsworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
@@ -28,6 +34,9 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.2
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.2
@@ -42,6 +54,9 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
@@ -49,9 +64,32 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +169,7 @@ files:
 - lib/ffi-ogr/point_25d.rb
 - lib/ffi-ogr/polygon.rb
 - lib/ffi-ogr/polygon_25d.rb
+- lib/ffi-ogr/postgis_reader.rb
 - lib/ffi-ogr/reader.rb
 - lib/ffi-ogr/shapefile.rb
 - lib/ffi-ogr/spatial_reference.rb
@@ -157,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Convenient access to OGR functionality from Ruby