filegdb 0.0.6 → 1.0.0

data/ext/filegdb/filegdb/include/Util.h

@@ -3,7 +3,7 @@
 //
 
 /*
-  COPYRIGHT � 2012 ESRI
+  COPYRIGHT � 2015 ESRI
   TRADE SECRETS: ESRI PROPRIETARY AND CONFIDENTIAL
   Unpublished material - all rights reserved under the
   Copyright Laws of the United States and applicable international
@@ -112,24 +112,33 @@ public:
   fgdbError GetSpatialReferenceText(std::wstring& spatialReference) const;
   fgdbError SetSpatialReferenceText(const std::wstring& spatialReference);
 
-  fgdbError GetSpatialReferenceID(int& wkid);
-  fgdbError SetSpatialReferenceID(int  wkid);
+  fgdbError GetSpatialReferenceID(int& srid);
+  fgdbError SetSpatialReferenceID(int  srid);
 
-  fgdbError GetFalseOriginAndUnits(double& falseX, double& falseY, double& xyUnits);
-  fgdbError SetFalseOriginAndUnits(double  falseX, double  falseY, double  xyUnits);
+  fgdbError GetXYFalseOrigin(double& falseX, double& falseY);
+  fgdbError SetXYFalseOrigin(double  falseX, double  falseY);
 
-  fgdbError GetZFalseOriginAndUnits(double& falseZ, double& zUnits);
-  fgdbError SetZFalseOriginAndUnits(double  falseZ, double  zUnits);
-
-  fgdbError GetMFalseOriginAndUnits(double& falseM, double& mUnits);
-  fgdbError SetMFalseOriginAndUnits(double  falseM, double  mUnits);
+  fgdbError GetXYResolution(double& xyResolution);
+  fgdbError SetXYResolution(double  xyResolution);
 
   fgdbError GetXYTolerance(double& xyTolerance);
   fgdbError SetXYTolerance(double  xyTolerance);
 
+  fgdbError GetZFalseOrigin(double& falseZ);
+  fgdbError SetZFalseOrigin(double  falseZ);
+
+  fgdbError GetZResolution(double& zResolution);
+  fgdbError SetZResolution(double  zResolution);
+
   fgdbError GetZTolerance(double& zTolerance);
   fgdbError SetZTolerance(double  zTolerance);
 
+  fgdbError GetMFalseOrigin(double& falseM);
+  fgdbError SetMFalseOrigin(double  falseM);
+
+  fgdbError GetMResolution(double& mResolution);
+  fgdbError SetMResolution(double  mResolution);
+
   fgdbError GetMTolerance(double& mTolerance);
   fgdbError SetMTolerance(double  mTolerance);
 
@@ -142,13 +151,13 @@ private:
   int                       m_wkid;
   double                    m_falseX;
   double                    m_falseY;
-  double                    m_XYUnits;
-  double                    m_falseZ;
-  double                    m_ZUnits;
-  double                    m_falseM;
-  double                    m_MUnits;
+  double                    m_XYResolution;
   double                    m_XYTolerance;
+  double                    m_falseZ;
+  double                    m_ZResolution;
   double                    m_ZTolerance;
+  double                    m_falseM;
+  double                    m_MResolution;
   double                    m_MTolerance;
 };
 

data/ext/filegdb/filegdb/include/make.include

@@ -14,16 +14,19 @@
 # Supported build configurations:
 # Linux 32-bit, 64-bit
 # Mac   64-bit
+#
+# Set CXX=g++ or CXX=clang++ based on your FileGDB API platform package.
+
 
 ifndef CFG
   CFG=Release
 endif
 
-CXDEF=-DUNICODE -D_UNICODE -DUNIX -D_REENTRANT -DFILEGDB_API \
+CXXDEF=-DUNICODE -D_UNICODE -DUNIX -D_REENTRANT -DFILEGDB_API \
       -D__USE_FILE_OFFSET64 -DUNIX_FILEGDB_API -D_FILE_OFFSET_BITS=64\
       -D_LARGEFILE64_SOURCE
 
-CFLAGS=-fPIC
+CXXFLAGS=-fPIC
 
 ifndef OS
   OS := $(shell uname)
@@ -39,52 +42,62 @@ ifndef ARCH
 endif
 
 ifdef API_BUILD
-  CFLAGS+=-fvisibility=hidden
+  CXXFLAGS+=-fvisibility=hidden -fpermissive
 
   ifndef RedHat5
     RedHat5 := $(shell grep -s -c 'release 5' /etc/redhat-release)
   endif
 
   ifeq "$(RedHat5)" "1"
-    CFLAGS+=-Wno-attributes
+    CXXFLAGS+=-Wno-attributes
   endif
 endif
 
 ifeq "$(CFG)" "Release"
-  ifndef HOST_ARCH
-    CFLAGS+=-O3
-  endif
+  CXXFLAGS+=-O3
 endif
 
 ifeq "$(CFG)" "Debug"
-  CFLAGS+=-g
+  CXXFLAGS+=-g
 endif
 
-ifndef HOST_ARCH
-  ifeq "$(ARCH)" "32"
-    CFLAGS+=-m32
-    LDFLAGS=-m32
-    3PLIBDIR=.
+ifeq "$(ARCH)" "32"
+  CXXFLAGS+=-m32
+  LDFLAGS=-m32
+  3PLIBDIR=.
+endif
+ifeq "$(ARCH)" "64"
+  CXXFLAGS+=-m64
+  LDFLAGS=-m64
+  ifeq "$(OS)" "Darwin"
+    3PLIBDIR=mac/x64
+    CXXFLAGS+=-arch x86_64
+    LDFLAGS+=-arch x86_64
+  else
+    3PLIBDIR=x64
   endif
-  ifeq "$(ARCH)" "64"
-    CFLAGS+=-m64
-    LDFLAGS=-m64
-    ifeq "$(OS)" "Darwin"
-      3PLIBDIR=mac/x64
-      CFLAGS+=-arch x86_64
-      LDFLAGS+=-arch x86_64
-    else
-      3PLIBDIR=x64
+endif
+
+ifndef CXX
+CXX=g++
+endif
+
+ifeq "$(OS)" "Darwin"
+  os_ver_minor := $(shell sw_vers -productVersion | cut -f2 -d.)
+  ifeq ($(shell test $(os_ver_minor) -gt 8; echo $$?), 0)
+    ifeq "$(CXX)" "g++"
+      CXXFLAGS+=-stdlib=libstdc++
+      LDFLAGS+=-stdlib=libstdc++
     endif
   endif
 endif
 
-ifndef CX
-CX=g++
+ifeq "$(CXX)" "clang++"
+  CXXFLAGS+=-stdlib=libc++
+  LDFLAGS+=-stdlib=libc++
 endif
 
-CXX=$(CX)
-CXOTHER=-I.
+CXXOTHER=-I.
 
 SLIBEXT=so
 ifeq "$(OS)" "Darwin"
@@ -93,6 +106,3 @@ endif
 
 AR=ar
 ARFLAGS=-rcs
-
-CXX=$(CX)
-CXOTHER=-I.

data/ext/filegdb/geodatabase.cpp

@@ -1,4 +1,3 @@
-
 #include "geodatabase.hpp"
 #include "table.hpp"
 
@@ -95,7 +94,7 @@ VALUE geodatabase::close(VALUE self) {
     return Qnil;
   }
 
-  db->_value = NULL;
+  db->_value = Qnil;
 
   return Qnil;
 }
@@ -228,7 +227,7 @@ VALUE geodatabase::get_child_datasets(VALUE self, VALUE parent_path, VALUE datas
   VALUE result = rb_ary_new();
 
   for (std::vector<wstring>::iterator it = children.begin(); it != children.end(); ++it) {
-    VALUE name = rb_str_new2(to_char_array(*it));
+    VALUE name = rb_str_new2(to_string(*it).c_str());
     rb_ary_push(result, name);
   }
 
@@ -312,7 +311,7 @@ VALUE geodatabase::get_child_dataset_definitions(VALUE self, VALUE parentPath, V
 
   VALUE result = rb_ary_new();
 
-  for (typename std::vector<string>::iterator it = definitions.begin(); it != definitions.end(); ++it) {
+  for (std::vector<string>::iterator it = definitions.begin(); it != definitions.end(); ++it) {
     rb_ary_push(result, rb_str_new2((*it).c_str()));
   }
 
@@ -340,7 +339,7 @@ VALUE geodatabase::get_related_dataset_definitions(VALUE self, VALUE path, VALUE
 
   VALUE result = rb_ary_new();
 
-  for (typename std::vector<string>::iterator it = definitions.begin(); it != definitions.end(); ++it) {
+  for (std::vector<string>::iterator it = definitions.begin(); it != definitions.end(); ++it) {
     rb_ary_push(result, rb_str_new2((*it).c_str()));
   }
 
@@ -361,8 +360,8 @@ VALUE geodatabase::get_dataset_types(VALUE self) {
 
   VALUE result = rb_ary_new();
 
-  for (typename std::vector<wstring>::iterator it = datasetTypes.begin(); it != datasetTypes.end(); ++it) {
-    rb_ary_push(result, rb_str_new2(to_char_array(*it)));
+  for (std::vector<wstring>::iterator it = datasetTypes.begin(); it != datasetTypes.end(); ++it) {
+    rb_ary_push(result, rb_str_new2(to_string(*it).c_str()));
   }
 
   return result;
@@ -382,8 +381,8 @@ VALUE geodatabase::get_dataset_relationship_types(VALUE self) {
 
   VALUE result = rb_ary_new();
 
-  for (typename std::vector<wstring>::iterator it = datasetTypes.begin(); it != datasetTypes.end(); ++it) {
-    rb_ary_push(result, rb_str_new2(to_char_array(*it)));
+  for (std::vector<wstring>::iterator it = datasetTypes.begin(); it != datasetTypes.end(); ++it) {
+    rb_ary_push(result, rb_str_new2(to_string(*it).c_str()));
   }
 
   return result;
@@ -410,8 +409,8 @@ VALUE geodatabase::get_related_datasets(VALUE self, VALUE path, VALUE relType, V
 
   VALUE result = rb_ary_new();
 
-  for (typename std::vector<wstring>::iterator it = datasets.begin(); it != datasets.end(); ++it) {
-    rb_ary_push(result, rb_str_new2(to_char_array(*it)));
+  for (std::vector<wstring>::iterator it = datasets.begin(); it != datasets.end(); ++it) {
+    rb_ary_push(result, rb_str_new2(to_string(*it).c_str()));
   }
 
   return result;
@@ -493,7 +492,7 @@ VALUE geodatabase::get_query_name(VALUE self, VALUE path) {
     return Qnil;
   }
 
-  return rb_str_new2(to_char_array(result));
+  return rb_str_new2(to_string(result).c_str());
 }
 
 void geodatabase::define(VALUE module)

data/ext/filegdb/integer_primitive.cpp

@@ -1,4 +1,3 @@
-
 #include "integer_primitive.hpp"
 
 namespace filegdb {

data/ext/filegdb/multi_part_shape_buffer.cpp

@@ -1,4 +1,3 @@
-
 #include "point.hpp"
 #include "shape_buffer.hpp"
 #include "multi_part_shape_buffer.hpp"

data/ext/filegdb/multi_point_shape_buffer.cpp

@@ -1,4 +1,3 @@
-
 #include "point.hpp"
 #include "shape_buffer.hpp"
 #include "multi_point_shape_buffer.hpp"

data/ext/filegdb/point.cpp

@@ -1,4 +1,3 @@
-
 #include "point.hpp"
 
 namespace filegdb {

data/ext/filegdb/point_shape_buffer.cpp

@@ -1,4 +1,3 @@
-
 #include "point.hpp"
 #include "shape_buffer.hpp"
 #include "point_shape_buffer.hpp"

data/ext/filegdb/row.cpp

@@ -1,4 +1,3 @@
-
 #include "row.hpp"
 #include "shape_buffer.hpp"
 
@@ -53,7 +52,7 @@ VALUE row::get_string(VALUE self, VALUE column) {
     return Qnil;
   }
 
-  return rb_str_new2(to_char_array(wvalue));
+  return rb_str_new2(to_string(wvalue).c_str());
 }
 
 VALUE row::set_geometry(VALUE self, VALUE geometry) {

data/ext/filegdb/shape_buffer.cpp

@@ -1,4 +1,3 @@
-
 #include "shape_buffer.hpp"
 
 namespace filegdb {

data/ext/filegdb/spatial_reference.cpp

@@ -1,4 +1,3 @@
-
 #include "spatial_reference.hpp"
 
 namespace filegdb {
@@ -28,7 +27,7 @@ VALUE spatial_reference::get_spatial_reference_text(VALUE self) {
     return Qnil;
   }
 
-  return rb_str_new2(to_char_array(text));
+  return rb_str_new2(to_string(text).c_str());
 }
 
 VALUE spatial_reference::set_spatial_reference_text(VALUE self, VALUE srs) {

data/ext/filegdb/table.cpp

@@ -1,4 +1,3 @@
-
 #include "table.hpp"
 #include "row.hpp"
 #include "field_info.hpp"

data/ext/filegdb/util.cpp

@@ -1,16 +1,21 @@
 #include "filegdb.hpp"
+#include <cstdlib>
 
-std::wstring to_wstring(const char *input) {
+const std::wstring to_wstring(const char *input) {
   std::string converted(input);
   return std::wstring(converted.begin(), converted.end());
 }
 
-const char* to_char_array(std::wstring str) {
-  return std::string(str.begin(), str.end()).c_str();
+const std::string to_string(std::wstring str) {
+  static char result[16384] = { 0 };
+
+  std::wcstombs(result, str.c_str(), sizeof(result));
+
+  return std::string(result);
 }
 
-const char *fgdb_error_string(fgdbError hr) {
+const std::string fgdb_error_string(fgdbError hr) {
   wstring errorText;
   ErrorInfo::GetErrorDescription(hr, errorText);
-  return to_char_array(errorText);
+  return to_string(errorText);
 }

data/filegdb.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Zac McCormick"]
   gem.email         = ["zac.mccormick@gmail.com"]
   gem.description   = %q{ESRI FileGDB bindings for ruby}
-  gem.summary       = %q{ESRI FileGDB bindings for ruby. Currently contains native extensions for FileGDB API 1.3}
+  gem.summary       = %q{ESRI FileGDB bindings for ruby. Currently contains native extensions for FileGDB API 1.4}
   gem.homepage      = "https://github.com/spatialnetworks/filegdb-ruby"
   gem.licenses      = ['BSD']
 

data/lib/filegdb/version.rb

@@ -1,3 +1,3 @@
 module FileGDB
-  VERSION = "0.0.6"
+  VERSION = "1.0.0"
 end

data/spec/geodatabase_spec.rb

@@ -36,7 +36,7 @@ describe "FileGDB" do
   end
 
   it 'gets the dataset definition' do
-    @db.get_dataset_definition('\\TestTable', 'Table').length.should eq(7188)
+    @db.get_dataset_definition('\\TestTable', 'Table').length.should eq(7022)
   end
 
   it 'gets the dataset documentation' do
@@ -61,7 +61,7 @@ describe "FileGDB" do
 
   it 'renames a table' do
     lambda { @db.rename('\\TestTable', 'Table', 'TestTableNew') }.should_not raise_error
-    @db.get_dataset_definition('\\TestTableNew', 'Table').length.should eq(5839)
+    @db.get_dataset_definition('\\TestTableNew', 'Table').length.should eq(5559)
   end
 
   it 'moves a table' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filegdb
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Zac McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-06 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -149,11 +149,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: ESRI FileGDB bindings for ruby. Currently contains native extensions for
-  FileGDB API 1.3
+  FileGDB API 1.4
 test_files:
 - spec/data/domain_definition.xml
 - spec/data/domain_definition_altered.xml