basecrm 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b39240e639171c284af2016c897affee25c599f
-  data.tar.gz: 4b67891d5ff434ee7e0394fca959b6e06d2d70b0
+  metadata.gz: e150ccbdeb24176553161e55e95a985d0355519d
+  data.tar.gz: c3425ea82d471eb5c98fd998f3fc4107afdae7d6
 SHA512:
-  metadata.gz: 339f88a6b215e7c3c717d3200c6fa753dfdba54aba7418c72cf9dc5d69893fd4b004ac456ca97d1c3e4f5aa947556a5965cc81fe59c21d3eb87176b57355d0a7
-  data.tar.gz: a535ff335c8c6972c0a0f369e358cd90bcbd257b23003bc7033aea5b553a53a579dd6eb069310e38bc4587faeb60aed0ebd34a662af7e5956f4c8b5edaa87dec
+  metadata.gz: be39ed5e4cbdede0f58e3ff0b0ae0a0a15d84107f12a72f2cf708bc1b74b2df6065e839ca0f433a0d3a9958d1725ee8a0334cb55c84747a901a10b668088c30d
+  data.tar.gz: f8fd742d3ba87a17968f40fdb1eea93a0884a1dd8c9a79e32ec5001cc177ab7f54a1011050ea997223cb278998e6c9b77e6444b6881ddd299e8eaa82f73d3ab5

data/README.md

@@ -135,12 +135,18 @@ sync = BaseCRM::Sync.new(client: client, device_uuid: "<YOUR_DEVICES_UUID>")
 Now all you have to do is to call `#fetch` method and pass a block that you might use to store fetched data to a database.
 
 ```ruby
-sync.fetch do |sync_meta, resource|
-  DB.send(sync_meta.event_type, resource) ? sync_meta.ack : sync_meta.nack
+sync.fetch do |meta, resource|
+  options = {
+    table: meta.type,
+    statement: meta.sync.event_type,
+    properties: resource
+  }
+
+  DB.execute(options) ? meta.sync.ack : meta.sync.nack
 end
 ```
 
-Notice that you must call either `#ack` or `#nack` method.
+Notice that you must call either `#ack` or `#nack` method on an instance of `BaseCRM::SyncMeta`.
 
 ## Resources and actions
 

data/lib/basecrm.rb

@@ -8,6 +8,7 @@ require 'basecrm/configuration'
 require 'basecrm/http_client'
 
 require 'basecrm/model'
+require 'basecrm/models/meta'
 require 'basecrm/models/account'
 require 'basecrm/models/address'
 require 'basecrm/models/associated_contact'

data/lib/basecrm/models/meta.rb

@@ -0,0 +1,11 @@
+module BaseCRM
+  class Meta < Model
+    # @attribute [r] type
+    #   @return [String] An entity type.
+    # attr_reader :type
+
+    # @attribute [r] sync
+    #   @return [SyncMeta] An entity which represents sync metadata. See below for it's attributes.
+    # attr_reader :sync
+  end
+end

data/lib/basecrm/services/sync_service.rb

@@ -33,7 +33,7 @@ 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<SyncMeta, 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.
     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?
@@ -44,7 +44,8 @@ module BaseCRM
 
       root[:items].map do |item|
         klass = classify_type(item[:meta][:type])
-        [SyncMeta.new(item[:meta][:sync]), klass.new(item[:data])]
+        next unless klass
+        [build_meta(item[:meta]), klass.new(item[:data])]
       end
     end
 
@@ -82,7 +83,8 @@ module BaseCRM
     end
 
     def classify_type(type)
-      BaseCRM.const_get(type.split('_').map(&:capitalize).join)
+      return nil unless type && !type.empty?
+      BaseCRM.const_get(type.split('_').map(&:capitalize).join) rescue nil
     end
 
     def build_session(root)
@@ -90,5 +92,9 @@ module BaseCRM
       session_data[:queues] = session_data[:queues].map { |queue| SyncQueue.new(queue[:data]) }
       SyncSession.new(session_data)
     end
+
+    def build_meta(meta)
+      Meta.new(meta.merge(sync: SyncMeta.new(meta[:sync])))
+    end
   end
 end

data/lib/basecrm/sync.rb

@@ -28,8 +28,8 @@ module BaseCRM
     #
     #   client = BaseCRM::Client.new(access_token: "<YOUR_ACCESS_TOKEN>")
     #   sync = BaseCRM::Sync.new(client: client, device_uuid: "<YOUR_DEVICES_UUID>")
-    #   sync.fetch do |sync_meta, resource|
-    #     DB.send(sync_meta.event_type, entity) ? sync_meta.ack : sync_meta.nack
+    #   sync.fetch do |meta, resource|
+    #     DB.send(meta.sync.event_type, entity) ? meta.sync.ack : meta.sync.nack
     #   end
     #
     # @param block [Proc] Procedure that will be called for every item in the queue. Takes two input arguments: SyncMeta instance

data/lib/basecrm/version.rb

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

data/spec/basecrm/sync_spec.rb

@@ -61,8 +61,8 @@ describe BaseCRM::Sync do
 
       let(:queue_items) do
         [
-          [BaseCRM::SyncMeta.new(event_type: 'created', ack_key: 'User-1234-1'), BaseCRM::User.new(id: 1)],
-          [BaseCRM::SyncMeta.new(event_type: 'created', ack_key: 'Source-1234-1'), BaseCRM::Source.new(id: 1)]
+          [BaseCRM::Meta.new(type: 'user', sync: BaseCRM::SyncMeta.new(event_type: 'created', ack_key: 'User-1234-1')), BaseCRM::User.new(id: 1)],
+          [BaseCRM::Meta.new(type: 'source', sync: BaseCRM::SyncMeta.new(event_type: 'created', ack_key: 'Source-1234-1')), BaseCRM::Source.new(id: 1)]
         ]
       end
 
@@ -74,19 +74,20 @@ describe BaseCRM::Sync do
       end
 
       it 'does whole synchronization flow' do
-        subject.fetch { |s, r| s.ack }
+        subject.fetch { |m, r| m.sync.ack }
       end
 
       it 'calls a provided block as many times as items in the queue' do
         counter = 0
-        subject.fetch { |s, r| counter += 1; s.ack }
+        subject.fetch { |m, r| counter += 1; m.sync.ack }
         expect(counter).to eq(2)
       end
 
       it 'passes two elements to provided block: first element is BaseCRM::SyncMeta and the second is a resource' do
-        subject.fetch do |s, r|
-          expect(s).to be_a BaseCRM::SyncMeta
-          s.ack
+        subject.fetch do |m, r|
+          expect(m).to be_a BaseCRM::Meta
+          expect(m.sync).to be_a BaseCRM::SyncMeta
+          m.sync.ack
         end
       end
     end

data/spec/services/sync_service_spec.rb

@@ -267,15 +267,19 @@ describe BaseCRM::SyncService do
         items = client.sync.fetch(device_uuid, session_id)
 
         sync_meta, user = items[0]
-        expect(sync_meta).to be_a BaseCRM::SyncMeta
+        expect(sync_meta).to be_a BaseCRM::Meta
+        expect(sync_meta.sync).to be_a BaseCRM::SyncMeta
         expect(user).to be_a BaseCRM::User
-        expect(sync_meta.ack_key).to eq('User-123-1')
+        expect(sync_meta.type).to eq('user')
+        expect(sync_meta.sync.ack_key).to eq('User-123-1')
         expect(user.id).to eq(1)
 
         sync_meta, source = items[1]
-        expect(sync_meta).to be_a BaseCRM::SyncMeta
+        expect(sync_meta).to be_a BaseCRM::Meta
+        expect(sync_meta.sync).to be_a BaseCRM::SyncMeta
         expect(source).to be_a BaseCRM::Source
-        expect(sync_meta.ack_key).to eq('Source-123-1')
+        expect(sync_meta.type).to eq('source')
+        expect(sync_meta.sync.ack_key).to eq('Source-123-1')
         expect(source.id).to eq(1)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basecrm
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - BaseCRM developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -144,6 +144,7 @@ files:
 - lib/basecrm/models/deal.rb
 - lib/basecrm/models/lead.rb
 - lib/basecrm/models/loss_reason.rb
+- lib/basecrm/models/meta.rb
 - lib/basecrm/models/note.rb
 - lib/basecrm/models/pipeline.rb
 - lib/basecrm/models/source.rb