insight_rails 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/app/controllers/help/sessions_controller.rb

@@ -3,29 +3,7 @@ class Help::SessionsController < ApplicationController
   layout Insight.configuration.layout
   
   skip_before_filter :login_required
-  
-  before_filter :check_existing_login, :only => [ :new ]
-  
-  # def new    
-  # end
-  # 
-  # def create
-  #   json         = { :username => params[:username], :password => params[:password] }.to_json
-  #   auth_details = MultiPass.encode64(json)
-  #   
-  #   session = InsightSession.new(:auth => auth_details)
-  #   if session.save
-  #     self.current_user = session.multipass
-  #   else
-  #     render :action => "new"
-  #   end
-  # end
-  
-  def destroy
-    session[:multipass] = nil
-    redirect_to("/help")
-  end
-  
+      
   protected
   
     def check_existing_login

data/app/controllers/insight_controller.rb

@@ -1,32 +1,32 @@
 class InsightController < ApplicationController
   
-  before_filter :login_required
-  
-  def current_user
-    @insight_user ||= login_from_multipass
-  end
-  
-  def current_user=(multipass)
-    session[:multipass] = multipass
-    @insight_user       = login_from_multipass
-  end
-  
-  def authorized?
-    logged_in?
-  end
-  
-  def logged_in?
-    !!current_user
-  end
-  
-  protected
-  
-    def login_required
-      authorized?
-    end
-    
-    def login_from_multipass
-      session[:multipass].nil? ? nil : InsightUser.new(session[:multipass])
-    end
+  # before_filter :login_required
+  # 
+  # def current_user
+  #   @insight_user ||= login_from_multipass
+  # end
+  # 
+  # def current_user=(multipass)
+  #   session[:multipass] = multipass
+  #   @insight_user       = login_from_multipass
+  # end
+  # 
+  # def authorized?
+  #   logged_in?
+  # end
+  # 
+  # def logged_in?
+  #   !!current_user
+  # end
+  # 
+  # protected
+  # 
+  #   def login_required
+  #     authorized?
+  #   end
+  #   
+  #   def login_from_multipass
+  #     session[:multipass].nil? ? nil : InsightUser.new(session[:multipass])
+  #   end
   
 end

data/app/models/issue.rb

@@ -11,6 +11,14 @@ class Issue < ActiveResource::Base
     "#{slug}-#{id}"
   end
   
+  def contact
+    if contact_id
+      super
+    else
+      nil
+    end
+  end
+  
   def user_name
     if contact_id
       contact.username

data/app/views/help/categories/index.html.erb

@@ -20,7 +20,7 @@
           <% if !category.issues.empty? -%>
             <%= link_to(category.issues.first.updated_at.strftime("%b %d, %Y %H:%M"),
                         help_category_issue_path(category, category.issues.first)) %> 
-            by <%= category.issues.first.user_name %>
+            by <%= category.issues.first.contact.nil? ? category.issues.first.user_name : category.issues.first.contact.username %>
           <% end -%>
         </td>
       </tr>

data/app/views/knowledge/article_categories/index.html.erb

@@ -2,15 +2,17 @@
 
 <div class="articles">
   <% @categories.each do |category| %>
-    <div class="category">
-      <h2><%= category.name %></h2>
-      <ul>
-        <% category.articles[0..5].each do |article| %>
-          <li>
-            <%= link_to(article.title, knowledge_article_path(article)) %>
-          </li>
-        <% end %>
-      </ul>
-    </div>
+    <% if !category.articles.empty? -%>
+      <div class="category">
+        <h2><%= category.name %></h2>
+        <ul>
+          <% category.articles[0..5].each do |article| %>
+            <li>
+              <%= link_to(article.title, knowledge_article_path(article)) %>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
   <% end %>
 </div>

data/app/views/layouts/_insight_footer.html.erb

@@ -5,7 +5,7 @@
       <ul>
         <% Issue.find(:all, :from => :latest).each do |issue| %>
           <li>
-            <span><%= issue.created_at.strftime("%d %b %H:%H") %></span> <%= link_to(issue.subject, help_issue_path(issue)) %>
+            <span><%= issue.created_at.strftime("%d %b %H:%M") %></span> <%= link_to(issue.subject, help_issue_path(issue)) %>
           </li>
         <% end %>
       </ul>

data/generators/insight/insight_generator.rb

@@ -11,6 +11,9 @@ class InsightGenerator < Rails::Generator::Base
                            "db/migrate",
                            :migration_file_name => "link_users_to_crm_contacts"
                            
+      m.file               "insight.html.erb", "app/views/layouts/insight.html.erb"
+      m.file               "_insight_footer.html.erb", "app/views/layouts/_insight_footer.html.erb"
+                           
       m.insert_into        "app/models/user.rb",    "include Insight::CRM::Callbacks::User"
       m.insert_into        "app/models/account.rb", "include Insight::CRM::Callbacks::Account"
       

data/generators/insight/templates/_insight_footer.html.erb

@@ -0,0 +1,25 @@
+<div id="footer">
+  <div class="latest-discussions">
+    <div class="latest discussions">
+      <h3>Latest Discussions</h3>
+      <ul>
+        <% Issue.find(:all, :from => :latest).each do |issue| %>
+          <li>
+            <span><%= issue.created_at.strftime("%d %b %H:%M") %></span> <%= link_to(issue.subject, help_issue_path(issue)) %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  
+    <div class="latest articles">
+      <h3>Latest Knowledge Base Articles</h3>
+      <ul>
+        <% Article.find(:all, :from => :latest).each do |article| %>
+          <li>
+            <%= link_to(article.title, knowledge_article_path(article)) %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+</div>

data/generators/insight/templates/insight.html.erb

@@ -0,0 +1,56 @@
+<!DOCTYPE>
+<html>
+  <head>
+    <title>Help &amp; Support</title>
+    
+    <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.0/build/reset-fonts-grids/reset-fonts-grids.css"> 
+    <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.0/build/base/base-min.css">
+    
+    <%= stylesheet_link_tag 'insight' %>
+  </head>
+  <body>
+    <div id="header">
+      <div class="section">
+        <div class="top-nav">
+          <ul class="nav">
+            <li>
+              <%= link_to("Support Home", help_path) %>
+            </li>
+            <li>
+              <%= link_to("Return to App", "/") %>
+            </li>
+            <% if logged_in? %>
+              <li>
+                <%= link_to("Logout", help_logout_path) %>
+              </li>
+            <% else %>
+              <li>
+                <%= link_to("Login", help_login_path) %>
+              </li>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+      <h1>Help &amp; Support</h1>
+      <div class="nav-bar">
+        <ul class="nav">
+          <li>
+            <%= link_to("Start a Discussion", new_help_issue_path) %>
+          </li>
+          <li>
+            <%= link_to("Browse Discussions", help_browse_path) %>
+          </li>
+          <li>
+            <%= link_to("Knowledge Base", knowledge_path) %>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div id="wrapper">
+      <div id="content">
+        <%= yield %>
+      </div>
+      <%= render :partial => "layouts/insight_footer" %>
+    </div>
+  </body>
+</html>

data/generators/insight/templates/migrations/link_users_to_crm_contacts.rb

@@ -1,13 +1,11 @@
-class LinkUsersToCRMContacts < ActiveRecord::Migration
+class LinkUsersToCrmContacts < ActiveRecord::Migration
   
   def self.up
     add_column :users, :crm_id, :integer
-    add_column :accounts, :crm_id, :integer
   end
   
   def self.down
     remove_column :users, :crm_id
-    remove_column :accounts, :crm_id
   end
   
 end

data/lib/insight/crm/callbacks/account.rb

@@ -22,11 +22,11 @@ module Insight
               self.update_attribute(:crm_id, account.id)
             end
           
-            def update_crm_account
-              account      = CRM::Models::Account.find(crm_id)
-              account.name = name
-              account.save
-            end
+            # def update_crm_account
+            #   account      = CRM::Models::Account.find(crm_id)
+            #   account.name = name
+            #   account.save
+            # end
                     
         end
       

data/lib/insight/crm/callbacks/user.rb

@@ -22,25 +22,27 @@ module Insight
               self.update_attribute(:crm_id, contact.id)
             end
           
-            def update_crm_contact
-              contact            = CRM::Models::Contact.find(crm_id)
-              contact.attributes = crm_attributes
-              contact.save
-            end
+            # def update_crm_contact
+            #   contact            = CRM::Models::Contact.find(crm_id)
+            #   contact.attributes = crm_attributes
+            #   contact.save
+            # end
           
             def crm_attributes
               a = {}
-              a[:title]      = title     if respond_to?(:title)
-              a[:first_name] = firstname if respond_to?(:firstname)
-              a[:last_name]  = lastname  if respond_to?(:lastname)
-              a[:email]      = email     if respond_to?(:email)
-              a[:username]   = username  if respond_to?(:username)
+              a[:title]      = title      if respond_to?(:title)
+              a[:first_name] = firstname  if respond_to?(:firstname)
+              a[:first_name] = first_name if respond_to?(:first_name)
+              a[:last_name]  = lastname   if respond_to?(:lastname)
+              a[:last_name]  = last_name  if respond_to?(:last_name)
+              a[:email]      = email      if respond_to?(:email)
+              a[:username]   = username   if respond_to?(:username)
               a
             end
             
-            def recording_last_activity?
-              respond_to?(:last_activity) && last_activity_changed?
-            end
+            # def recording_last_activity?
+            #   respond_to?(:last_activity) && last_activity_changed?
+            # end
           
         end
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: insight_rails
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Kieran Johnson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 +00:00
+date: 2011-02-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,8 @@ files:
 - generators/insight/insight_generator.rb
 - generators/insight/lib/insert_commands.rb
 - generators/insight/templates/README
+- generators/insight/templates/_insight_footer.html.erb
+- generators/insight/templates/insight.html.erb
 - generators/insight/templates/insight.rake
 - generators/insight/templates/insight.rb
 - generators/insight/templates/insight.sass
@@ -101,7 +103,6 @@ files:
 - lib/insight/crm/callbacks/user.rb
 - lib/insight/crm/models/account.rb
 - lib/insight/crm/models/contact.rb
-- lib/insight/multi_pass_attributes.rb
 has_rdoc: true
 homepage: http://github.com/kieranj/insight
 licenses: []

data/lib/insight/multi_pass_attributes.rb

@@ -1,32 +0,0 @@
-module Insight
-  
-  module MultiPassAttributes
-    
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    def multipass
-       @multipass ||= self.class.multipass.encode({
-         :id         => id,
-         :email      => email,
-         :title      => title,
-         :first_name => firstname,
-         :last_name  => lastname,
-         :crm_id     => crm_id,
-         :expires    => 30.minutes.from_now
-       })
-     end
-    
-     module ClassMethods
-      
-       def multipass
-         # @multipass ||= MultiPass.new(FatFreeAuth.configuration.site_name, FatFreeAuth.configuration.secret)
-         @multipass ||= MultiPass.new('fatfree', 'abc')
-       end
-       
-     end
-       
-  end
-
-end