simple_forum 0.0.2 → 0.0.4

data/app/models/simple_forum/moderatorship.rb

@@ -4,7 +4,7 @@ module SimpleForum
                :class_name => "SimpleForum::Forum"
 
     belongs_to :user,
-               :class_name => instance_eval(&AbstractAuth.invoke(:user_class)).name
+               :class_name => instance_eval(&SimpleForum.invoke(:user_class)).name
 
     validates :forum, :user, :presence => true
     validates :user_id, :uniqueness => {:scope => :forum_id, :allow_nil => true}

data/app/models/simple_forum/post.rb

@@ -1,13 +1,13 @@
 module SimpleForum
   class Post < ::ActiveRecord::Base
     belongs_to :user,
-               :class_name => instance_eval(&AbstractAuth.invoke(:user_class)).name
+               :class_name => instance_eval(&SimpleForum.invoke(:user_class)).name
 
     belongs_to :edited_by,
-               :class_name => instance_eval(&AbstractAuth.invoke(:user_class)).name
+               :class_name => instance_eval(&SimpleForum.invoke(:user_class)).name
 
     belongs_to :deleted_by,
-               :class_name => instance_eval(&AbstractAuth.invoke(:user_class)).name
+               :class_name => instance_eval(&SimpleForum.invoke(:user_class)).name
 
     belongs_to :topic,
                :counter_cache => true,

data/app/models/simple_forum/topic.rb

@@ -1,6 +1,6 @@
 module SimpleForum
   class Topic < ::ActiveRecord::Base
-    belongs_to :user, :class_name => instance_eval(&AbstractAuth.invoke(:user_class)).name
+    belongs_to :user, :class_name => instance_eval(&SimpleForum.invoke(:user_class)).name
 
     belongs_to :forum,
                :class_name => "SimpleForum::Forum", :counter_cache => true
@@ -98,14 +98,6 @@ module SimpleForum
       update_attribute(:is_closed, true)
     end
 
-    def recent_activity?(user)
-      SimpleForum::UserActivity.new(user).recent_activity?(self)
-    end
-
-    def bang_recent_activity(user)
-      SimpleForum::UserActivity.new(user).bang(self)
-    end
-
     def increment_views_count
       self.class.increment_counter(:views_count, self)
     end

data/app/models/simple_forum/user_activity.rb

@@ -1,80 +1,87 @@
-require 'pstore'
+module SimpleForum
+  class UserActivity < ::ActiveRecord::Base
 
-class SimpleForum::UserActivity
+    class Checker
+      attr_reader :user, :hash
 
-  PATH = Rails.root.join("file_store")
-  FILE = "simple_forum_activity"
-  FileUtils.mkdir_p(PATH)
+      def initialize(user, hash)
+        @user = user
+        @hash = hash
+      end
 
-  attr_reader :user
+      def recent_activity?(object)
+        type = object.class.base_class.name.to_sym
+        hash[type] ||= {}
+        read_at = hash[type][object.id]
+        return unless read_at
 
-  def recent_activity?(object)
-    self[object] > Time.now
-    return false unless user.try(:id)
-    if object.is_a?(SimpleForum::Forum)
-      if recent_post = object.recent_post
-        recent_post.created_at > self[object]
-      else
-        false
+        if object.is_a?(SimpleForum::Forum)
+          recent_post = object.recent_post
+          recent_post && recent_post.created_at > read_at
+        elsif object.is_a?(SimpleForum::Topic)
+          object.last_updated_at && object.last_updated_at > read_at
+        elsif object.respond_to?(:updated_at)
+          object.updated_at > self[object]
+        end
       end
-    else #SimpleForum::Topic
-      if object.last_updated_at
-        object.last_updated_at > self[object]
-      else
-        false
+
+      def bang(object)
+        return unless user
+        UserActivity.bang(object, user)
       end
+
     end
-  end
 
-  def initialize(user)
-    @user = user
-  end
+    belongs_to :user,
+               :class_name => instance_eval(&SimpleForum.invoke(:user_class)).name
 
-  def self.store
-    @@store ||= PStore.new(File.join(PATH, FILE))
-  end
+    belongs_to :memoryable, :polymorphic => true
 
-  def store
-    self.class.store
-  end
+    scope :only_read, where("#{quoted_table_name}.read_at IS NOT NULL")
 
-  def [](object, default=Time.now)
-    ret = nil
-    store.transaction(true) do
-      user_hash = store[user.id] || {}
-      object_hash = user_hash[key_for_object(object)] || {}
-      ret = object_hash[object.id]
-    end if user.try(:id)
-    ret || default
-  end
+    def self.recent_activity_for_user(user)
+      if user && user.persisted?
+        u = user
+        hash = self.where(:user_id => user.try(:id)).to_hash
+      else
+        u = nil
+        hash = {}
+      end
+      Checker.new(u, hash)
+    end
 
-  def bang(object)
-    store.transaction do
-      user_hash = store[user.id] || {}
-      object_hash = (user_hash[key_for_object(object)] ||= {})
-      object_hash[object.id] = Time.now
-      store[user.id] = user_hash
-    end if user.try(:id)
-    nil
-  end
+    def self.to_hash(collection=nil)
+      collection ||= only_read.all
+      {}.tap do |hash|
+        collection.each do |a|
+          hash[a.memoryable_type.to_sym] ||= {}
+          hash[a.memoryable_type.to_sym][a.memoryable_id] = a.read_at
+        end
+      end
+    end
 
-  def destroy
-    store.transaction do
-      store.delete(user.id)
+    def self.bang(object, user)
+      if am = load(object, user)
+        update_all({:read_at => Time.now}, {:id => am.id})
+      else
+        am = create_for(object, user)
+      end
+      am
     end
-  end
 
-  private
+    def self.load(object, user, conditions=nil)
+      scope = self.where({:memoryable_type => object.class.name, :memoryable_id => object.id, :user_id => user.id})
+      scope = scope.where(conditions) if conditions
+      scope.first
+    end
 
-  def key_for_object(object)
-    case object
-      when SimpleForum::Forum then
-        :f
-      when SimpleForum::Topic then
-        :t
-      else
-        object.model_name.cache_key
+    def self.create_for(object, user, time=Time.now)
+      SimpleForum::UserActivity.create do |m|
+        m.memoryable = object
+        m.user = user
+        m.read_at = time
+      end
     end
-  end
 
+  end
 end

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

@@ -1,8 +1,10 @@
 <!DOCTYPE html>
 <html lang="<%= I18n.locale %>">
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <meta charset="utf-8">
+
   <title><%= yield(:title) || '' %></title>
+
   <%= favicon_link_tag %>
 
   <%= stylesheet_link_tag "simple_forum/application" %>
@@ -20,9 +22,26 @@
 <body>
 
 <p class="logo">
-  <%= link_to image_tag('http://galdomedia.pl/images/logo.gif', :alt => 'Galdomedia'), "http://galdomedia.pl", :title => "Galdomedia" %>
+  <%= link_to image_tag('simple_forum/galdomedia-logo.png', :alt => 'GaldoMedia'), "http://galdomedia.pl", :title => "GaldoMedia" %>
 </p>
 
+<ul class="links">
+  <% if user_authenticated? %>
+      <li>
+        <%= link_to t('simple_forum.sign_out'), main_app.send(:"#{SimpleForum.sign_out_path}_path"), :method => main_app.routes.routes.named_routes["#{SimpleForum.sign_out_path}"].verb === "DELETE" ? :delete : :get  %>
+      </li>
+      <% if forum_admin? %>
+          <li>
+            <%= link_to t('simple_forum.forum_administration'), simple_forum.admin_forums_path %>
+          </li>
+      <% end %>
+  <% else %>
+      <li>
+        <%= link_to t('simple_forum.sign_in'), main_app.send(:"#{SimpleForum.sign_in_path}_path") %>
+      </li>
+  <% end %>
+</ul>
+
 <% if flash.present? %>
     <div id="flash_messages">
       <% flash.each do |key, val| %>
@@ -46,4 +65,4 @@
 </div>
 
 </body>
-</html>
+</html>

data/app/views/layouts/simple_forum/admin.html.erb

@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html lang="<%= I18n.locale %>">
+<head>
+  <meta charset="utf-8">
+
+  <title><%= yield(:title) || '' %></title>
+
+  <%= favicon_link_tag %>
+
+  <%= stylesheet_link_tag "simple_forum/admin" %>
+
+  <%= yield :stylesheets %>
+
+  <%= csrf_meta_tag %>
+
+  <%= javascript_include_tag "simple_forum/application" %>
+
+  <%= yield :javascripts %>
+
+  <%= yield :head %>
+</head>
+<body>
+<div id="container">
+  <div id="header">
+    <h1>
+      <%= link_to "Forum", simple_forum.root_path %>
+    </h1>
+
+    <div id="user-navigation">
+      <!--<ul class="wat-cf"></ul>-->
+    </div>
+    <div id="main-navigation">
+      <ul class="wat-cf">
+        <%= content_tag(:li, :class => controller.controller_path == 'simple_forum/admin/forums' ? 'active' : '') do %>
+            <%= link_to SimpleForum::Forum.model_name.human(:count => 3), simple_forum.admin_forums_path %>
+        <% end %>
+        <%= content_tag(:li, :class => controller.controller_path == 'simple_forum/admin/categories' ? 'active' : '') do %>
+            <%= link_to SimpleForum::Category.model_name.human(:count => 3), simple_forum.admin_categories_path %>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+  <div id="wrapper" class="wat-cf">
+    <div class="flash">
+      <% flash.each do |type, message| %>
+          <%= content_tag(:div, :class => "message #{type}") do %>
+              <p>
+                <%= message %>
+              </p>
+          <% end %>
+      <% end %>
+    </div>
+    <div id="main">
+      <%= yield %>
+
+      <div id="footer">
+        <div class="block">
+          <p>
+            Copyright &copy; #{Time.current.year}.
+          </p>
+        </div>
+      </div>
+    </div>
+    <div id="sidebar">
+      <%= yield :sidebar %>
+    </div>
+  </div>
+</div>
+</body>
+</html>

data/app/views/simple_forum/admin/categories/_form.html.erb

@@ -0,0 +1,9 @@
+<%= semantic_form_for [:admin, resource], :html => {:class => 'form'} do |f| %>
+    <%= f.semantic_errors %>
+    <%= f.inputs do %>
+        <%= f.input :name %>
+        <%= f.input :body %>
+        <%= f.input :position %>
+    <% end %>
+    <%= f.actions(:submit) %>
+<% end %>

data/app/views/simple_forum/admin/categories/edit.html.erb

@@ -0,0 +1,18 @@
+<div class="block">
+  <div class="secondary-navigation">
+    <ul class="wat-cf">
+      <li>
+        <%= link_to "#{t("web-app-theme.list", :default => "List")}", simple_forum.admin_categories_path %>
+      </li>
+    </ul>
+  </div>
+  <div class="content">
+    <h2 class="title">
+      Edit
+    </h2>
+
+    <div class="inner">
+      <%= render :partial => "form" %>
+    </div>
+  </div>
+</div>

data/app/views/simple_forum/admin/categories/index.html.erb

@@ -0,0 +1,45 @@
+<div class="block">
+  <div class="secondary-navigation">
+    <ul class="wat-cf">
+      <li>
+        <%= link_to "#{t("web-app-theme.new", :default => "New")}", simple_forum.new_admin_category_path %>
+      </li>
+    </ul>
+  </div>
+  <div class="content">
+    <h2 class="title">
+      <%= SimpleForum::Category.model_name.human(:count => 3) %>
+    </h2>
+
+    <div class="inner">
+      <table class="table">
+        <thead>
+        <tr>
+          <th>ID</th>
+          <th><%= SimpleForum::Category.human_attribute_name :name %></th>
+          <th class="last">&nbsp;</th>
+        </tr>
+        </thead>
+        <tbody>
+        <% @categories.each do |c| %>
+            <tr>
+              <td><%= c.id %></td>
+              <td><%= c.name %></td>
+              <td class="last">
+                <%= link_to t("web-app-theme.show", :default => "Show"), simple_forum.admin_category_path(c) %>
+                |
+                <%= link_to t("web-app-theme.edit", :default => "Edit"), simple_forum.edit_admin_category_path(c) %>
+                |
+                <%= link_to t("web-app-theme.delete", :default => "Delete"), simple_forum.admin_category_path(c), :method => :delete, :confirm => t('simple_forum.are_you_sure', :default => 'Are you sure?') %>
+
+              </td>
+            </tr>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+
+</div>
+
+

data/app/views/simple_forum/admin/categories/new.html.erb

@@ -0,0 +1,17 @@
+<div class="block">
+  <div class="secondary-navigation">
+    <ul class="wat-cf">
+      <li>
+        <%= link_to "#{t("web-app-theme.list", :default => "List")}", simple_forum.admin_categories_path %>
+      </li>
+    </ul>
+  </div>
+  <div class="content">
+    <h2 class="title">
+      New
+    </h2>
+    <div class="inner">
+      <%= render :partial => "form" %>
+    </div>
+  </div>
+</div>

data/app/views/simple_forum/admin/categories/show.html.erb

@@ -0,0 +1,35 @@
+<div class="block">
+  <div class="secondary-navigation">
+    <ul class="wat-cf">
+      <li>
+        <%= link_to "#{t("web-app-theme.list", :default => "List")}", simple_forum.admin_categories_path %>
+      </li>
+      <li>
+        <%= link_to "#{t("web-app-theme.edit", :default => "Edit")}", simple_forum.edit_admin_category_path(resource) %>
+      </li>
+    </ul>
+  </div>
+  <div class="content">
+    <h2 class="title">
+      <%= SimpleForum::Category.model_name.human %>
+    </h2>
+
+    <div class="inner">
+      <p>
+        <strong><%= resource.class.human_attribute_name :name %></strong>:
+        <%= resource.name %>
+      </p>
+
+      <p>
+        <strong><%= resource.class.human_attribute_name :body %></strong>:
+        <%= simple_format(resource.body) %>
+      </p>
+
+      <p>
+        <strong><%= resource.class.human_attribute_name :position %></strong>:
+        <%= resource.position %>
+      </p>
+
+    </div>
+  </div>
+</div>