jimson 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5745486a124bbc3d73284db9d6294aac57eb23d1815e2ad8c98f145f9fc124a9
-  data.tar.gz: 258d62e7212cc0c559d167aacf1f511a5cbf88e2b022ff423634537cefa570a9
+  metadata.gz: 8a755a4bd134103ffcc9794d845c4bf6f97060060d7c4909a68c5c106fbb09df
+  data.tar.gz: e82997e74c772975dc46f337fb0660ca71b718e4364836c480dbb6b2fcf9e2f5
 SHA512:
-  metadata.gz: 2f2c58014cf11afea61ed91cc2bbb6e4b57bd3622ac58b2c4b4372054ce72c25938bfa72bfbbdc233c4ec1afaa698103d8e889ab22496d580c161ee99858d49e
-  data.tar.gz: c2b1642505d7ff5846c8cb9314be37ec95d409bf466eb126120870cb76ec5b5db0a5cb58693e4e50e932e05c148f5395890dffcd75ea397fb0d9c396fbc7a053
+  metadata.gz: b707a76bb0a4f229d6c54be74caed765d2452255b0c4f91d35f2cc56aa199af6168a6361ee23a203defe161e87ac1acafb76f9aaf396f96ecc054727ec2bce25
+  data.tar.gz: bcb8e158d88406523d0243b94507d3c6d45ad011ab7e637a60186275cf203c1218a61003e3714c5a062121d6330efa5ce2b875429160562f1842c389565860c1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.13.0 / 2021-05-10
+
+* Major enhancements
+
+  * Added option to use strings as id instead of an int
+
 # 0.12.0 / 2021-05-05
 
 * Major enhancements

data/lib/jimson/client.rb

@@ -13,13 +13,16 @@ module Jimson
     end
 
     def initialize(url, opts = {}, namespace = nil, client_opts = {})
+      URI.parse(url) # for the sake of validating the url
       @url = url
-      URI.parse(@url) # for the sake of validating the url
-      @batch = []
       @opts = opts
+      @opts[:id_type] ||= :int # Possible id types: :int, :string
       @namespace = namespace
-      @opts[:content_type] ||= 'application/json'
       @client_opts = client_opts
+
+      @batch = []
+      @headers = opts.slice( * opts.keys - [:id_type] )
+      @headers[:content_type] ||= 'application/json'
     end
 
     def process_call(sym, args)
@@ -44,9 +47,9 @@ module Jimson
         'jsonrpc' => JSON_RPC_VERSION,
         'method'  => namespaced_method,
         'params'  => args,
-        'id'      => self.class.make_id
+        'id'      => format_post_id(self.class.make_id)
       })
-      resp = RestClient::Request.execute(@client_opts.merge(:method => :post, :url => @url, :payload => post_data, :headers => @opts))
+      resp = RestClient::Request.execute(@client_opts.merge(:method => :post, :url => @url, :payload => post_data, :headers => @headers))
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise Client::Error::InvalidResponse.new(resp)
       end
@@ -56,7 +59,7 @@ module Jimson
 
     def send_batch_request(batch)
       post_data = MultiJson.encode(batch)
-      resp = RestClient::Request.execute(@client_opts.merge(:method => :post, :url => @url, :payload => post_data, :headers => @opts))
+      resp = RestClient::Request.execute(@client_opts.merge(:method => :post, :url => @url, :payload => post_data, :headers => @headers))
       if resp.nil? || resp.body.nil? || resp.body.empty?
         raise Client::Error::InvalidResponse.new(resp)
       end
@@ -130,6 +133,14 @@ module Jimson
       @batch = []
     end
 
+    def format_post_id(id)
+      if @opts[:id_type] == :string 
+        id.to_s
+      else
+        id
+      end
+    end
+
   end
 
   class BatchClient < BlankSlate

data/lib/jimson/version.rb

@@ -1,3 +1,3 @@
 module Jimson
-  VERSION = '0.12.0'
+  VERSION = '0.13.0'
 end

data/spec/client_spec.rb

@@ -55,6 +55,20 @@ module Jimson
             @client[:foo][:bar].sum(1, 2, 3).should == 42
           end
         end
+
+        it "sends the id as string" do
+          expected = MultiJson.encode({
+           'jsonrpc' => '2.0',
+           'method'  => 'foo.sum',
+           'params'  => [1,2,3],
+           'id'      => "1"
+          })
+          response = MultiJson.encode(BOILERPLATE.merge({'result' => 42}))
+          RestClient::Request.should_receive(:execute).with(method: :post, url: SPEC_URL, payload: expected, headers: {:content_type => 'application/json'}).and_return(@resp_mock)
+          @resp_mock.should_receive(:body).at_least(:once).and_return(response)
+          client = Client.new(SPEC_URL, {id_type: :string})
+          client[:foo].sum(1, 2, 3).should == 42
+        end
       end
 
       context "when sending positional arguments" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimson
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Chris Kite
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blankslate