tiny_core_accounts 0.0.1 → 0.0.2

data/lib/tiny_core/acts/user_account.rb

@@ -27,7 +27,7 @@ module TinyCore
 
       module InstanceMethods
         def after_initialize
-          extend "::Role::Account::#{self.role.classify}".constantize
+          extend "::Role::Account::#{self.role.classify}".constantize if self.role
         end
 
       protected

data/lib/tiny_core/role/account/admin.rb

@@ -0,0 +1,17 @@
+module TinyCore
+  module Role
+    module Account
+      module Admin
+        include TinyCore::Role
+  
+        def method_missing(method)
+          if method.to_s =~ /^can_.*\?$/
+            true
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tiny_core/role/account/user.rb

@@ -0,0 +1,9 @@
+module TinyCore
+  module Role
+    module Account
+      module User
+        include TinyCore::Role
+      end
+    end
+  end
+end

data/rails_generators/tiny_account/templates/accounts_de.yml

@@ -0,0 +1,79 @@
+--- 
+de: 
+  account: 
+    role: 
+      admin: Admin
+      user: Benutzer
+  accounts: 
+    edit: 
+      edit_account: "Konto bearbeiten"
+    form: 
+      could_not_create_account: "Konnte Konto nicht erstellen"
+      name: Kontoname
+      name_hint: "Zum Beispiel der Name Ihrer Organisation. Hinweis: Alle Benutzer des Kontos können alle Funktionstests sehen"
+      save_account: "Konto speichern"
+    index: 
+      details: Details
+      edit: Bearbeiten
+      name: Name
+      new_account: "Neues Konto"
+      options: Optionen
+    info: 
+      name: Name
+    new: 
+      new_account: "Neues Konto"
+    show: 
+      account: "Konto {{account}}"
+      add_existing: "Vorhandenen Benutzer zum Konto hinzufügen"
+      add_new: "Neuen Benutzer für Konto registrieren"
+      change: Ändern
+      name: Name
+      options: Optionen
+      really_remove_user_from_account: "Wollen Sie wirklich diesen Benutzer vom Konto entfernen?"
+      remove: Entfernen
+      role: Rolle
+      users: Benutzer
+    tabs: 
+      edit: Bearbeiten
+      information: Information
+  activerecord: 
+    errors: 
+      models: 
+        user_account: 
+          attributes: 
+            email: 
+              not_found: "gehört zu keinem registrierten Benutzer"
+            user_id: 
+              taken: "ist bereits diesem Konto zugeordnet"
+  admin: 
+    accounts: 
+      edit: 
+        could_not_update_account: "Konnte das Konto nicht aktualisieren"
+        edit_account: "Konto bearbeiten"
+        name: Name
+        save_account: "Konto speichern"
+      index: 
+        all_accounts: "Alle Konten"
+        edit: Bearbeiten
+        name: Name
+        no_accounts: "Es gibt bisher keine Konten."
+        options: Optionen
+        users: Benutzer
+      show: 
+        account: "Konto {{account}}"
+        no_users: "bisher keine Benutzer"
+        users: Benutzer
+      tabs: 
+        edit: Bearbeiten
+        information: Information
+  flash: 
+    error: 
+      assign_roles: "Konnte die Rolle dem Benutzer nicht zuteilen"
+      create_account_first: "Sie müssen zuerst einem Konto zugewiesen sein"
+    notice: 
+      assign_roles: "Die Rolle wurde dem Benutzer erfolgreich zugeteilt"
+      created_account: "Konto {{account}} wurde erfolgreich erstellt"
+      created_user_account: "Benutzer wurde erfolgreich dem Konto hinzugefügt"
+      removed_user_account: "Benutzer wurde erfolgreich vom Konto entfernt"
+      switched_account: "Erfolgreich zu Konto {{account}} gewechselt"
+      updated_account: "Konto {{account}} wurde erfolgreich aktualisiert"

data/rails_generators/tiny_account/templates/accounts_en.yml

@@ -0,0 +1,79 @@
+--- 
+en: 
+  account: 
+    role: 
+      admin: Admin
+      user: User
+  accounts: 
+    edit: 
+      edit_account: "Edit Account"
+    form: 
+      could_not_create_account: "Could not create account"
+      name: Name
+      name_hint: "For example your organization's name. Note that every user in an account can see all health checks"
+      save_account: "Save account"
+    index: 
+      details: Details
+      edit: Edit
+      name: Name
+      new_account: "New Account"
+      options: Options
+    info: 
+      name: Name
+    new: 
+      new_account: "New Account"
+    show: 
+      account: "Account {{account}}"
+      add_existing: "Add existing user to this account"
+      add_new: "Register new user for this account"
+      change: Change
+      name: Name
+      options: Options
+      really_remove_user_from_account: "Do you really want to remove the user from this account?"
+      remove: Remove
+      role: Role
+      users: Users
+    tabs: 
+      edit: Edit
+      information: Information
+  activerecord: 
+    errors: 
+      models: 
+        user_account: 
+          attributes: 
+            email: 
+              not_found: "does not belong to an existing user"
+            user_id: 
+              taken: "is already assigned to this account"
+  admin: 
+    accounts: 
+      edit: 
+        could_not_update_account: "Could not update account"
+        edit_account: "Edit account"
+        name: Name
+        save_account: "Save account"
+      index: 
+        all_accounts: "All accounts"
+        edit: Edit
+        name: Name
+        no_accounts: "There are no accounts yet"
+        options: Options
+        users: Users
+      show: 
+        account: "Account {{account}}"
+        no_users: "no users yet"
+        users: Users
+      tabs: 
+        edit: Edit
+        information: Information
+  flash: 
+    error: 
+      assign_roles: "Could not assign account role to user"
+      create_account_first: "You need to be assigned to an account first"
+    notice: 
+      assign_roles: "Successfully assigned account role to user"
+      created_account: "Successfully created account {{account}}"
+      created_user_account: "Successfully added this user to the account"
+      removed_user_account: "Successfully removed user from this account"
+      switched_account: "Successfully switched to account {{account}}"
+      updated_account: "Successfully updated account {{account}}"

data/rails_generators/tiny_account/templates/create_accounts.rb

@@ -4,9 +4,20 @@ class CreateAccounts < ActiveRecord::Migration
       t.string :name
       t.timestamps
     end
+
+    create_table :user_accounts do |t|
+      t.integer :user_id
+      t.integer :account_id
+      t.string :role, :default => "user"
+      t.timestamps
+    end
+
+    add_column :users, :current_account_id, :integer
   end
 
   def self.down
+    remove_column :users, :current_account_id
+    drop_table :user_accounts
     drop_table :accounts
   end
 end

data/rails_generators/tiny_account/templates/role/account/admin.rb

@@ -0,0 +1,3 @@
+module Role::Account::Admin
+  include TinyCore::Role::Account::Admin
+end

data/rails_generators/tiny_account/templates/role/account/user.rb

@@ -0,0 +1,3 @@
+module Role::Account::User
+  include TinyCore::Role::Account::User
+end

data/rails_generators/tiny_account/tiny_account_generator.rb

@@ -10,8 +10,10 @@ class TinyAccountGenerator < Rails::Generator::Base
       m.directory 'app/controllers/admin'
       m.directory 'app/views/accounts'
       m.directory 'app/views/admin/accounts'
+      m.directory 'config/locales'
       m.directory 'test/unit'
       m.directory 'test/functional'
+      m.directory 'test/functional/admin'
 
       # Classes and tests.
       m.file "account.rb", 'app/models/account.rb'
@@ -21,9 +23,13 @@ class TinyAccountGenerator < Rails::Generator::Base
       m.file "accounts_controller.rb", 'app/controllers/accounts_controller.rb'
       m.file "user_accounts_controller.rb", 'app/controllers/user_accounts_controller.rb'
       m.file "admin_accounts_controller.rb", 'app/controllers/admin/accounts_controller.rb'
-      m.file "accounts_controller_test.rb", 'test/functional/accounst_controller_test.rb'
-      m.file "user_accounts_controller_test.rb", 'test/functional/user_accounst_controller_test.rb'
-      m.file "admin_accounts_controller_test.rb", 'test/functional/admin_accounts_controller_test.rb'
+      m.file "accounts_controller_test.rb", 'test/functional/accounts_controller_test.rb'
+      m.file "user_accounts_controller_test.rb", 'test/functional/user_accounts_controller_test.rb'
+      m.file "admin_accounts_controller_test.rb", 'test/functional/admin/accounts_controller_test.rb'
+      
+      # Locales
+      m.file "accounts_en.yml", 'config/locales/accounts_en.yml'
+      m.file "accounts_de.yml", 'config/locales/accounts_de.yml'
       
       # Views
       base_dir = File.dirname(__FILE__) + '/templates'
@@ -33,9 +39,7 @@ class TinyAccountGenerator < Rails::Generator::Base
       end
       
       # Migrations
-      m.migration_template 'create_accounts.rb', 'db/migrate', :migration_file_name => 'create_accounts.rb'
-      m.migration_template 'create_user_accounts.rb', 'db/migrate', :migration_file_name => 'create_user_accounts.rb'
-      m.migration_template 'add_current_account_id_to_users.rb', 'db/migrate', :migration_file_name => 'add_current_account_id_to_users.rb'
+      m.migration_template 'create_accounts.rb', 'db/migrate', :migration_file_name => 'create_accounts'
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tiny_core_accounts
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Thomas Kadauke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-27 00:00:00 +02:00
+date: 2010-08-31 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -35,6 +35,8 @@ files:
 - lib/tiny_core/controllers/application.rb
 - lib/tiny_core/controllers/user_accounts.rb
 - lib/tiny_core/has/accounts.rb
+- lib/tiny_core/role/account/admin.rb
+- lib/tiny_core/role/account/user.rb
 - lib/tiny_core_accounts.rb
 - rails_generators/tiny_account/templates/account.rb
 - rails_generators/tiny_account/templates/account_test.rb
@@ -49,7 +51,8 @@ files:
 - rails_generators/tiny_account/templates/accounts/show.html.erb
 - rails_generators/tiny_account/templates/accounts_controller.rb
 - rails_generators/tiny_account/templates/accounts_controller_test.rb
-- rails_generators/tiny_account/templates/add_current_account_id_to_users.rb
+- rails_generators/tiny_account/templates/accounts_de.yml
+- rails_generators/tiny_account/templates/accounts_en.yml
 - rails_generators/tiny_account/templates/admin/accounts/_index.html.erb
 - rails_generators/tiny_account/templates/admin/accounts/_tabs.html.erb
 - rails_generators/tiny_account/templates/admin/accounts/edit.html.erb
@@ -58,7 +61,8 @@ files:
 - rails_generators/tiny_account/templates/admin_accounts_controller.rb
 - rails_generators/tiny_account/templates/admin_accounts_controller_test.rb
 - rails_generators/tiny_account/templates/create_accounts.rb
-- rails_generators/tiny_account/templates/create_user_accounts.rb
+- rails_generators/tiny_account/templates/role/account/admin.rb
+- rails_generators/tiny_account/templates/role/account/user.rb
 - rails_generators/tiny_account/templates/user_account.rb
 - rails_generators/tiny_account/templates/user_account_test.rb
 - rails_generators/tiny_account/templates/user_accounts_controller.rb
@@ -97,6 +101,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Insert description here
+summary: Simple account management based on tiny_core_users
 test_files: []
 

data/rails_generators/tiny_account/templates/add_current_account_id_to_users.rb

@@ -1,9 +0,0 @@
-class AddCurrentAccountIdToUsers < ActiveRecord::Migration
-  def self.up
-    add_column :users, :current_account_id, :integer
-  end
-
-  def self.down
-    remove_column :users, :current_account_id
-  end
-end

data/rails_generators/tiny_account/templates/create_user_accounts.rb

@@ -1,13 +0,0 @@
-class CreateUserAccounts < ActiveRecord::Migration
-  def self.up
-    create_table :user_accounts do |t|
-      t.integer :user_id
-      t.integer :account_id
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :user_accounts
-  end
-end