devise_traceable 0.0.3 → 0.0.4

data/lib/devise_traceable/hooks/traceable.rb

@@ -3,17 +3,8 @@
 # and on authentication. Retrieving the user from session (:fetch) does
 # not trigger it.
 
-Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
-  puts "Shenouda AfterSETUser" + record
-  if record.respond_to?(:insert_login!) #&& warden.authenticated?(options[:scope])
-    puts "WardenRequest" + warden.request
-    record.insert_login!(warden.request)
-  end
-end
-
 Warden::Manager.before_logout do |record, warden, opts|
-  puts "Shenouda Before Logout" + record
-  if record.respond_to?(:update_logout!)
-    record.update_logout!(warden.request)
+  if record.respond_to?(:trace!)
+    record.trace!
   end
-end
+end

data/lib/devise_traceable/model.rb

@@ -7,22 +7,12 @@ module Devise
     # * resource_id
     # * sign_in_at
     # * sign_out_at
-    # * time
     #
 
     module Traceable
-      def insert_login!(request)
+      def trace!
         new_current = Time.now
-        self.sign_in_at  = new_current
-        save(:validate => false)
-      end
-
-      def update_logout!(request)
-        new_current = Time.now
-        self.sign_out_at  = new_current
-        time = self.sign_out_at - self.sign_in_at
-        self.time = time
-        save(:validate => false)
+        "#{self.class}Tracing".constantize.create(:sign_in_at => self.current_sign_in_at, :sign_out_at => new_current, :"#{self.class.primary_key}" => self.id)
       end
     end
   end

data/lib/devise_traceable/version.rb

@@ -1,3 +1,3 @@
 module DeviseTraceable
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

data/lib/generators/devise_traceable/devise_traceable_generator.rb

@@ -25,7 +25,33 @@ class DeviseTraceableGenerator < Rails::Generators::NamedBase
   class_option :orm
   class_option :migration, :type => :boolean, :default => orm_has_migration?
 
+  def invoke_orm_model
+    if model_exists?
+      say "* Model already exists."
+    elsif options[:orm].present?
+      invoke "model", ["#{name}Tracing"], :migration => false, :orm => options[:orm]
+
+      unless model_exists?
+        abort "Tried to invoke the model generator for '#{options[:orm]}' but could not find it.\n" <<
+          "Please create your model by hand before calling `rails g devise_traceable #{name}`."
+      end
+    else
+      abort "Cannot create a devise model because config.generators.orm is blank.\n" <<
+        "Please create your model by hand or configure your generators orm before calling `rails g devise_traceable #{name}`."
+    end
+  end
+
   def create_migration_file
-    migration_template 'migration.rb', "db/migrate/devise_create_#{name.tableize}_tracing.rb"
+    migration_template 'migration.rb', "db/migrate/devise_create_#{name.downcase}_tracings.rb"
+  end
+
+  protected
+
+  def model_exists?
+    File.exists?(File.join(destination_root, model_path))
+  end
+
+  def model_path
+    @model_path ||= File.join("app", "models", "#{file_path}.rb")
   end
 end

data/lib/generators/devise_traceable/templates/migration.rb

@@ -1,18 +1,18 @@
-class DeviseCreate<%= table_name.camelize %>Tracing < ActiveRecord::Migration
+class DeviseCreate<%= table_name.camelize.singularize %>Tracings < ActiveRecord::Migration
   def self.up
-    create_table :<%= table_name %>_tracing do |t|
+    create_table :<%= table_name.singularize %>_tracings do |t|
       t.integer  :<%= table_name.classify.foreign_key  %>
-      t.datetime :sign_in_at
-      t.datetime :sign_out_at
-      #Any additional fields here
+  t.datetime :sign_in_at
+  t.datetime :sign_out_at
+  #Any additional fields here
 
-      t.timestamps
+  t.timestamps
 end
 
-add_index :<%= table_name %>_tracing, :<%= table_name.classify.foreign_key  %>
+add_index :<%= table_name.singularize %>_tracings, :<%= table_name.classify.foreign_key  %>
 end
 
 def self.down
-  drop_table :<%= table_name %>
+drop_table :<%= table_name.singularize %>_tracings
 end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Shenouda Bertel