charta 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 94a236f9258dcbbbaa9a215a5af25e1ddeb904bb
-  data.tar.gz: 8251595d5fc8c7a70881108b37b43507b694f034
+SHA256:
+  metadata.gz: 6e1a6955069e9535ef7d8b3b7e72a38902f161a5c040a6ba3e86ebf010ddcf7c
+  data.tar.gz: c413fb93fdb9ccf1328b58d7a721a1eca54c219e5ca54bc61066df2a4ccce1ac
 SHA512:
-  metadata.gz: 2440f9a26b7cd4d3d14c5f8b3840f3be1ba51ac7e11269c4ef2d5e615956d87f652b210b70861d803f11a1748533e67166c33732c946eac46f31e57470bf1496
-  data.tar.gz: a426cc2d10067261ad61666d63373cb7e28be1ac6c5b4887926b44d1ae7efe8e3d089e4092d19e791d6b5dc9df9ee6bbd96faa687568ae8253c3e367b7bfc6a2
+  metadata.gz: f4457d1afc0c7289e3748a07a95b9422e797edee230447bb90bfa6423614dc9133f330aab1acb8be0a485b8de4172673933c3d7c493602a29422053d45435f12
+  data.tar.gz: 33942453f7c1863b13b2011a05923ffcdeae0098899ea50bd8ee7b012be3a135564d95b030bc781aedaca57237fa4f8ffd5e1701010e73f4169dc8ec3699ed2e

data/.gitlab-ci.yml

@@ -0,0 +1,14 @@
+stages:
+  - test
+
+test:
+  image: registry.gitlab.com/ekylibre/docker-base-images/ruby2.3:master
+  before_script:
+    - gem install bundler
+    - bundle install --path vendor/bundle
+  cache:
+    key: bundle
+    paths:
+      - vendor/bundle
+  script:
+    - bundle exec rake test

data/charta.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'nokogiri', '>= 1.7.0'
-  spec.add_dependency 'rgeo', '~> 1.0.0'
+  spec.add_dependency 'rgeo', '~> 1.0'
   spec.add_dependency 'json', '>= 1.8.0'
-  spec.add_dependency 'rgeo-geojson', '~> 1.0.0'
-  spec.add_dependency 'rgeo-proj4', '~> 1.0.0'
-  spec.add_dependency 'activesupport', '>= 5.1'
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_dependency 'rgeo-geojson', '~> 1.0'
+  spec.add_dependency 'rgeo-proj4', '~> 1.0'
+  spec.add_dependency 'activesupport', '~> 5.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'byebug'

data/lib/charta/geometry.rb

@@ -6,8 +6,6 @@ require 'active_support/core_ext/module/delegation'
 module Charta
   # Represents a Geometry with SRID
   class Geometry
-    delegate_missing_to :to_rgeo
-
     def initialize(feature, properties = {})
       self.feature = feature
       @properties = properties
@@ -36,16 +34,12 @@ module Charta
       feature.srid.to_i
     end
 
-    # Returns the underlaying object managed by Charta: the RGeo feature
-    def to_rgeo
-      feature
-    end
-
     # Returns the Well-Known Text (WKT) representation of the geometry/geography
     # without SRID metadata
     def to_text
       feature.as_text.match(/\ASRID=.*;(.*)/)[1]
     end
+
     alias as_text to_text
     alias to_wkt to_text
 
@@ -53,6 +47,7 @@ module Charta
     def to_ewkt
       Charta.generate_ewkt(feature).to_s
     end
+
     alias to_s to_ewkt
 
     def ewkt
@@ -65,6 +60,7 @@ module Charta
       generator = RGeo::WKRep::WKBGenerator.new(tag_format: :ewkbt, emit_ewkbt_srid: true)
       generator.generate(feature)
     end
+
     alias to_ewkb to_binary
 
     # Pas bien compris le fonctionnement
@@ -88,6 +84,7 @@ module Charta
     def to_geojson
       to_json_object.to_json
     end
+
     alias to_json to_geojson
 
     # Returns object in JSON (Hash)
@@ -126,6 +123,7 @@ module Charta
     def empty?
       feature.is_empty?
     end
+
     alias blank? empty?
 
     # Computes the geometric center of a geometry, or equivalently, the center
@@ -199,6 +197,7 @@ module Charta
       other_geometry = Charta.new_geometry(other).transform(srid)
       feature.union(other_geometry.feature)
     end
+
     alias + merge
 
     def intersection(other)
@@ -210,6 +209,7 @@ module Charta
       other_geometry = Charta.new_geometry(other).transform(srid)
       feature.difference(other_geometry.feature)
     end
