cobot_client 3.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e33543f24073fe4a3c349c97874dd846533bea1
-  data.tar.gz: 3c9818a5755292537b3fb8fbf0fa566c780dc382
+  metadata.gz: 0a30b5eca1e0c962124b7b58a2b2028b6844a74c
+  data.tar.gz: d9d307e97fda81cde1e3c857f22e159f9b995d42
 SHA512:
-  metadata.gz: afc679f1b10dd8a731a46cb43e97f0858a3e8827c87b6293308597ec2edaa8af6883917e90464e8056533094ee4141c77098667137ed787c7224b2d3860ab0c9
-  data.tar.gz: 7923351ded252310bed7277ba5d93a65021f261cb9bcc0c3f8710d1bd909697360bd596e0a423ded6d1b62097087eef2691a951eb34812050048c658ad417170
+  metadata.gz: 43f4f96b21d31aade0f682f2feb5e65c132663b2de2b3d6449697d9910e55cc789c94169c0305e5afd0a55495813e982799ee9aefea58c74b252572a71ca07d8
+  data.tar.gz: cc89589edc277e10173a2b1ce8a40e91b058de20afcac50ce6f93e759bb55ba7cb5472052430caf86ea221d6732e926055492b38c83ed4e752a5e139062005d5

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 4.0.0
+
+*   changed navigation link service to add missing links and return all if there are links already (before it would do nothing if there were any links already)
 
 # 3.1.0
 

data/lib/cobot_client/navigation_link_service.rb

@@ -16,18 +16,22 @@ module CobotClient
     #
     # Returns the links as `[CobotClient::NavigationLink]`
     def install_links(new_links)
-      if (links = get_links).empty?
-        new_links.each do |link|
-          links << create_link(link)
+      existing_links = get_links
+      missing_links = new_links.reject do |new_link|
+        existing_links.find do |existing_link|
+          existing_link.section == new_link.section && existing_link.iframe_url == new_link.iframe_url
         end
       end
-      links
+      created_links = missing_links.map do |link|
+        create_link(link)
+      end
+      existing_links + created_links
     end
 
     private
 
     def get_links
-      @api_client.get(@subdomain, "/navigation_links").map do |attributes|
+      @api_client.get(@subdomain, '/navigation_links').map do |attributes|
         NavigationLink.new attributes
       end
     end
@@ -37,8 +41,7 @@ module CobotClient
         section: link.section,
         label: link.label,
         iframe_url: link.iframe_url,
-        user_editable: link.user_editable
-      )
+        user_editable: link.user_editable)
 
       NavigationLink.new response
     end

data/lib/cobot_client/version.rb

@@ -1,3 +1,3 @@
 module CobotClient
-  VERSION = '3.1.0'
+  VERSION = '4.0.0'
 end

data/spec/cobot_client/navigation_link_service_spec.rb

@@ -5,19 +5,34 @@ describe CobotClient::NavigationLinkService, '#install_links' do
   let(:api_client) { instance_double(CobotClient::ApiClient) }
 
   context 'when there are links already' do
+    let(:existing_link) do
+      instance_double(CobotClient::NavigationLink, label: 'existing link',
+        section: 'admin/setup', iframe_url: 'http://example.com/1').as_null_object
+    end
+    let(:new_link) do
+      instance_double(CobotClient::NavigationLink, label: 'new link',
+        section: 'admin/setup', iframe_url: 'http://example.com/2').as_null_object
+    end
+
     before(:each) do
       allow(api_client).to receive(:get)
-        .with('co-up', '/navigation_links') { [{label: 'test link'}] }
+        .with('co-up', '/navigation_links')
+        .and_return([{label: 'existing link',
+          section: 'admin/setup', iframe_url: 'http://example.com/1'}])
     end
 
-    it 'installs no links' do
-      expect(api_client).to_not receive(:post)
+    it 'installs the missing links' do
+      expect(api_client).to receive(:post)
+        .with('co-up', '/navigation_links', hash_including(label: 'new link',
+          section: 'admin/setup', iframe_url: 'http://example.com/2')) { {} }
 
-      service.install_links [double(:link)]
+      service.install_links [existing_link, new_link]
     end
 
-    it 'returns the links' do
-      expect(service.install_links([double(:link)]).map(&:label)).to eql(['test link'])
+    it 'returns all the links' do
+      allow(api_client).to receive(:post) { {label: 'new link'} }
+
+      expect(service.install_links([existing_link, new_link]).map(&:label)).to eql(['existing link', 'new link'])
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cobot_client
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Alexander Lang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus