growthforecast-client 0.0.6 → 0.62.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 055319d3adf0fb80f5d0f557cb1f13eca1fbcddf
-  data.tar.gz: 90cb32798ddd05248e741c21683aa54b86d3d7e5
+  metadata.gz: 4e380347aae163347f8aff0e1cfa188113cc3350
+  data.tar.gz: 4a82887db1bd53783f3132ad1fbf50d86a491296
 SHA512:
-  metadata.gz: bea692b3fbcb469e1a3b4b046868d00cd1722bb2a3c73ca73f3f347e8167eaca64e2d59cf99418b733b323ba614db310ff4a576b4a9cfb8fdc1d7b679ba14514
-  data.tar.gz: 1808862d990022d1ec47c369d8f00d1e1584e61e88b405dfb8d963db9c4c0ce7483da0075c03b96a6934b5c27c2c73dba3ff60e205f6e4d2f7cdf3f70d2722e2
+  metadata.gz: 98882b9370b43b92a4ec1045a3f27f8d2c2b0a3a9408e0f0d2f45551d9336e2a98c616509dbf1be1c791dcfba69bc7bea58b20235829753e5bc307b310ae97fd
+  data.tar.gz: 5217464da3ac661d186abe1e615cdcf16fe5aa1849e4226053bdf572f07a67276182b6359fc04b182645a4058457be7b772017e84f43fa918414043fefc804b3

data/README.md

@@ -1,6 +1,6 @@
 # GrowthForecast Client [![Build Status](https://secure.travis-ci.org/sonots/growthforecast-client.png?branch=master)](http://travis-ci.org/sonots/growthforecast-client) [![Dependency Status](https://gemnasium.com/sonots/growthforecast-client.png)](https://gemnasium.com/sonots/growthforecast-client)
 
-testing ruby: 1.9.3; GrowthForecast: > 0.39
+testing ruby: 1.9.2, 1.9.3, 2.0.0; GrowthForecast: >= 0.62 (Jun 27, 2013 released)
 
 ## About GrowthForecast Client
 

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.62.0

data/examples/edit_graph.rb

@@ -6,6 +6,7 @@ require 'growthforecast-client'
 
 # Create a GrowthForecast Client, given he base URI of GrowthForecast
 client = GrowthForecast::Client.new('http://localhost:5125')
+client.debug_dev = STDOUT # debug print the http requests and responses
 
 # configure colors of graphs whose names are as belows:
 graph_colors = {

data/lib/growthforecast/cli.rb

@@ -35,12 +35,12 @@ class GrowthForecast::CLI < Thor
 
   no_tasks do
     def e(str)
-      URI.escape(str) if str
+      CGI.escape(str).gsub('+', '%20') if str
     end
 
     def split_path(path)
       path = path.gsub(/.*list\//, '').gsub(/.*view_graph\//, '')
-      path.split('/').map {|p| URI.unescape(p) }
+      path.split('/').map {|p| CGI.unescape(p.gsub('%20', '+')) }
     end
 
     def client(uri)

data/lib/growthforecast/client.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 require 'httpclient'
 require 'json'
-require 'uri'
+require 'cgi'
 require 'pp'
 
 module GrowthForecast
@@ -12,6 +12,7 @@ module GrowthForecast
   class Client
     attr_accessor :debug
     attr_accessor :client
+    attr_reader   :debug_dev
     attr_reader   :base_uri
 
     # @param [String] base_uri The base uri of GrowthForecast
@@ -23,6 +24,12 @@ module GrowthForecast
       @client ||= HTTPClient.new
     end
 
+    # set the `debug_dev` attribute of HTTPClient
+    # @param [IO] debug_dev such as STDOUT
+    def debug_dev=(debug_dev)
+      client.debug_dev = debug_dev
+    end
+
     def last_response
       @res
     end
@@ -121,6 +128,42 @@ module GrowthForecast
       services.keys
     end
 
+    # Post parameters to a graph, POST /api/:service_name/:section_name/:graph_name
+    # @param [String] service_name
+    # @param [String] section_name
+    # @param [String] graph_name
+    # @param [Hash] params The POST parameters. See #get_graph
+    # @return [Hash] the error code and graph property
+    # @example
+    #{"error"=>0,
+    #"data"=>{
+    #  "number"=>1,
+    #  "llimit"=>-1000000000,
+    #  "mode"=>"gauge",
+    #  "stype"=>"AREA",
+    #  "adjustval"=>"1",
+    #  "meta"=>"",
+    #  "service_name"=>"test",
+    #  "gmode"=>"gauge",
+    #  "color"=>"#cc6633",
+    #  "created_at"=>"2013/02/02 00:41:11",
+    #  "section_name"=>"hostname",
+    #  "ulimit"=>1000000000,
+    #  "id"=>21,
+    #  "graph_name"=>"<4sec_count",
+    #  "description"=>"",
+    #  "sulimit"=>100000,
+    #  "unit"=>"",
+    #  "sort"=>0,
+    #  "updated_at"=>"2013/02/02 02:32:10",
+    #  "adjust"=>"*",
+    #  "type"=>"AREA",
+    #  "sllimit"=>-100000,
+    #  "md5"=>"3c59dc048e8850243be8079a5c74d079"}}
+    def post_graph(service_name, section_name, graph_name, params)
+      post_query("/api/#{e service_name}/#{e section_name}/#{e graph_name}", params)
+    end
+
     # Get the propety of a graph, GET /api/:service_name/:section_name/:graph_name
     # @param [String] service_name
     # @param [String] section_name
@@ -185,15 +228,6 @@ module GrowthForecast
       get_json("/json/graph/#{id}")
     end
 
-    # Post parameters to a graph, POST /api/:service_name/:section_name/:graph_name
-    # @param [String] service_name
-    # @param [String] section_name
-    # @param [String] graph_name
-    # @param [Hash] params The POST parameters. See #get_graph
-    def post_graph(service_name, section_name, graph_name, params)
-      post_query("/api/#{e service_name}/#{e section_name}/#{e graph_name}", params)
-    end
-
     # Delete a graph, POST /delete/:service_name/:section_name/:graph_name
     # @param [String] service_name
     # @param [String] section_name
@@ -202,6 +236,12 @@ module GrowthForecast
       post_query("/delete/#{e service_name}/#{e section_name}/#{e graph_name}")
     end
 
+    # Delete a graph, POST /json/delete/graph/:id
+    # @param [String] id
+    def delete_graph_by_id(id)
+      post_query("/json/delete/graph/#{id}")
+    end
+
     # Update the property of a graph, /json/edit/graph/:id
     # @param [String] service_name
     # @param [String] section_name
@@ -268,10 +308,43 @@ module GrowthForecast
         :sort         => to_complex["sort"],
         :data         => graph_data
       }
-
       post_json('/json/create/complex', post_params)
     end
 
+    # Get the propety of a complex graph, GET /json/complex/:service_name/:section_name/:graph_name
+    # @param [String] service_name
+    # @param [String] section_name
+    # @param [String] graph_name
+    # @return [Hash] the graph property
+    # @version 0.70 or more
+    # @example
+    # {"number"=>0,
+    #  "complex"=>true,
+    #  "created_at"=>"2013/05/20 15:08:28",
+    #  "service_name"=>"app name",
+    #  "section_name"=>"host name",
+    #  "id"=>18,
+    #  "graph_name"=>"complex graph test",
+    #  "data"=>
+    #   [{"gmode"=>"gauge", "stack"=>false, "type"=>"AREA", "graph_id"=>218},
+    #    {"gmode"=>"gauge", "stack"=>true, "type"=>"AREA", "graph_id"=>217}],
+    #  "sumup"=>false,
+    #  "description"=>"complex graph test",
+    #  "sort"=>10,
+    #  "updated_at"=>"2013/05/20 15:08:28"}
+    def get_complex(service_name, section_name, graph_name)
+      get_json("/json/complex/#{e service_name}/#{e section_name}/#{e graph_name}")
+    end
+
+    # Get the propety of a complex graph, GET /json/complex/:id
+    # @param [String] id
+    # @return [Hash] the graph property
+    # @version 0.70 or more
+    # @example See #get_complex
+    def get_complex_by_id(id)
+      get_json("/json/complex/#{id}")
+    end
+
     # Delete a complex graph
     #
     # This is a helper method of GrowthForecast API to find complex graph id and call delete_complex_by_id
@@ -284,10 +357,7 @@ module GrowthForecast
     # {"error"=>0} #=> Success
     # {"error"=>1} #=> Error
     def delete_complex(service_name, section_name, graph_name)
-      complex_graphs = list_complex
-      complex = complex_graphs.select {|g| g["service_name"] == service_name and g["section_name"] == section_name and g["graph_name"] == graph_name }
-      raise NotFound if complex.empty?
-      delete_complex_by_id(complex.first["id"])
+      post_query("/json/delete/complex/#{e service_name}/#{e section_name}/#{e graph_name}")
     end
 
     # Delete a complex graph, /delete_complex/:complex_id
@@ -304,7 +374,7 @@ module GrowthForecast
     private
 
     def e(str)
-      URI.escape(str) if str
+      CGI.escape(str).gsub('+', '%20') if str
     end
 
     def handle_error(res)
@@ -320,7 +390,7 @@ module GrowthForecast
     end
 
     def error_message(res)
-      "status:#{res.status}\turi:#{res.http_header.request_uri.to_s}"
+      "status:#{res.status}\turi:#{res.http_header.request_uri.to_s}\tmessage:#{res.body}"
     end
 
     # GrowthForecast's /json/edit/graph API requires all parameters to update, thus

data/spec/growthforecast/client_spec.rb

@@ -1,31 +1,12 @@
 require 'spec_helper'
 
-shared_context "setup_growthforecast_client" do
-  before(:all) { @client = GrowthForecast::Client.new('http://localhost:5125') }
-
-  include_context "stub_list_graph" if ENV['MOCK'] == 'on'
-  let(:graphs) { @client.list_graph }
-  let(:graph) { graphs.first }
-
-  include_context "stub_post_graph" if ENV['MOCK'] == 'on'
-  include_context "stub_delete_graph" if ENV['MOCK'] == 'on'
-  before(:all) {
-    @client.delete_graph("app name", "host name", "<1sec count") rescue nil
-    @client.delete_graph("app name", "host name", "<2sec count") rescue nil
-    @client.post_graph("app name", "host name", "<1sec count", { 'number' => 0 }) rescue nil
-    @client.post_graph("app name", "host name", "<2sec count", { 'number' => 0 }) rescue nil
-  }
-  after(:all) {
-    @client.delete_graph("app name", "host name", "<1sec count") rescue nil
-    @client.delete_graph("app name", "host name", "<2sec count") rescue nil
-  }
-end
-
 describe GrowthForecast::Client do
   include_context "setup_growthforecast_client"
   id_keys    = %w[id service_name section_name graph_name]
   graph_keys = %w[number llimit mode stype adjustval gmode color created_at ulimit description
                   sulimit unit sort updated_at adjust type sllimit meta md5]
+  complex_keys = %w[number complex created_at service_name section_name id graph_name data sumup
+                    description sort updated_at]
 
   context "#list_graph" do
     include_context "stub_list_graph" if ENV['MOCK'] == 'on'
@@ -36,7 +17,7 @@ describe GrowthForecast::Client do
 
   context "#list_section" do
     include_context "stub_list_graph" if ENV['MOCK'] == 'on'
-    subject { @client.list_section }
+    subject { client.list_section }
     its(:size) { should > 0 }
     its(:class) { should == Hash }
     it { subject.each {|service_name, sections| sections.size.should > 0 } }
@@ -44,21 +25,21 @@ describe GrowthForecast::Client do
 
   context "#list_service" do
     include_context "stub_list_graph" if ENV['MOCK'] == 'on'
-    subject { @client.list_service }
+    subject { client.list_service }
     its(:size) { should > 0 }
     its(:class) { should == Array }
   end
 
   context "#get_graph" do
     include_context "stub_get_graph" if ENV['MOCK'] == 'on'
-    subject { @client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"]) }
+    subject { client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"]) }
     id_keys.each {|key| it { subject[key].should == graph[key] } }
     graph_keys.each {|key| it { subject.should have_key(key) } }
   end
 
   context "#get_graph_by_id" do
     include_context "stub_get_graph_by_id" if ENV['MOCK'] == 'on'
-    subject { @client.get_graph_by_id(graph["id"]) }
+    subject { client.get_graph_by_id(graph["id"]) }
     id_keys.each {|key| it { subject[key].should == graph[key] } }
     # this is the behavior of GrowthForecast API
     (graph_keys - %w[meta md5]).each {|key| it { subject.should have_key(key) } }
@@ -70,7 +51,7 @@ describe GrowthForecast::Client do
     params = {
       'number' => 0,
     }
-    subject { @client.post_graph(graph["service_name"], graph["section_name"], graph["graph_name"], params) }
+    subject { client.post_graph(graph["service_name"], graph["section_name"], graph["graph_name"], params) }
     it { subject["error"].should == 0 }
     params.keys.each {|key| it { subject["data"][key].should == params[key] } }
   end
@@ -78,6 +59,13 @@ describe GrowthForecast::Client do
   context "#delete_graph" do
     include_context "stub_post_graph" if ENV['MOCK'] == 'on'
     include_context "stub_delete_graph" if ENV['MOCK'] == 'on'
+    before { client.post_graph(graph['service_name'], graph['section_name'], graph['graph_name'], { 'number' => 0 }) }
+    subject { client.delete_graph(graph['service_name'], graph['section_name'], graph['graph_name']) }
+    it { subject["error"].should == 0 }
+  end
+
+  context "#delete_graph_by_id" do
+    include_context "stub_post_graph" if ENV['MOCK'] == 'on'
     let(:graph) {
       {
         "service_name" => "app name",
@@ -85,8 +73,12 @@ describe GrowthForecast::Client do
         "graph_name"   => "<1sec count",
       }
     }
-    before  { @client.post_graph(graph['service_name'], graph['section_name'], graph['graph_name'], { 'number' => 0 }) }
-    subject { @client.delete_graph(graph['service_name'], graph['section_name'], graph['graph_name']) }
+    let(:id) do
+      ret = client.post_graph(graph['service_name'], graph['section_name'], graph['graph_name'], { 'number' => 0 })
+      ret["data"]["id"]
+    end
+    include_context "stub_delete_graph_by_id" if ENV['MOCK'] == 'on'
+    subject { client.delete_graph_by_id(id) }
     it { subject["error"].should == 0 }
   end
 
@@ -100,10 +92,10 @@ describe GrowthForecast::Client do
         'unit' => 'sec',
         'color'  => "#000000"
       }
-      before(:all) do
-        @before = @client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"])
-        @response = @client.edit_graph(graph["service_name"], graph["section_name"], graph["graph_name"], params)
-        @after = @client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"])
+      before do
+        @before = client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"])
+        @response = client.edit_graph(graph["service_name"], graph["section_name"], graph["graph_name"], params)
+        @after = client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"])
       end
       it { @response["error"].should == 0 }
       # @todo: how to stub @after?
@@ -120,10 +112,10 @@ describe GrowthForecast::Client do
         'number' => 0,
         'mode'   => 'count',
       }
-      before(:all) do
-        @before = @client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"])
-        @response = @client.edit_graph(graph["service_name"], graph["section_name"], graph["graph_name"], params)
-        @after = @client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"])
+      before do
+        @before = client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"])
+        @response = client.edit_graph(graph["service_name"], graph["section_name"], graph["graph_name"], params)
+        @after = client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"])
       end
       params.keys.each {|key| it { @after[key].should == @before[key] } }
     end
@@ -132,29 +124,35 @@ describe GrowthForecast::Client do
   context "#create_complex" do
     include_context "stub_create_complex" if ENV['MOCK'] == 'on'
     include_context "stub_delete_complex" if ENV['MOCK'] == 'on'
-    context "normal" do
-      let(:from_graphs) do
-        [
-          graphs[0],
-          graphs[1],
-        ]
-      end
-      let(:to_complex) do
-        {
-          "service_name" => graphs.first["service_name"],
-          "section_name" => graphs.first["section_name"],
-          "graph_name"   => "complex graph test",
-          "description"  => "complex graph test",
-          "sort"         => 10
-        }
-      end
-      subject { @client.create_complex(from_graphs, to_complex) }
-      it { subject["error"].should == 0 }
-      after { @client.delete_complex(to_complex["service_name"], to_complex["section_name"], to_complex["graph_name"]) }
-    end
+    subject { client.create_complex(from_graphs, to_complex) }
+    it { subject["error"].should == 0 }
+    after { client.delete_complex(to_complex["service_name"], to_complex["section_name"], to_complex["graph_name"]) }
+  end
+
+  context "#get_complex" do
+    include_context "stub_create_complex" if ENV['MOCK'] == 'on'
+    include_context "stub_get_complex" if ENV['MOCK'] == 'on'
+    include_context "stub_delete_complex" if ENV['MOCK'] == 'on'
+    before { client.create_complex(from_graphs, to_complex) }
+    subject { client.get_complex(to_complex["service_name"], to_complex["section_name"], to_complex["graph_name"]) }
+    complex_keys.each {|key| it { subject.should have_key(key) } }
+    after { client.delete_complex(to_complex["service_name"], to_complex["section_name"], to_complex["graph_name"]) }
+  end
+
+  context "#get_complex_by_id" do
+    include_context "stub_create_complex" if ENV['MOCK'] == 'on'
+    include_context "stub_get_complex" if ENV['MOCK'] == 'on'
+    before { client.create_complex(from_graphs, to_complex) }
+    let(:id) { client.get_complex(to_complex["service_name"], to_complex["section_name"], to_complex["graph_name"])["id"] }
+    include_context "stub_get_complex_by_id" if ENV['MOCK'] == 'on'
+    include_context "stub_delete_complex_by_id" if ENV['MOCK'] == 'on'
+    subject { client.get_complex_by_id(id) }
+    complex_keys.each {|key| it { subject.should have_key(key) } }
+    after { client.delete_complex_by_id(id) }
   end
 
   describe 'http://blog.64p.org/?page=1366971426' do
+    before { @client ||= client }
     context "#client=" do
       before { @client.client = HTTPClient.new(agent_name: 'TestAgent/0.1') }
       it { @client.client.agent_name.should == 'TestAgent/0.1' }
@@ -162,6 +160,7 @@ describe GrowthForecast::Client do
 
     context "#last_response" do
       include_context "stub_list_graph" if ENV['MOCK'] == 'on'
+      before { @client.list_graph }
       subject { @client.last_response }
       it { should be_kind_of HTTP::Message }
     end

data/spec/spec_helper.rb

@@ -4,7 +4,9 @@ require "bundler/setup"
 ENV['MOCK'] ||= 'on'
 require "pry"
 require 'growthforecast-client'
-require 'webmock/rspec' if ENV['MOCK'] == 'on'
+require 'webmock/rspec'
+require 'cgi'
+WebMock.allow_net_connect! if ENV['MOCK'] == 'off'
 
 ROOT = File.dirname(__FILE__)
 Dir[File.expand_path("support/**/*.rb", ROOT)].each {|f| require f }
@@ -13,3 +15,20 @@ RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
 end
+
+def u(str)
+  ::CGI.unescape(str.gsub('%20', '+')) if str
+end
+
+def e(str)
+  ::CGI.escape(str).gsub('+', '%20') if str
+end
+
+def base_uri
+  'http://localhost:5125'
+end
+
+def client
+  GrowthForecast::Client.new(base_uri)
+end
+

data/spec/support/mock.rb

@@ -1,31 +1,27 @@
 # -*- encoding: utf-8 -*-
 
-base_uri = 'http://localhost:5125'
-
 shared_context "stub_list_graph" do
-  let(:list_graph_example) {
+  def list_graph_example
     [
       {"service_name"=>"app name",
        "section_name"=>"host name",
        "graph_name"=>"<1sec count",
        "id"=>1},
-       {"service_name"=>"app name",
-        "section_name"=>"host name",
-        "graph_name"=>"<2sec count",
-        "id"=>2},
+      {"service_name"=>"app name",
+       "section_name"=>"host name",
+       "graph_name"=>"<2sec count",
+       "id"=>2},
     ]
-  }
+  end
 
   proc = Proc.new do
-    # WebMock.allow_net_connect!
     stub_request(:get, "#{base_uri}/json/list/graph").to_return(:status => 200, :body => list_graph_example.to_json)
   end
   before(:each, &proc)
-  before(:all, &proc)
 end
 
 shared_context "stub_get_graph" do
-  let(:graph_example) {
+  def graph_example
     {
       "number"=>0,
       "llimit"=>-1000000000,
@@ -51,19 +47,18 @@ shared_context "stub_get_graph" do
       "sllimit"=>-100000,
       "md5"=>"3c59dc048e8850243be8079a5c74d079"
     }
-  }
+  end
 
   proc = Proc.new do
-    stub_request(:get, "#{base_uri}/api/#{graph['service_name']}/#{graph['section_name']}/#{graph['graph_name']}").
+    stub_request(:get, "#{base_uri}/api/#{e graph['service_name']}/#{e graph['section_name']}/#{e graph['graph_name']}").
     to_return(:status => 200, :body => graph_example.to_json)
   end
   before(:each, &proc)
-  before(:all, &proc)
 end
 
 shared_context "stub_get_graph_by_id" do
   # /json/graph/:id does not return `meta` and `md5`
-  let(:graph_example) {
+  def graph_example
     {
       "number"=>0,
       "llimit"=>-1000000000,
@@ -89,33 +84,37 @@ shared_context "stub_get_graph_by_id" do
       "sllimit"=>-100000,
       # "md5"=>"3c59dc048e8850243be8079a5c74d079"
     }
-  }
+  end
 
   proc = Proc.new do
     stub_request(:get, "#{base_uri}/json/graph/#{graph['id']}").
     to_return(:status => 200, :body => graph_example.to_json)
   end
   before(:each, &proc)
-  before(:all, &proc)
 end
 
 shared_context "stub_post_graph" do
   include_context "stub_get_graph"
-  proc = Proc.new do
-    stub_request(:post, "#{base_uri}/api/#{graph['service_name']}/#{graph['section_name']}/#{graph['graph_name']}").
+  before do
+    stub_request(:post, "#{base_uri}/api/#{e graph['service_name']}/#{e graph['section_name']}/#{e graph['graph_name']}").
     to_return(:status => 200, :body => { "error" => 0, "data" => graph_example }.to_json)
   end
-  before(:each, &proc)
-  before(:all, &proc)
 end
 
 shared_context "stub_delete_graph" do
   proc = Proc.new do
-    stub_request(:post, "#{base_uri}/delete/#{graph['service_name']}/#{graph['section_name']}/#{graph['graph_name']}").
+    stub_request(:post, "#{base_uri}/delete/#{e graph['service_name']}/#{e graph['section_name']}/#{e graph['graph_name']}").
+    to_return(:status => 200, :body => { "error" => 0 }.to_json)
+  end
+  before(:each, &proc)
+end
+
+shared_context "stub_delete_graph_by_id" do
+  proc = Proc.new do
+    stub_request(:post, "#{base_uri}/json/delete/graph/#{id}").
     to_return(:status => 200, :body => { "error" => 0 }.to_json)
   end
   before(:each, &proc)
-  before(:all, &proc)
 end
 
 shared_context "stub_edit_graph" do
@@ -126,37 +125,89 @@ shared_context "stub_edit_graph" do
     to_return(:status => 200, :body => { "error" => 0 }.to_json)
   end
   before(:each, &proc)
-  before(:all, &proc)
 end
 
 shared_context "stub_list_complex" do
-  let(:list_complex_example) {
+  def list_complex_example
     [
       {"service_name"=>"app name",
        "section_name"=>"host name",
        "graph_name"=>"complex graph test",
        "id"=>1},
     ]
-  }
-  let(:complex_example) {
-    list_complex_example.first
-  }
+  end
 
   proc = Proc.new do
     stub_request(:get, "#{base_uri}/json/list/complex").
     to_return(:status => 200, :body => list_complex_example.to_json)
   end
   before(:each, &proc)
-  before(:all, &proc)
+end
+
+shared_context "stub_get_complex" do
+  def complex_example
+    {"number"=>0,
+     "complex"=>true,
+     "created_at"=>"2013/05/20 15:08:28",
+     "service_name"=>"app name",
+     "section_name"=>"host name",
+     "id"=>1,
+     "graph_name"=>"complex graph test",
+     "data"=>
+    [{"gmode"=>"gauge", "stack"=>false, "type"=>"AREA", "graph_id"=>218},
+     {"gmode"=>"gauge", "stack"=>true, "type"=>"AREA", "graph_id"=>217}],
+    "sumup"=>false,
+    "description"=>"complex graph test",
+    "sort"=>10,
+    "updated_at"=>"2013/05/20 15:08:28"}
+  end
+
+  proc = Proc.new do
+    stub_request(:get, "#{base_uri}/json/complex/#{e to_complex['service_name']}/#{e to_complex['section_name']}/#{e to_complex['graph_name']}").
+    to_return(:status => 200, :body => complex_example.to_json)
+  end
+  before(:each, &proc)
+end
+
+shared_context "stub_get_complex_by_id" do
+  def complex_example
+    {"number"=>0,
+     "complex"=>true,
+     "created_at"=>"2013/05/20 15:08:28",
+     "service_name"=>"app name",
+     "section_name"=>"host name",
+     "id"=>1,
+     "graph_name"=>"complex graph test",
+     "data"=>
+    [{"gmode"=>"gauge", "stack"=>false, "type"=>"AREA", "graph_id"=>218},
+     {"gmode"=>"gauge", "stack"=>true, "type"=>"AREA", "graph_id"=>217}],
+    "sumup"=>false,
+    "description"=>"complex graph test",
+    "sort"=>10,
+    "updated_at"=>"2013/05/20 15:08:28"}
+  end
+
+  proc = Proc.new do
+    stub_request(:get, "#{base_uri}/json/complex/#{id}").
+    to_return(:status => 200, :body => complex_example.to_json)
+  end
+  before(:each, &proc)
 end
 
 shared_context "stub_delete_complex" do
   proc = Proc.new do
-    stub_request(:post, "#{base_uri}/delete_complex/#{complex_example['id']}").
+    stub_request(:post, "#{base_uri}/json/delete/complex/#{e to_complex['service_name']}/#{e to_complex['section_name']}/#{e to_complex['graph_name']}").
+    to_return(:status => 200, :body => { "error" => 0 }.to_json)
+  end
+  before(:each, &proc)
+end
+
+shared_context "stub_delete_complex_by_id" do
+  proc = Proc.new do
+    stub_request(:post, "#{base_uri}/delete_complex/#{id}").
     to_return(:status => 200, :body => { "error" => 0 }.to_json)
   end
   before(:each, &proc)
-  before(:all, &proc)
 end
 
 shared_context "stub_create_complex" do
@@ -164,7 +215,7 @@ shared_context "stub_create_complex" do
 
   proc = Proc.new do
     list_graph_example.each do |graph|
-      stub_request(:get, "#{base_uri}/api/#{graph['service_name']}/#{graph['section_name']}/#{graph['graph_name']}").
+      stub_request(:get, "#{base_uri}/api/#{e graph['service_name']}/#{e graph['section_name']}/#{e graph['graph_name']}").
       to_return(:status => 200, :body => graph.to_json)
     end
 
@@ -172,6 +223,5 @@ shared_context "stub_create_complex" do
     to_return(:status => 200, :body => { "error" => 0 }.to_json)
   end
   before(:each, &proc)
-  before(:all, &proc)
 end
 

data/spec/support/setup.rb

@@ -1,22 +1,49 @@
 # -*- encoding: utf-8 -*-
 
 shared_context "setup_growthforecast_client" do
-  before(:all) { @client = GrowthForecast::Client.new('http://localhost:5125') }
-
   include_context "stub_list_graph" if ENV['MOCK'] == 'on'
-  let(:graphs) { @client.list_graph }
+  let(:graphs) { client.list_graph }
   let(:graph) { graphs.first }
+  let(:from_graphs) do
+    [
+      {
+        "service_name" => graphs[0]["service_name"],
+        "section_name" => graphs[0]["section_name"],
+        "graph_name"   => graphs[0]["graph_name"],
+        "gmode" => "gauge",
+        "stack" => false,
+        "type" => "AREA",
+      },
+      {
+        "service_name" => graphs[1]["service_name"],
+        "section_name" => graphs[1]["section_name"],
+        "graph_name"   => graphs[1]["graph_name"],
+        "gmode" => "gauge",
+        "stack" => false,
+        "type" => "AREA"
+      },
+    ]
+  end
+  let(:to_complex) do
+    {
+      "service_name" => graphs.first["service_name"],
+      "section_name" => graphs.first["section_name"],
+      "graph_name"   => "complex graph test",
+      "description"  => "complex graph test",
+      "sort"         => 10
+    }
+  end
 
   include_context "stub_post_graph" if ENV['MOCK'] == 'on'
   include_context "stub_delete_graph" if ENV['MOCK'] == 'on'
-  before(:all) {
-    @client.delete_graph("app name", "host name", "<1sec count") rescue nil
-    @client.delete_graph("app name", "host name", "<2sec count") rescue nil
-    @client.post_graph("app name", "host name", "<1sec count", { 'number' => 0 }) rescue nil
-    @client.post_graph("app name", "host name", "<2sec count", { 'number' => 0 }) rescue nil
+  before {
+    client.delete_graph("app name", "host name", "<1sec count") rescue nil
+    client.delete_graph("app name", "host name", "<2sec count") rescue nil
+    client.post_graph("app name", "host name", "<1sec count", { 'number' => 0 }) rescue nil
+    client.post_graph("app name", "host name", "<2sec count", { 'number' => 0 }) rescue nil
   }
-  after(:all) {
-    @client.delete_graph("app name", "host name", "<1sec count") rescue nil
-    @client.delete_graph("app name", "host name", "<2sec count") rescue nil
+  after {
+    client.delete_graph("app name", "host name", "<1sec count") rescue nil
+    client.delete_graph("app name", "host name", "<2sec count") rescue nil
   }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: growthforecast-client
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.62.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A Ruby Client Library for GrowthForecast API