susies 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf7da5127df09154bacf3cbb580d41f61ebfda47
-  data.tar.gz: 082c4d806dcceac2c188c0057c18569ce91bcf9c
+  metadata.gz: 70f54d52e7f3c392e035de6cef606aa506e30fab
+  data.tar.gz: adbcdf81300066417f562273eeb93fc663cbf8ce
 SHA512:
-  metadata.gz: 2ffc7e22c0a978a4b1c9c98c0d62e4be0dbd8f626a116a6b907f1bc9cf7cad8d43aa71806d2cdff06e019fdfa1c4de126cda436d2fe22b04635432a22d7ce3cb
-  data.tar.gz: 1bb0a3d5e2efe415593417ac9728d71a1af7cf26625419d04274ef6a285a63d8fb482986a8364c7a912909db43a398430393a034b87d17521b66dfb37d2e31e4
+  metadata.gz: bf3c243d128dcf54614160bb1f715ba88867f8ba34a13f1d5bf556fefcca982bf14b78868175daea5967238054370b9ddd745b1c0b2b703965aaa2e42599e081
+  data.tar.gz: d6a7d885ad6b69971888c06cec86397ef8b65195f51860cb416874df72a9e731092b92fa78cbf981cb98a7d208a93b07a81ab99cfb04d616bf611defdbdb4361

data/README.md

@@ -19,14 +19,14 @@ Soit via un `Gemfile`: `gem 'susies'` et `bundle install`
 L'utilisation est assez simple:
 
 ```ruby
-require 'Susies'
+require 'susies'
 
 # whiteListFilters: susies MUST match these filters
 whiteListFilters = {
-  login:      %w[login_x],
-  maxStudent: 6,
-  minHour:    8,
-  maxHour:    17
+  logins:       %w[login_x],
+  nb_registered: 6,
+  minHour:       8,
+  maxHour:       17
 }
 
 # blackListFilters: susies MUST NOT match these filters
@@ -37,8 +37,8 @@ blackListFilters = {
 
 # autologin: intranet authentication
 autologins = {
-  autologinPath:     'https://intra.epitech.eu/my_autologin_url',
-  buddiesAutologins: %w[/buddy_autologin_url],
+  autologinPath:     '/my_autologin_path',
+  buddiesAutologins: %w[/buddy_autologin_path],
 }
 
 # mailInfos: mailer configuration
@@ -63,14 +63,14 @@ Les whiteListFilters sont les critères que les susies doivent avoir, à l'inver
 
 Laissez `nil` si vous ne voullez pas de filtres.
 
-### login
+### logins
 
 * Les logins des susies recherchées.
 * Type: Array of strings
 * Default: nil
 
 
-### maxStudent
+### nb_registered
 
 * Nombre d'étudiants déjà inscrit à la susie class (0: personne d'inscrit, 10: plus de places)
 * Type: int

data/example/susies.rb

@@ -1,13 +1,13 @@
 #!/usr/bin/ruby
 
-require 'Susies'
+require 'susies'
 
 # whiteListFilters: susies MUST match these filters
 whiteListFilters = {
-  login:      %w[login_x],
-  maxStudent: 6,
-  minHour:    8,
-  maxHour:    17
+  logins:        %w[login_x],
+  nb_registered: 6,
+  minHour:       8,
+  maxHour:       17
 }
 
 # blackListFilters: susies MUST NOT match these filters

data/lib/susies.rb

@@ -0,0 +1 @@
+require 'susies/Susies'

data/lib/{IntraRequestsManager.rb → susies/IntraRequestsManager.rb}

@@ -1,5 +1,5 @@
 # Dependencies
-require 'Susie.rb'
+require 'susies/Susie'
 require 'net/http'
 require 'json'
 
@@ -57,7 +57,7 @@ class IntraRequestsManager
     path = "/planning/#{ @planningID }/#{ susie.id }/subscribe?format=json&registercalendar"
     response = @http.post path, '', { 'Cookie' => @cookies }
 
-    susie.nb_registered -= 1    
+    susie.nb_registered += 1
     susie
   end
 

data/lib/{Susie.rb → susies/Susie.rb}

@@ -21,6 +21,11 @@ class Susie
 
 
   def to_s
+    "#{ self.title } (#{ self.type }) by #{ self.login } from #{ self.start } to #{ self.end } (#{ self.nb_registered } people registered)."
+  end
+
+
+  def to_text
     <<-SUSIE
 Login: #{ self.login }
 

data/lib/{Susies.rb → susies/Susies.rb}

@@ -1,8 +1,8 @@
 # Dependencies
 require 'active_support/time'
 require 'net/smtp'
-require 'Susie.rb'
-require 'IntraRequestsManager.rb'
+require 'susies/Susie'
+require 'susies/IntraRequestsManager'
 
 class Susies
 
@@ -47,8 +47,9 @@ class Susies
   def findSusie(susies)
     log "Not already registrated: seeking susies"
     susies.each do |susie|
+      log "Checking criterias of: #{ susie.to_s }"
       if !matchCriterias?(susie, @blackListFilters) && matchCriterias?(susie, @whiteListFilters)
-        log "Find susie matching criterias"
+        log "Find susie matching criterias: #{ susie.to_s }"
         log "Registering to susie"
 	registerSusie  susie
         log "Sending mails"
@@ -74,7 +75,7 @@ Hey,
 
 I've just registered to a susie class.
 
-#{ susie.to_s }
+#{ susie.to_text }
     MESSAGE
   end
 
@@ -94,20 +95,14 @@ I've just registered to a susie class.
   def matchCriterias?(susie, filters)
     return true unless filters
 
-    min_hour    = filters[:minHour].nil? || susie.start.hour >= filters[:minHour]
-    max_hour    = filters[:maxHour].nil? || susie.end.hour >= filters[:maxHour]
-    nb_students = filters[:nb_registered].nil? || susie.nb_registered <= filters[:nb_registered]
-    login       = filters[:logins].nil? || filters[:logins].include?(susie.login)
-    type        = filters[:type].nil? || susie.type == filters[:type]
-    title       = filters[:title].nil? || susie.title.include?(filters[:title])
+    min_hour    = filters[:minHour].nil? || (susie.start.hour >= filters[:minHour])
+    max_hour    = filters[:maxHour].nil? || (susie.end.hour >= filters[:maxHour])
+    nb_students = filters[:nb_registered].nil? || (susie.nb_registered <= filters[:nb_registered])
+    login       = filters[:logins].nil? || (filters[:logins].include?(susie.login))
+    type        = filters[:type].nil? || (susie.type == filters[:type])
+    title       = filters[:title].nil? || (susie.title.include?(filters[:title]))
 
-    if filters[:logins]
-      filters[:logins].each do |login|
-        login = true if susie.login == login
-      end
-    end
-
-    return min_hour && max_hour && login && nb_students && type && title
+    min_hour && max_hour && login && nb_students && type && title
   end
 
   
@@ -125,10 +120,7 @@ I've just registered to a susie class.
   
 
   def registeredThisWeek?(susies)
-    susies.each do |susie|
-      return true if susie.is_registered
-    end
-    
+    susies.each { |susie| return true if susie.is_registered }
     false
   end
 

data/susies.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'susies'
-  s.version     = '0.1.1'
+  s.version     = '0.1.2'
   s.date        = '2014-10-07'
   s.summary     = 'Epitech Susie Classes Bot'
   s.description = 'Susies is a Gem to register easily for Epitech Susie Classes'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: susies
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Simon Ninon
@@ -20,9 +20,10 @@ files:
 - MIT_LICENSE.txt
 - README.md
 - example/susies.rb
-- lib/IntraRequestsManager.rb
-- lib/Susie.rb
-- lib/Susies.rb
+- lib/susies.rb
+- lib/susies/IntraRequestsManager.rb
+- lib/susies/Susie.rb
+- lib/susies/Susies.rb
 - susies.gemspec
 homepage: https://github.com/Cylix/Susies
 licenses:
@@ -34,19 +35,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Epitech Susie Classes Bot
 test_files: []
-has_rdoc: