growthforecast-client 0.80.2 → 0.82.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 389f477ae239f1c04bc4da5d4c666f8cd2c3caba
-  data.tar.gz: dbc01e7a72b731632b05b1b217e00ac1b2c1cf04
+  metadata.gz: 148a2f0792e825f45d2fd455208d21eff0fcb406
+  data.tar.gz: a2edd60c2e63cbcef3052400a2de88511ba81a31
 SHA512:
-  metadata.gz: cdfe3688ec02a66270f5e62001feb72d662180944b5e4db6e9599f11e357783ced44c776b565055820a262c0ff409ba9e66a4a995d90abd5a7ac8c8893af0589
-  data.tar.gz: 02bf8f6e2845a8b13fe7656fd125733925e3a8992fbb9ed4a4b967c0530cbb0aa6ed2b4beaf2bae7e1b7b9964f8e70e2ab25218aa4af3d6dc866f82357ad9c0f
+  metadata.gz: 50f2f7bdb5ba1b8e414626162788af7c28cec322a421f79614f4c5ca3a02ecb15991820238df277558ff91ff29f10fe0f7a29c3614887511016609652b03ea64
+  data.tar.gz: e145c5e28616bf9471403b22adcafd972d733c2469224b386e6f049d9e95438869c0be101aaeec6a717a208834fcb54f4075cfb774f43217b99a562e7bdd9aa4

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.82.1 (2014/03/26)
+
+Changes:
+
+  - Changed the argument order of #post_vrule
+
+# 0.82.0 (2014/03/26)
+
+Enhancement:
+
+  - Support newly created `vrule` api
+
 # 0.80.2 (2014/03/06)
 
 Fixes:

data/VERSION

@@ -1 +1 @@
-0.80.2
+0.82.1

data/lib/growthforecast/client.rb

@@ -415,6 +415,61 @@ module GrowthForecast
       post_query("/delete_complex/#{complex_id}")
     end
 
+    # Post parameters to a vrule, POST /vrule/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_vrule
+    # @return [Hash] the error code and graph property
+    # @example
+    #{"error"=>0,
+    #"data"=>{
+    #  "graph_path"=>"/hoge/hoge/hoge",
+    #  "color"=>"#FF0000",
+    #  "time"=>1395826210,
+    #  "id"=>1,
+    #  "dashes"=>"2,10",
+    #  "description"=>""}}
+    def post_vrule(service_name = nil, section_name = nil, graph_name = nil, params = {})
+      path = "/vrule/api"
+      path += "/#{e service_name}" if service_name
+      path += "/#{e section_name}" if section_name
+      path += "/#{e graph_name}"   if graph_name
+      post_query(path, params)
+    end
+
+    # Get the data of vrules, GET /vrule/summary/:service_name/:section_name/:graph_name
+    # @param [String] service_name
+    # @param [String] section_name
+    # @param [String] graph_name
+    # @return [Hash] the data of vrules
+    # @example
+    #[
+    #{
+    #  "graph_path"=>"/hoge/hoge/hoge",
+    #  "color"=>"#FF0000",
+    #  "time"=>1395826210,
+    #  "id"=>1,
+    #  "dashes"=>"",
+    #  "description"=>""
+    #},
+    #{
+    #  "graph_path"=>"/hoge/hoge/hoge",
+    #  "color"=>"#FF0000",
+    #  "time"=>1395826363,
+    #  "id"=>2,
+    #  "dashes"=>"2,10",
+    #  "description"=>""
+    #}
+    #]
+    def get_vrule(service_name = nil, section_name = nil, graph_name = nil)
+      path = "/vrule/summary"
+      path += "/#{e service_name}" if service_name
+      path += "/#{e section_name}" if section_name
+      path += "/#{e graph_name}"   if graph_name
+      get_json(path)
+    end
+
     private
 
     def e(str)

data/spec/growthforecast/client_spec.rb

@@ -7,6 +7,7 @@ describe GrowthForecast::Client do
                   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]
+  vrule_keys = %w[graph_path color time id dashes description]
 
   context "#list_graph" do
     include_context "stub_list_graph" if ENV['MOCK'] == 'on'
@@ -176,5 +177,29 @@ describe GrowthForecast::Client do
       it { should == "http://localhost:5125/json/list/graph" }
     end
   end
+
+  context "#post_vrule" do
+    include_context "stub_post_vrule" if ENV['MOCK'] == 'on'
+    params = {
+      'dashes' => '2,10'
+    }
+    subject { client.post_vrule(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
+
+  context "#get_vrule" do
+    context "200 OK" do
+      include_context "stub_get_vrule" if ENV['MOCK'] == 'on'
+      subject { client.get_vrule(graph["service_name"], graph["section_name"], graph["graph_name"]).first }
+      vrule_keys.each {|key| it { subject.should have_key(key) } }
+    end
+
+    context "Not Found" do
+      include_context "stub_get_notfound_vrule" if ENV['MOCK'] == 'on'
+      subject { client.get_vrule(notfound_graph["service_name"], notfound_graph["section_name"], notfound_graph["graph_name"]) }
+      it { should == [] } # differ with 404 Not Found
+    end
+  end
 end
 

data/spec/support/mock.rb

@@ -225,17 +225,53 @@ shared_context "stub_create_complex" do
   before(:each, &proc)
 end
 
+def notfound_graph
+  {
+    'service_name' => 'not found',
+    'section_name' => 'not found',
+    'graph_name'   => 'not found',
+  }
+end
 shared_context "stub_get_notfound_graph" do
-  def notfound_graph
+  proc = Proc.new do
+    stub_request(:get, "#{base_uri}/api/#{e notfound_graph['service_name']}/#{e notfound_graph['section_name']}/#{e notfound_graph['graph_name']}").
+    to_return(:status => 404, :body => '<html><body><strong>404</strong> Not Found</body></html>')
+  end
+  before(:each, &proc)
+end
+
+shared_context "stub_post_vrule" do
+  include_context "stub_get_vrule"
+  before do
+    stub_request(:post, "#{base_uri}/vrule/api/#{e graph['service_name']}/#{e graph['section_name']}/#{e graph['graph_name']}").
+    to_return(:status => 200, :body => { "error" => 0, "data" => vrule_example }.to_json)
+  end
+end
+
+shared_context "stub_get_vrule" do
+  def vrule_example
     {
-      'service_name' => 'not found',
-      'section_name' => 'not found',
-      'graph_name'   => 'not found',
+      "graph_path"=>"/#{graph['service_name']}/#{graph['section_name']}/#{graph['graph_name']}",
+      "color"=>"#FF0000",
+      "time"=>1395826210,
+      "id"=>1,
+      "dashes"=>"2,10",
+      "description"=>""
     }
   end
+
   proc = Proc.new do
-    stub_request(:get, "#{base_uri}/api/#{e notfound_graph['service_name']}/#{e notfound_graph['section_name']}/#{e notfound_graph['graph_name']}").
-    to_return(:status => 404, :body => '<html><body><strong>404</strong> Not Found</body></html>')
+    stub_request(:get, "#{base_uri}/vrule/summary/#{e graph['service_name']}/#{e graph['section_name']}/#{e graph['graph_name']}").
+    to_return(:status => 200, :body => [vrule_example].to_json)
   end
   before(:each, &proc)
 end
+
+shared_context "stub_get_notfound_vrule" do
+  proc = Proc.new do
+    stub_request(:get, "#{base_uri}/vrule/summary/#{e notfound_graph['service_name']}/#{e notfound_graph['section_name']}/#{e notfound_graph['graph_name']}").
+    to_return(:status => 200, :body => [].to_json)
+  end
+  before(:each, &proc)
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: growthforecast-client
 version: !ruby/object:Gem::Version
-  version: 0.80.2
+  version: 0.82.1
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient