From fa7154a9fe684f8b42bfc4afcacaa56bc1fe6d45 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Wed, 3 Aug 2016 16:07:22 +0200
Subject: Remove device :confirmable

---
 lib/tasks/demo.rake | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/tasks/demo.rake b/lib/tasks/demo.rake
index fbafa96c1..d7e8c59f1 100644
--- a/lib/tasks/demo.rake
+++ b/lib/tasks/demo.rake
@@ -10,14 +10,13 @@ namespace :demo do
 
     organisation = Organisation.create!(:name => "DemoChouette")
     user = organisation.users.create( :name => "Demo", :email => "demo@chouette.mobi", :password => "chouette", :password_confirmation =>"chouette")
-    user.confirm!
     referential = organisation.referentials.create( :name => "Tatrobus", :slug => "tatrobus", :prefix => "TAT")
 
     #resource = Rack::Test::UploadedFile.new( Rails.application.config.demo_data, 'application/zip', false)
     #import_instance = ImportTask.new( :resources => resource, :referential_id => referential.id, :user_name => user.name, :no_save => false, :user_id => user.id, :name => "initialize demo", :data_format => "neptune")
     #import_instance.save
-	 
-	 File.open("/tmp/parameters_demo.json", "w")  { |file| 
+
+	 File.open("/tmp/parameters_demo.json", "w")  { |file|
 	                                           file.write('{
 "parameters" :  {
     "neptune-import": {
@@ -30,10 +29,10 @@ namespace :demo do
         }
 	 }
 }') }
-	 
+
 	 cmd = 'curl -F "file=@'+Rails.application.config.demo_data+';filename=tatrobus.zip" -F "file=@/tmp/parameters_demo.json;filename=parameters.json" http://localhost:8180/chouette_iev/referentials/tatrobus/importer/neptune'
 	 system(cmd)
-	 
+
     puts "Restore demo environment complete"
   end
 end
-- 
cgit v1.2.3


From 9a818eeb8991bf0e07f2c9a9837930d153a0492f Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Thu, 4 Aug 2016 16:05:06 +0200
Subject: Rake task organisations:sync

---
 lib/tasks/organisations.rake | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 lib/tasks/organisations.rake

(limited to 'lib')

diff --git a/lib/tasks/organisations.rake b/lib/tasks/organisations.rake
new file mode 100644
index 000000000..a887cd277
--- /dev/null
+++ b/lib/tasks/organisations.rake
@@ -0,0 +1,32 @@
+namespace :organisations do
+  def api_retrieve_organisation
+    last_sync = User.minimum(:synced_at)
+    conf      = Rails.application.config.stif_portail_api
+
+    conn = Faraday.new(:url => conf[:url]) do |c|
+      c.headers['Authorization'] = "Token token=\"#{conf[:key]}\""
+      c.request  :url_encoded
+      c.adapter  Faraday.default_adapter
+    end
+
+    response = conn.get '/api/v1/organizations'
+    JSON.parse response.body if response.status == 200
+  end
+
+  def sync_organisations data
+    data.each do |org|
+      Organisation.sync_or_create(code: org['code'], name: org['name']).tap do |organisation|
+        organisation.name      = org['name']
+        organisation.synced_at = Time.now
+        organisation.save if organisation.changed?
+        puts "Organisation #{organisation.name} has been updated"
+      end
+    end
+  end
+
+  desc "Sync organisations from stif portail"
+  task sync: :environment  do
+    data = api_retrieve_organisation
+    sync_organisations(data) if data
+  end
+end
-- 
cgit v1.2.3


From 7cfd4faefab17e556ac66dd0e52c5942b289ec62 Mon Sep 17 00:00:00 2001
From: Xinhui
Date: Fri, 5 Aug 2016 11:23:03 +0200
Subject: Rspec task organisations:sync

---
 lib/tasks/organisations.rake | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/tasks/organisations.rake b/lib/tasks/organisations.rake
index a887cd277..06e1d3da7 100644
--- a/lib/tasks/organisations.rake
+++ b/lib/tasks/organisations.rake
@@ -1,7 +1,7 @@
 namespace :organisations do
   def api_retrieve_organisation
-    last_sync = User.minimum(:synced_at)
-    conf      = Rails.application.config.stif_portail_api
+    conf = Rails.application.config.try(:stif_portail_api)
+    raise 'Rails.application.config.stif_portail_api settings is not defined' unless conf
 
     conn = Faraday.new(:url => conf[:url]) do |c|
       c.headers['Authorization'] = "Token token=\"#{conf[:key]}\""
@@ -9,8 +9,8 @@ namespace :organisations do
       c.adapter  Faraday.default_adapter
     end
 
-    response = conn.get '/api/v1/organizations'
-    JSON.parse response.body if response.status == 200
+    resp = conn.get '/api/v1/organizations'
+    JSON.parse resp.body if resp.status == 200
   end
 
   def sync_organisations data
@@ -19,7 +19,7 @@ namespace :organisations do
         organisation.name      = org['name']
         organisation.synced_at = Time.now
         organisation.save if organisation.changed?
-        puts "Organisation #{organisation.name} has been updated"
+        puts "✓ Organisation #{organisation.name} has been updated" unless Rails.env.test?
       end
     end
   end
-- 
cgit v1.2.3