+
     alias - difference
 
     def bounding_box
@@ -234,8 +234,7 @@ module Charta
       Charta.find_srid(name_or_srid)
     end
 
-    # TODO: Manage YAML domain type to ensure maintainability of YAML
-    # serialization in time.
+    # Returns the underlaying object managed by Charta: the RGeo feature
     def feature
       unless defined? @feature
         if defined? @ewkt
@@ -248,6 +247,8 @@ module Charta
       @feature.dup
     end
 
+    alias to_rgeo feature
+
     def feature=(new_feature)
       raise ArgumentError, "Feature can't be nil" if new_feature.nil?
       @feature = new_feature
@@ -279,7 +280,7 @@ module Charta
 
       def from_ewkt(ewkt)
         # Cleans empty geometries
-        ewkt.gsub!(/(GEOMETRYCOLLECTION|GEOMETRY|((MULTI)?(POINT|LINESTRING|POLYGON)))\(\)/, '\1 EMPTY')
+        ewkt = ewkt.gsub(/(GEOMETRYCOLLECTION|GEOMETRY|((MULTI)?(POINT|LINESTRING|POLYGON)))\(\)/, '\1 EMPTY')
         srs = ewkt.split(/[\=\;]+/)[0..1]
         srid = nil
         srid = srs[1] if srs[0] =~ /srid/i
@@ -291,57 +292,68 @@ module Charta
 
       private
 
-      def geos_factory(srid)
-        RGeo::Geos.factory(
-          srid: srid,
-          wkt_generator: {
-            type_format: :ewkt,
-            emit_ewkt_srid: true,
-            convert_case: :upper
-          },
-          wkt_parser: {
-            support_ewkt: true
-          },
-          wkb_generator:  {
-            type_format: :ewkb,
-            emit_ewkb_srid: true,
-            hex_format: true
-          },
-          wkb_parser: {
-            support_ewkb: true
-          }
-        )
-      end
+        def geos_factory(srid)
+          RGeo::Geos.factory(
+            srid: srid,
+            wkt_generator: {
+              type_format: :ewkt,
+              emit_ewkt_srid: true,
+              convert_case: :upper
+            },
+            wkt_parser: {
+              support_ewkt: true
+            },
+            wkb_generator: {
+              type_format: :ewkb,
+              emit_ewkb_srid: true,
+              hex_format: true
+            },
+            wkb_parser: {
+              support_ewkb: true
+            }
+          )
+        end
 
-      def projected_factory(srid)
-        proj4 = '+proj=cea +lon_0=0 +lat_ts=30 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs'
-        RGeo::Geographic.projected_factory(
-          srid: srid,
-          wkt_generator: {
-            type_format: :ewkt,
-            emit_ewkt_srid: true,
-            convert_case: :upper
-          },
-          wkt_parser: {
-            support_ewkt: true
-          },
-          wkb_generator:  {
-            type_format: :ewkb,
-            emit_ewkb_srid: true,
-            hex_format: true
-          },
-          wkb_parser: {
-            support_ewkb: true
-          },
-          projection_srid: 6933,
-          projection_proj4: proj4
-        )
-      end
-    end
+        def projected_factory(srid)
+          proj4 = '+proj=cea +lon_0=0 +lat_ts=30 +x_0=0 +y_0=0 +datum=WGS84 +units=m +no_defs'
+          RGeo::Geographic.projected_factory(
+            srid: srid,
+            wkt_generator: {
+              type_format: :ewkt,
+              emit_ewkt_srid: true,
+              convert_case: :upper
+            },
+            wkt_parser: {
+              support_ewkt: true
+            },
+            wkb_generator: {
+              type_format: :ewkb,
+              emit_ewkb_srid: true,
+              hex_format: true
+            },
+            wkb_parser: {
+              support_ewkb: true
+            },
+            projection_srid: 6933,
+            projection_proj4: proj4
+          )
+        end
+
+        def method_missing(name, *args, &block)
+          target = to_rgeo
+          if target.respond_to? name
+            target.send name, *args
+          else
+            raise StandardError.new("Method #{name} does not exist for #{self.class.name}")
+          end
+        end
+
+        def respond_to_missing?(name, include_private = false)
+          return false if name == :init_with
+          return true if to_rgeo.respond_to? name, include_private
+          super
+        end
 
-    def respond_to_missing?(name, include_private = false)
-      return false if name == :init_with
-      super
     end
   end
 end

data/lib/charta/version.rb

@@ -1,3 +1,3 @@
 module Charta
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: charta
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Brice TEXIER
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rgeo-proj4
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -199,8 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Simple tool over geos and co