arcrest 0.0.5 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 948d7b288f2b704e1437945ec175ad399e2d419edce9692c042009f36af2f072
-  data.tar.gz: a63cb3c9e7efacff80129324d6a3ad5f947170b6932fef3fa117bed207b0096f
+  metadata.gz: 292ae1d4438c385028b3a62069c1fe27503c548b5c2e9f474d65ab3603a4e6fe
+  data.tar.gz: 97ea5dd4491a08f33debad349655d51a592b0b7d284a7c56842469889d5ab0c9
 SHA512:
-  metadata.gz: bb831237a571a7928ca0736094545c4bd3ef530faad8c6d9873d7eb6c9a55718d2b5acf006586ae87850aa43f3f00de85d2e14bb197cf8a986d6a1641a6f5645
-  data.tar.gz: f53a0d06535c3a932571e369ffa98a429d17db3edb70cf9b7eee6ad0f09ad38c09b0c0baeed8a62bacfb6825ce2ff4c01297136bbdb03e5891160283de4fcf0e
+  metadata.gz: 4a92781610d5d4f01149b959866e74231ba2f76e57088d343cc629e4cfffdc8dec055db01b16518f3a228f928fa001c366702b1467264c8876ddb0511c69df58
+  data.tar.gz: c79e431b41c8c0f991c1568ee792695eb929d6dbe11f25855d22415ee66bd8e936ead88c6b7aef27c6b55707aa2c7667af492c262c46c554a1a456c887e280d9

data/.gitignore

@@ -9,3 +9,5 @@
 /tmp/
 /bin/guard
 /bin/_guard-core
+/.gitlab-ci-local
+*.gem

data/.gitlab-ci.yml

@@ -5,7 +5,7 @@ before_script:
   - bundle install --jobs $(nproc)  "${FLAGS[@]}"
 
 .job_template: &job_definition
-  image: ruby:2.7.2
+  image: ruby:3.3.3
 
 test:
   <<: *job_definition

data/.rubocop.yml

@@ -1,4 +1,8 @@
 ---
+require:
+ - rubocop-rake
+ - rubocop-rspec
+
 AllCops:
     NewCops: enable
 

data/.ruby-version

@@ -0,0 +1 @@
+3.3.3

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+## master (unreleased)
+
+## [1.0.0] - 2024-06-28
+
+### Bug fixes
+
+* Curb gem now a development dependency

data/Gemfile

@@ -1,4 +1,22 @@
 # frozen_string_literal: true
 
 source 'https://rubygems.org'
+
+gem 'curb', '~> 1.0.5'
+
+group :test, :development do
+  gem 'rubocop-rake', '0.6.0', require: false
+  gem 'rubocop-rspec', '3.0.1', require: false
+end
+
+group :development do
+  gem 'bundler', '~> 2.1'
+  gem 'guard', '~> 2.18'
+  gem 'guard-rspec', '~> 4.7'
+  gem 'libnotify', '~> 0.9' # guard notifications
+  gem 'rake', '~> 13.0'
+  gem 'rspec', '~> 3.13'
+  gem 'rubocop', '~> 1.64'
+end
+
 gemspec

data/README.md

@@ -1,10 +1,13 @@
+[![Gem Version](https://badge.fury.io/rb/arcrest.svg)](https://badge.fury.io/rb/arcrest)
+[![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop)
+
 # ArcREST
 
-Ruby Gem wrapper around the [ArcGIS REST API](https://services.arcgisonline.com/arcgis/sdk/rest/)
+Ruby Gem wrapper around the [ArcGIS REST API](https://services.arcgisonline.com/arcgis/sdk/rest)
 
 ## Requirements
 
-Ruby >= 2.4
+Ruby >= 3.3.3
 
 
 ## Current Limitations
@@ -28,7 +31,7 @@ Or install it yourself as:
 
 ## Usage
 
-The API defines a [resource heirarchy](http://services.arcgisonline.com/arcgis/sdk/rest/#/Resource_hierarchy) which includes a Catalog of Services (MapServer or FeatureServer). Services have one or more Layers and Layers have Features, which may be queried in various ways, including by spatial coordinates.
+The API defines a [resource heirarchy](https://services.arcgisonline.com/arcgis/sdk/rest/#/Resource_hierarchy) which includes a Catalog of Services (MapServer or FeatureServer). Services have one or more Layers and Layers have Features, which may be queried in various ways, including by spatial coordinates.
 
 ```ruby
 require 'arcrest'
@@ -37,7 +40,7 @@ catalog = ArcREST::Catalog.new 'https://sampleserver6.arcgisonline.com/arcgis/re
 puts catalog.services
 #=> {"name"=>"911CallsHotspot", "type"=>"GPServer"}
 #=> {"name"=>"911CallsHotspot", "type"=>"MapServer"}
-#=> {"name"=>"Census", "type"=>"MapServer"}
+#=> {"name"=>"911CallsHotspotPro", "type"=>"GPServer"}
 ...
 
 puts catalog.folders
@@ -49,19 +52,20 @@ puts catalog.folders
 It is also possible to pass a Referer (or any other) header which will be added to all HTTP requests:
 
 ```ruby
-catalog = ArcREST::Catalog.new('https://gojdippmaps.azurewebsites.net/proxy.ashx?https://maps.gov.je/arcgis/rest/services', headers: {referer: 'https://www.gov.je//citizen/Planning/Pages/HistoricEnvironmentDetail.aspx'})
+catalog = ArcREST::Catalog.new('https://gojdippmaps.azurewebsites.net/proxy.ashx?https://maps.gov.je/arcgis/rest/services', headers: {referer: 'https://www.gov.je/'})
 ```
 
 A Service (FeatureServer) is instantiated like this:
 
 ```ruby
-service = ArcREST::Service.new 'https://sampleserver6.arcgisonline.com/arcgis/rest/services/EmergencyFacilities/FeatureServer'
+service = ArcREST::Service.new 'https://sampleserver6.arcgisonline.com/arcgis/rest/services/Military/FeatureServer'
 puts service.layers
-#=> {"id"=>0, "name"=>"Emergency Facilities", "parentLayerId"=>-1, "defaultVisibility"=>true, "subLayerIds"=>nil, "minScale"=>150000, "maxScale"=>0, "type"=>"Feature Layer", "geometryType"=>"esriGeometryPoint"}
+#=> {"id"=>2, "name"=>"Units", "parentLayerId"=>-1, "defaultVisibility"=>true, "subLayerIds"=>nil, "minScale"=>0, "maxScale"=>0, "type"=>"Feature Layer", "geometryType"=>"esriGeometryPoint"}
+...
 
-layer = ArcREST::Layer.new "#{service.url}/0"
+layer = ArcREST::Layer.new "#{service.url}/2"
 puts layer.name
-#=> Emergency Facilities
+#=> Units
 
 puts layer.type
 #=> Feature Layer
@@ -70,45 +74,45 @@ puts layer.max_record_count
 #=> 1000 # maximum number of features that can be queried, see below
 
 puts layer.count
-#=> 16 # count of the layer's features
+#=> 36 # count of the layer's features
 
 puts layer.object_ids.inspect
-#=> [29489, 29503, 29490, 29491, 29492, 29493, 29494, 29495, 29496, 29497, 29498, 29499, 29500, 29501, 29502, 29504]
+#=> [420224, 420225, 420226, 420227, 420228, 420229.. ]
 
 puts layer.fields
-#=> {"name"=>"objectid", "type"=>"esriFieldTypeOID", "alias"=>"OBJECTID", "domain"=>nil, "editable"=>false, "nullable"=>false, "defaultValue"=>nil, "modelName"=>"System-maintained ObjectID"}
-#=> {"name"=>"facilityid", "type"=>"esriFieldTypeString", "alias"=>"Emergency Facility ID", "domain"=>nil, "editable"=>true, "nullable"=>true, "length"=>20, "defaultValue"=>nil, "modelName"=>"FACILITYID"},
+#=> {"name"=>"objectid", "type"=>"esriFieldTypeOID", "alias"=>"OBJECTID", "domain"=>nil, "editable"=>false, "nullable"=>false, "defaultValue"=>nil, "modelName"=>"OBJECTID"}
 ...
 ```
 
 Catalog, Service and Layer have a ```json``` method which returns information from the relevant server as a Hash. In addition to the example methods above this can be parsed in the usual way - e.g:
 ```ruby
 puts layer.json.keys.inspect
-#=> ["currentVersion", "id", "name", "type", "parentLayer", "defaultVisibility", ...
+#=> ["currentVersion", "cimVersion", "id", "name", "type", "parentLayer", "defaultVisibility", ... ]
 ```
 
-Once you have a Layer object, you can perform queries on it. The [documention](https://services.arcgisonline.com/arcgis/sdk/rest/index.html#/Query_Feature_Service_Layer/02ss0000002r000000/) shows the possibilities. Here is a very simple example:
+Once you have a Layer object, you can perform queries on it. The [documention](https://services.arcgisonline.com/arcgis/sdk/rest/index.html#/Query_Feature_Service_Layer/02ss0000002r000000) shows the possibilities. Here is a very simple example:
 
 The ```query``` method returns the whole server response as a Hash:
 ```ruby
 puts layer.query(where: '1=0').inspect
-#=> {"objectIdFieldName"=>"objectid", "globalIdFieldName"=>"globalid", "geometryType"=>"esriGeometryPoint", "spatialReference"=>{"wkid"=>4326, "latestWkid"=>4326}, "features"=>[]}
+#=> {"objectIdFieldName"=>"objectid", "globalIdFieldName"=>"", "geometryType"=>"esriGeometryPoint", "spatialReference"=>{"wkid"=>4326, "latestWkid"=>4326}, "hasZ"=>false, "features"=>[]}
 ```
 
 If you just want the features, use the ```features``` method:
 ```ruby
+features = layer.features
 puts features.count
-#=> 16
+#=> 36
 
 puts features[1]
-#=> {"attributes"=>{"objectid"=>29503, "facilityid"=>"K2032", "facname"=>"Redlands Mall", "factype"=>3, ...
+#=> {"attributes"=>{"objectid"=>420225, "echelon"=>3, "reinforced"=>0, "combateffectiveness"=>nil, ... }
 
-features = layer.features(where: "factype=3", returnGeometry: false)
-puts features.size
-#=> 7
+third_echelon = layer.features(where: "echelon=3", returnGeometry: false)
+puts third_echelon.size
+#=> 18
 
 puts features.first['attributes']
-#=> {"objectid"=>29503, "facilityid"=>"K2032", "facname"=>"Redlands Mall", "factype"=>3, "organiz"=>"City of Redlands", ...
+#=> {"objectid"=>420224, "echelon"=>3, "reinforced"=>0, "combateffectiveness"=>nil, "higherformation"=>nil, ... }
 ```
 
 ```query``` and ```features``` take an options hash of API call params. Invalid key values raise an error. Valid params for the server can be listed like this:
@@ -116,7 +120,7 @@ puts features.first['attributes']
 puts layer.valid_opts.inspect
 #=> ["dbVersion", "distance", "geometry", "geometryPrecision", ... , "where"]
 ```
-or by consulting the [docs](https://services.arcgisonline.com/arcgis/sdk/rest/index.html#/Query_Feature_Service_Layer/02ss0000002r000000/). One default is set: ```outFields: '*'``` - which requests data for all fields.
+or by consulting the [docs](https://services.arcgisonline.com/arcgis/sdk/rest/index.html#/Query_Feature_Service_Layer/02ss0000002r000000). One default is set: ```outFields: '*'``` - which requests data for all fields.
 
 
 The ```:where``` key is used with any valid SQL to query the layer fields. The default is '1=1' which returns all records (up to the ```layer.max_record_count``` value, usually 1,000). An error is raised if the server gives a 400 error of this form:

data/arcrest.gemspec

@@ -2,18 +2,16 @@
 
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'arcrest/version'
+require 'arc_rest/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'arcrest'
   spec.version       = ArcREST::VERSION
   spec.authors       = ['matzfan']
-  spec.email         = ['matzfan@yandex.com']
-
   spec.summary       = 'Wrapper for ArcGIS REST API'
   spec.description   = 'Wrapper for ArcGIS REST API'
   spec.homepage      = 'https://gitlab.com/matzfan/arcrest'
-  spec.required_ruby_version = '>= 2.4'
+  spec.required_ruby_version = '>= 3.3.3'
   spec.license = 'MIT'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
@@ -22,14 +20,5 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 2.1'
-  spec.add_development_dependency 'guard', '~> 2.14'
-  spec.add_development_dependency 'guard-rspec', '~> 4.7'
-  spec.add_development_dependency 'libnotify', '~> 0.9' # guard notifications
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'rubocop', '~> 1.3'
-
-  spec.add_runtime_dependency 'curb', '~> 0.9.11'
+  spec.metadata = { 'rubygems_mfa_required' => 'true' }
 end

data/lib/{arcrest → arc_rest}/attributable.rb

@@ -2,12 +2,12 @@
 
 # adds ability to dynamically set instance vars & accessors
 module Attributable
-  def create_method(name, &block)
-    self.class.send(:define_method, name.to_sym, &block)
+  def create_method(name, &)
+    self.class.send(:define_method, name.to_sym, &)
   end
 
   def create_setter(method)
-    create_method("#{method}=".to_sym) { |v| instance_variable_set("@#{method}", v) }
+    create_method("#{method}=") { |v| instance_variable_set("@#{method}", v) }
   end
 
   def create_getter(method)
@@ -16,7 +16,7 @@ module Attributable
 
   def set_attr(method, value)
     create_setter(method)
-    send "#{method}=".to_sym, value
+    send "#{method}=", value
     create_getter(method)
   end
 end

data/lib/{arcrest → arc_rest}/curlable.rb

@@ -27,6 +27,7 @@ module Curlable
 
   def configure(curl, headers)
     curl.follow_location = true
+    curl.encoding = 'gzip'
     headers.each { |k, v| curl.headers[k.capitalize] = v }
   end
 end

data/lib/{arcrest → arc_rest}/layer.rb

@@ -2,7 +2,9 @@
 
 module ArcREST
   class InvalidOption < StandardError; end
+
   class BadQuery < StandardError; end
+
   # a layer
   class Layer < Server
     include Attributable
@@ -64,7 +66,7 @@ module ArcREST
 
     def camelify(name)
       words = name.split('_')
-      words[1..-1].map(&:capitalize).unshift(words.first).join
+      words[1..].map(&:capitalize).unshift(words.first).join
     end
 
     def valid_resp(opts)

data/lib/{arcrest → arc_rest}/server.rb

@@ -11,7 +11,7 @@ module ArcREST
   class Server
     include Curlable # for #curl_get
 
-    ENDPOINT_REGEX = %r{/arcgis/rest/services/?}i.freeze
+    ENDPOINT_REGEX = %r{/arcgis/rest/services/?}i
     BAD_ENDPOINT = 'Invalid ArcGIS endpoint'
 
     attr_reader :url, :json, :version

data/lib/{arcrest → arc_rest}/service.rb

@@ -19,7 +19,8 @@ module ArcREST
     end
 
     def capabilities_
-      @json['capabilities'] ? @json['capabilities'].split(',') : nil
+      # @json['capabilities'] ? @json['capabilities'].split(',') : nil
+      @json['capabilities']&.split(',')
     end
 
     def layers_

data/lib/{arcrest → arc_rest}/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ArcREST
-  VERSION = '0.0.5'
+  VERSION = '1.0.0'
 end

data/lib/arcrest.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'arcrest/attributable' # module
-require 'arcrest/version'
-require 'arcrest/server'
-require 'arcrest/catalog'
-require 'arcrest/service'
-require 'arcrest/layer'
+require 'arc_rest/attributable' # module
+require 'arc_rest/version'
+require 'arc_rest/server'
+require 'arc_rest/catalog'
+require 'arc_rest/service'
+require 'arc_rest/layer'
 
 # namespace
-module ArcRest; end
+module ArcREST; end

metadata

@@ -1,130 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: arcrest
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
 platform: ruby
 authors:
 - matzfan
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: libnotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.11
+date: 2024-06-28 00:00:00.000000000 Z
+dependencies: []
 description: Wrapper for ArcGIS REST API
 email:
-- matzfan@yandex.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -133,6 +20,8 @@ files:
 - ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -141,19 +30,20 @@ files:
 - arcrest.gemspec
 - bin/console
 - bin/setup
+- lib/arc_rest/attributable.rb
+- lib/arc_rest/catalog.rb
+- lib/arc_rest/curlable.rb
+- lib/arc_rest/layer.rb
+- lib/arc_rest/server.rb
+- lib/arc_rest/service.rb
+- lib/arc_rest/version.rb
 - lib/arcrest.rb
-- lib/arcrest/attributable.rb
-- lib/arcrest/catalog.rb
-- lib/arcrest/curlable.rb
-- lib/arcrest/layer.rb
-- lib/arcrest/server.rb
-- lib/arcrest/service.rb
-- lib/arcrest/version.rb
 homepage: https://gitlab.com/matzfan/arcrest
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -161,15 +51,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: 3.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.5.13
+signing_key:
 specification_version: 4
 summary: Wrapper for ArcGIS REST API
 test_files: []