authn 1.0.0 → 2.0.0

data/lib/authn/config.rb

@@ -11,9 +11,7 @@ module AuthN
       login_password_key: :password,
       model_id_method: :id,
       model_critera_method: :where,
-      session_key_function: ->(klass) {
-        :"session_#{klass}_id"
-      }
+      session_key_function: ->(klass) { :"session_#{klass}_id" }
     }
   end
 end

data/lib/authn/model.rb

@@ -31,11 +31,7 @@ module AuthN
         # Check to see if the instance exists and if a password was given
         if instance && password
           # Check to see if the instance can authenticate with password
-          if instance.authenticate password
-            instance
-          else
-            false
-          end
+          instance.authenticate(password) ? instance : false
         end
 
         # Return instance if account was found and password matched

data/lib/authn/session.rb

@@ -1,72 +1,66 @@
 module AuthN
   module Session
-    def self.included(object)
-      object.extend ClassMethods
+    def login(identifiers, klass = AuthN.config.account_klass)
+      generate_session_and_instance_from find_instance_klass(klass).authenticate identifiers
     end
 
-    module ClassMethods
-      def login(identifiers, klass = AuthN.config.account_klass)
-        generate_session_and_instance_from find_instance_klass(klass).authenticate identifiers
-      end
-
-      def auto_login(instance)
-        instance_and_session instance
-      end
+    def auto_login(instance)
+      instance_and_session instance
+    end
 
-      def logged_in?(instance = nil, klass = AuthN.config.account_klass)
-        klass = instance.class if instance
-        klass = find_instance_klass klass unless instance
-        check_session klass
-      end
+    def logged_in?(instance = nil, klass = AuthN.config.account_klass)
+      klass = instance.class if instance
+      klass = find_instance_klass klass unless instance
+      check_session klass
+    end
 
-      def logout(instance = nil, klass = AuthN.config.account_klass)
-        klass = instance.class if instance
-        klass = find_instance_klass klass unless instance
-        destroy_session klass
-      end
+    def logout(instance = nil, klass = AuthN.config.account_klass)
+      klass = instance.class if instance
+      klass = find_instance_klass klass unless instance
+      destroy_session klass
+    end
 
-      def current_user(klass = AuthN.config.account_klass)
-        @current_user ||= get_session klass_as_name klass
-      end
+    def current_user(klass = AuthN.config.account_klass)
+      @current_user ||= get_session klass_as_name klass
+    end
 
-      alias_method :current_account, :current_user
+    alias_method :current_account, :current_user
 
-      private
+    private
 
-      def find_instance_klass(klass)
-        const_get klass.capitalize
-      end
+    def find_instance_klass(klass)
+      const_get klass.capitalize
+    end
 
-      def klass_as_name(klass)
-        klass.name.downcase
-      end
+    def klass_as_name(klass)
+      klass.name.downcase
+    end
 
-      def generate_session_and_instance_from(instance)
-        instance.tap { instance_and_session instance if instance }
-      end
+    def generate_session_and_instance_from(instance)
+      instance.tap { instance_and_session instance if instance }
+    end
 
-      def instance_and_session(instance)
-        instance.tap { |instance| create_session instance.class, instance }
-      end
+    def instance_and_session(instance)
+      instance.tap { |instance| create_session instance.class, instance }
+    end
 
-      def create_session(klass, instance)
-        key = AuthN.config.session_key_function.call klass_as_name klass
-        session[key] = instance.send AuthN.config.model_id_method
-      end
+    def create_session(klass, instance)
+      key = AuthN.config.session_key_function.call klass_as_name klass
+      session[key] = instance.send AuthN.config.model_id_method
+    end
 
-      def destroy_session(klass)
-        key = AuthN.config.session_key_function.call klass_as_name klass
-        session.delete key
-      end
+    def destroy_session(klass)
+      key = AuthN.config.session_key_function.call klass_as_name klass
+      session.delete key
+    end
 
-      def check_session(klass)
-        get_session(klass).present?
-      end
+    def check_session(klass)
+      get_session(klass).present?
+    end
 
-      def get_session(klass)
-        key = AuthN.config.session_key_function.call klass_as_name klass
-        session[key]
-      end
+    def get_session(klass)
+      key = AuthN.config.session_key_function.call klass_as_name klass
+      session[key]
     end
   end
 end

data/lib/authn/version.rb

@@ -1,3 +1,3 @@
 module AuthN
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authn
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4128468406629184695
+      hash: 4517271983309580040
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4128468406629184695
+      hash: 4517271983309580040
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24