spatial_features 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 161e05dd5050ab333151fad1b7ec795e3f7586dd
-  data.tar.gz: 64e96f4e2f77c54db017c31e0d7babcce42015ba
+  metadata.gz: e95e4c5de92ba868287059cbc55cd3ad0d2c1846
+  data.tar.gz: 9a69e73f631891b6f0a2d31cc44a0beedc18c07f
 SHA512:
-  metadata.gz: 42339e9b2190d5ad0b88a5823140b70febf158de17978822598799d22ad46e0276f76d28c1289599acfd24e7fd36d2c946e0bb2e09f1e43e37c48f6feb2c4c7f
-  data.tar.gz: 52bb8cfed4a5728f997e8f0cbb7b6ededf330e1f7dbf1ce6478b7306556f802165a3746e6ba8a1e9f626c541e93138636984b23af998658aa021c34b2e792b04
+  metadata.gz: 45abd37c19fb70efdb09451017a2541a00f60e2eac82f41271669103f1ff26ae91942a3eaaff8d5c9553f3585a416ccdad4e26b538635f66a215c9a29f7fa693
+  data.tar.gz: d4a85dc77e38d8c5f761e9260affcb1daad1586c881eb673f0e91d108f5691eccb5d8f4daf512dea92a38e63ced95aa36768b7b81e9f07164f2245ed53ee65a7

data/lib/spatial_features/has_fusion_table_features/api.rb

@@ -21,13 +21,17 @@ module SpatialFeatures
       end
 
       def find_table(name)
-        service.tables.find {|table| table['name'] == name }.try(:fetch, 'tableId')
+        service.tables.find {|table| table.name == name }.try(:table_id)
       end
 
       def delete_table(table_id)
         service.delete_table(table_id)
       end
 
+      def tables
+        service.tables
+      end
+
       def set_features(table_id, features, colour: nil)
         colour_features(features, colour)
         service.replace_rows(table_id, features_to_csv(features))

data/lib/spatial_features/has_fusion_table_features/service.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module SpatialFeatures
   module FusionTables
     class Service
@@ -11,29 +9,24 @@ module SpatialFeatures
       end
 
       def table_ids
-        tables.collect {|t| t['tableId'] }
+        tables.collect(&:table_id)
       end
 
       def tables
-        parse_reponse(request(:get, 'https://www.googleapis.com/fusiontables/v2/tables')).fetch('items', [])
+        fusion_tables_service.list_tables.items
       end
 
       def create_table(name, columns = [], table_options = {})
-        body = {:name => name, :columns => columns}.merge(:description => "Features", :isExportable => true).merge(table_options).to_json
-        response = request(:post, 'https://www.googleapis.com/fusiontables/v2/tables', :body => body)
-        return parse_reponse(response)['tableId']
-      end
-
-      def select(query)
-        parse_reponse request(:get, "https://www.googleapis.com/fusiontables/v2/query", :params => {:sql => query})
+        table_object = {:name => name, :columns => columns, :is_exportable => true}.merge(table_options)
+        fusion_tables_service.insert_table(table_object, :fields => 'table_id')
       end
 
       def delete_table(table_id)
-        request(:delete, "https://www.googleapis.com/fusiontables/v2/tables/#{table_id}")
+        fusion_tables_service.delete_table(table_id)
       end
 
       def style_ids(table_id)
-        styles(table_id).collect {|t| t['styleId'] }
+        tables.collect(&:style_id)
       end
 
       def styles(table_id)
@@ -66,20 +59,6 @@ module SpatialFeatures
         end
       end
 
-      def request(method, url, header: {}, body: {}, params: {})
-        headers = @authorization.apply('Content-Type' => 'application/json')
-        headers.merge!(header)
-        headers.merge!(:params => params)
-        return RestClient::Request.execute(:method => method, :url => url, :headers => headers, :payload => body)
-      rescue RestClient::ExceptionWithResponse => e
-        puts e.response
-        raise e
-      end
-
-      def parse_reponse(response)
-        JSON.parse(response.body)
-      end
-
       def replace_rows(table_id, csv)
         fusion_tables_service.replace_table_rows(table_id, :upload_source => csv, :options => {:open_timeout_sec => 1.hour})
       end

data/lib/spatial_features/has_fusion_table_features.rb

@@ -25,7 +25,7 @@ module SpatialFeatures
         fusion_table_groups(group_options) do |fusion_table_id, records, group_features|
           API.delete_table(fusion_table_id)
         end
-        fusion_table_id_cache.clear
+        @fusion_table_id_cache = nil
       end
 
       def acts_like_fusion_table_features?
@@ -33,17 +33,17 @@ module SpatialFeatures
       end
 
       def fusion_table_id_cache
-        @fusion_table_id_cache ||= Hash.new do |hash, table_name|
-          hash[table_name] = API.find_or_create_table(table_name)
-        end
+        @fusion_table_id_cache ||= Hash.new {|hash, table_name| hash[table_name] = API.find_or_create_table(table_name) }
+          .replace(API.tables.collect {|table| [table.name, table.table_id] }.to_h) # Warm the cache
       end
 
       private
 
       def fusion_table_groups(only: [], except: [])
-        all.group_by(&:fusion_table_id).each do |fusion_table_id, records|
-          next if only.present? && !Array.wrap(only).include?(fusion_table_id)
-          next if except.present? && Array.wrap(except).include?(fusion_table_id)
+        groups = all.group_by(&:fusion_table_id)
+        groups.select! {|fusion_table_id| Array.wrap(only).include?(fusion_table_id) } if only.present?
+        groups.select! {|fusion_table_id| !Array.wrap(except).include?(fusion_table_id) } if except.present?
+        groups.each do |fusion_table_id, records|
           yield fusion_table_id, records, features.where(:spatial_model_id => records)
         end
       end

data/lib/spatial_features/version.rb

@@ -1,3 +1,3 @@
 module SpatialFeatures
-  VERSION = "2.1.4"
+  VERSION = "2.1.5"
 end

data/lib/spatial_features.rb

@@ -2,7 +2,6 @@
 require 'rgeo/shapefile'
 require 'nokogiri'
 require 'zip'
-require 'rest-client'
 require 'googleauth'
 require 'google/apis/fusiontables_v2'
 require 'google/apis/drive_v3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spatial_features
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Ryan Wallace
@@ -81,20 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement