muck-users 0.1.12 → 0.1.13

data/.gitignore

@@ -19,4 +19,10 @@ mkmf.log
 *.bundle
 conftest
 content/
-.idea
+.idea
+*.sw?
+.DS_Store
+coverage
+rdoc
+pkg
+pkg/*

data/Rakefile

@@ -22,14 +22,7 @@ begin
     gem.add_dependency "binarylogic-searchlogic"
     gem.add_dependency "bcrypt-ruby"
     gem.add_dependency "muck-engine"
-    # gem.files.include %w( tasks/*
-    #                       db/migrate/*.rb
-    #                       app/**/**/**/*
-    #                       config/*
-    #                       locales/*
-    #                       rails/*
-    #                       test/*
-    #                       lib/**/* )
+    gem.add_dependency "friendly_id"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
@@ -72,10 +65,13 @@ end
 
 begin
   require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
+  Rcov::RcovTask.new do |t|
+    #t.libs << 'lib'
+    t.libs << 'test/rails_root/lib'
+    t.pattern = 'test/rails_root/test/**/*_test.rb'
+    t.verbose = true
+    t.output_dir = 'coverage'
+    t.rcov_opts << '--exclude "gems/*"'
   end
 rescue LoadError
   task :rcov do
@@ -83,7 +79,6 @@ rescue LoadError
   end
 end
 
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/app/controllers/admin/muck/users_controller.rb

@@ -116,7 +116,7 @@ class Admin::Muck::UsersController < Admin::Muck::BaseController
   private 
   
   def get_user
-    @user = User.find_by_login(params[:id]) || User.find(params[:id])
+    @user = User.find(params[:id])
   end
   
 end

data/app/models/user_mailer.rb

@@ -46,7 +46,7 @@ class UserMailer < ActionMailer::Base
   protected
     def setup_email(user)
       recipients    user.email
-      from          "#{GlobalConfig.application_name} <#{GlobalConfig.from_email_name}>"
+      from          "#{GlobalConfig.from_email_name} <#{GlobalConfig.from_email}>"
       sent_on       Time.now
       content_type "text/html" # There is a bug in Rails that prevents multipart emails from working inside an engine.  See: https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/2263-rails-232-breaks-implicit-multipart-actionmailer-tests#ticket-2263-22
     end

data/lib/active_record/acts/muck_user.rb

@@ -52,22 +52,8 @@ module ActiveRecord
 
         def activate_all
           User.update_all("activated_at = '#{Time.now}'", 'activated_at IS NULL')
-        end            
-        
-        # Finds the user with the corresponding activation code, activates their account and returns the user.
-        #
-        # Raises:
-        #  +User::ActivationCodeNotFound+ if there is no user with the corresponding activation code
-        #  +User::AlreadyActivated+ if the user with the corresponding activation code has already activated their account
-        def find_and_activate!(activation_code)
-          raise ArgumentError if activation_code.nil?
-          user = find_by_activation_code(activation_code)
-          raise ActivationCodeNotFound if !user
-          raise AlreadyActivated.new(user) if user.active?
-          user.send(:activate!)
-          user
         end
-        
+
         # checks to see if a given login is already in the database
         def login_exists?(login)
           if User.find_by_login(login).nil?
@@ -118,7 +104,6 @@ module ActiveRecord
           UserMailer.deliver_username_request(self)
         end
         
-        
         # Since password reset doesn't need to change openid_identifier,
         # we save without block as usual.
         def reset_password!(user)
@@ -128,13 +113,25 @@ module ActiveRecord
         end
                 
         def has_role?(rolename)
-          @roles ||= self.roles.map{|role| role.rolename}
-          return false unless @roles
-          @roles.include?(rolename)
+          self.any_role?(rolename)
         end
 
+        def any_role?(*test_rolenames)
+          test_rolenames = [test_rolenames] unless test_rolenames.is_a?(Array)
+          test_rolenames.flatten!
+          @role_names ||= self.roles.map(&:rolename)
+          return false if @role_names.blank?
+          (@role_names & test_rolenames).length > 0
+        end
+        
+        # Add the user to a new role
+        def add_to_role(rolename)
+          role = Role.find_or_create_by_rolename(rolename)
+          self.roles << role if !self.roles.include?(role) # Make sure that the user can only be put into a role once
+        end
+        
         def admin?
-          has_role?('administrator')
+          self.has_role?('administrator')
         end
 
         def can_edit?(user)

data/lib/active_record/secure_methods.rb

@@ -16,7 +16,7 @@ module ActiveRecord
     end
  
     def check(user, field)
-      if user && user != :false
+      if user && user != false
         self.send(field) == user.id || user.admin?
       else
         false

data/lib/muck_users/tasks.rb

@@ -22,7 +22,7 @@ module MuckUsers
 
           desc "Setup default admin user"
           task :create_admin => :environment do
-            ['administrator'].each {|r| Role.create(:rolename => r) }
+            ['administrator', 'manager', 'editor', 'contributor'].each {|r| Role.create(:rolename => r) }
             user = User.new
             user.login = "admin"
             user.email = GlobalConfig.admin_email
@@ -33,7 +33,7 @@ module MuckUsers
             user.save
             user.activate!
 
-            user.roles << Role.find_by_rolename('administrator')
+            user.add_to_role('administrator')
 
             puts 'created admin user'
           end

data/locales/ar.yml

@@ -59,7 +59,7 @@ ar:
       login_requred: "يجب أن تكون مسجلا للحصول على هذه الميزة."
       login_success: "ادخل ناجحة!"
       login_title: "الدخول إلى حسابك"
-      logout_required: "ينبغي عليك تسجيل الخروج من الوصول إلى هذه الصفحة."
+      logout_required: ""
       my_dashboard: "بلدي لوحة التحكم الرئيسية"
       name: اسم
       navigation: 

data/locales/bg.yml

@@ -59,7 +59,7 @@ bg:
       login_requred: "Трябва да сте влезли, за да ползвате тази функция."
       login_success: "Вход успешен!"
       login_title: "Влез в профила си"
-      logout_required: "Трябва да сте влезли, за да достъп до тази страница."
+      logout_required: ""
       my_dashboard: "Моето Табло"
       name: Име
       navigation: 
@@ -116,7 +116,7 @@ bg:
       user_update: "Вие сте потребител информация е била актуализирана."
       username: Потребител
       username_available: "Потребител наличните"
-      username_help: "Можете да използвате между 6 и 20 символа. Ако името, което искате не е на разположение, опитайте добави номера или препинателни знаци."
+      username_help: "Можете да ползвате между 6 и 20 символа. Ако името, което искате не е на разположение, опитайте добави номера или препинателни знаци."
       username_not_available: "Потребителско име не се предлага"
       username_recover_prompt: "Моля, представете имейла, който сте използвали при създаването на профила си, вашето потребителско име ще бъде изпратен по имейл до вас."
       username_sent: "Вашето потребителско име е изпратен емайл. Моля, проверете електронната си поща."

data/locales/ca.yml

@@ -16,7 +16,7 @@ ca:
       activation_not_found: "No s'ha trobat el codi d'activació. Si us plau, intenteu crear-ne un de nou."
       admin: 
         activate_all_inactive_users: "Activar tots els usuaris inactius"
-        activate_all_inactive_users_confirm: "Estàs segur que desitja activar tots els usuaris inactius en el sistema? Això no es pot desfer!"
+        activate_all_inactive_users_confirm: "Esteu segur que voleu activar tots els usuaris inactius en el sistema? Això no es pot desfer!"
         search_users: "Cerca d'Usuaris"
         show_emails: "Mostra correus electrònics"
         unactivated_users: "Hi ha {{count}} unactivated usuaris"
@@ -59,7 +59,7 @@ ca:
       login_requred: "Has d'estar registrat per accedir a aquesta funció."
       login_success: "Inici de sessió amb èxit!"
       login_title: "Entreu al vostre compte"
-      logout_required: "Has d'estar registrat per accedir a aquesta pàgina."
+      logout_required: ""
       my_dashboard: "El meu Escriptori"
       name: Nom
       navigation: 

data/locales/cs.yml

@@ -59,7 +59,7 @@ cs:
       login_requred: "Musíte být přihlášen pro přístup k této funkci."
       login_success: "Přihlásit úspěšná!"
       login_title: "Log-in do vašeho účtu"
-      logout_required: "Musíte být přihlášen, aby přístup k této stránce."
+      logout_required: ""
       my_dashboard: "My Dashboard"
       name: Jméno
       navigation: 

data/locales/da.yml

@@ -59,7 +59,7 @@ da:
       login_requred: "Du skal være logget på for at få adgang til denne funktion."
       login_success: "Login succes!"
       login_title: "Log ind på din konto"
-      logout_required: "Du skal være logget ud til at få adgang til denne side."
+      logout_required: ""
       my_dashboard: "Min Dashboard"
       name: Navn
       navigation: 

data/locales/de.yml

@@ -54,12 +54,12 @@ de:
       invalid_username: "Ungültiger Benutzername"
       join_application_name: "Join und es erfolgt"
       last_name: Nachname
-      login_fail: "Es tut uns leid, aber wir konnten nicht erkennen, Ihren Login-Daten. Bitte versuchen Sie es erneut."
+      login_fail: "Es tut uns leid, aber wir konnten nicht erkennen, Ihren Login-Daten. Bitte versuchen Sie es noch einmal."
       login_out_success: "Sie wurden abgemeldet."
       login_requred: "Sie müssen angemeldet sein, um Zugriff auf diese Funktion."
       login_success: "Anmeldung erfolgreich!"
       login_title: "Log-in zu Ihrem Konto"
-      logout_required: "Sie müssen angemeldet sein, um auf diese Seite zuzugreifen."
+      logout_required: ""
       my_dashboard: "My Dashboard"
       name: Name
       navigation: 

data/locales/el.yml

@@ -59,7 +59,7 @@ el:
       login_requred: "Πρέπει να έχετε συνδεθεί για να έχουν πρόσβαση σε αυτό το χαρακτηριστικό."
       login_success: "Η σύνδεση πραγματοποιήθηκε με επιτυχία!"
       login_title: "Σύνδεση με το λογαριασμό σας"
-      logout_required: "Πρέπει να έχετε συνδεθεί για να αποκτήσετε πρόσβαση σε αυτή τη σελίδα."
+      logout_required: ""
       my_dashboard: "Το ταμπλό"
       name: Όνομα
       navigation: 
@@ -73,7 +73,7 @@ el:
       password_confirmation_help: "Για να εξασφαλιστεί ότι τον κωδικό σας είναι σωστή βάλε πάλι εδώ."
       password_help: "Ο κωδικός πρόσβασης θα πρέπει να είναι τουλάχιστον έξι χαρακτήρες. Ο συνδυασμός των άνω και κάτω-γράμματα και οι αριθμοί που λειτουργεί καλά"
       password_mismatch: "Κωδικός αναντιστοιχία."
-      password_not_reset: "Κωδικός πρόσβασης δεν Επαναφ."
+      password_not_reset: "Κωδικός πρόσβασης δεν επαναφέρετε."
       password_reset: "Κωδικός επαναφέρετε."
       password_reset_email_subject: "Έχετε ζητήσει να αλλάξετε τον κωδικό πρόσβασης {{application_name}}"
       password_reset_link_sent: "Οδηγίες για να επαναφέρετε τον κωδικό σας έχουν αποστέλλονται σε εσάς. Ελέγξτε το email σας."
@@ -107,7 +107,7 @@ el:
       update_user: "Ενημέρωση χρήστη σας πληροφορίες"
       user_account_deleted: "Έχετε διαγραφεί επιτυχώς τον λογαριασμό σας."
       user_disable_problem: "Υπήρξε πρόβλημα στην απενεργοποίηση αυτού του χρήστη."
-      user_disabled: "Χρήστης με αναπηρία"
+      user_disabled: "Χρηστών με ειδικές ανάγκες"
       user_enable_problem: "Υπήρξε ένα πρόβλημα που επιτρέπει αυτό το χρήστη."
       user_enabled: "Χρήστη τη δυνατότητα"
       user_marked_active: "Χρήστης έχει επισημανθεί ως ενεργό"
@@ -123,4 +123,4 @@ el:
       welcome: "Καλώς ορίσατε"
       welcome_email_subject: "Καλώς ήλθατε στο {{application_name}}"
       welcome_message: "Καλώς ήρθατε στην κοπριά. Το σύστημα αυτό παρέχει τα βασικά στοιχεία για να σας βοηθήσει να οικοδομήσουμε την ιστοσελίδα σας."
-      what_is_the_email: "Ποια είναι η διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιούνται για τη δημιουργία του λογαριασμού σας;"
+      what_is_the_email: "Ποια είναι η διεύθυνση ηλεκτρονικού ταχυδρομείου που χρησιμοποιείται για τη δημιουργία του λογαριασμού σας;"

data/locales/en.yml

@@ -1,15 +1,15 @@
 en:
   muck:
     users:
-      register_account: Register for a {{application_name}} account
-      already_registered: Already a member?
+      register_account: "Register for a {{application_name}} account"
+      already_registered: "Already a member?"
       sign_in_now: Sign in now!
       sign_in: Sign In
       sign_in_title: Sign In
       sign_out_title: Sign Out
       sign_up: Sign Up
-      thanks_sign_up: Thanks for signing up!
-      thanks_sign_up_login: Thanks for signing up! You may login now
+      thanks_sign_up: "Thanks for signing up!"
+      thanks_sign_up_login: "Thanks for signing up! You may login now"
       thanks_sign_up_check: "Your account has been created. Please check your e-mail for your account activation instructions!"
       welcome_message: "Welcome to muck.  This system provides the basic components to help you build your website."
       username_not_available: Username not available
@@ -97,7 +97,7 @@ en:
       login_out_success: "You have been logged out."
       login_fail: "We're sorry, but we couldn't recognize your login information.  Please try again."
       login_requred: "You must be logged in to access this feature."
-      logout_required: "You must be logged out to access this page."
+      logout_required: ""
       permission_denied: "You don't have permission to complete the requested action."
       access_denied: "You don't have permission to access the requested page."
       user_update: "You're user information has been updated."

data/locales/es.yml

@@ -59,7 +59,7 @@ es:
       login_requred: "Tienes que estar registrado para acceder a esta función."
       login_success: "Inicio de sesión exitoso!"
       login_title: "Acceda a su cuenta"
-      logout_required: "Tienes que estar registrado para acceder a esta página."
+      logout_required: ""
       my_dashboard: "Mi Escritorio"
       name: Nombre
       navigation: 

data/locales/et.yml

@@ -0,0 +1,126 @@
+--- 
+et: 
+  muck: 
+    roles: 
+      assign_role: "Määra roll"
+      edit_roles: "Edit Rollid"
+      remove_role: "Eemalda roll"
+      role_created: "Roll on edukalt loodud."
+      roles: Rollid
+    users: 
+      access_denied: "Sul ei ole juurdepääsu taotletud lehel."
+      account_activated: "Teie konto on aktiveeritud! Nüüd saad login."
+      account_not_activated: "Teie {{application_name}} konto ei ole veel aktiveeritud."
+      activation_complete: "Aktiveerimine Complete"
+      activation_instructions: "Aktiveerimise juhised"
+      activation_not_found: "Activation koodi ei leitud. Palun proovi luua uue konto."
+      admin: 
+        activate_all_inactive_users: "Aktiveeri Kõik Mitteaktiivne Kasutajad"
+        activate_all_inactive_users_confirm: "Kas olete kindel, et soovite aktiveerida kõik mitteaktiivsed kasutajad süsteemi? Seda ei saa tagasi võtta!"
+        search_users: "Otsi kasutajaid"
+        show_emails: "Show sähköposteista"
+        unactivated_users: "On {{count}} unactivated kasutajad"
+      admin_users_title: "Kasutaja Administratsioon"
+      all_users: "Kõik kasutajad"
+      already_activated: "Sinu konto on juba aktiveeritud. Saad sisse allpool."
+      already_logged_in: "Te olete juba sisse loginud ja ei ole vaja taastada oma parooli."
+      already_registered: "Already a member?"
+      cannot_deactivate_yourself: "Sa ei saa välja lülitada ennast!"
+      change_password: "Muuda parool"
+      change_your_password: "Muuda parooli"
+      choose_member_name: "Member name"
+      complete_profile: "Täitke oma profiil"
+      confirm_delete_account: "Kas olete kindel, et soovite kustutada oma konto? \\ NSee ei saa tagasi võtta."
+      confirm_password: "Kinnita parool"
+      confirm_select_new_password: "Kinnita Parool Muuda"
+      could_not_find_reset_code: "Ei suutnud leida paroolilähtestusketas koodi. Palun proovige uuesti oma parool uuesti."
+      could_not_find_user_with_email: "Ei suutnud leida kasutaja, et e-posti aadress."
+      current_password: "Praegune parool"
+      delete_my_account: "Kustuta Minu kasutajakonto ja kõik minu andmed."
+      delete_this_user: "Kustuta see kasutaja."
+      edit_profile: "Muuda profiili"
+      email_address: Meiliaadress
+      email_available: "Post saadaval"
+      email_empty: "Anna meiliaadress"
+      email_help: "Palun kasutage kehtivat, praegune e-posti aadress. Me ei jaga ega spam e-posti aadress."
+      email_invalid: "Vigane e-posti"
+      email_not_available: "E-mail on juba kasutusel. {{reset_password_help}}"
+      email_recover_prompt: "Palun emaili olete koos taastuda parool."
+      first_name: Eesnimi
+      forgot_password: "Unustasid salasõna"
+      forgot_username: "Unustasid Kasutajanimi"
+      forgot_your_password: "Unustasid parooli?"
+      forgot_your_username: "Unustasid oma kasutajanime?"
+      invalid_username: "Vigane kasutajanimi"
+      join_application_name: "Liitu ja saad seda teha"
+      last_name: Perekonnanimi
+      login_fail: "Meil on kahju, kuid me ei tunne oma sisselogimise andmeid. Palun proovige uuesti."
+      login_out_success: "Oled välja logitud."
+      login_requred: "Sa pead olema sisse logitud, et kasutada seda funktsiooni."
+      login_success: "Sisselogimine õnnestus!"
+      login_title: "Logi sisse oma kontole"
+      logout_required: ""
+      my_dashboard: "Minu Armatuurlaud"
+      name: Nimi
+      navigation: 
+        all_users: "Kõik kasutajad"
+        inactive_users: "Mitteaktiivne Kasutajad"
+        search_users: "Otsi kasutajaid"
+      new_password_doesnt_match: "Uus parool ei sobi Parooli kinnitus."
+      old_password_incorrect: "Teie vana parool on vale."
+      password: Salasõna
+      password_cannot_be_blank: "Salasõna välja ei saa tühjaks."
+      password_confirmation_help: "Selleks et tagada, et parool on õige, sisestage see uuesti siin."
+      password_help: "Sinu parool peab olema vähemalt kuus märki pikad. A Mix ülemise ja alumise-tähti ja numbreid toimib hästi"
+      password_mismatch: "Parool ei kattu."
+      password_not_reset: "Parool ei ole nullitud."
+      password_reset: Paroolilähtestusketas.
+      password_reset_email_subject: "Soovisid, et muuta oma {{application_name}} parooli"
+      password_reset_link_sent: "Juhised parooli on emailitaks teile. Palun kontrollige oma e-posti."
+      password_updated: "Salasõna edukalt uuendatud."
+      permission_denied: "Sul ei ole lõpule nõutud meetmeid."
+      problem_changing_password: "Probleem, muutes oma parooli. {{errors}}"
+      problem_creating_account: "Probleem konto loomisel. Paranda järgmised vead:"
+      problem_editing_account: "Probleem uuendasite teavet."
+      recover_password: "Recover Password"
+      recover_password_prompt: "(Kui sa unustasid oma salasõna taastada see siia)"
+      register_account: "Registreeri "{{application_name}} konto"
+      register_for_account: "Registreeri konto"
+      remember_me: "Mäleta mind"
+      remove_my_account: "Kustuta minu konto"
+      request_username: "Soov Kasutajanimi"
+      reset_password: Parooli
+      reset_your_password: Parooli
+      select_new_password: "Valige uus parool"
+      sign_in: "Logi sisse"
+      sign_in_now: "Registreeru nüüd!"
+      sign_in_title: "Logi sisse"
+      sign_out_title: "Sign Out"
+      sign_up: Registreeru
+      sign_up_now: "Sign up Now"
+      sorry_invalid_reset_code: "Meil on kahju, kuid me ei suutnud leida oma konto. Kui sul on küsimusi proovida kopeerige URL oma e-posti brauserisse või taaskäivitamisel taastada parool protsessi."
+      terms_and_service: "Kilkates' Sisselogimine nüüd olete nõus vastama {{tos_link_anchor}}Terms and Conditions{{link_end}}."
+      thanks_sign_up: "Täname, et kirjauduit up!"
+      thanks_sign_up_check: "Teie konto on loodud. Palun kontrollige oma e-posti oma konto aktiveerimise juhised!"
+      thanks_sign_up_login: "Täname, et kirjauduit up! Võite login nüüd"
+      update_profile: "Uuenda oma profiili"
+      update_user: "Uuendage oma kasutajateave"
+      user_account_deleted: "Olete edukalt kustutatud oma konto."
+      user_disable_problem: "Seal oli probleem kustutad selle kasutaja."
+      user_disabled: "Kasutaja puuetega"
+      user_enable_problem: "Probleem, mis võimaldab selle kasutaja."
+      user_enabled: "Kasutaja võimaldanud"
+      user_marked_active: "Kasutaja on märgistatud aktiivne"
+      user_marked_inactive: "Kasutaja on märgistatud mitteaktiivsete"
+      user_successfully_deleted: "Kasutaja {{login}} edukalt kustutatud."
+      user_update: "Sa oled kasutaja andmed on uuendatud."
+      username: Kasutajanimi
+      username_available: "Kasutajanimi saadaval"
+      username_help: "Te saate kasutada 6 kuni 20 tähemärki. Kui nimi, mida soovite ei ole võimalik proovida, lisades numbreid või kirjavahemärke."
+      username_not_available: "Kasutaja ei ole kättesaadav"
+      username_recover_prompt: "Palun esitada e-posti aadress, mida kasutasite, kui te oma konto loonud, teie kasutajanimi emailitakse teile."
+      username_sent: "Sinu kasutajanimi on saadetud emailitaks teile. Kontrollige Email."
+      welcome: "Tere tulemast"
+      welcome_email_subject: "Tere tulemast {{application_name}}"
+      welcome_message: "Tere tulemast Raiskama. See süsteem annab põhilisi komponente, mis aitavad teil ehitada oma veebilehel."
+      what_is_the_email: "Mis on e-posti aadress, mida kasutatakse luua oma konto?"