maestrano-connector-rails 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d94d15e3a6fd70083f95437d043eaa3a75483798
-  data.tar.gz: 265289bdb90adbc369999c37e22b0614b4793c9a
+  metadata.gz: 9fbcf23f810c8f8163bffe839d39ef0d36531fde
+  data.tar.gz: 1ef445f37a5a3dc44bd737e966a65ca5a03ef73b
 SHA512:
-  metadata.gz: 5876b376594568daf87136ffe2db59812f25d023def013a2419f8e4e1a8bd47b51d0b971c7584d7ee7b869821d7db91a47ea5b92178ceece70c2a3f284b3c9b6
-  data.tar.gz: 10e5113d838dbd8a9bfbb282955a4b9ad715772289d2a4afd510d5e542612157fcdef2a2303bbf0bbb0c677f04c1c3fb01ffb0d062855655bfff670b80f5f1cf
+  metadata.gz: 20f2202b8094a5c43fe5066f9b918fa4307b527531228d1d5f21e37de581e7c292d90a5984134231f6d40fc585417b4c7eabc4d8b812109eeea65aab5a49a986
+  data.tar.gz: 14d8ba996bb7c9e11525d12d17086126035a882d2b7fe532ff8c6b22ff8ee9377555b5a3580d91a0e615eac7cd8c5b24dad8b09e88837ed7f017d8cdf6e7079a

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

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

@@ -167,22 +167,30 @@ module Maestrano::Connector::Rails::Concerns::Entity
   # ----------------------------------------------
   #                 Connec! methods
   # ----------------------------------------------
+  # Supported options:
+  # * full_sync
+  # * $filter (see Connec! documentation)
+  # * $orderby (see Connec! documentation)
   def get_connec_entities(client, last_synchronization, organization, opts={})
     return [] unless self.class.can_read_connec?
 
     Maestrano::Connector::Rails::ConnectorLogger.log('info', organization, "Fetching Connec! #{self.class.connec_entity_name}")
 
     entities = []
+    query_params = {}
+    query_params[:$orderby] = opts[:$orderby] if opts[:$orderby]
 
     # Fetch first page
     if last_synchronization.blank? || opts[:full_sync]
       Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "entity=#{self.class.connec_entity_name}, fetching all data")
-      response = client.get("/#{self.class.normalized_connec_entity_name}")
+      query_params[:$filter] = opts[:$filter] if opts[:$filter]
     else
       Maestrano::Connector::Rails::ConnectorLogger.log('debug', organization, "entity=#{self.class.connec_entity_name}, fetching data since #{last_synchronization.updated_at.iso8601}")
-      query_param = URI.encode("$filter=updated_at gt '#{last_synchronization.updated_at.iso8601}'")
-      response = client.get("/#{self.class.normalized_connec_entity_name}?#{query_param}")
+      filter = "updated_at gt '#{last_synchronization.updated_at.iso8601}'"
+      filter += " and #{opts[:$filter]}" if opts[:$filter]
+      query_params[:$filter] = filter
     end
+    response = client.get("/#{self.class.normalized_connec_entity_name}?#{query_params.to_query}")
     raise "No data received from Connec! when trying to fetch #{self.class.connec_entity_name.pluralize}" unless response
 
     response_hash = JSON.parse(response.body)

data/lib/generators/connector/install_generator.rb

@@ -51,7 +51,6 @@ module Connector
 
       def copy_stylesheets
         copy_file 'stylesheets/application.sass', 'app/assets/stylesheets/application.sass'
-        copy_file 'stylesheets/banners.sass', 'app/assets/stylesheets/banners.sass'
         copy_file 'stylesheets/home.sass', 'app/assets/stylesheets/home.sass'
         copy_file 'stylesheets/layout.sass', 'app/assets/stylesheets/layout.sass'
         copy_file 'stylesheets/spacers.sass', 'app/assets/stylesheets/spacers.sass'

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

@@ -7,14 +7,18 @@ class HomeController < ApplicationController
     organization = Maestrano::Connector::Rails::Organization.find_by_id(params[:id])
 
     if organization && is_admin?(current_user, organization)
+      old_sync_state = organization.sync_enabled
+
       organization.synchronized_entities.keys.each do |entity|
-        if !!params["#{entity}"]
-          organization.synchronized_entities[entity] = true
-        else
-          organization.synchronized_entities[entity] = false
-        end
+        organization.synchronized_entities[entity] = !!params["#{entity}"]
       end
+      organization.sync_enabled = organization.synchronized_entities.values.any?
       organization.save
+
+      if !old_sync_state
+        Maestrano::Connector::Rails::SynchronizationJob.perform_later(organization, {})
+        flash[:info] = 'Congrats, you\'re all set up! Your data are now being synced'
+      end
     end
 
     redirect_to(:back)
@@ -29,12 +33,8 @@ class HomeController < ApplicationController
     redirect_to(:back)
   end
 
-  def toggle_sync
-    if is_admin
-      current_organization.update(sync_enabled: !current_organization.sync_enabled)
-      flash[:info] = current_organization.sync_enabled ? 'Synchronization enabled' : 'Synchronization disabled'
-    end
-
-    redirect_to(:back)
+  def redirect_to_external
+    redirect_to 'https://path/to/external/app'
   end
+
 end

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

@@ -32,11 +32,28 @@ describe HomeController, :type => :controller do
 
       it { expect(subject).to redirect_to back_path }
 
-      it 'updates organization' do
+      it 'updates organization synchronized_entities' do
         subject
         organization.reload
         expect(organization.synchronized_entities).to eq({'people' => true, 'item' => false})
       end
+
+      it 'updates organization sync_enabled' do
+        subject
+        organization.reload
+        expect(organization.sync_enabled).to eq true
+      end
+
+      context 'when removing all entities' do
+        subject { put :update, id: organization.id, 'people' => false, 'item' => false }
+        before { organization.update(sync_enabled: true) }
+
+        it 'set sync_enabled to false' do
+          subject
+          organization.reload
+          expect(organization.sync_enabled).to eq false
+        end
+      end
     end
   end
 
@@ -49,7 +66,7 @@ describe HomeController, :type => :controller do
 
     context 'when user is not admin' do
       before {
-        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(false)
+        allow_any_instance_of(ApplicationHelper).to receive(:is_admin).and_return(false)
       }
 
       it { expect(subject).to redirect_to back_path }
@@ -62,7 +79,7 @@ describe HomeController, :type => :controller do
 
     context 'when user is admin' do
       before {
-        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(true)
+        allow_any_instance_of(ApplicationHelper).to receive(:is_admin).and_return(true)
       }
 
       it { expect(subject).to redirect_to back_path }
@@ -85,40 +102,22 @@ describe HomeController, :type => :controller do
         end
       end
     end
+  end
 
-    describe 'toggle_sync' do
-      subject { put :toggle_sync }
-      let(:organization) { create(:organization, sync_enabled: true) }
+  describe 'redirect_to_external' do
+    subject { get :redirect_to_external }
+
+    context 'when organization has a redirect url' do
+      let(:organization) {  create(:organization, instance_url: 'url') }
       before {
         allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_organization).and_return(organization)
       }
 
-      context 'when user is not an admin' do
-        before {
-          allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(false)
-        }
-        it { expect(subject).to redirect_to back_path }
-
-        it 'does nothing' do
-          expect{ subject }.to_not change{ organization.sync_enabled }
-        end
-      end
-
-      context 'when user is admin' do
-        before {
-          allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(true)
-        }
-        it { expect(subject).to redirect_to back_path }
-
-        it 'change sync_enabled from true to false' do
-          expect{ subject }.to change{ organization.sync_enabled }.from(true).to(false)
-        end
+      it {expect(subject).to redirect_to('url')}
+    end
 
-        it 'change sync_enabled from false to true' do
-          organization.update(sync_enabled: false)
-          expect{ subject }.to change{ organization.sync_enabled }.from(false).to(true)
-        end
-      end
+    context 'otherwise' do
+      it {expect(subject).to redirect_to('https://login.salesforce.com')}
     end
   end
 end

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

@@ -6,7 +6,10 @@
       .col-md-10.col-md-offset-2
         %h2 ApplicationName Connector
         %p
-          Link your Maestrano account to ApplicationName to get your business in synch. Check the status of your connection on this screen.
+          -if @organization
+            Link your company <strong>#{@organization.name} (#{@organization.uid})</strong> to ApplicationName to get your business in synch. Check the status of your connection on this screen.
+          -else
+            Link your account to ApplicationName to get your business in synch. Check the status of your connection on this screen.
 
   .container
     - if current_user
@@ -15,89 +18,58 @@
           .col-md-12.alert.alert-warning
             Only administrators can modify the application settings
 
-      .row.link-step
+      .row.link-step{class: "#{@organization.oauth_uid ? 'done' : 'todo'}"}
         .col-md-1.text-center.link-step-number
           %span.badge.link-step-badge
             1
-        .col-md-3.text-center
-          =image_tag "logos/default-white.png", class: 'logo'
-        .col-md-6.link-step-description
-          %h
-            Your Maestrano company <strong>#{@organization.name} (#{@organization.uid})</strong> is currently linked
-        .col-md-2.text-center.link-step-action
-          = link_to "Disconnect", Maestrano::Connector::Rails::Engine.routes.url_helpers.maestrano_signout_path, class: "btn btn-warning btn-lg #{is_admin ? '' : 'disabled'}"
-
-      .spacer1
-
-      .row.link-step
-        .col-md-1.text-center.link-step-number
-          %span.badge.link-step-badge
-            2
-        .col-md-3.text-center
-          =image_tag "logos/external.png", class: 'logo'
         .col-md-6.link-step-description
           %h
             - if @organization.oauth_uid
               Your ApplicationName account <strong>#{@organization.oauth_name} (#{@organization.oauth_uid})</strong> is currently linked
             - else
               Your ApplicationName account is not linked
-        .col-md-2.text-center.link-step-action
+        .col-md-2.col-md-offset-3.text-center.link-step-action
           - if @organization.oauth_uid
-            / TODO
-            = link_to "Disconnect", root_path, class: "btn btn-warning btn-lg #{is_admin ? '' : 'disabled'}"
+            = link_to "Disconnect", signout_omniauth_path(organization_id: @organization.id), class: "btn btn-warning btn-lg #{is_admin ? '' : 'disabled'}"
           - else
-            / TODO
-            = link_to "Link to ApplicationName", root_path, class: "btn btn-warning btn-lg #{is_admin ? '' : 'disabled'}"
+            = link_to "Link to ApplicationName", "/auth/ApplicationName/request?org_uid=#{@organization.uid}", class: "btn btn-warning btn-lg" if is_admin
 
       .spacer1
 
-      .row.link-step
-        .col-md-1.text-center.link-step-number
-          %span.badge.link-step-badge
-            3
-        .col-md-3.text-center
-          =image_tag "logos/sync.png", class: 'logo'
-        .col-md-6.link-step-description
-          %h
-            - if @organization.sync_enabled
-              Synchronizations are enabled
-            - else
-              Synchronizations are disabled
-        .col-md-2.text-center.link-step-action
-          = link_to "Toggle #{@organization.sync_enabled ? 'off' : 'on'}", home_toggle_sync_path, method: :put, class: "btn btn-warning btn-lg #{is_admin ? '' : 'disabled'}"
+      .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
+          .col-md-9.link-step-description
+            %h
+              You can customize which entities are synchronized by the connector:
+            .spacer1
+            .row
+              .col-md-11.col-md-offset-1
+                - @organization.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
+                        - 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"
+          .spacer1
+          .row
+            .col-md-2.col-md-offset-10.text-center.link-step-action
+              =submit_tag "#{@organization.sync_enabled ? 'Update' : 'Start synchronizing!'}", class: "btn btn-lg btn-warning #{@organization.oauth_uid ? '' : 'disabled'} text-sm"
+
+      -if @organization.oauth_uid && @organization.sync_enabled
+        .spacer2
+        .row
+          .col-md-4.col-md-offset-4.text-center
+            = link_to 'Go to ApplicationName', home_redirect_to_external_path, class: 'btn btn-lg btn-primary'
 
     - else
       .row
         .col-md-4.col-md-offset-4.center
           = link_to "Link your Maestrano account", Maestrano::Connector::Rails::Engine.routes.url_helpers.default_maestrano_auth_saml_index_path(tenant: :default), class: 'btn btn-warning'
 
-    - if @organization
-      .spacer2
-      .row
-        .col-md-12
-          %h1
-            Synchronized entities
-            %small You can customize which entities are synchronized by the connector
-
-      .spacer1
-      .row
-        .col-md-10.col-md-offset-1
-          = form_tag home_update_path(id: @organization.id), method: :put do
-            - @organization.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-7{style: 'padding-top: 5px;'}
-                  %label{:for => "#{k}"} #{k.to_s.humanize}
-                -if is_admin
-                  .col-md-4.text-right
-                    - if v && @organization.oauth_uid
-                      - if @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 #{is_admin && @organization.sync_enabled ? '' : 'disabled'}"
-                      - else
-                        .btn.btn-warning.btn-sm.disabled= "Force a synchronization for #{k.to_s.humanize.pluralize} only"
-            -if is_admin
-              .spacer1
-              .row
-                .col-md-4.col-md-offset-8.text-right
-                  =submit_tag :Save, class: "btn btn-primary"

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

@@ -3,7 +3,7 @@
 !!!
 %html
   %head
-    %title ApplicationName Connector for Connec!™
+    %title SalesForce Connector
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true
     = csrf_meta_tags
@@ -16,7 +16,9 @@
 
           %ul.nav.navbar-nav
             %li=link_to "Status", root_path
+
             %li=link_to "History", synchronizations_index_path
+
             -if is_admin
               %li=link_to "Mapping", shared_entities_index_path
 
@@ -41,5 +43,4 @@
         .row
           .col-xs-12
             .copyright
-              © Copyright #{Time.now.year} Maestrano Pty Ltd (ABN: 80 152 564 424).
-              All rights reserved. Various trademarks held by their respective owners.
+              © Copyright #{Time.now.year}. All rights reserved. Various trademarks held by their respective owners.

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

@@ -34,6 +34,7 @@ class OauthController < ApplicationController
       organization.oauth_uid = nil
       organization.oauth_token = nil
       organization.refresh_token = nil
+      organization.sync_enabled = false
       organization.save
     end
 

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

@@ -7,15 +7,15 @@
         .row
           .col-md-10
             %h3 Data Shared
-            %small Equivalence between Maestrano's Connec!™ id and ApplicationName id for each of your entities
+            %small Equivalence between the internal id and ApplicationName id for each of your entities
 
         - if @idmaps
           %table.table.table-condensed
             %th Entity name
-            %th Connec!™ entity
-            %th Connec!™ id
-            %th SalesForce entity
-            %th SalesForce id
+            %th Internal entity
+            %th Internal id
+            %th ApplicationName entity
+            %th ApplicationName id
             %th Message
 
             - @idmaps.each do |idmap|

data/lib/generators/connector/templates/stylesheets/application.sass

@@ -16,7 +16,6 @@
 @import 'bootstrap-sprockets'
 @import 'bootstrap'
 
-@import 'banners'
 @import 'spacers'
 
 @import 'layout'

data/lib/generators/connector/templates/stylesheets/home.sass

@@ -10,7 +10,6 @@
       .link-step-badge
         padding: 10px
         font-size: 20px
-        background-color: cornflowerblue
         border-radius: 20px
 
     .link-step-description
@@ -19,7 +18,22 @@
     .link-step-action
       padding-top: 3px
 
+    &.done
+      background-color: $done-step-bg-color
+      border-color: $done-step-border-color
+      .link-step-badge
+        background-color: $done-step-badge-color
+
+    &.todo
+      background-color: $todo-step-bg-color
+      border-color: $todo-step-border-color
+      .link-step-badge
+        background-color: $todo-step-badge-color
+
   .sync-entity
     padding-bottom: 8px
     margin-bottom: 8px
-    border-bottom: dashed 1px silver
+    border-bottom: dashed 1px silver
+
+  .btn.btn-lg.text-sm
+    font-size: 16px

data/lib/generators/connector/templates/stylesheets/layout.sass

@@ -1,59 +1,30 @@
-.mno-main-logo
-  width: 201px
-  height: 51px
-  background: image-url('sprites/shared-icons.sprite.png') 0px 0px no-repeat
-
-.logo
-  height: 51px
-
-.navbar
-  &.navbar-dashboard
-    top: 0px
-
-    .container-fluid
-      .navbar-brand
-        position: absolute
-        margin-top: -44px
-
-  .navbar-submenu
-    background-color: $purple
-    padding: 15px
-    margin-top: 14px
-    margin-bottom: -1px
-    width: 100%
-
-    ul
-      margin: auto
-      list-style-type: none
-
-      li
-        display: inline
-        margin: 0px 13px
+html, body
+  height: 100%
+  background-color: $bg-color
+  color: $text-color
 
-        a
-          color: white
-          font-size: 14px
-          font-weight: 300
+.wrapper
+  min-height: 100%
+  margin-bottom: -$footer-height
 
-          &.active
-            color: $darkblue
-            font-weight: 300
+  &:after
+    content: ""
+    display: block
 
-  .navbar-nav
-    &.navbar-right:last-child
-      margin-right: 10px
+.footer
+  padding-top: $navbar-padding
+  height: $footer-height
+  border-top: 1px solid darken($navbar-bg-color, 10%)
+  border-bottom: 1px solid darken($navbar-bg-color, 10%)
+  background-color: $navbar-bg-color
 
-    li.active
-      .navbar-arrow
-        position: absolute
-        margin-top: 60px
-        width: 0
-        height: 0
-        border-left: 27px solid transparent
-        border-right: 27px solid transparent
-        margin-left: calc(50% - 27px)
-        border-bottom: 20px solid $purple
+  .copyright
+    text-align: center
+    font-size: 10px
+    color: $copyright-color
+    margin-top: 20px
 
+.navbar
   .container-fluid
     .navbar-brand
       margin-left: 20px
@@ -69,17 +40,6 @@
       a
         font-size: $normal
 
-    ul.nav.navbar-nav.navbar-right
-      button
-        margin-top: (($navbar-height - $line-height-computed) / 2) - 18
-
-      a
-        text-transform: none
-
-.padding-navbar
-  margin-top: $navbar-height
-
-
 // Reduce the height of the navbar if on mobile device
 @media(min-width: 768px)
   .navbar-fixed-top
@@ -89,37 +49,15 @@
   .padding-navbar
     margin-top: $navbar-desktop-height
 
+.banners
+  width: 100%
+  padding: 58px 0 58px 0
+
+.logo
+  height: 51px
+
 .center
   text-align: center
 
 .align-right
-  text-align: right
-
-html, body
-  height: 100%
-
-.wrapper
-  min-height: 100%
-  margin-bottom: -$footer-height 
-
-  &:after
-    content: ""
-    display: block
-
-.footer
-  padding-top: $navbar-padding
-  height: $footer-height
-  border-top: 1px solid darken(#e5e5e5, 10%)
-  border-bottom: 1px solid darken(#e5e5e5, 10%)
-  background-color: $darkblue
-
-  .copyright
-    text-align: center
-    font-size: 10px
-    color: #f4f4f4
-    margin-top: 20px
-
-
-.banners
-  &.sticky-top
-    padding-top: 10px
+  text-align: right

data/lib/generators/connector/templates/stylesheets/variables.sass

@@ -11,30 +11,23 @@ $font-family-base:               $font-family-sans-serif
 /*-----------------------------------------------------------------------*/
 /*                          Color palette                                */
 /*-----------------------------------------------------------------------*/
-$darkerblue:                     #16252c
-$darkblue:                       #17262d
-$darkerblue:                     darken($darkblue,4%)
-$darkblue2:                      #25333a
-$mediumblue:                     #626d6d
-$lightblue:                      #abc4c6
-$pink:                           #ed1e79
-$fluroblue:                      #00e5f0
-$fluroorange:                    #ff7300
-$flureoyellow:                   #fbd925
-$flurogreen:                     #47ff00
-$fluropink:                      #e01f74
-$darkgreen:                      #33d375
-$green:                          #d1e55c
-$purple:                         #977bf0
-$lightgray:                      #e6edee
-$bluegray:                       #abc4c6
-$bluegray2:                      #35464c
-
-$brand-success:                  $fluroblue
-$brand-warning:                  $purple
-$brand-info:                     $fluroblue
-$brand-danger:                   $fluropink
-$brand-primary:                  $fluroblue
+$bg-color:                #fff
+$text-color:              #000
+
+$navbar-bg-color:         #aaa
+$navbar-text-color:       #fff
+
+$copyright-color:         $navbar-text-color
+
+$primary-button-color:    blue
+$warning-button-color:    red
+
+$done-step-bg-color:      #dff0d8
+$done-step-border-color:  #d6e9c6
+$done-step-badge-color:   darken($done-step-border-color, 20%)
+$todo-step-bg-color:      #fcf8e3
+$todo-step-border-color:  #faebcc
+$todo-step-badge-color:   darken($todo-step-border-color, 20%)
 
 /*-----------------------------------------------------------------------*/
 /*                          Text Size                                    */
@@ -45,13 +38,17 @@ $normal:                         13px
 /*-----------------------------------------------------------------------*/
 /*                          Nav bar                                      */
 /*-----------------------------------------------------------------------*/
-$navbar-inverse-bg:              $darkblue
+$navbar-inverse-bg:              $navbar-bg-color
 $navbar-height:                  40px
-$navbar-inverse-link-color:      $lightblue
+$navbar-inverse-link-color:      $navbar-text-color
 $navbar-border-radius:           0px
-$navbar-inverse-border:          $darkblue
+$navbar-inverse-border:          $navbar-bg-color
 $navbar-desktop-height:          80px
 $navbar-inverse-link-active-bg:  $navbar-inverse-bg
 
 $navbar-padding: 10px
-$footer-height: 50px
+$footer-height: 50px
+
+$brand-success:                  $primary-button-color
+$brand-primary:                  $primary-button-color
+$brand-warning:                  $warning-button-color

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 0.3.6 ruby lib
+# stub: maestrano-connector-rails 0.3.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   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-03-29"
+  s.date = "2016-03-31"
   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"]
@@ -83,7 +83,6 @@ Gem::Specification.new do |s|
     "lib/generators/connector/templates/shared_entities_controller_spec.rb",
     "lib/generators/connector/templates/shared_entities_index.haml",
     "lib/generators/connector/templates/stylesheets/application.sass",
-    "lib/generators/connector/templates/stylesheets/banners.sass",
     "lib/generators/connector/templates/stylesheets/home.sass",
     "lib/generators/connector/templates/stylesheets/layout.sass",
     "lib/generators/connector/templates/stylesheets/spacers.sass",

data/spec/models/entity_spec.rb

@@ -203,7 +203,7 @@ describe Maestrano::Connector::Rails::Entity do
             }
 
             it 'calls get with a singularize url' do
-              expect(client).to receive(:get).with("/#{connec_name.downcase}")
+              expect(client).to receive(:get).with("/#{connec_name.downcase}?")
               subject.get_connec_entities(client, nil, organization)
             end
           end
@@ -215,26 +215,46 @@ describe Maestrano::Connector::Rails::Entity do
 
             context 'when opts[:full_sync] is true' do
               it 'performs a full get' do
-                expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}")
-                subject.get_connec_entities(client, nil, organization, {full_sync: true})
+                expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}?")
+                subject.get_connec_entities(client, sync, organization, {full_sync: true})
               end
             end
 
             context 'when there is no last sync' do
               it 'performs a full get' do
-                expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}")
+                expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}?")
                 subject.get_connec_entities(client, nil, organization)
               end
             end
 
             context 'when there is a last sync' do
               it 'performs a time limited get' do
-                uri_param = URI.encode("$filter=updated_at gt '#{sync.updated_at.iso8601}'")
+                uri_param = {"$filter" => "updated_at gt '#{sync.updated_at.iso8601}'"}.to_query
                 expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}?#{uri_param}")
                 subject.get_connec_entities(client, sync, organization)
               end
             end
 
+            context 'with options' do
+              it 'support filter option for full sync' do
+                uri_param = {'$filter'=>'code eq \'PEO12\''}.to_query
+                expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}?#{uri_param}")
+                subject.get_connec_entities(client, sync, organization, {full_sync: true, :$filter => "code eq 'PEO12'"})
+              end
+
+              it 'support filter option for time limited sync' do
+                uri_param = {"$filter"=>"updated_at gt '#{sync.updated_at.iso8601}' and code eq 'PEO12'"}.to_query
+                expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}?#{uri_param}")
+                subject.get_connec_entities(client, sync, organization, {:$filter => "code eq 'PEO12'"})
+              end
+
+              it 'support orderby option for time limited sync' do
+                uri_param = {"$orderby"=>"name asc", "$filter"=>"updated_at gt '#{sync.updated_at.iso8601}'"}.to_query
+                expect(client).to receive(:get).with("/#{connec_name.downcase.pluralize}?#{uri_param}")
+                subject.get_connec_entities(client, sync, organization, {:$orderby => "name asc"})
+              end
+            end
+
             context 'with pagination' do
               before {
                 allow(client).to receive(:get).and_return(ActionDispatch::Response.new(200, {}, {people: [], pagination: {next: "https://api-connec.maestrano.com/api/v2/cld-dkg601/people?%24skip=10&%24top=10"}}.to_json, {}), ActionDispatch::Response.new(200, {}, {people: []}.to_json, {}))

data/template/routes.rb

@@ -7,7 +7,6 @@ Rails.application.routes.draw do
   get 'home/index' => 'home#index'
   put 'home/update' => 'home#update'
   post 'home/synchronize' => 'home#synchronize'
-  put 'home/toggle_sync' => 'home#toggle_sync'
 
   get 'synchronizations/index' => 'synchronizations#index'
   get 'shared_entities/index' => 'shared_entities#index'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Pierre Berard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: maestrano-rails
@@ -293,7 +293,6 @@ files:
 - lib/generators/connector/templates/shared_entities_controller_spec.rb
 - lib/generators/connector/templates/shared_entities_index.haml
 - lib/generators/connector/templates/stylesheets/application.sass
-- lib/generators/connector/templates/stylesheets/banners.sass
 - lib/generators/connector/templates/stylesheets/home.sass
 - lib/generators/connector/templates/stylesheets/layout.sass
 - lib/generators/connector/templates/stylesheets/spacers.sass

data/lib/generators/connector/templates/stylesheets/banners.sass

@@ -1,59 +0,0 @@
-.banners
-  width: 100%
-  padding: 58px 0 58px 0
-
-  &.small-padding
-    padding: 10px 0px 10px 0px
-
-  &.lightgray
-    background-color: $lightgray
-
-  &.purple
-    background-color: $purple
-
-  &.darkblue
-    background-color: $darkblue
-    p
-      color: $lightgray
-      font-size: 1.1em
-      font-weight: 300
-
-  h2
-    font-weight: 700
-    font-size: 40px
-    color: $darkblue
-
-  h4
-    font-weight: 900
-    font-size: 14px
-    color: $darkblue
-
-  p
-    color: $mediumblue
-    font-weight: 300
-    font-size: 16px
-
-  &.promo
-    h2
-      font-weight: 700
-      font-size: 40px
-      text-align: center
-      color: $darkblue
-
-    h3
-      font-weight: 300
-      font-size: 18px
-      text-align: center
-      color: $darkblue
-
-    h4
-      font-size: 24px
-      font-weight: 400
-
-    h5
-      text-align: center
-      font-size: 14px
-      font-weight: 300
-
-    &.sticky
-      padding: 5px 0