dtmcli 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc819432a1d2b76dcf9081bad4b185394857bafdb9a658b54e5d3798de909636
-  data.tar.gz: 0e2fb36a0b38c4ecbaf9a96b40ee3b7ace2716b41ba8e54f4a5c171fd36bf7b6
+  metadata.gz: 9c178227ab5797145c53527f60aa649f84d00f7cd726b4f67bfd2d934dfaa1e9
+  data.tar.gz: c79e08a3c9c27c7352455205f1cb7acde4094ecb05c9a23b57a6de89ed455346
 SHA512:
-  metadata.gz: d674552f78936d9f1e04f3c86ca407f70577d789222544c579b08e8bba6efbd6cebff9bc3eedf5aa1a80387284c5d1911490d9d4f770a6c3eb8f110e52b3974e
-  data.tar.gz: 12732c4356bdc4b2e7ba801f438f87a295fb74a525d792914c09febb19f03a0fe39a15985e4ad329116038e4be92cfc6577b248e51fc6b80b3e737b80c092415
+  metadata.gz: 17c7cc58cd05aeda876fe42dccfafe257465980e271ab14126912e0aa93a0f83211556d6f03476e0c88c009b297727a779c5dbd5b5c6a465cb99ab42522fc6ef
+  data.tar.gz: 83a7eb7c53d24c5e3074aa49f329633999982da0a1d8880971cf9a79b47dd5b3148d225a7cdaf1e00b142b48d36edbcc5c77fb8e1625fb9a4ebcad3baf8badcb

data/README.md

@@ -37,4 +37,16 @@ saga.add(biz_url + '/TransOut', biz_url + '/TransOutRevert', post_data)
 saga.add(biz_url + '/TransIn', biz_url + '/TransInRevert', post_data)
 
 saga.submit
+
+# Model Transcation Msg
+dtm_msg = Dtmcli::Msg.new(dtm_url)
+dtm_msg.gen_gid
+
+post_data = {amount: 30}
+dtm_msg.add(biz_url + '/TransOut', post_data)
+dtm_msg.add(biz_url + '/TransIn', post_data)
+
+dtm_msg.prepare(biz_url + '/TransQuery')
+
+dtm_msg.submit
 ```

data/dtmcli.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency             'faraday', '~> 1.6.0'
 
-  spec.add_development_dependency "bundler", '>= 2.2.10'
+  spec.add_development_dependency "bundler", '~> 2.2'
   spec.add_development_dependency 'minitest', '~> 5.8', '>= 5.8.4'
   spec.add_development_dependency 'webmock', '~> 3.13.0'
 

data/lib/dtmcli.rb

@@ -3,6 +3,7 @@ require 'faraday'
 require_relative 'dtmcli/dtm'
 require_relative 'dtmcli/errors'
 require_relative 'dtmcli/id_generator'
+require_relative 'dtmcli/msg'
 require_relative 'dtmcli/proxy'
 require_relative 'dtmcli/saga'
 require_relative 'dtmcli/tcc'

data/lib/dtmcli/msg.rb

@@ -0,0 +1,45 @@
+module Dtmcli
+  class Msg
+    attr_accessor :gid, :steps, :query_prepared
+    attr_reader :dtm, :dtm_url
+
+    TRANS_TYPE = 'msg'
+
+    def initialize(dtm_url)
+      @dtm_url = dtm_url
+      @dtm = Dtm.new(dtm_url)
+      @steps = []
+      @query_prepared = ''
+    end
+
+    def gen_gid
+      @gid = IdGenerator.gen_gid(dtm_url)
+    end
+
+    def add(action, post_data)
+      step = {
+        action: action,
+        data:   post_data.to_json,
+      }
+      @steps << step
+    end
+
+    def prepare(p_url)
+      @query_prepared = p_url if !p_url.nil?
+      dtm.prepare(wrap_tbody)
+    end
+
+    def submit
+      dtm.submit(wrap_tbody)
+    end
+
+    def wrap_tbody
+      {
+        gid:            gid,
+        trans_type:     TRANS_TYPE,
+        steps:          steps,
+        query_prepared: query_prepared
+      }
+    end
+  end
+end

data/lib/dtmcli/version.rb

@@ -1,3 +1,3 @@
 module Dtmcli
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/test_msg.rb

@@ -0,0 +1,226 @@
+require 'helper'
+
+class TestMsg < Minitest::Test
+  def setup
+    mocking!
+  end
+
+  def test_initialize
+    saga = Dtmcli::Msg.new('dtmurl')
+    assert_equal 'dtmurl', saga.dtm_url
+    assert_equal [], saga.steps
+    assert_equal '', saga.query_prepared
+  end
+
+  def test_gen_gid_succ
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    dtm_msg = Dtmcli::Msg.new(@dtm_url)
+    dtm_msg.gen_gid
+    assert_equal 'test_gid', dtm_msg.gid
+  end
+
+  def test_gen_gid_fail
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(status: 200, body: {dtm_result: 'FAILURE', gid: ''}.to_json)
+
+    dtm_msg = Dtmcli::Msg.new(@dtm_url)
+    assert_raises(Dtmcli::DtmSvrError) {
+      dtm_msg.gen_gid
+    }
+  end
+
+  def test_add_succ
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    dtm_msg = Dtmcli::Msg.new(@dtm_url)
+    assert_equal [], dtm_msg.steps
+    dtm_msg.gen_gid
+
+    post_data = {amount: 30}
+    dtm_msg.add(@host + '/TransOut1', post_data)
+    assert_equal 1, dtm_msg.steps.size
+    step1 = dtm_msg.steps[0]
+    assert_equal @host + '/TransOut1', step1[:action]
+
+    dtm_msg.add(@host + '/TransOut2', post_data)
+    assert_equal 2, dtm_msg.steps.size
+    step2 = dtm_msg.steps[1]
+    assert_equal @host + '/TransOut2', step2[:action]
+  end
+
+  def test_prepare_succ
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    stub_request(:post, @dtm_url + "/prepare").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+      )
+
+    dtm_msg = Dtmcli::Msg.new(@dtm_url)
+    assert_equal [], dtm_msg.steps
+    dtm_msg.gen_gid
+
+    post_data = {amount: 30}
+    dtm_msg.add(@host + '/TransOut1', post_data)
+
+    dtm_msg.prepare(@host + '/TransQuery')
+    assert_equal @host + '/TransQuery', dtm_msg.query_prepared
+  end
+
+  def test_prepare_fail
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    stub_request(:post, @dtm_url + "/prepare").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'FAILURE', gid: ''}.to_json,
+      )
+
+    dtm_msg = Dtmcli::Msg.new(@dtm_url)
+    assert_equal [], dtm_msg.steps
+    dtm_msg.gen_gid
+
+    post_data = {amount: 30}
+    dtm_msg.add(@host + '/TransOut1', post_data)
+
+    assert_raises(Dtmcli::DtmSvrError) {
+      dtm_msg.prepare(@host + '/TransQuery')
+    }
+  end
+
+  def test_wrap_tbody
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    stub_request(:post, @dtm_url + "/prepare").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+      )
+
+    dtm_msg = Dtmcli::Msg.new(@dtm_url)
+    assert_equal [], dtm_msg.steps
+    dtm_msg.gen_gid
+
+    post_data = {amount: 30}
+    dtm_msg.add(@host + '/TransOut1', post_data)
+
+    dtm_msg.prepare(@host + '/TransQuery')
+
+    tbody = dtm_msg.wrap_tbody
+    assert_equal 'test_gid', tbody[:gid]
+    assert_equal 'msg', tbody[:trans_type]
+    assert_equal 1, tbody[:steps].size
+    assert_equal @host + '/TransQuery', tbody[:query_prepared]
+  end
+
+  def test_submit_succ
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    stub_request(:post, @dtm_url + "/prepare").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+      )
+
+    stub_request(:post, @dtm_url + "/submit").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+      )
+
+    dtm_msg = Dtmcli::Msg.new(@dtm_url)
+    assert_equal [], dtm_msg.steps
+    dtm_msg.gen_gid
+
+    post_data = {amount: 30}
+    dtm_msg.add(@host + '/TransOut1', post_data)
+
+    dtm_msg.prepare(@host + '/TransQuery')
+    assert_equal @host + '/TransQuery', dtm_msg.query_prepared
+
+    res = dtm_msg.submit
+    assert_equal 'SUCCESS', res['dtm_result']
+  end
+
+  def test_submit_succ
+    stub_request(:get, @dtm_url + "/newGid").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+        headers: {}
+      )
+
+    stub_request(:post, @dtm_url + "/prepare").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'SUCCESS', gid: 'test_gid'}.to_json,
+      )
+
+    stub_request(:post, @dtm_url + "/submit").
+      with(headers: @headers).
+      to_return(
+        status: 200,
+        body: {dtm_result: 'FAILURE', gid: ''}.to_json,
+      )
+
+    dtm_msg = Dtmcli::Msg.new(@dtm_url)
+    assert_equal [], dtm_msg.steps
+    dtm_msg.gen_gid
+
+    post_data = {amount: 30}
+    dtm_msg.add(@host + '/TransOut1', post_data)
+
+    dtm_msg.prepare(@host + '/TransQuery')
+    assert_equal @host + '/TransQuery', dtm_msg.query_prepared
+
+    assert_raises(Dtmcli::DtmSvrError) {
+      dtm_msg.submit
+    }
+  end
+end

data/test/test_saga.rb

@@ -101,7 +101,7 @@ class TestSaga < Minitest::Test
     assert_equal 'SUCCESS', res['dtm_result']
   end
 
-  def test_submit_succ
+  def test_submit_fail
     stub_request(:get, @dtm_url + "/newGid").
       with(headers: @headers).
       to_return(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dtmcli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - jedhu0
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -88,12 +88,14 @@ files:
 - lib/dtmcli/dtm.rb
 - lib/dtmcli/errors.rb
 - lib/dtmcli/id_generator.rb
+- lib/dtmcli/msg.rb
 - lib/dtmcli/proxy.rb
 - lib/dtmcli/saga.rb
 - lib/dtmcli/tcc.rb
 - lib/dtmcli/version.rb
 - test/helper.rb
 - test/test_id_generator.rb
+- test/test_msg.rb
 - test/test_saga.rb
 - test/test_tcc.rb
 homepage: https://github.com/jedhu0/dtmcli
@@ -122,5 +124,6 @@ summary: client for dtm
 test_files:
 - test/helper.rb
 - test/test_id_generator.rb
+- test/test_msg.rb
 - test/test_saga.rb
 - test/test_tcc.rb