fullstack-admin 0.2.2 → 0.2.3

data/Gemfile

@@ -16,7 +16,6 @@ gem "plupload-rails"
 gem "has-attached", '~> 0.2.4'
 
 gem 'bootstrap-datepicker-rails'
-gem 'sorcery'
 
 group :development do
   gem "jeweler"

data/Gemfile.lock

@@ -85,8 +85,6 @@ GEM
     facebox-rails (0.1.2)
       railties (~> 3.0)
       thor (~> 0.14)
-    faraday (0.8.4)
-      multipart-post (~> 1.1)
     flash_cookie_session (1.1.3)
       rails (~> 3.0)
     formtastic (2.2.1)
@@ -131,7 +129,6 @@ GEM
     httparty (0.9.0)
       multi_json (~> 1.0)
       multi_xml
-    httpauth (0.2.0)
     i18n (0.6.0)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -166,14 +163,8 @@ GEM
       rails
     multi_json (1.3.6)
     multi_xml (0.5.1)
-    multipart-post (1.1.5)
     net-ssh (2.5.2)
     nokogiri (1.5.5)
-    oauth (0.4.7)
-    oauth2 (0.6.1)
-      faraday (~> 0.7)
-      httpauth (~> 0.1)
-      multi_json (~> 1.3)
     orm_adapter (0.4.0)
     paperclip (3.2.0)
       activemodel (>= 3.0.0)
@@ -229,10 +220,6 @@ GEM
     remotipart (1.0.2)
     resource-presentation-helpers (0.1.1)
       rails
-    sorcery (0.7.13)
-      bcrypt-ruby (~> 3.0.0)
-      oauth (~> 0.4.4)
-      oauth2 (~> 0.6.0)
     sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -267,4 +254,3 @@ DEPENDENCIES
   meta_search
   plupload-rails
   rails (~> 3.2)
-  sorcery

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/app/controllers/admin/base_controller.rb

@@ -1,15 +1,9 @@
 class Admin::BaseController < ApplicationController
-  before_filter :require_login
+  before_filter :authenticate_administrator!
   before_filter :fetch_current_resource
   
   layout 'admin'
-
-  protected
-
-  def not_authenticated
-    redirect_to new_admin_session_url, :alert => "First login to access this page."
-  end
-  
+    
   class << self
     def responder
     ::Admin::Responder
@@ -28,7 +22,7 @@ class Admin::BaseController < ApplicationController
 
 
   def subject
-    @subject ||= ::Admin::SubjectModelAdapter.new(current_user)
+    @subject ||= ::Admin::SubjectModelAdapter.new(current_administrator)
   end
 
   def current_resource_class

data/app/controllers/admin/sessions_controller.rb

@@ -1,27 +1,10 @@
-class Admin::SessionsController < ApplicationController
+class Admin::SessionsController < Devise::SessionsController
   layout 'login'
   
   def new
-    @user = Superuser.new
+    super
   end
   
-  def create
-    respond_to do |format|
-      if @user = login(params[:username],params[:password])
-        format.html { redirect_back_or_to("/", :notice => I18n.t("signed_in", :scope => "fullstack.admin", :default  => 'Signed in successfully.')) }
-        format.xml { render :xml => @user, :status => :created, :location => @user }
-      else
-        format.html { flash.now[:alert] = I18n.t("login_failed", :scope => "fullstack.admin", :default  => 'Login failed.'); render :action => "new" }
-        format.xml { render :xml => @user.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-    
-  def destroy
-    logout
-    redirect_to("/", :notice => I18n.t("signed_out", :scope => "fullstack.admin", :default  => 'Signed out successfully.'))
-  end
-
 end
 
 

data/app/models/administrator.rb

@@ -0,0 +1,28 @@
+class Administrator < ActiveRecord::Base
+
+  ## Database authenticatable
+  field :username, :null => false, :default => "", :index => { :unique => true }
+  field :email
+  field :encrypted_password, :null => false, :default => ""
+  timestamps
+
+  ## Trackable
+  field :sign_in_count, :as => :integer, :default => 0
+  field :current_sign_in_at, :as => :datetime
+  field :last_sign_in_at, :as => :datetime
+  field :current_sign_in_ip
+  field :last_sign_in_ip
+    
+  ## Lockable
+  field :failed_attempts, :integer, :default => 0
+  field :unlock_token
+  field :locked_at, :datetime
+      
+  devise :database_authenticatable, :validatable, :lockable, :trackable, :authentication_keys => [:username] 
+  attr_accessible :username, :email, :password, :password_confirmation
+  
+  def has_role?(role)
+    %w(administrator logged_in).include?( role.try(:to_s) ) ? true : false
+  end
+
+end

data/app/views/admin/_nav.html.erb

@@ -9,7 +9,7 @@
   </li>
   
     <%= dropdown_nav_item t('fullstack.admin.account', :default => "Account"), :icon => "user", :"icon_color" => :white do %>
-        <%= nav_item t('fullstack.admin.logout', :default => "Logout"), admin_sessions_path, :method => :delete %>
+        <%= nav_item t('fullstack.admin.logout', :default => "Logout"), destroy_administrator_session_path, :method => :delete %>
     <% end %>
   <% end %>
   

data/app/views/admin/sessions/new.html.erb

@@ -1,4 +1,8 @@
-<%= form_tag admin_sessions_path, :method => :post, :class => "login-box" do %>
+<% if resource.errors.any? %>
+<%= resource.errors.inspect %>
+<% end %>
+
+<%= form_for( resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => "login-box"} ) do |f| %>
   <div class="login-box-header">
     Login
   </div>
@@ -18,12 +22,12 @@
 
     <div class="input-prepend">
     	<span class="add-on"><i class="icon-user"></i></span>
-      <%= text_field_tag :username, nil, :placeholder => I18n.t("username", :scope => "helpers.label", :default => "Username") %>            
+      <%= f.text_field :username, :placeholder => I18n.t("username", :scope => "helpers.label", :default => "Username") %>            
     </div>
 
     <div class="input-prepend">
     	<span class="add-on"><i class="icon-lock"></i></span>
-      <%= password_field_tag :password, nil, :placeholder => I18n.t("password", :scope => "helpers.label", :default => "Password") %>            
+      <%= f.password_field :password, :placeholder => I18n.t("password", :scope => "helpers.label", :default => "Password") %>            
     </div>
   </div>
 

data/config/routes.rb

@@ -1,12 +1,11 @@
 Rails.application.routes.draw do
  
   mount Ckeditor::Engine => '/ckeditor'
-  
+
+  devise_for :administrators, :controllers => { :sessions => "admin/sessions" }  
   namespace :admin do
-    resources :sessions, :only => [:new, :create] do
-      match :destroy, :via => :delete, :on => :collection
-    end
-    
+ 
+ 
     resources :positionables, :only => [:index] do
       post :sort, :on => :collection
     end

data/fullstack-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-admin"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-11-05"
+  s.date = "2012-11-06"
   s.description = "Administration interface framework for fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -969,6 +969,7 @@ Gem::Specification.new do |s|
     "app/inputs/taglist_input.rb",
     "app/inputs/tags_input.rb",
     "app/inputs/text_input.rb",
+    "app/models/administrator.rb",
     "app/models/authenticatable.rb",
     "app/models/ckeditor/asset.rb",
     "app/models/ckeditor/attachment_file.rb",
@@ -979,7 +980,6 @@ Gem::Specification.new do |s|
     "app/models/registerable.rb",
     "app/models/rememberable.rb",
     "app/models/roleable.rb",
-    "app/models/superuser.rb",
     "app/models/suspendable.rb",
     "app/models/trackable.rb",
     "app/views/admin/_nav.html.erb",
@@ -1092,7 +1092,6 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<plupload-rails>, [">= 0"])
       s.add_runtime_dependency(%q<has-attached>, ["~> 0.2.4"])
       s.add_runtime_dependency(%q<bootstrap-datepicker-rails>, [">= 0"])
-      s.add_runtime_dependency(%q<sorcery>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["~> 3.2"])
@@ -1106,7 +1105,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<plupload-rails>, [">= 0"])
       s.add_dependency(%q<has-attached>, ["~> 0.2.4"])
       s.add_dependency(%q<bootstrap-datepicker-rails>, [">= 0"])
-      s.add_dependency(%q<sorcery>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
@@ -1121,7 +1119,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<plupload-rails>, [">= 0"])
     s.add_dependency(%q<has-attached>, ["~> 0.2.4"])
     s.add_dependency(%q<bootstrap-datepicker-rails>, [">= 0"])
-    s.add_dependency(%q<sorcery>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/lib/fullstack/admin.rb

@@ -33,7 +33,6 @@ require "plupload-rails"
 require "fullstack"
 require "bootstrap-datepicker-rails"
 require "fullstack"
-require 'sorcery'
 
 require 'fullstack/admin/engine'
 require 'fullstack/admin/resources'

data/lib/generators/fullstack/admin/install_generator.rb

@@ -33,19 +33,17 @@ eos
       
 
       def users
-        generate "sorcery:install remember_me activity_logging brute_force_protection --model Superuser"
+        generate "migration:from administrator"
         generate "migration:from user"
         append_to_file "db/seeds.rb" do
 <<-eos
 
 if Rails.env.development?
-  user = Superuser.new( :email => "admin@example.com",
-                    :password => "password" )
-                  
-  user.skip_confirmation! if user.respond_to?(:skip_confirmation!)             
-  user.save!
-  user.confirm! if user.respond_to?(:confirm)
-  user.has_role!(:administrator) if user.respond_to?(:has_role!)
+  user = Administrator.create!( 
+                    :username => "admin", 
+                    :email => "admin@example.com",
+                    :password => "password" 
+                    )
 end
   
 eos

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -187,22 +187,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sorcery
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -1179,6 +1163,7 @@ files:
 - app/inputs/taglist_input.rb
 - app/inputs/tags_input.rb
 - app/inputs/text_input.rb
+- app/models/administrator.rb
 - app/models/authenticatable.rb
 - app/models/ckeditor/asset.rb
 - app/models/ckeditor/attachment_file.rb
@@ -1189,7 +1174,6 @@ files:
 - app/models/registerable.rb
 - app/models/rememberable.rb
 - app/models/roleable.rb
-- app/models/superuser.rb
 - app/models/suspendable.rb
 - app/models/trackable.rb
 - app/views/admin/_nav.html.erb
@@ -1295,7 +1279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 445393833660587370
+      hash: -821323276577765542
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/models/superuser.rb

@@ -1,6 +0,0 @@
-class Superuser < ActiveRecord::Base
-  authenticates_with_sorcery!
-  def has_role?(r)
-    true
-  end
-end