arcrest 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 948887626e3cbf6c38a60ab4d3f3f96f38815a64
-  data.tar.gz: ee36b210de6e5354e2afae62ec6b3ba3bdbb44d4
+  metadata.gz: 118b49ef19eede12dba1c5a14b4f44c312765fac
+  data.tar.gz: a8ff9d6eb9e1ac44416b4d8841945beb67a62237
 SHA512:
-  metadata.gz: a3bfa45f4ea1fa30629e216122fe40783d3519b78e9e592e6e14ea41082b0e88d18bc8e284f101da40a07610ec69154772a99256b9748cf30f62e4905d89edbd
-  data.tar.gz: 736154f7a57441c74bb37234b500a3126c258ce173adc4aa5e0a7b5af2ca2be38f7c55d7aad7952cace2f82337d7529a638538ff238e02cf630b7f578ccf9509
+  metadata.gz: 29051ead9be6f5a6b978d9fa25159a670440820617e900bca47a216df32af9334259d0df5d8cecda96e22d732f44b4c7c6fe2d4a6b37fac8e0fd9ac2acd0aabb
+  data.tar.gz: e4e10b26003115d561d2f4ed2959118763693c991b1e294da93e46180bde880056a47798bce6ed8225c9d0f845978c57f421ac6cd5c913a97389dc60aa1d5d2d

data/README.md

@@ -65,8 +65,21 @@ puts layer.fields
 #=> ...
 ```
 
-Once you have a Layer object, you can query it's features. The [documention](http://services.arcgisonline.com/arcgis/sdk/rest/index.html#/Query_Feature_Service_Layer/) shows the possibilities. Here is a very simple example:
+Catalog, Service and Layer have a ```json``` method which returns information from the relevant server as a Hash (derived from JSON). 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", "description", "copyrightText"...
+```
+
+Once you have a Layer object, you can perform queries on it. The [documention](http://services.arcgisonline.com/arcgis/sdk/rest/index.html#/Query_Feature_Service_Layer/) 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"=>"", "features"=>[]}
+```
 
+If you just want the features, use the ```features``` method:
 ```ruby
 features = layer.features(where: "agency='BLM'", returnGeometry: false)
 puts features.count
@@ -75,7 +88,7 @@ puts features.first
 #=> {"objectid"=>690, "agency"=>"BLM", "comments"=>" ", "active"=>"Y"...
 ```
 
-```features``` takes an options hash of API call params. Invalid key values raise an error. Valid params for the server can be listed like this:
+```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:
 ```ruby
 puts layer.valid_opts.inspect
 #=> ["dbVersion", "distance", "geometry", "geometryPrecision"...
@@ -83,7 +96,7 @@ puts layer.valid_opts.inspect
 or by consulting the [docs](http://services.arcgisonline.com/arcgis/sdk/rest/index.html#/Query_Feature_Service_Layer/). 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 ```@max_record_count``` value, usually 1,000). An InvalidQuery error is raised if the server gives a 400 error of this form:
+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 ```@max_record_count``` value, usually 1,000). An error is raised if the server gives a 400 error of this form:
 ```json
 {
   "error": {

data/lib/arcrest/layer.rb

@@ -1,11 +1,11 @@
 module ArcREST
   class InvalidOption < StandardError; end
-  class InvalidQuery < StandardError; end
+  class BadQuery < StandardError; end
   # a layer
   class Layer < Server
     include Attributable
 
-    ERR = 'error'.freeze
+    E = 'error'.freeze
     ATTRIBUTES = %w(id name type drawing_info fields max_record_count).freeze
     DEFAULT_PARAMS = { where: '1=1', outFields: '*' }.freeze
     PARAMS = %w(distance geometry geometryType inSR objectIds
@@ -32,6 +32,11 @@ module ArcREST
       query(outFields: nil, returnIdsOnly: true)['objectIds']
     end
 
+    def query(options = {})
+      validate(options.keys.map(&:to_s).sort)
+      valid_resp(build_uri, DEFAULT_PARAMS.merge(options))
+    end
+
     def features(options = {})
       query(options)['features']
     end
@@ -58,13 +63,8 @@ module ArcREST
       words[1..-1].map(&:capitalize).unshift(words.first).join
     end
 
-    def query(options)
-      validate(options.keys.map(&:to_s).sort)
-      valid_resp(build_uri, DEFAULT_PARAMS.merge(options))
-    end
-
     def valid_resp(uri, opts)
-      raise InvalidQuery, m(opts) if (resp = json(uri, opts)).keys.include? ERR
+      raise BadQuery, m(opts) if (resp = parse_json(uri, opts)).keys.include? E
       resp
     end
 

data/lib/arcrest/server.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'open-uri'
 require 'json'
 
 module ArcREST
@@ -13,20 +14,25 @@ module ArcREST
       @url = url
       @uri = uri
       @server_uri = server_uri
-      @json = json(@uri)
+      @json = json
       @version = version
     end
 
-    def json(uri, options = {})
-      JSON.parse get(uri, options)
+    def json
+      parse_json @uri
     end
 
     def version
-      json(server_uri)['currentVersion'] # subclasses use server uri
+      parse_json(server_uri)['currentVersion'] # subclasses use server uri
     end
 
     protected
 
+    def parse_json(uri, options = {})
+      JSON.parse get(uri, options)
+    end
+
+
     def uri
       raise ArgumentError, BAD_ENDPOINT if (URI(@url).path =~ REGEX) != 0
       URI @url
@@ -42,7 +48,7 @@ module ArcREST
 
     def get(uri, options = {})
       uri.query = URI.encode_www_form(add_json_param_to(options))
-      Net::HTTP.get uri
+      open(uri).read # net/http doesn't follow redirects..
     end
   end
 end

data/lib/arcrest/version.rb

@@ -1,3 +1,3 @@
 module ArcREST
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arcrest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Bruce Steedman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-08 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler