fc2json 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65ac2311eb61e08baf184b4d6fe92ac1de54c9ef
-  data.tar.gz: 46a9dea59ca075267d8ef104a12083bdf0ad7cb4
+  metadata.gz: dbcd8561a70124820294be6d08cab42839eecc32
+  data.tar.gz: 9d66b0099a955274d165b92b498630e968ca466b
 SHA512:
-  metadata.gz: d23c7270c47a4f8d0ddf6cd5e69f5dbdb698a9850e6d94c58cd505c961578a054efd5715b57935691d7e353530ffbf1ebbe3f31735ae4d294770f4ebf186aadd
-  data.tar.gz: 5a0ccd42b1eba1d1732a7af1a0c6c1c48d6db54e181b10f8e58bf8ffccca4ab63c13bd59286775fe179bad2936acbc0673d67333a5ea62307022c581d9928404
+  metadata.gz: e014021f2a827525ce99f0703185fbe93bad34c3886b5568e1640b813f3ea193385d2b922b80541ef1930f43a5d4671a7638a7a83c526d42477bd4b59cd35a96
+  data.tar.gz: 6d520e944a50863e0ed476856646417688691b9f9948c46c0747f9fe48008ad4eca1d638f5c1afcd47ac462ae0f962135687264719e1dbb191c208127d25e59c

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+before_install:
+  - gem update bundler
+rvm: 
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0

data/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
     builder (3.2.2)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
     git (1.2.6)
@@ -46,14 +46,14 @@ GEM
     rake (10.1.1)
     rdoc (4.1.0)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
     safe_yaml (0.9.7)
     vcr (2.8.0)
     webmock (1.15.2)

data/README.md

@@ -1,3 +1,4 @@
+[![Build Status](https://travis-ci.org/rpepato/fc2json.png?branch=master)](https://travis-ci.org/rpepato/fc2json) [![Code Climate](https://codeclimate.com/github/rpepato/fc2json.png)](https://codeclimate.com/github/rpepato/fc2json)
 fc2json
 ==================
 
@@ -22,7 +23,7 @@ end
 
 ####Initialization parameters
 
-The constructor of a FC2Json object is declares as follows:
+The constructor of a FC2Json object is declared as follows:
 
 ```ruby
 def initialize (service_url, object_identifier_field_name = nil, records_per_request = nil, where_clause = nil)
@@ -36,6 +37,13 @@ The construction parameters are:
 * __records_per_request:__ Optional. The number of records returned on each request to the service. Be aware that if you specify a number greater than the max number of records configured on the service, an ArgumentError will be raised. If not provided, defaults to 2000.
 * __where_clause:__ Optional. The where condition (SQL query) to filter the records on the feature service. If not provided, defaults to "1 = 1"
 
+####Binary usage
+If you prefer you can use the binary provided by the gem and redirect the output to a file:
+
+```shell
+fc2json "http://services2.arcgis.com/hMIIIBIOpi8Cdgjw/arcgis/rest/services/ubs/FeatureServer/0" "FID" 6 "FID >= 1 and FID <=6" > output.json 
+```
+
 ###Contributing to fc2json
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/fc2json.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: fc2json 0.2.1 ruby lib
+# stub: fc2json 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fc2json"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Roberto Pepato"]
-  s.date = "2013-12-31"
+  s.date = "2014-01-10"
   s.description = "fc2json queries, downloads and formats all data from a remote Esri feature service, exposing it as json representation"
   s.email = "rpepato@gmail.com"
   s.executables = ["fc2json"]
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",

data/lib/fc2json.rb

@@ -18,21 +18,18 @@ class FC2Json
 	end
 
 	def get
-		ids = get_ids
+		ids = object_identifiers
 		json = {}
 		request_index = 0
 		continue = true
 
 		while continue do
-			if ids[request_index * @records_per_request + (@records_per_request - 1)].nil?
-				continue = false
-				where = "#{@object_identifier_field_name} >= #{ids[request_index * @records_per_request]} AND #{@object_identifier_field_name} <= #{ids.last}"
-			else
-				where = "#{@object_identifier_field_name} >= #{ids[request_index * @records_per_request]} AND #{@object_identifier_field_name} <= #{ids[request_index * @records_per_request + (@records_per_request - 1)]}"
-			end
-			request_url = "#{@service_url}/query?where=#{CGI.escape(where)}&f=pjson&outFields=*"
 
-			request_result = JSON.parse(Nokogiri::HTML(open(request_url)))
+			continue = false if ids[request_index * @records_per_request + (@records_per_request - 1)].nil?
+
+			where = where_clause_for(ids, request_index)
+
+			request_result = request_features(where)
 			if request_result["exceededTransferLimit"]
 				raise ArgumentError, "The batch size of #{@records_per_request} exceeds the capability provided by the service used on this query. Review the service's batch size limit and adjust your query parameters."
 			end
@@ -52,13 +49,25 @@ class FC2Json
 		if json["error"]
 			return {} if json["error"]["details"] == ["'where' parameter is invalid"]
 		end
-
 		json
+
 	end
 
 	private 
 
-	def get_ids
+	def request_features(where_clause)
+		JSON.parse(Nokogiri::HTML(open("#{@service_url}/query?where=#{CGI.escape(where_clause)}&f=pjson&outFields=*")))
+	end
+
+	def where_clause_for(dataset, index)
+		if dataset[index * @records_per_request + (@records_per_request - 1)].nil?
+			"#{@object_identifier_field_name} >= #{dataset[index * @records_per_request]} AND #{@object_identifier_field_name} <= #{dataset.last}"
+		else
+			"#{@object_identifier_field_name} >= #{dataset[index * @records_per_request]} AND #{@object_identifier_field_name} <= #{dataset[index * @records_per_request + (@records_per_request - 1)]}"
+		end
+	end 
+
+	def object_identifiers
 		request_url = "#{self.service_url}/query?where=#{CGI.escape(self.where_clause)}&f=pjson&returnIdsOnly=true"
 		(JSON.parse Nokogiri::HTML(open(request_url)))["objectIds"]
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fc2json
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Roberto Pepato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -96,6 +96,7 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt