maestrano-connector-rails 2.0.0.pre.RC10 → 2.0.0.pre.RC11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b84ee19b8cb4c3c76c762e3fdc902cc59e5e2ec6
-  data.tar.gz: 8b828b5c3cdf10bcf1e7b65ff3991ad3f5cbc224
+  metadata.gz: 393f91e1248007d0b8d38c99280d466bd935f54f
+  data.tar.gz: d2e43d71732f2d7280d355e67484e18fc97c8b14
 SHA512:
-  metadata.gz: 94dbd9143e6e01e37180ecf7ac329d56f1c3b88d28afc9cdb30a41c44dad5c3e1e0e884b24e2341effbfa1bb7b39b04620966300d86e62fb65e8fccb98154bf3
-  data.tar.gz: 689d3157aa9a71533bbe9915e4a4005f2c9b4250f897452ba80a76bdccc3a8ceaf4b04d6ad96006d4829556a08734a81316f6c6fe9437200f0e1e358633ab67f
+  metadata.gz: e29765cb69956279f371bd227b44065d114a24cce99f1cf88242d4e5afb1e8d17cde78487b15bb866028668050660a770ae6ebbe01bb9752a64b89c2e6c447d0
+  data.tar.gz: a0a8dc357400da0362385decfa9e5d0432affd445611c86021bea1500621e10df1ca8f72fd2afed11fec46012d9a1331e0f427ccb4d63cb21630930aa8b15099

data/CHANGELOG.md

@@ -6,7 +6,9 @@
 ### Migration guide
 * Follow migration steps up to framework version 1.5.0
 * Replace ocurrences of `@organizations` with `current_organization` in `home_index.haml`
-* Developer Platform registration to be detailed
+* In spec_helper.rb add the line `require 'maestrano_connector_rails/factories.rb'`
+
+### Developer Platform registration to be detailed
 
 ## 1.5.0
 

data/VERSION

@@ -1 +1 @@
-2.0.0.pre.RC10
+2.0.0.pre.RC11

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

@@ -207,9 +207,6 @@ module Maestrano::Connector::Rails::Concerns::Entity
     query_params = {}
     query_params[:$orderby] = @opts[:$orderby] if @opts[:$orderby]
 
-    # Fetch first page
-    page_number = 0
-
     batched_fetch = @opts[:__limit] && @opts[:__skip]
     if batched_fetch
       query_params[:$top] = @opts[:__limit]
@@ -224,7 +221,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
 
     Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "entity=#{self.class.connec_entity_name}, fetching data with #{query_params.to_query}")
     uri = "#{self.class.normalized_connec_entity_name}?#{query_params.to_query}"
-    response_hash = fetch_connec(uri, 0)
+    response_hash = fetch_connec(uri)
     entities = response_hash[self.class.normalized_connec_entity_name]
     entities = [entities] if self.class.singleton?
 
@@ -232,11 +229,10 @@ module Maestrano::Connector::Rails::Concerns::Entity
     unless batched_fetch
       # Fetch subsequent pages
       while response_hash['pagination'] && response_hash['pagination']['next']
-        page_number += 1
         # ugly way to convert https://api-connec/api/v2/group_id/organizations?next_page_params to /organizations?next_page_params
         next_page = response_hash['pagination']['next'].gsub(/^(.*)\/#{self.class.normalized_connec_entity_name}/, self.class.normalized_connec_entity_name)
 
-        response_hash = fetch_connec(next_page, page_number)
+        response_hash = fetch_connec(next_page)
         entities.concat response_hash[self.class.normalized_connec_entity_name]
       end
     end
@@ -604,13 +600,15 @@ module Maestrano::Connector::Rails::Concerns::Entity
       {entity: map_to_connec(external_entity, idmap.last_push_to_connec.nil?), idmap: idmap}
     end
 
-    def fetch_connec(uri, page_number)
+    def fetch_connec(uri)
+      Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "Fetching data from connec entity=#{self.class.connec_entity_name}, url=#{uri}")
       response = @connec_client.get(uri)
-      raise "No data received from Connec! when trying to fetch page #{page_number} of #{self.class.normalized_connec_entity_name}" unless response && !response.body.blank?
+
+      raise "No data received from Connec! when trying to fetch #{self.class.normalized_connec_entity_name}" unless response && !response.body.blank?
 
       response_hash = JSON.parse(response.body)
-      Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "Received page #{page_number} for entity=#{self.class.connec_entity_name}, response=#{response_hash}")
-      raise "Received unrecognized Connec! data when trying to fetch page #{page_number} of #{self.class.normalized_connec_entity_name}: #{response_hash}" unless response_hash[self.class.normalized_connec_entity_name]
+      Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "Received response for entity=#{self.class.connec_entity_name}, response=#{response_hash}")
+      raise "Received unrecognized Connec! data when trying to fetch #{self.class.normalized_connec_entity_name}: #{response_hash}" unless response_hash[self.class.normalized_connec_entity_name]
 
       response_hash
     end

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

@@ -2,9 +2,8 @@ require 'spec_helper'
 
 describe HomeController, type: :controller do
   let(:back_path) { home_index_path }
-  before(:each) do
-    request.env['HTTP_REFERER'] = back_path
-  end
+
+  before(:each) { request.env['HTTP_REFERER'] = back_path }
 
   describe 'index' do
     subject { get :index }
@@ -13,21 +12,22 @@ describe HomeController, type: :controller do
   end
 
   describe 'update' do
+    let(:user) { create(:user) }
     let(:organization) { create(:organization, synchronized_entities: {'people' => false, 'item' => true}) }
+
+    before { allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_user).and_return(user) }
+    before { allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_organization).and_return(organization) }
+
     subject { put :update, id: organization.id, 'people' => true, 'item' => false, 'lala' => true }
 
     context 'when user is not admin' do
-      before do
-        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin?).and_return(false)
-      end
+      before { allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(false) }
 
       it { expect(subject).to redirect_to back_path }
     end
 
     context 'when user is admin' do
-      before do
-        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin?).and_return(true)
-      end
+      before { allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(true) }
 
       it { expect(subject).to redirect_to back_path }
 
@@ -57,16 +57,16 @@ describe HomeController, type: :controller do
   end
 
   describe 'synchronize' do
+    let(:user) { create(:user) }
+    let(:organization) { create(:organization, synchronized_entities: {'people' => false, 'item' => true}) }
+
+    before { allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_user).and_return(user) }
+    before { allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_organization).and_return(organization) }
+
     subject { post :synchronize }
-    let(:organization) { create(:organization) }
-    before do
-      allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:current_organization).and_return(organization)
-    end
 
     context 'when user is not admin' do
-      before do
-        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(false)
-      end
+      before { allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(false) }
 
       it { expect(subject).to redirect_to back_path }
 
@@ -77,9 +77,7 @@ describe HomeController, type: :controller do
     end
 
     context 'when user is admin' do
-      before do
-        allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(true)
-      end
+      before { allow_any_instance_of(Maestrano::Connector::Rails::SessionHelper).to receive(:is_admin).and_return(true) }
 
       it { expect(subject).to redirect_to back_path }
 

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 2.0.0.pre.RC10 ruby lib
+# stub: maestrano-connector-rails 2.0.0.pre.RC11 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "maestrano-connector-rails"
-  s.version = "2.0.0.pre.RC10"
+  s.version = "2.0.0.pre.RC11"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Maestrano"]
-  s.date = "2016-10-12"
+  s.date = "2016-10-13"
   s.description = "Maestrano is the next generation marketplace for SME applications. See https://sme.maestrano.com for details."
   s.email = "developers@maestrano.com"
   s.executables = ["rails"]

data/template/maestrano_connector_template.rb

@@ -76,7 +76,6 @@ after_bundle do
   remove_file 'app/assets/stylesheets/application.css'
   remove_file 'config/routes.rb'
   copy_file 'spec_helper.rb', 'spec/spec_helper.rb'
-  copy_file 'factories.rb', 'spec/factories.rb'
   copy_file 'routes.rb', 'config/routes.rb'
 
   # Heroku and uat

data/template/spec_helper.rb

@@ -8,6 +8,7 @@ require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
 require 'factory_girl_rails'
 require 'shoulda/matchers'
+require 'maestrano_connector_rails/factories.rb'
 
 Rails.backtrace_cleaner.remove_silencers!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.RC10
+  version: 2.0.0.pre.RC11
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails