Merge pull request #17 from nwwatson/master

Small changes made to authentication

Author: Nicholas W. Watson

app/controllers/entropi_social/user_registrations_controller.rb

@@ -12,6 +12,9 @@ def create
         @user = User.new(params[:user])
 
         if @user.save
+          
+          flash[:notice] = I18n.t("devise.registrations.signed_up")
+          
           sign_in_and_redirect(:user, @user)
         else
           clean_up_passwords(@user)

app/models/asset_photo.rb

@@ -1,4 +1,5 @@
 class AssetPhoto < ActiveRecord::Base
   belongs_to :photoable, :polymorphic => true
   belongs_to :photo
-end
+end
+

app/views/entropi_social/user_sessions/new.html.erb

@@ -1,4 +1,4 @@
-<div class="modal active">
+<div class="modal active well">
   <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
     <div class="modal-header">
       <h3>Log In</h3>

config/initializers/devise.rb

@@ -70,22 +70,6 @@
 
   # Setup a pepper to generate the encrypted password.
   # config.pepper = "1b7f9bac66e61d8d7fa8fe02c5ca25fc7c774ec4b1e1a56117e8eec0f53fb6f66f6d03b85ab727dd7cc314516ead92e8792a995fc9120a273790b0f8382067b8"
-
-  # ==> Configuration for :invitable
-  # The period the generated invitation token is valid, after
-  # this period, the invited resource won't be able to accept the invitation.
-  # When invite_for is 0 (the default), the invitation won't expire.
-  config.invite_for = 3.weeks
-  
-  # Number of invitations users can send.
-  # If invitation_limit is nil, users can send unlimited invitations.
-  # If invitation_limit is 0, users can't send invitations.
-  # If invitation_limit n > 0, users can send n invitations.
-  # Default: nil
-  config.invitation_limit = 15
-  
-  # The key to be used to check existing users when sending an invitation
-  config.invite_key = :email
 
   # Flag that force a record to be valid before being actually invited 
   # Default: false

entropi_social.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency 'rails', '~> 3.2.0'
-  s.add_dependency 'devise', '1.4.9'
-  s.add_dependency "devise_invitable", "~> 0.6.0"
+  s.add_dependency 'rails'
+  s.add_dependency 'devise'
+  #s.add_dependency "devise_invitable", "~> 0.6.0"
   s.add_dependency "carrierwave"
   s.add_dependency "squeel", "~> 0.9.5"
   s.add_development_dependency "sqlite3"

lib/entropi_social.rb

@@ -1,6 +1,5 @@
 require "entropi_social/engine"
 require 'devise'
-require 'devise_invitable'
 
 require 'entropi_social/authorize'
 require 'entropi_social/commentable'

lib/generators/entropi_social.rb

@@ -4,7 +4,7 @@ module EntropiSocial
   module Generators
     class Base < ::Rails::Generators::Base
       def self.source_root
-        @_entropi_social_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'alohomora', generator_name, 'templates'))
+        @_entropi_social_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'entropi_social', generator_name, 'templates'))
       end
 
       def self.banner
@@ -18,6 +18,10 @@ def add_gem(name, options = {})
         File.open(destination_path("Gemfile"), 'a') { |f| f.write("\n") } unless gemfile_content =~ /\n\Z/
         gem name, options unless gemfile_content.include? name
       end
+      
+      def destination_path(path)
+        File.join(destination_root, path)
+      end
 
       def print_usage
         self.class.help(Thor::Base.shell.new)

lib/generators/entropi_social/install/install_generator.rb

@@ -3,36 +3,44 @@
 
 module EntropiSocial
   module Generators
-    class InstallGenerator < Base
+    class InstallGenerator < EntropiSocial::Generators::Base
       include ::Rails::Generators::Migration
 
       def copy_initializers
 
       end
 
       def copy_configuration
-        copy_file 'devise_invitable.en.yml', 'config/'
-        copy_file 'devise.en.yml', 'config'
+        copy_file 'devise_invitable.en.yml', 'config/devise_invitable.en.yml'
+        copy_file 'devise.en.yml', 'config/devise.en.yml'
       end
 
       def copy_models
-        #copy_file 'user.rb', 'app/models/user.rb'
+        copy_file 'user.rb', 'app/models/user.rb'
+        copy_file 'profile.rb', 'app/models/profile.rb'
       end
 
       def copy_migrations
-        #migration_template 'create_identities.rb', 'db/migrate/create_identities.rb'
+        migration_template '20111118193950_setup_entropi_social.rb', 'db/migrate/20111118193950_setup_entropi_social.rb'
       end
 
       def add_gems
-        #add_gem 'omniauth-identity'
-
+        add_gem 'omniauth-identity'
+        add_gem 'squeel', '~> 0.9.5'
+        add_gem 'bootstrapped','0.0.6'
+        add_gem 'carrierwave'
+        add_gem 'fog'
+        add_gem 'rmagick', '2.12.2'
       end
 
       def add_alohomora_routes
-        #route %Q(match "/register", to: "identities#new", :as => "register")
+        route %Q(mount EntropiSocial::Engine => '/', :as => 'entropi_social')
       end
+            
       private
 
+        
+      
         def self.next_migration_number( dirname )
           next_migration_number = current_migration_number(dirname) + 1
           if ActiveRecord::Base.timestamped_migrations

lib/generators/entropi_social/install/templates/20111118193950_setup_entropi_social.rb

@@ -0,0 +1,134 @@
+class SetupEntropiSocial < ActiveRecord::Migration
+  def up
+    create_table :users do |t|
+      t.string    :username
+      t.integer   :invitation_limit,  :default => 0
+      t.database_authenticatable :null => false
+      t.invitable
+      t.recoverable
+      t.rememberable
+      t.trackable
+      t.lockable  :lock_strategy => :failed_attempts, :unlock_strategy => :both
+      t.timestamps
+    end
+    
+    # Setup Indexes for Users table
+    add_index :users, :email,                :unique => true
+    add_index :users, :reset_password_token, :unique => true
+    add_index :users, :unlock_token,         :unique => true
+    add_index :users, :username,             :unique => true
+    add_index :users, :invitation_token
+    
+    create_table :profiles do |t|
+      t.references :user
+      t.string  :first_name
+      t.string :last_name
+      t.date  :birth_date
+      t.integer :avatar_id
+      t.text :about
+      t.timestamps
+    end
+    
+    create_table :groups do |t|
+      t.string :title
+      t.integer :avatar_id
+      t.references :profile
+      t.references :groupable, :polymorphic => true
+      t.timestamps
+    end
+    
+    create_table :friendships do |t|
+      t.integer :inviter_id
+      t.integer :invited_id
+      t.string :status
+      t.timestamps
+    end
+    
+    create_table :memberships do |t|
+      t.integer :group_id
+      t.integer :profile_id
+      t.boolean :admin
+      t.timestamps
+    end
+    
+    create_table :likes do |t|
+      t.integer :user_id
+      t.references :likable, :polymorphic => true
+      t.timestamps
+    end
+    
+    add_index :likes, :likable_id
+    add_index :likes, :likable_type
+    
+    create_table :photos do |t|
+      t.boolean :is_primary
+      t.string :asset
+      t.references :photoable, :polymorphic => true
+      t.references :profile_id
+      t.timestamps
+    end
+    
+    add_index :photos, :photoable_id
+    add_index :photos, :photoable_type
+    
+    create_table :comments do |t|
+      t.text :comment
+      t.references :commentable, :polymorphic => true
+      t.references :profile
+      t.string :role, :default => "comments"
+      t.timestamps
+    end
+    
+    add_index :comments, :commentable_type
+    add_index :comments, :commentable_id
+    add_index :comments, :profile_id
+    
+    create_table :accesses do |t|
+      t.integer :group_id
+      t.references :accessible, :polymorphic => true
+      t.timestamps
+    end
+    
+    add_index :accesses, :group_id
+    add_index :accesses, :accessible_id
+    add_index :accesses, :accessible_type
+    
+    create_table :albums do |t|
+      t.string :name
+      t.string :description
+      t.references :profile
+      t.timestamps
+    end
+    
+    create_table :sessions do |t|
+      t.string :session_id, :null => false
+      t.text :data
+      t.timestamps
+    end
+
+    add_index :sessions, :session_id
+    add_index :sessions, :updated_at
+    
+    # Create Default User
+    profile = Profile.new
+    profile.first_name = 'System'
+    profile.last_name = 'Administrator'
+    profile.birth_date = Time.now
+    User.create!(:profile => profile, :username => 'timeline', :email => 'administrator@timeline.com', :password => 'password', :password_confirmation => "password")
+    
+  end
+
+  def down
+    
+    drop_table :users
+    drop_table :profiles
+    drop_table :groups
+    drop_table :friendships
+    drop_table :memberships
+    drop_table :comments
+    drop_table :likes
+    drop_table :photos
+    drop_table :accesses
+    
+  end
+end

lib/generators/entropi_social/install/templates/profile.rb

@@ -0,0 +1,3 @@
+class Profile < EntropiSocial::Profile 
+  
+end