adherent 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89036065575320fa31e190a7d4032261d8083b6a
-  data.tar.gz: 160e89736ef978f9693bb031e5c5fe95d62f11d8
+  metadata.gz: 8b29d8528df12db718332171265a6d754d2a3b26
+  data.tar.gz: 0353753b7acdacf51c0df287ad6dfd1a363486c7
 SHA512:
-  metadata.gz: 06a8c253866a1ad145ec36ad6c5f52454e0448ce75f4644d36f8b4a577966500039627dd363ae58e8257139977898736ac1ad444d92378c46cd610001efcd3d8
-  data.tar.gz: 08077bfd6a803c8a94a292891a4c910e0b790013a9f1458b3b583a6fe03817413f820ce7cc9393d08060310ee3c9e5b15c84253630e133fe474a480fdd240c9f
+  metadata.gz: 0a1a9653e134225fca9188be266d377c12c48504e475e886e1ba0cde0cdda131ed9c2275f2e55971fc82dbb196e63d4bb86b9a62a8b9502134d6687f89f724ec
+  data.tar.gz: de93d76ed685af67d41d2dbc56b26bf4bba1c4c97b46cf24a763351f0caa70d51f440c5ca76f638685b1547bf0060d19d7ef6116ac74d38964955fb7759b051f

data/app/controllers/adherent/adhesions_controller.rb

@@ -74,7 +74,7 @@ module Adherent
     protected
     
     def find_member
-      @member = Member.find(params[:member_id])
+      @member = @organism.members.find(params[:member_id])
     end
     
     private 

data/app/controllers/adherent/coords_controller.rb

@@ -5,7 +5,7 @@ require_dependency "adherent/application_controller"
 module Adherent
   class CoordsController < ApplicationController
     
-    before_filter :find_member, :except=>[:index]
+    before_filter :find_member, :except=>[:index] 
    
     # GET /coords/1
     # GET /coords/1.json
@@ -74,7 +74,7 @@ module Adherent
     protected 
     
     def find_member
-      @member = Member.find(params[:member_id])
+      @member = @organism.members.find(params[:member_id])
     end
     
     def coord_params

data/app/controllers/adherent/members_controller.rb

@@ -4,14 +4,19 @@ require_dependency "adherent/application_controller"
 
 module Adherent
   class MembersController < ApplicationController
+    
+    before_filter :find_member, :except=>[:index, :create, :new]
+    
+    
     # GET /members
     # GET /members.json
     def index 
       
-      @members = Adherent::QueryMember.query_members(@organism)
+      
   
       respond_to do |format|
-        format.html # index.html.erb
+        format.html {@members = Adherent::QueryMember.query_members(@organism) }
+        # index.html.erb
         format.csv { send_data Adherent::QueryMember.to_csv(@organism),
           :filename=>"#{@organism.title}-#{dashed_date(Date.today)}-Membres.csv"  } 
         
@@ -24,7 +29,7 @@ module Adherent
     # GET /members/1
     # GET /members/1.json
     def show
-      @member = Member.find(params[:id])
+     
   
       respond_to do |format|
         format.html # show.html.erb
@@ -45,7 +50,7 @@ module Adherent
   
     # GET /members/1/edit
     def edit
-      @member = Member.find(params[:id])
+      
     end
   
     # POST /members
@@ -67,7 +72,7 @@ module Adherent
     # PUT /members/1
     # PUT /members/1.json
     def update
-      @member = Member.find(params[:id])
+     
   
       respond_to do |format|
         if @member.update_attributes(member_params)
@@ -83,7 +88,7 @@ module Adherent
     # DELETE /members/1
     # DELETE /members/1.json
     def destroy
-      @member = Member.find(params[:id])
+     
       @member.destroy
   
       respond_to do |format|

data/app/controllers/adherent/payments_controller.rb

@@ -70,7 +70,7 @@ module Adherent
     
     
     def find_member
-      @member = Member.find(params[:member_id])
+      @member = @organism.members.find(params[:member_id])
     end
     
     # cette méthode permet à l'application qui intègre le gem adhérent 

data/app/controllers/adherent/reglements_controller.rb

@@ -11,7 +11,7 @@ module Adherent
       @payment = Payment.find(params[:payment_id])
       @member = @payment.member
       @reglement = @payment.reglements.new(amount:@payment.non_impute)
-      @unpaid_adhesions = Adhesion.unpaid
+      @unpaid_adhesions = @organism.adhesions.unpaid
     end
     
     # TODO voir pour faire les deux approches (succès et échec)

data/app/models/adherent/adhesion.rb

@@ -39,7 +39,7 @@ module Adherent
     
     # liste toutes les adhésions qui ne sont pas payées.
     # pour rappel un where ne fonctionne pas avec un aggrégat obligeant à utiliser la clause having
-    #
+    # FIXME doit être filtré par un organisme
     scope :unpaid, -> {select('adherent_adhesions.*, sum(adherent_reglements.amount) as reglements_amount').
         joins('left join adherent_reglements on adherent_adhesions.id = adherent_reglements.adhesion_id').
         group('adherent_adhesions.id').

data/app/models/adherent/coord.rb

@@ -1,11 +1,18 @@
 module Adherent
   class Coord < ActiveRecord::Base
     belongs_to :member
-    
-    
-    
+       
     validates :member_id, :presence=>true
-    
+    validates :tel, :format=>{with:NAME_REGEX}, 
+      :length=>{:maximum=>LONG_NAME_LENGTH_MAX}, :allow_blank=>true
+    validates :gsm, :format=>{with:NAME_REGEX}, 
+      :length=>{:maximum=>LONG_NAME_LENGTH_MAX}, :allow_blank=>true
+    validates :office, :format=>{with:NAME_REGEX}, 
+      :length=>{:maximum=>LONG_NAME_LENGTH_MAX}, :allow_blank=>true
+    validates :zip, :format=>{with:NAME_REGEX}, 
+      :length=>{:maximum=>LONG_NAME_LENGTH_MAX}, :allow_blank=>true
+    validates :city, :format=>{with:NAME_REGEX}, 
+      :length=>{:maximum=>LONG_NAME_LENGTH_MAX}, :allow_blank=>true
     
   end
 end

data/app/models/adherent/member.rb

@@ -13,8 +13,11 @@ module Adherent
     
     # TODO rajouter un before_destroy sur les paiements
     
-    validates :number, :name, :forname , :organism_id, :presence=>true
+    validates :organism_id, :presence=>true
+    validates :number, :format=>{with:NAME_REGEX}, :length=>{:within=>NAME_LENGTH_LIMITS}, :presence=>true
     validates_uniqueness_of  :number, :scope=>:organism_id
+    validates :name, presence:true, :format=>{with:NAME_REGEX}, :length=>{:maximum=>LONG_NAME_LENGTH_MAX}
+    validates :forname, presence:true, :format=>{with:NAME_REGEX}, :length=>{:maximum=>LONG_NAME_LENGTH_MAX}
     
     # arel des adhésions impayées par ordre de date
     def unpaid_adhesions

data/app/models/organism.rb

@@ -3,6 +3,7 @@ class Organism < ActiveRecord::Base
   
   has_many :members, class_name:'Adherent::Member'
   has_many :payments, through: :members, class_name:'Adherent::Payment'
+  has_many :adhesions, through: :members, class_name:'Adherent::Adhesion'
   
   # méthode devant être surchargée dans l'application principale
   # pour avoir une capacité à gerer les limites de dates lors de la saisie des 
@@ -13,10 +14,6 @@ class Organism < ActiveRecord::Base
   # 
   # Dans l'appli compta, on redéfinit range_date pour avoir les dates 
   # correspondants aux exercices ouverts.
-  # 
-  # TODO revoir ce sujet pour introduire un fichier de configuration 
-  # permettant d'indiquer les limites de dates
-  #
   def range_date
     Date.today.<<(3)..Date.today.>>(3)
   end

data/lib/adherent/version.rb

@@ -16,6 +16,6 @@ module Adherent
   # VERSION = '0.2.3' # Ajout d'un champ comment pour les paiements
   # VERSION = '0.2.8' # Insertion icone et action export csv xls pour members
   # VERSION = '0.2.9' # Mémorisation choix longueur liste des dataTables
-  VERSION = '0.3.0' # Passage à Rails 4.1
-
-end
+  # VERSION = '0.3.0' # Passage à Rails 4.1
+  VERSION = '0.3.1' # Modifications pour le passage de flc à noschema
+  end

data/spec/controllers/adherent/coords_controller_spec.rb

@@ -2,21 +2,28 @@
 
 require 'rails_helper'
 
+RSpec.configure do |c|
+ # c.exclusion_filter = {js:true}
+ #  c.filter = {wip:true}
+end
+
 describe Adherent::CoordsController, :type => :controller do
   
   before(:each) do
    @routes = Adherent::Engine.routes
    @member = double(Adherent::Member)
-   allow(Adherent::Member).to receive(:find).with(@member.to_param).and_return @member
+   allow(@controller).to receive(:find_member)
+   @controller.instance_variable_set('@member', @member)
   end
     
   
   
   
   describe "GET show" do
-    it 'appelle le coord' do
+    it 'appelle le coord' , wip:true do
       expect(@member).to receive(:coord).and_return(double(Adherent::Coord))
-      get :show, member_id:@member.to_param
+      get :show, {member_id:@member.to_param}
+      assigns.each {|h| puts "#{h.inspect }"}
     end
     
     it 'assigne le membre et rend la vue' do

data/spec/dummy/app/controllers/application_controller.rb

@@ -6,6 +6,6 @@ class ApplicationController < ActionController::Base
   protected
   
   def find_organism
-     @organism = Organism.find_or_create_by(title:'Mon association')
+     @organism = Organism.find_by_id(session[:organism])
   end
 end