maestrano-connector-rails 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f89f758823b4cd6fa2ad8124eb8764c217c459c
-  data.tar.gz: 6302aa155673536e7d4db81abef9e74972c02f0e
+  metadata.gz: cfff81420a6741ea4266fed785dce4f76c29c690
+  data.tar.gz: fdd3b60473284591c2eb525cc18c262e9d04d20b
 SHA512:
-  metadata.gz: 19f2d1ae020d5f16c44224c3a8ee26d5e8ac41fc69fb55f7fe6a88dcb6c52254e912c0a2ddf69caee54667aeffdcb055dee6d53883685c5c2ab1d41855878b9b
-  data.tar.gz: a0d412871c75c0c71ff661c20f13023b8b26b7c1a5683ee84c6643eed720ddff0e13829224c549f0c5c52fb5390718a7af3e0489dfe94a4f3249be31c0272116
+  metadata.gz: 7caeee0e3b32d1fb42b2003a2bcfbf8fc9b326f9839d0c4b538eca420f6b582ba38f106c6a6d1cd7328abed02642337443251de698024440d3334d936f1c15e1
+  data.tar.gz: 5ecc8fe7963ef79db58d4def70cca3bb709f9f585500d76b0179a410e1ddcc1a542792ffef94e87c6843b9633a1f70c5a6236bbccbd77308b86d813d47309510

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/app/models/maestrano/connector/rails/concerns/complex_entity.rb

@@ -30,6 +30,20 @@ module Maestrano::Connector::Rails::Concerns::ComplexEntity
     def count_entities(entities)
       entities.values.map(&:size).max
     end
+
+    def public_connec_entity_name
+      public_name(formatted_connec_entities_names)
+    end
+
+    def public_external_entity_name
+      public_name(formatted_external_entities_names)
+    end
+
+    def public_name(formatted_names)
+      names = formatted_names.keys.map(&:pluralize)
+      return names.first.humanize if names.size == 1
+      (names[0..-2].join(', ') + " and #{names.last}").humanize
+    end
   end
 
   # input :  {

data/app/models/maestrano/connector/rails/concerns/entity.rb

@@ -134,6 +134,14 @@ module Maestrano::Connector::Rails::Concerns::Entity
     def count_entities(entities)
       entities.size
     end
+
+    def public_connec_entity_name
+      connec_entity_name.pluralize
+    end
+
+    def public_external_entity_name
+      external_entity_name.pluralize
+    end
   end
 
   # ==============================================

data/app/models/maestrano/connector/rails/organization.rb

@@ -44,6 +44,19 @@ module Maestrano::Connector::Rails
     #===================================
     serialize :synchronized_entities
 
+    def displayable_synchronized_entities
+      result = {}
+      synchronized_entities.each do |entity, boolean|
+        begin
+          clazz = "Entities::#{entity.to_s.titleize.split.join}".constantize
+        rescue
+          next
+        end
+        result[entity] = {value: boolean, connec_name: clazz.public_connec_entity_name, external_name: clazz.public_external_entity_name}
+      end
+      result
+    end
+
     def add_member(user)
       user_organization_rels.create(user: user) if tenant == user.tenant && !member?(user)
     end

data/lib/generators/connector/templates/home.js

@@ -8,4 +8,9 @@ function historicalDataDisplay()
       document.getElementById('historical-data-display-unchecked').style.display = 'block';
       document.getElementById('historical-data-display-checked').style.display = 'none';
   }
-}
+}
+
+
+$(function () {
+  $('[data-toggle="tooltip"]').tooltip()
+})

data/lib/generators/connector/templates/home_controller.rb

@@ -1,6 +1,7 @@
 class HomeController < ApplicationController
   def index
     @organization = current_organization
+    @displayable_synchronized_entities = @organization.displayable_synchronized_entities if @organization
   end
 
   def update

data/lib/generators/connector/templates/home_index.haml

@@ -42,35 +42,47 @@
       .row.link-step{class: "#{(@organization.sync_enabled && @organization.synchronized_entities.values.any?) ? 'done' : 'todo'}"}
         = form_tag home_update_path(id: @organization.id), method: :put do
           .col-md-1.text-center.link-step-number
-            %span.badge.link-step-badge
-              2
+            %span.badge.link-step-badge 2
           .col-md-9.link-step-description
-            %h
-              You can customize which entities are synchronized by the connector:
+            %h You can customize which entities are synchronized by the connector:
+            .spacer1
+            .row
+              .col-md-11.col-md-offset-1.center
+                .col-md-4.col-md-offset-1
+                  ApplicationName wording
+                .col-md-4
+                  Universal wording
             .spacer1
             .row
               .col-md-11.col-md-offset-1
-                - @organization.synchronized_entities.each do |k, v|
+                - @displayable_synchronized_entities.each do |k, v|
                   .row.sync-entity
                     .col-md-1.link-step-action
-                      %input{type: "checkbox", id: "#{k}", name: "#{k}", checked: v}
-                    .col-md-6{style: 'padding-top: 5px;'}
-                      %label{:for => "#{k}"} #{k.to_s.humanize.pluralize}
-                    - if is_admin
-                      .col-md-5.text-right
+                      %input{type: "checkbox", id: "#{k}", name: "#{k}", checked: v[:value]}
+                    %label.col-md-8{:for => "#{k}", style: 'padding-top: 5px;'}
+                      .col-md-6
+                        #{v[:external_name]}
+                      .col-md-6
+                        #{v[:connec_name]}
+                    -if is_admin
+                      .col-md-3.text-right
                         - if v && @organization.oauth_uid && @organization.sync_enabled
-                          = link_to "Force a synchronization for #{k.to_s.humanize.pluralize} only", home_synchronize_path(opts: {only_entities: [k.to_s]}), method: :post, class: 'btn btn-warning btn-sm'
+                          = link_to 'Force a synchronization', home_synchronize_path(opts: {only_entities: [k.to_s]}), method: :post, class: 'btn btn-warning btn-sm', title: "Force a synchronization for #{v[:external_name]} only", 'data-toggle' => 'tooltip', 'data-placement' => 'right'
+
+            .spacer2
+            .row
+              %h Chose whether to synchronize your historical data:
             .spacer1
             .row
-              .col-md-4
+              .col-md-4.col-md-offset-1
                 %label{:for => 'historical-data'} Synchronize my historical data
-              .col-md-2
+              .col-md-1
                 %input{type: 'checkbox', id: 'historical-data', name: 'historical-data', checked: @organization.historical_data, onchange: 'historicalDataDisplay();', disabled: @organization.historical_data}
               .col-md-6
                 %small#historical-data-display-unchecked{style: "display: #{@organization.historical_data ? 'none' : 'block'}"} Only data created after #{(@organization.date_filtering_limit && @organization.date_filtering_limit.utc || Time.now.utc).to_formatted_s(:long_ordinal)} will be synchronized
                 %small#historical-data-display-checked{style: "display: #{!@organization.historical_data ? 'none' : 'block'}"}
-                  Synchronizing your historical data will share all data, including the one created prior to #{Time.now.utc} in ApplicationName. This action is <strong>not reversible</strong>. Want to know more? Check 
-                  = link_to 'here', 'https://maestrano.atlassian.net/wiki/display/UKB/How+Connec%21+manages+Historical+Data+Sharing'
+                  Synchronizing your historical data will share all data in ApplicationName. This action is not reversible. Want to know more? Check #{link_to 'here', 'https://maestrano.atlassian.net/wiki/display/UKB/How+Connec%21+manages+Historical+Data+Sharing'}
+                
           .spacer1
           .row
             .col-md-2.col-md-offset-10.text-center.link-step-action

data/lib/generators/connector/templates/layouts.haml

@@ -6,6 +6,7 @@
     %title ApplicationName Connector
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
+    %script{src: 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js', integrity: 'sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa', crossorigin: 'anonymous'}
     = csrf_meta_tags
   %body
     .navbar.navbar-fixed-top.navbar-inverse

data/maestrano-connector-rails.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: maestrano-connector-rails 1.3.1 ruby lib
+# stub: maestrano-connector-rails 1.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Pierre Berard"]
-  s.date = "2016-07-26"
+  s.date = "2016-07-27"
   s.description = "Maestrano is the next generation marketplace for SME applications. See https://maestrano.com for details."
   s.email = "pierre.berard@maestrano.com"
   s.executables = ["rails"]

data/release_notes.md

@@ -1,3 +1,8 @@
+## 1.3.1
+
+### Fixes
+* Fix method in organization class that caused issue with authentication
+
 ## 1.3.0
 * Methods `create_external_entity` and `update_external_entity` should now returns the created/updated entity
 * Home page should now include a link populated from `external.rb` to create an account 

data/spec/models/complex_entity_spec.rb

@@ -22,6 +22,42 @@ describe Maestrano::Connector::Rails::ComplexEntity do
           expect(subject.count_entities(entities)).to eql(39)
         end
       end
+
+      describe 'public_connec_entity_name' do
+        it 'calls public name' do
+          allow(subject).to receive(:formatted_connec_entities_names).and_return(a: 2)
+          expect(subject).to receive(:public_name).with(a: 2)
+          subject.public_connec_entity_name
+        end
+      end
+      describe 'public_external_entity_name' do
+        it 'calls public name' do
+          allow(subject).to receive(:formatted_external_entities_names).and_return(a: 2)
+          expect(subject).to receive(:public_name).with(a: 2)
+          subject.public_external_entity_name
+        end
+      end
+
+
+      describe 'public_name' do
+        context 'when one entity' do
+          it 'returns the pluralized entity name' do
+            expect(subject.public_name({'sales_order' => 'Sales order'})).to eql('Sales orders')
+          end
+        end
+
+        context 'when two entities' do
+          it 'returns the pluralized entity names separeted by a and' do
+            expect(subject.public_name({'Sales order' => 'Sales order', 'Purchase order' => 'Purchase order'})).to eql('Sales orders and purchase orders')
+          end
+        end
+
+        context 'when more than two' do
+          it 'returns the pluralized entity names separeted by commas and a and' do
+            expect(subject.public_name({'Sales order' => 'Sales order', 'Purchase order' => 'Purchase order', 'Order' => 'Order'})).to eql('Sales orders, purchase orders and orders')
+          end
+        end
+      end
   end
 
   describe 'instance methods' do

data/spec/models/entity_spec.rb

@@ -116,6 +116,20 @@ describe Maestrano::Connector::Rails::Entity do
         expect(subject.count_entities([*1..27])).to eql(27)
       end
     end
+
+    describe 'public_connec_entity_name' do
+      it 'returns the connec_entity_name' do
+        allow(subject).to receive(:connec_entity_name).and_return('tree')
+        expect(subject.public_connec_entity_name).to eql('trees')
+      end
+    end
+
+    describe 'public_external_entity_name' do
+      it 'returns the external_entity_name' do
+        allow(subject).to receive(:external_entity_name).and_return('tree')
+        expect(subject.public_external_entity_name).to eql('trees')
+      end
+    end
   end
 
   describe 'instance methods' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails