easy_auth 0.2.1 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8031ade914227fa6a302b315b81ed1d770c983dc
+  data.tar.gz: 460ce79e6dc08a35bfa723d51e78022ec6f6f627
+SHA512:
+  metadata.gz: f61a2d1b0133d7e119fc5bc045b4b34bdcd647541d2edcdcd9c54edbc40416afd00b90ea9557edb649e5933e5a8da030cdfccb35e9cfe2bd43440fcb8bb94a33
+  data.tar.gz: 37c2b860b6c5319df03ecf7d159088d9db713a2f2aae59790bfa75610bdc0552951ce3cc85f78975436ef19acd6a164ead24f2bf3dc14a223312f6889ab1a780

data/README.md

@@ -2,9 +2,9 @@
 
 [![Build Status](https://secure.travis-ci.org/dockyard/easy_auth.png?branch=master)](http://travis-ci.org/dockyard/easy_auth)
 [![Dependency Status](https://gemnasium.com/dockyard/easy_auth.png?travis)](https://gemnasium.com/dockyard/easy_auth)
-[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/dockyard/easy_auth)
+[![Code Climate](https://codeclimate.com/github/dockyard/easy_auth.png)](https://codeclimate.com/github/dockyard/easy_auth)
 
-Dead simple drop in authentication for Rails
+Dead simple drop in authentication for Rails 3.2+
 
 ## Installation ##
 
@@ -47,8 +47,14 @@ Your application is now ready for EasyAuth.
 ## Usage ##
 
 You will need to use one of the many
-[plugins](https://github.com/dockyard/easy_auth/wiki/Plugins) available for EasyAuth to
-provide a specific authentication strategy.
+[plugins](https://github.com/dockyard/easy_auth/wiki/Plugins) available for EasyAuth to provide a specific authentication strategy.
+
+## What you get ##
+
+You `User` model will be setup with an association to `identities`. The modeling is pretty simple:
+
+![EasyAuth Identity Modeling](http://i.imgur.com/LBafe.png)
+
 
 ## Authors ##
 

data/Rakefile

@@ -1,6 +1,5 @@
 require 'bundler/setup'
 require 'rspec/core/rake_task'
-Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new('default') do |t|
   t.pattern = FileList['spec/**/*_spec.rb']
@@ -8,3 +7,4 @@ end
 
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
+Bundler::GemHelper.install_tasks

data/app/helpers/easy_auth_helper.rb

@@ -1,46 +1,3 @@
 module EasyAuthHelper
-  def self.included(base)
-    base.class_eval do
-      helper_method :current_account, :current_user, :account_signed_in?, :user_signed_in?, :account_not_signed_in?, :user_not_signed_in?
-    end
-  end
-
-  # Access the current account the users is authenticated with
-  #
-  # @return [Account] instance
-  def current_account
-    if session[:session_token] && session[:account_class]
-      begin
-        @current_account ||= session[:account_class].constantize.find_by_session_token(session[:session_token])
-      rescue
-        @current_account = nil
-        session.delete(:session_token)
-      end
-    elsif cookies[:remember_token]
-      begin
-        @current_account ||= EasyAuth.identity_model.find_by_remember_token(cookies[:remember_token]).account
-      rescue
-        @current_acount = nil
-        cookies.delete(:remember_token)
-      end
-    else
-      session.delete(:session_token)
-      cookies.delete(:remember_token)
-    end
-
-    @current_account
-  end
-  alias :current_user :current_account
-
-  # Should be used to test if user is authenticated
-  def account_signed_in?
-    current_account
-  end
-  alias :user_signed_in? :account_signed_in?
-
-  # Should be used to test if user is not authenticated
-  def account_not_signed_in?
-    !account_signed_in?
-  end
-  alias :user_not_signed_in? :account_not_signed_in?
+  include EasyAuth::Helpers::EasyAuth
 end

data/db/migrate/20120227014023_create_easy_auth_identities.rb

@@ -1,18 +1,14 @@
 class CreateEasyAuthIdentities < ActiveRecord::Migration
   def change
     create_table :identities do |t|
-      t.string  :username
+      t.string  :uid
       t.string  :token
       t.string  :account_type
       t.integer :account_id
-      t.string  :reset_token
-      t.string  :remember_token
       t.string  :type
       t.timestamps
     end
 
-    [:username, :reset_token, :remember_token].each do |column|
-      add_index :identities, column
-    end
+    add_index :identities, :uid, using: :gin
   end
 end

data/lib/easy_auth/active_support/concern.rb

@@ -0,0 +1,37 @@
+module ActiveSupport::Concern
+  def append_features(base)
+    if base.instance_variable_defined?("@_dependencies")
+      base.instance_variable_get("@_dependencies") << { :method => :include, :module => self }
+      return false
+    else
+      return false if base < self
+      @_dependencies.each { |dep| Hash === dep ? base.send(dep[:method], dep[:module]) : base.send(:include, dep) }
+      super
+      base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
+      base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
+    end
+  end
+
+  def prepend_features(base)
+    if base.instance_variable_defined?("@_dependencies")
+      base.instance_variable_get("@_dependencies").unshift({ :method => :prepend, :module => self })
+      return false
+    else
+      return false if base < self
+      super
+      base.singleton_class.send(:prepend, const_get("ClassMethods")) if const_defined?("ClassMethods")
+      @_dependencies.each { |dep| Hash === dep ? base.send(dep[:method], dep[:module]) : base.send(:prepend, dep) }
+      base.class_eval(&@_prepended_block) if instance_variable_defined?("@_prepended_block")
+    end
+  end
+
+  def prepended(base = nil, &block)
+    if base.nil?
+      raise MultipleIncludedBlocks if instance_variable_defined?("@_prepended_block")
+
+      @_prepended_block = block
+    else
+      super
+    end
+  end
+end

data/lib/easy_auth/controllers/authenticated.rb

@@ -1,7 +1,7 @@
 module EasyAuth::Controllers::Authenticated
-  extend EasyAuth::ReverseConcern
+  extend ActiveSupport::Concern
 
-  reverse_included do
+  included do
     before_filter :attempt_to_authenticate
   end
 
@@ -9,7 +9,7 @@ module EasyAuth::Controllers::Authenticated
 
   def attempt_to_authenticate
     if account_not_signed_in?
-      session[:requested_path] = request.path
+      session[:requested_path] = request.method == 'GET' ? request.path :  request.referer
       respond_to do |format|
         format.html { redirect_to main_app.sign_in_url }
         format.json { render :json => {}, :status => 401 }

data/lib/easy_auth/controllers/sessions.rb

@@ -1,64 +1,61 @@
 module EasyAuth::Controllers::Sessions
-  extend EasyAuth::ReverseConcern
+  extend ActiveSupport::Concern
 
   def new
     EasyAuth.new_session(self)
   end
 
   def create
-    if identity = EasyAuth.authenticate(self)
-      identity.set_account_session(session)
-      set_remember(identity)
-      if identity.remember
-        cookies[:remember_token] = { :value => identity.generate_remember_token!, :expires => identity.remember_time.from_now }
-      end
-      after_successful_sign_in(identity)
+    if @identity = EasyAuth.authenticate(self)
+      session[:identity_id] = @identity.id
+      after_successful_sign_in
     else
       @identity = EasyAuth.find_identity_model(params).new(params[params[:identity]])
-      after_failed_sign_in(@identity)
+      after_failed_sign_in
     end
+  rescue AbstractController::DoubleRenderError
   end
 
   def destroy
-    session.delete(:session_token)
-    session.delete(:account_class)
-    cookies.delete(:remember_token)
+    session.delete(:identity_id)
     after_sign_out
   end
 
-  private
-
-  def after_with_or_default(method_name, identity)
-    send("#{method_name}_with_#{params[:identity]}", identity) || send("#{method_name}_default", identity)
+  def after_with_or_default(method_name)
+    send("#{method_name}_with_#{params[:identity]}") || send("#{method_name}_default")
   end
 
-  def after_successful_sign_in(identity)
-    after_with_or_default(__method__, identity)
+  def after_successful_sign_in
+    after_with_or_default(__method__)
   end
 
-  def after_successful_sign_in_url(identity)
-    after_with_or_default(__method__, identity)
+  def after_successful_sign_in_url
+    after_with_or_default(__method__)
   end
 
-  def after_failed_sign_in(identity)
-    after_with_or_default(__method__, identity)
+  def after_failed_sign_in
+    after_with_or_default(__method__)
   end
 
-  def after_successful_sign_in_default(identity)
-    redirect_to(session.delete(:requested_path) || after_successful_sign_in_url(identity), :notice => I18n.t('easy_auth.sessions.create.notice'))
+  def after_successful_sign_in_default
+    redirect_to(session.delete(:requested_path) || after_successful_sign_in_url, :notice => I18n.t('easy_auth.sessions.create.notice'))
   end
 
-  def after_successful_sign_in_url_default(identity)
-    identity.account
+  def after_successful_sign_in_url_default
+    @identity.account
   end
 
-  def after_failed_sign_in_default(identity)
+  def after_failed_sign_in_default
     flash.now[:error] = I18n.t('easy_auth.sessions.create.error')
     render :new
   end
 
   def after_sign_out
-    redirect_to main_app.root_url, :notice => I18n.t('easy_auth.sessions.delete.notice')
+    redirect_to after_sign_out_url, :notice => I18n.t('easy_auth.sessions.delete.notice')
+  end
+
+  def after_sign_out_url
+    main_app.root_url
   end
 
   def no_authentication
@@ -77,10 +74,4 @@ module EasyAuth::Controllers::Sessions
       super
     end
   end
-
-  def set_remember(identity)
-    if identity_attributes = params[ActiveModel::Naming.param_key(EasyAuth.find_identity_model(params).new)]
-      identity.remember = identity_attributes[:remember]
-    end
-  end
 end

data/lib/easy_auth/helpers/easy_auth.rb

@@ -0,0 +1,48 @@
+module EasyAuth::Helpers::EasyAuth
+  extend ActiveSupport::Concern
+
+  def self.included(base)
+    base.class_eval do
+      def self.included(base)
+        base.class_eval do
+          helper_method :current_account, :current_user, :account_signed_in?, :user_signed_in?, :account_not_signed_in?, :user_not_signed_in?
+        end
+      end
+    end
+  end
+
+  # Access the current account the users is authenticated with
+  #
+  # @return [Account] instance
+  def current_account
+    if session[:identity_id]
+      begin
+        @current_account ||= EasyAuth.identity_model.find(session[:identity_id]).account
+      rescue ActiveRecord::RecordNotFound
+        @current_account = nil
+        delete_session_data
+      end
+    end
+
+    @current_account
+  end
+  alias :current_user :current_account
+
+  # Should be used to test if user is authenticated
+  def account_signed_in?
+    current_account
+  end
+  alias :user_signed_in? :account_signed_in?
+
+  # Should be used to test if user is not authenticated
+  def account_not_signed_in?
+    !account_signed_in?
+  end
+  alias :user_not_signed_in? :account_not_signed_in?
+
+  private
+
+  def delete_session_data
+    session.delete(:identity_id)
+  end
+end

data/lib/easy_auth/helpers.rb

@@ -0,0 +1,4 @@
+module EasyAuth::Helpers
+  extend ActiveSupport::Autoload
+  autoload :EasyAuth
+end

data/lib/easy_auth/models/account.rb

@@ -1,52 +1,9 @@
 module EasyAuth::Models::Account
-  include EasyAuth::TokenGenerator
-  extend  EasyAuth::ReverseConcern
-  class   NoIdentityUsernameError < StandardError; end
+  extend ActiveSupport::Concern
 
-  reverse_included do
+  included do
     # Relationships
-    has_many :identities, :class_name => 'Identity', :as => :account, :dependent => :destroy
-
-    def identity_username_attribute
-      self.send(self.class.identity_username_attribute)
-    end
-  end
-
-  module ClassMethods
-    # Will attempt to find the username attribute
-    #
-    # First will check to see if #identity_username_attribute is already defined in the model.
-    #
-    # If not, will check to see if `username` exists as a column on the record
-    # If not, will check to see if `email` exists as a column on the record
-    #
-    # @return [Symbol]
-    def identity_username_attribute
-      if respond_to?(:super)
-        super
-      elsif column_names.include?('username')
-        :username
-      elsif column_names.include?('email')
-        :email
-      else
-        raise EasyAuth::Models::Account::NoIdentityUsernameError, 'your model must have either a #username or #email attribute. Or you must override the .identity_username_attribute class method'
-      end
-    end
-  end
-
-  # Generates a new session token and updates the record
-  #
-  # @return [String]
-  def generate_session_token!
-    self.update_column(:session_token, _generate_token(:session))
-    self.session_token
-  end
-
-  # Used to set the session for the authenticated account
-  #
-  # @param [Rack::Session::Abstract::SessionHash] session controller session
-  def set_session(session)
-    session[:session_token] = generate_session_token!
-    session[:account_class] = self.class.to_s
+    has_many :identities, :class_name => 'Identity', :as => :account, :dependent => :destroy, :autosave => true
+    accepts_nested_attributes_for :identities
   end
 end

data/lib/easy_auth/models/identity.rb

@@ -1,12 +1,10 @@
 module EasyAuth::Models::Identity
-  include EasyAuth::TokenGenerator
-  include EasyAuth::ReverseConcern
+  extend ActiveSupport::Concern
 
-  def self.included(base)
-    base.class_eval do
-      belongs_to :account, :polymorphic => true
-      extend ClassMethods
-    end
+  included do
+    belongs_to :account, polymorphic: true, dependent: :destroy, autosave: true, validate: true
+    validates :uid, :uniqueness => { :scope => :type }, :presence => true
+    validates :token, presence: true
   end
 
   module ClassMethods
@@ -24,40 +22,4 @@ module EasyAuth::Models::Identity
       controller.instance_variable_set(:@identity, self.new)
     end
   end
-
-  # Sets the session for the association account
-  #
-  # @param [Rack::Session::Abstract::SessionHash] session controller session
-  def set_account_session(session)
-    account.set_session(session)
-  end
-
-  # Getter for the remember flag
-  def remember
-    @remember
-  end
-
-  # Setter for the remember flag
-  #
-  # @param [Boolean] value
-  def remember=(value)
-    @remember = ::ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
-  end
-
-  # Generates a new remember token and updates it on the identity record
-  #
-  # @return [String]
-  def generate_remember_token!
-    update_column(:remember_token, _generate_token(:remember))
-    remember_token
-  end
-
-  # The time used for remembering how long to stay signed in
-  #
-  # Defaults to 1 year, override in the model to set your own custom remember time
-  #
-  # @return [DateTime]
-  def remember_time
-    1.year
-  end
 end

data/lib/easy_auth/token_generator.rb

@@ -2,6 +2,6 @@ module EasyAuth::TokenGenerator
   private
 
   def _generate_token(type)
-    token = BCrypt::Password.create("#{id}-#{type}_token-#{DateTime.current}")
+    token = Digest::SHA2.hexdigest("#{id}-#{type}_token-#{DateTime.current}")
   end
 end

data/lib/easy_auth/version.rb

@@ -1,3 +1,3 @@
 module EasyAuth
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/easy_auth.rb

@@ -1,15 +1,15 @@
 require 'active_support'
-require 'bcrypt'
 require 'easy_auth/engine'
 require 'easy_auth/version'
+require 'easy_auth/active_support/concern'
 
 module EasyAuth
   extend ActiveSupport::Autoload
 
   autoload :Controllers
+  autoload :Helpers
   autoload :Mailers
   autoload :Models
-  autoload :ReverseConcern
   autoload :Routes
   autoload :TokenGenerator
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Cardarella
@@ -10,124 +9,109 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
+  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: 4.0.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: valid_attribute
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -135,7 +119,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -143,7 +126,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -151,57 +133,50 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: bourne
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: EasyAuth
@@ -220,16 +195,18 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20120227014023_create_easy_auth_identities.rb
+- lib/easy_auth/active_support/concern.rb
 - lib/easy_auth/controllers/authenticated.rb
 - lib/easy_auth/controllers/sessions.rb
 - lib/easy_auth/controllers.rb
 - lib/easy_auth/engine.rb
+- lib/easy_auth/helpers/easy_auth.rb
+- lib/easy_auth/helpers.rb
 - lib/easy_auth/mailers.rb
 - lib/easy_auth/models/account.rb
 - lib/easy_auth/models/identities.rb
 - lib/easy_auth/models/identity.rb
 - lib/easy_auth/models.rb
-- lib/easy_auth/reverse_concern.rb
 - lib/easy_auth/routes.rb
 - lib/easy_auth/token_generator.rb
 - lib/easy_auth/version.rb
@@ -240,32 +217,25 @@ files:
 - README.md
 homepage: https://github.com/dockyard/easy_auth
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 911422429951666950
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 911422429951666950
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: EasyAuth
 test_files: []

data/lib/easy_auth/reverse_concern.rb

@@ -1,27 +0,0 @@
-module EasyAuth::ReverseConcern
-  def self.extended(base)
-    base.instance_variable_set("@_dependencies", [])
-  end
-
-  def append_features(base)
-    if base.instance_variable_defined?("@_dependencies")
-      base.instance_variable_get("@_dependencies") << self
-      return false
-    else
-      return false if base < self
-      base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
-      base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-      @_dependencies.each { |dep| base.send(:include, dep) }
-      super
-    end
-  end
-
-  def reverse_included(base = nil, &block)
-    if base.nil?
-      @_included_block = block
-    else
-      super
-    end
-  end
-end
-