inkling 0.0.8 → 0.0.9

data/app/controllers/inkling/users/sessions_controller.rb

@@ -2,4 +2,16 @@ class Inkling::Users::SessionsController < Devise::SessionsController
 
   layout nil
   
+  after_filter :log, :only => [:create]
+  before_filter :log, :only => [:destroy]
+  
+  private
+  
+  def log
+    if params[:action] == "create"
+      Inkling::Log.create!(:user => current_inkling_user, :text => "#{current_inkling_user.email} signed in.")
+    elsif params[:action] == "destroy"
+      Inkling::Log.create!(:user => current_inkling_user, :text => "#{current_inkling_user.email} signed out.")      
+    end
+  end
 end

data/app/models/inkling/log.rb

@@ -1,3 +1,4 @@
 class Inkling::Log < ActiveRecord::Base
   set_table_name 'inkling_logs'
+  belongs_to :inkling_user
 end

data/app/models/inkling/session_observer.rb

@@ -0,0 +1,30 @@
+require 'archive'
+
+class Inkling::SessionObserver < ActiveRecord::Observer
+   # include ActionView::Helpers::UrlHelper
+   include ActionController::UrlWriter
+   include Rails.application.routes.url_helpers
+   
+  def after_create(session)
+    debugger
+    puts "*****"
+    # log("created", page) if page.created_at == page.updated_at
+  end
+  # 
+  # def after_save(page)
+  #   log("edited", page) if page.created_at != page.updated_at
+  # end
+  # 
+  # def after_destroy(page)
+  #   log("deleted", page)    
+  # end
+  # 
+  # private
+  # def log(verb, page)
+  #   if page.archive
+  #     Inkling::Log.create!(:text => "#{page.author.email} #{verb} page <a href='#{edit_staff_page_path(page, :archive_id => page.archive.id)}'>#{page.title}</a> in <a href='/staff/archives/#{page.archive.slug}'>#{page.archive.name}</a>.")
+  #   else
+  #     Inkling::Log.create!(:text => "#{page.author.email} #{verb} page <a href='#{edit_staff_page_path(page)}'>#{page.title}</a> in <a href='/staff/archives/ada'>ADA</a>.")
+  #   end
+  # end
+end

data/app/models/inkling/user.rb

@@ -3,6 +3,7 @@ class Inkling::User < ActiveRecord::Base
   set_table_name 'inkling_users' 
   has_many :role_memberships
   has_many :roles, :through => :role_memberships
+  has_many :logs
   
   devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable    
   

data/app/views/inkling/users/sessions/new.html.erb

@@ -1,5 +1,8 @@
 <h2>Sign in</h2>
 
+<div class="notice"><%= notice %></div>
+<div class="alert"><%= alert %></div>
+
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
   <p><%= f.label :email %><br />
   <%= f.text_field :email %></p>

data/lib/generators/templates/create_inkling_tables.rb

@@ -54,8 +54,9 @@ class CreateInklingTables < ActiveRecord::Migration
     end    
 
     create_table :inkling_logs do |t|
-      t.timestamps
+      t.created_at
       t.text :text, :null => false
+      t.integer :inkling_user_id
     end    
 
   end

data/lib/inkling/version.rb

@@ -1,3 +1,3 @@
 module Inkling
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/controllers/inkling/users/sessions_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Inkling::Users::SessionsController do
+
+  describe "creating logs based on signing in or out" do
+    specify "that login created a login log" do
+      @admin = make_user(:administrator)
+      sign_in @admin
+      
+      Inkling::Log.all.size.should > 0
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -23,4 +23,6 @@ Rspec.configure do |config|
   # uncomment the following line.
   # config.use_transactional_examples = false
   config.use_transactional_examples = true
+  
+  config.include Devise::TestHelpers, :type => :controller
 end

data/spec/support/blueprints.rb

@@ -0,0 +1,45 @@
+require 'machinist/active_record'
+require 'sham'
+require 'faker'
+
+# a machinist config for quick data generation
+Sham.created_at { (0..60).to_a.rand.days.ago }
+Sham.body       { Faker::Lorem.sentence }
+Sham.reason     { Faker::Lorem.sentence }
+Sham.name       { Faker::Lorem.sentence }
+Sham.email      { Faker::Internet.email }
+Sham.title      { Faker::Lorem.words(2).to_s }
+Sham.word       { Faker::Lorem.words(1).to_s }
+Sham.description  { Faker::Lorem.sentence }
+Sham.body       { Faker::Lorem.paragraph }
+Sham.url        { "http://" + Faker::Internet.domain_name.to_s  }
+Sham.display_from { (0..60).to_a.rand.days.ago }
+Sham.display_to   { (0..60).to_a.rand.days.since }
+Sham.keywords   { Faker::Lorem.sentence }
+
+Inkling::User.blueprint do 
+  email Sham.email
+  password 'test123'
+  password_confirmation  'test123'
+end
+
+Inkling::Role.blueprint do
+  name Sham.name
+end
+
+Inkling::Role.blueprint(:admin) do
+  name "administrator"
+end
+
+Inkling::RoleMembership.blueprint do 
+  role
+  user
+end
+
+def make_user(role_name)
+  role_name = role_name.to_s if role_name.is_a? Symbol
+  user = Inkling::User.make
+  role = Inkling::Role.make(:name => role_name)
+  role_membership = Inkling::RoleMembership.create(:role => role, :user => user)
+  user
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: []
 
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +11:00
+date: 2010-11-23 00:00:00 +11:00
 default_executable: inkling
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        - 3
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -68,8 +68,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        - 3
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: *id004
@@ -94,8 +96,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
+        - 1
         - 0
-        version: "0"
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: *id006
@@ -104,20 +108,18 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
-        - 0
-        - beta
-        - 8
-        version: 2.0.0.beta.8
+        - 1
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug19
+  name: capybara
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -130,7 +132,7 @@ dependencies:
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: cucumber-rails
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,7 +145,7 @@ dependencies:
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: cucumber
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -151,12 +153,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 7
+        - 2
+        version: 0.7.2
   type: :development
   prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: cucumber-rails
+  name: spork
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -169,7 +173,7 @@ dependencies:
   prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: launchy
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -177,14 +181,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
-        - 2
-        version: 0.7.2
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: spork
+  name: jeweler
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -197,7 +199,7 @@ dependencies:
   prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: launchy
+  name: gemcutter
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -205,12 +207,14 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 6
+        - 1
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: devise
+  name: autotest
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -219,12 +223,83 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: inherited_resources
+  name: steak
   requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc
+        - 1
+        version: 1.0.0.rc.1
+  type: :development
+  prerelease: false
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: faker
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: machinist
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 6
+        version: 1.0.6
+  type: :development
+  prerelease: false
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: database_cleaner
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: capistrano
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id020
+- !ruby/object:Gem::Dependency 
+  name: devise
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -234,10 +309,23 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id016
+  version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  name: inherited_resources
+  requirement: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: formtastic
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -247,10 +335,10 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id017
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
   name: cancan
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -260,10 +348,10 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id018
+  version_requirements: *id024
 - !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -273,7 +361,7 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id019
+  version_requirements: *id025
 description: A content framework engine for Rails 3
 email: 
 executables: 
@@ -303,6 +391,7 @@ files:
 - app/models/inkling/permission.rb
 - app/models/inkling/role.rb
 - app/models/inkling/role_membership.rb
+- app/models/inkling/session_observer.rb
 - app/models/inkling/theme.rb
 - app/models/inkling/type.rb
 - app/models/inkling/user.rb
@@ -363,10 +452,12 @@ files:
 - lib/tasks/rspec.rake
 - README.txt
 - spec/controllers/inkling/proxying_spec.rb
+- spec/controllers/inkling/users/sessions_spec.rb
 - spec/models/path_spec.rb
 - spec/models/permission_spec.rb
 - spec/models/theme_spec.rb
 - spec/spec_helper.rb
+- spec/support/blueprints.rb
 - spec/support/devise.rb
 - spec/support/inkling_spec_helper.rb
 - bin/inkling
@@ -404,9 +495,11 @@ specification_version: 3
 summary: A content framework engine for Rails 3
 test_files: 
 - spec/controllers/inkling/proxying_spec.rb
+- spec/controllers/inkling/users/sessions_spec.rb
 - spec/models/path_spec.rb
 - spec/models/permission_spec.rb
 - spec/models/theme_spec.rb
 - spec/spec_helper.rb
+- spec/support/blueprints.rb
 - spec/support/devise.rb
 - spec/support/inkling_spec_helper.rb