multiforecast-client 0.62.0.2 → 0.62.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1316eee0e12243629951f3a621150271e5df2a3f
-  data.tar.gz: f4cb9e1be15332f4f7cf51036f2d509ef93926c6
+  metadata.gz: fd49406437bfd41b01f10ede5949c037b07d4ada
+  data.tar.gz: 985af45511b980ad3c8b1a83a1e5dfbdda396973
 SHA512:
-  metadata.gz: 61b291a15bbf7ce71c80783ef984ac3b56cc2a10862a8ccce2ae05034848dabf72bc6926f3bbd9fed495adcf0c8d5f4494636e29f250c0c723256564118ebb6f
-  data.tar.gz: 0cc4d55285915ff7334b047076c52efa49a3b5dc52d9fcddef604804260da1a5f33ccc9efdcbf37f6da602ad0c1849e100b362fc0d9ccbbcf78181bdffd89e0e
+  metadata.gz: 4d0b3e3912b0107dd72e7411246926a518ada6a50398cf9fee152707f8f20d690c07598daaf57f253bb78202a4cffc6684c344a4a850bcc41fd1fc150befb728
+  data.tar.gz: bea0308427fe97696bc89c041b76a2614b203a5c658a35bb41260d197659efe6b8e002a90eacc867580948752a5f62b22d08e8cee04597eaef2c6d9d6acadeec

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-# 0.62.0.1 (2013/07/06)
+# 0.62.0.3 (2013/07/11)
+
+Fix
+
+* Escape a white space to %20, not + to avoid GF (Kossy?) bug
+
+# 0.62.0.2 (2013/07/07)
 
 First version
 

data/README.md

@@ -51,7 +51,6 @@ $ cat multiforecast.yml
 ---
 mapping:
   '': http://localhost:5125
-short_metrics: true
 ```
 
 Post a number and create a graph:
@@ -75,13 +74,13 @@ $ multiforecast help
 ## INSIDE: How to treat graphs of more than 3 levels
 
 Although GrowthForecast can treat only graphs of 3 leveled path, MultiForecast can handle graphs of more than 3 levels.
-This feature is achieved by converting a given path to GrowthForecast's `service_name/section_name/graph_name` path as follows:
+This feature is achieved by converting a given path string to `service_name/section_name/graph_name` path of GrowthForecast as follows:
 
     service_name = 'multiforecast'
     section_name = CGI.escape(File.dirname(path)).gsub('+', '%20').gsub('.', '%2E')
     graph_name   = File.basename(path)
 
-As a viewer for these converted path, [Yohoushi](https://github.com/yohoushi/yohoushi) is ready for you.
+As a viewer for such converted graphs, you can use [Yohoushi](https://github.com/yohoushi/yohoushi) visualization tool.
 
 ## Contributing
 

data/VERSION

@@ -1 +1 @@
-0.62.0.2
+0.62.0.3

data/lib/multiforecast/client.rb

@@ -275,7 +275,7 @@ module MultiForecast
     # @example
     def get_graph_uri(path, params = {})
       params = preprocess_time_params(params) if params
-      "#{@base_uris[id(path)]}/graph/#{CGI.escape(service_name(path))}/#{CGI.escape(section_name(path))}/#{CGI.escape(graph_name(path))}?#{query_string(params)}"
+      "#{@base_uris[id(path)]}/graph/#{uri_escape(service_name(path))}/#{uri_escape(section_name(path))}/#{uri_escape(graph_name(path))}?#{query_string(params)}"
     end
 
     # Get complex graph image uri
@@ -293,7 +293,7 @@ module MultiForecast
     # @example
     def get_complex_uri(path, params = {})
       params = preprocess_time_params(params) if params
-      "#{@base_uris[id(path)]}/complex/graph/#{CGI.escape(service_name(path))}/#{CGI.escape(section_name(path))}/#{CGI.escape(graph_name(path))}?#{query_string(params)}"
+      "#{@base_uris[id(path)]}/complex/graph/#{uri_escape(service_name(path))}/#{uri_escape(section_name(path))}/#{uri_escape(graph_name(path))}?#{query_string(params)}"
     end
 
     # process the time params (from and to)

data/lib/multiforecast/conversion_rule.rb

@@ -3,6 +3,16 @@ require 'cgi'
 
 module MultiForecast
   module ConversionRule
+    def uri_escape(string)
+      # + => '%20' is to avoid GF (Kossy?) bug
+      # . => '%2E' because a/./b is recognized as a/b as URL
+      CGI.escape(string).gsub('+', '%20').gsub('.', '%2E') if string
+    end
+
+    def uri_unescape(string)
+      CGI.unescape(string) if string
+    end
+
     def service_name(path)
       return path.split('/')[0] if path.count('/') == 2
       'multiforecast'
@@ -10,9 +20,7 @@ module MultiForecast
 
     def section_name(path)
       return path.split('/')[1] if path.count('/') == 2
-      # + => '%20' is to avoid GF (Kossy?) bug
-      # . => '%2E' because a/./b is recognized as a/b as URL
-      CGI.escape(File.dirname(path)).gsub('+', '%20').gsub('.', '%2E')
+      uri_escape(File.dirname(path))
     end
 
     def graph_name(path)
@@ -21,7 +29,7 @@ module MultiForecast
 
     def path(service_name, section_name, graph_name)
       return "#{service_name}/#{section_name}/#{graph_name}" unless service_name == "multiforecast"
-      dirname = CGI.unescape(section_name)
+      dirname = uri_unescape(section_name)
       basename = graph_name
       dirname == "." ? basename : "#{dirname}/#{basename}"
     end

data/lib/multiforecast/shared_context/mock.rb

@@ -5,13 +5,13 @@ base_uri = 'http://localhost:5125'
 shared_context "stub_list_graph" do
   def list_graph_example
     [
-      {"gfuri"=>'http://localhost:5125',
+      {"base_uri"=>'http://localhost:5125',
        "path"=>"app name/host name/<1sec count",
        "service_name"=>"multiforecast",
        "section_name"=>"app%20name%2Fhost%20name",
        "graph_name"=>"<1sec count",
        "id"=>1},
-      {"gfuri"=>'http://localhost:5125',
+      {"base_uri"=>'http://localhost:5125',
        "path"=>"app name/host name/<2sec count",
        "service_name"=>"multiforecast",
        "section_name"=>"app+name%2Fhost+name",
@@ -30,7 +30,7 @@ end
 shared_context "stub_get_graph" do
   def graph_example
     {
-      "gfuri"=>"http://localhost:5125",
+      "base_uri"=>"http://localhost:5125",
       "path"=>"app name/host name/<1sec count",
       "number"=>0,
       "llimit"=>-1000000000,
@@ -95,7 +95,7 @@ end
 shared_context "stub_list_complex" do
   def list_complex_example
     [
-      {"gfuri"=>"http://localhost:5125",
+      {"base_uri"=>"http://localhost:5125",
        "path"=>"app name/host name/complex graph test",
        "service_name"=>"multiforecast",
        "section_name"=>"app%20name%2Fhost%20name",
@@ -113,7 +113,7 @@ end
 
 shared_context "stub_get_complex" do
   def complex_example
-    {"gfuri"=>"http://localhost:5125",
+    {"base_uri"=>"http://localhost:5125",
      "path"=>"app name/host name/complex graph test",
      "service_name"=>"multiforecast",
      "section_name"=>"app%20name%2Fhost%20name",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiforecast-client
 version: !ruby/object:Gem::Version
-  version: 0.62.0.2
+  version: 0.62.0.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-06 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: growthforecast-client