basecrm 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e150ccbdeb24176553161e55e95a985d0355519d
-  data.tar.gz: c3425ea82d471eb5c98fd998f3fc4107afdae7d6
+  metadata.gz: 5dcaf2ad0e9a6309f0e15de36290dacff0df1909
+  data.tar.gz: 7affdbefad17eb59e53933115e6e8d1951ca1a44
 SHA512:
-  metadata.gz: be39ed5e4cbdede0f58e3ff0b0ae0a0a15d84107f12a72f2cf708bc1b74b2df6065e839ca0f433a0d3a9958d1725ee8a0334cb55c84747a901a10b668088c30d
-  data.tar.gz: f8fd742d3ba87a17968f40fdb1eea93a0884a1dd8c9a79e32ec5001cc177ab7f54a1011050ea997223cb278998e6c9b77e6444b6881ddd299e8eaa82f73d3ab5
+  metadata.gz: 0a845eafc5a21533161c0ba3eda5080bf1d0786b010ad0d49a4bf75f9d1e31341f6038105d3244641b75877bf34d08e64902132d9f7e8b0403b1fd6cfef082bf
+  data.tar.gz: 8fb8d88033550b7f97e5239347ef65447bb183c2129730ed81b849e9ef3ba1dfe38229405e01ef923c2507f9c30491ff611b50aa9a547ac5c4a7fd6fe80c60d4

data/lib/basecrm/http_client.rb

@@ -71,7 +71,9 @@ module BaseCRM
         end
       RUBY
 
-      [res.status, res.headers, extract_body(res)]
+      body = extract_body(res)
+      @config.logger.debug body if @config.debug? && body && @config.logger
+      [res.status, res.headers, body]
     rescue Faraday::Error::ConnectionFailed => e
       raise ConnectionError, e.message
     end

data/lib/basecrm/services/sync_service.rb

@@ -33,14 +33,14 @@ module BaseCRM
     # @param device_uuid [String] Device's UUID for which to perform synchronization
     # @param session_id [String] Unique identifier of a synchronization session.
     # @param queue [String|Symbol] Queue name.
-    # @return [Array<Array<Meta, Model>>] The list of sync's metadata associated with data and data.
+    # @return [Array<Array<Meta, Model>>] The list of sync's metadata associated with data and data, or nil if nothing more to synchronize.
     def fetch(device_uuid, session_id, queue='main')
       validate_device!(device_uuid)
       raise ArgumentError, "session_id must not be nil nor empty" unless session_id && !session_id.strip.empty?
       raise ArgumentError, "queue name must not be nil nor empty" unless queue && !queue.strip.empty?
 
       status, _, root = @client.get("/sync/#{session_id}/queues/#{queue}", {}, build_headers(device_uuid))
-      return [] if status == 204
+      return nil if status == 204
 
       root[:items].map do |item|
         klass = classify_type(item[:meta][:type])
@@ -78,7 +78,10 @@ module BaseCRM
 
     def build_headers(device_uuid)
       {
-        "X-Basecrm-Device-UUID" => device_uuid
+        "X-Basecrm-Device-UUID" => device_uuid,
+        "X-Client-Type" => 'api',
+        "X-Client-Version" => BaseCRM::VERSION,
+        "X-Device-Id" => 'Ruby'
       }
     end
 

data/lib/basecrm/sync.rb

@@ -50,7 +50,10 @@ module BaseCRM
         queued_data = @client.sync.fetch(@device_uuid, session.id)
 
         # nothing more to synchronize ?
-        break if queued_data.empty?
+        break unless queued_data
+
+        # something bad at the backend
+        next if queued_data.empty?
 
         ack_keys = []
         queued_data.each do |sync_meta, resource|

data/lib/basecrm/version.rb

@@ -1,3 +1,3 @@
 module BaseCRM
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/basecrm/sync_spec.rb

@@ -70,6 +70,7 @@ describe BaseCRM::Sync do
         expect(client.sync).to receive(:start).with(device_uuid).and_return(session)
         expect(client.sync).to receive(:fetch).with(device_uuid, session_id).and_return(queue_items)
         expect(client.sync).to receive(:fetch).with(device_uuid, session_id).and_return([])
+        expect(client.sync).to receive(:fetch).with(device_uuid, session_id).and_return(nil)
         expect(client.sync).to receive(:ack).with(device_uuid, ack_keys).and_return(true)
       end
 

data/spec/services/sync_service_spec.rb

@@ -45,7 +45,7 @@ describe BaseCRM::SyncService do
       end
 
       it 'returns nil' do
-        expect(client.http_client).to receive(:post).with('/sync/start', {}, {'X-Basecrm-Device-UUID' => device_uuid}).and_return(http_response)
+        expect(client.http_client).to receive(:post).with('/sync/start', {}, hash_including({'X-Basecrm-Device-UUID' => device_uuid})).and_return(http_response)
         expect(client.sync.start(device_uuid)).to be_nil
       end
     end
@@ -77,7 +77,7 @@ describe BaseCRM::SyncService do
       end
 
       before :each do
-        expect(client.http_client).to receive(:post).with('/sync/start', {}, {'X-Basecrm-Device-UUID' => device_uuid}).and_return(http_response)
+        expect(client.http_client).to receive(:post).with('/sync/start', {}, hash_including({'X-Basecrm-Device-UUID' => device_uuid})).and_return(http_response)
       end
 
       it 'returns an instance of BaseCRM::SyncSession' do
@@ -140,7 +140,7 @@ describe BaseCRM::SyncService do
 
     context 'non empty ack_keys call' do
       it 'returns true value' do
-        expect(client.http_client).to receive(:post).with('/sync/ack', {ack_keys: ack_keys}, {'X-Basecrm-Device-UUID' => device_uuid}).and_return(http_response)
+        expect(client.http_client).to receive(:post).with('/sync/ack', {ack_keys: ack_keys}, hash_including({'X-Basecrm-Device-UUID' => device_uuid})).and_return(http_response)
         expect(client.sync.ack(device_uuid, ack_keys)).to eq(true)
       end
     end
@@ -190,9 +190,9 @@ describe BaseCRM::SyncService do
         [204, {}, nil]
       end
 
-      it 'returns an empty array' do
-        expect(client.http_client).to receive(:get).with("/sync/#{session_id}/queues/main", {}, {'X-Basecrm-Device-UUID' => device_uuid}).and_return(http_response)
-        expect(client.sync.fetch(device_uuid, session_id)).to eq([])
+      it 'returns nil' do
+        expect(client.http_client).to receive(:get).with("/sync/#{session_id}/queues/main", {}, hash_including({'X-Basecrm-Device-UUID' => device_uuid})).and_return(http_response)
+        expect(client.sync.fetch(device_uuid, session_id)).to be_nil
       end
     end
 
@@ -240,7 +240,7 @@ describe BaseCRM::SyncService do
       end
 
       before :each do
-        expect(client.http_client).to receive(:get).with("/sync/#{session_id}/queues/main", {}, {'X-Basecrm-Device-UUID' => device_uuid}).and_return(http_response)
+        expect(client.http_client).to receive(:get).with("/sync/#{session_id}/queues/main", {}, hash_including({'X-Basecrm-Device-UUID' => device_uuid})).and_return(http_response)
       end
 
       it 'returns an array' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basecrm
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - BaseCRM developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday