cartocss_helper 5.0.3 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 687e90505435113721d6c181afce5feb18be9813
-  data.tar.gz: 127cf1604bb20100d21dde261ca687cad19a8300
+SHA256:
+  metadata.gz: c4b353be50dfd2f899e2b2917a5f221f6046dcb451ca3a98257b10fb776862fe
+  data.tar.gz: f612f883bdbe64b93b2da32ba76cc2301744d6c5d222f024eb8c78b68c2850c1
 SHA512:
-  metadata.gz: b6d068d926cf96ac6047044bd34631edc40d259980f10c08bf1fc111b3336bdf94e278ac69731d1878ef637effae7131ab48408d23a48b696b6b63c3293dd5f9
-  data.tar.gz: c35e933f2ab3484797d2a7ce1f4617af3cb71134c984cb1189b1a5950afc56019c2bdd46373915feee974d08058fa6a12f800acefaca0ab64a4720ddbbf63508
+  metadata.gz: 1b4ae1b202698be4c2ad64ca22bf7976f68d7f4cf4d0621a1904978388163ea28e6b1418ca91ccddbd4433160078386a94641bd2d5c8c5c50d76acff78b2d115
+  data.tar.gz: 1338085a9c2ffe1aa86aef7b977bb84bb71865e59095fb581801cdddce44c4f4e016ee0d410004ffc60008c8599c282062d983f35f8c51273c0860ef57025e21

data/lib/cartocss_helper.rb

@@ -12,6 +12,7 @@ require_relative 'cartocss_helper/validator.rb'
 require_relative 'cartocss_helper/git.rb'
 require_relative 'cartocss_helper/util/generic_downloader.rb'
 require_relative 'cartocss_helper/notes_downloader.rb'
+require_relative 'cartocss_helper/history_downloader.rb'
 require_relative 'cartocss_helper/style_specific/default_osm_style.rb'
 require_relative 'data/testing_locations'
 

data/lib/cartocss_helper/configuration.rb

@@ -103,6 +103,12 @@ module CartoCSSHelper::Configuration
     return location
   end
 
+  def get_path_to_folder_for_history_api_cache
+    location = File.join(get_path_to_folder_for_cache, 'history-api', '')
+    FileUtils.mkdir_p location
+    return location
+  end
+
   def get_data_filename
     return get_path_to_folder_for_branch_specific_cache + 'data.osm'
   end

data/lib/cartocss_helper/history_downloader.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require_relative 'util/generic_cached_downloader.rb'
+
+module CartoCSSHelper
+  class HistoryDownloader
+    def self.cache_filename(type, id)
+      url = HistoryDownloader.format_query_into_url(type, id)
+      return CartoCSSHelper::Configuration.get_path_to_folder_for_history_api_cache + url.delete("/") + ".cache"
+    end
+
+    def self.run_history_query(type, id, invalidate_cache: false)
+      timeout = HistoryDownloader.get_allowed_timeout_in_seconds
+      downloader = GenericCachedDownloader.new(timeout: timeout, stop_on_timeout: false)
+      file = cache_filename(type, id)
+      url = HistoryDownloader.format_query_into_url(type, id)
+      return downloader.get_specified_resource(url, file, invalidate_cache: invalidate_cache)
+    end
+
+    def self.cache_timestamp(type, id)
+      downloader = GenericCachedDownloader.new
+      file = cache_filename(type, id)
+      return downloader.get_cache_timestamp(file)
+    end
+
+    def self.get_allowed_timeout_in_seconds
+      return 10 * 60
+    end
+
+    def self.format_query_into_url(type, id)
+      # documentated at https://wiki.openstreetmap.org/wiki/API_v0.6
+      return "http://api.openstreetmap.org/api/0.6/#{type}/#{id}/history"
+    end
+  end
+end

data/lib/cartocss_helper/notes_downloader.rb

@@ -42,9 +42,5 @@ module CartoCSSHelper
       max_longitude = longitude + size / 2
       return "#{min_longitude},#{min_latitude},#{max_longitude},#{max_latitude}"
     end
-
-    def self.get_overpass_instance_url
-      return CartoCSSHelper::Configuration.get_overpass_instance_url
-    end
   end
 end

data/lib/cartocss_helper/overpass_downloader.rb

@@ -2,8 +2,8 @@
 
 require_relative 'util/generic_downloader.rb'
 require_relative 'util/generic_cached_downloader.rb'
-require 'uri' # for URI.escape
 require 'digest/sha1'
+require 'addressable/uri'
 
 module CartoCSSHelper
   class OverpassDownloader
@@ -42,6 +42,9 @@ module CartoCSSHelper
         puts
         puts url
         puts
+        puts "url with %20 replaced back by spaces, %22 by \""
+        puts url.replace("%20", " ").replace("%22", '"')
+        puts
         puts e
       elsif e.http_code == 414
         puts 'see https://github.com/matkoniecz/CartoCSSHelper/issues/35'
@@ -53,13 +56,33 @@ module CartoCSSHelper
       return 10 * 60
     end
 
-    def self.format_query_into_url(query)
-      query = query.gsub(/\/\/.*\n/, '') # add proper parsing - it will mutilate // inside quotes etc
+    def self.escape_query(query)
+      # code causing bug - (// inside quotes, as predicted) - why it was even added?
+      #query = query.gsub(/\/\/.*\n/, '') # add proper parsing - it will mutilate // inside quotes etc
+      # TODO: replace complaint above by a test
+      # maybe URI.escape(query, "/") is sufficient?
+
+      # escape backslash - turns \ into \\
       query = query.gsub('\\', '\\\\')
+
+      # newlines, tabs added in query for readability may be safely deleted
       query = query.delete("\n")
       query = query.delete("\t")
-      query = URI.escape(query)
+
+      #query = URI.escape(query) # no escaping for / [add require 'uri' to use it]
+      #query = URI.escape(query, "/") # escapes only / [add require 'uri' to use it]
+      #query = CGI.escape(query) # escapes spaces to + sign
+      query = Addressable::URI.encode_component(query, Addressable::URI::CharacterClasses::QUERY)
+      query = query.gsub("/", "%2F") # escape slashes manually
+
+      # inside query also & and + must be escaped (entire query is an url parameter)
       query = query.gsub("&", "%26")
+      query = query.gsub('+', '%2B')
+      return query
+    end
+
+    def self.format_query_into_url(query)
+      query = escape_query(query)
       if query.length > 8174 #8175 is too much and allows crashes
         raise 'see https://github.com/matkoniecz/CartoCSSHelper/issues/35'
       end

data/lib/cartocss_helper/util/rest-client_wrapper.rb

@@ -19,6 +19,8 @@ class RestClientWrapper
   rescue RestClient::SSLCertificateNotVerified, RestClient::ServerBrokeConnection, SocketError, URI::InvalidURIError
     raise ExceptionWithoutResponse.new(e), e.to_s
   rescue ArgumentError => e
+    puts "url:"
+    puts url
     raise_issue_359_exception(e)
   rescue => e
     puts 'unhandled exception! It is a clear bug!'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cartocss_helper
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.0
 platform: ruby
 authors:
 - Mateusz Konieczny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -93,25 +93,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: matkoniecz-ruby-style
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.52'
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -140,20 +134,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
 description: Tool to make development of CartoCSS styles more efficient. Automates
   actions necessary to produce test images and validates style. Loading data using
   osm2pgsql, rendering with TileMill, obtaining test data from overpass turbo.
@@ -168,6 +148,7 @@ files:
 - lib/cartocss_helper/data_file_handling.rb
 - lib/cartocss_helper/git.rb
 - lib/cartocss_helper/heuristic.rb
+- lib/cartocss_helper/history_downloader.rb
 - lib/cartocss_helper/image_generator.rb
 - lib/cartocss_helper/notes_downloader.rb
 - lib/cartocss_helper/overpass_downloader.rb
@@ -200,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -208,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Tool to make development of CartoCSS styles more efficient.