my_forum 0.0.1.beta43 → 0.0.1.beta44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 898dfc20ccc1570159c8b166757647cd1561ac69
-  data.tar.gz: 3d36e03985b31c140e2c2d32eb92557cd3df6026
+  metadata.gz: b9e6b7c0c57f0a4a8bbdcbfd68a8d4897d4d756c
+  data.tar.gz: dc665408beac7afd641d6924108c2fd0df5d3e62
 SHA512:
-  metadata.gz: 7e251953aa891fef3009d0a77de913a8958962db75616b89a04a780b02373e0cea92a77664b34d2edc464f3ba762da3d5390e548dd6374f16f843ac9c88685ad
-  data.tar.gz: 286758629f312cb16c798682f04cc5dbaf6b87a168cdd8c93bd19135af5b1851cfa9c3c40dff348280c50870beeb4a1b6e7265d7b97fe675ac8ab3b436cf991c
+  metadata.gz: e3a7b6210f0c307546d2cbc5892a35cdb32de3bc0df9eccd3745a585a9f403b01375a0664f7ce809770ccf9acb191961a0b23037174588d8b6ca1df313f792ab
+  data.tar.gz: 1cfbd5122f63ed7eb6208a09bc733002ea2aa34eeba7b598415af3ae7be94bdc3ca5236a5699730d0e31c926b2cf83ac992298e5d3c93a302d2f25102762f4f3

data/README.rdoc

@@ -7,41 +7,8 @@ This project rocks and uses MIT-LICENSE.
 INSTALLATION
 rake my_forum:install:migrations
 
-
-FAQ
-Q: how to customize urls
-A:
-
-Create, for exmaple, my_forum.rb file in your initialize app folder (your_app/config/initializer/my_forum.rb) and rewrite
-methids like this -
-
-MyForum::Forum.class_eval do
-  def to_param
-    "#{id}-something"
-  end
-end
-
-
-
-
-
-
-
-
 For using existing User model, use somethink like this:
 
 Create config/initializers/my_forum.rb with next content:
 MyForum::Engine.use_custom_user_model = true
-...
-
-http://w3facility.org/question/ruby-regex-for-stripping-bbcode/
-
-gem build my_forum.gemspec
-
-https://github.com/cpjolicoeur/bb-ruby
-http://fortawesome.github.io/Font-Awesome/icons/#text-editor
-
-
-Used plugins:
-
-http://madapaja.github.io/jquery.selection/
+...

data/app/controllers/my_forum/topics_controller.rb

@@ -12,7 +12,10 @@ module MyForum
     def show
       @topic = Topic.find(params[:id])
       check_access_permissions(@topic)
-      @topic_posts = @topic.posts.paginate(per_page: Post::PER_PAGE, page: params[:page])
+
+      user_last_page = get_last_readed_user_page
+
+      @topic_posts  = @topic.posts.paginate(per_page: Post::PER_PAGE, page: (params[:page] || user_last_page))
       @new_post = Post.new #TODO if quick_answer_enabled
 
       @topic.mark_as_read(current_user, @topic_posts.last)
@@ -57,6 +60,22 @@ module MyForum
 
     private
 
+    # TODO development in progress
+    def get_last_readed_user_page
+      return nil unless params[:page].blank? or current_user
+      return nil if
+      user_last_page = nil
+
+      latest_readed_post = LogReadMark.where(user_id: current_user.id, topic_id: @topic.id).first
+      return nil unless latest_readed_post
+
+      page_groups = @topic.posts.pluck(:id).in_groups_of(Post::PER_PAGE)
+      page_groups.each_with_index { |group, page| user_last_page = page and break if group.include?(latest_readed_post.post_id) }
+      user_last_page +=1 if user_last_page
+
+      user_last_page
+    end
+
     def check_is_admin
       return unless current_user
       return unless current_user.is_admin?

data/app/controllers/my_forum/users_controller.rb

@@ -21,8 +21,6 @@ module MyForum
         current_user.update(attr => params[:user][attr]) if params[:user][attr]
       end
 
-      flash[:notice] = t('.successfully_updated')
-
       redirect_to edit_user_path(current_user)
     end
 
@@ -32,7 +30,7 @@ module MyForum
         @user.user_groups << UserGroup::MEMBER_GROUP
         @user.save
         session[:user_id] = @user.id
-        redirect_to edit_user_path(@user)
+        redirect_to root_path
       else
         render :new
       end

data/app/helpers/my_forum/application_helper.rb

@@ -22,8 +22,7 @@ module MyForum
     end
 
     def online_users
-      users_list = User.online.pluck(:login).join(', ')
-      users_list.blank? ? I18n.t('my_forum.no_online_users') : users_list
+      User.online.pluck(:login).join(', ')
     end
 
     def today_was_users

data/app/helpers/my_forum/posts_helper.rb

@@ -57,7 +57,8 @@ module MyForum
       end
 
       # Link
-      text.gsub!(/\[url=(.*?)\](.*?)\[\/url\]/i) { "<a href='#{$1}'>#{$2}</a>" }
+      text.gsub!(/\[url=(.*?)\](.*?)\[\/url\]/i)    { "<a href='#{$1}'>#{$2}</a>" }
+      text.gsub!(/(http:\/\/[\S]+|www:\/\/[\S]+)/)  { "<a target=\"_blank\" href=#{$1}>#{$1}</a>"}
 
       text.html_safe
     end

data/app/views/my_forum/topics/show.haml

@@ -1,8 +1,9 @@
 .container-fluid
   .row
-    .col-md-12
-      #topic_header
-        = render 'topic_header', topic: @topic
+    #topic_header.col-md-9
+      = render 'topic_header', topic: @topic
+    .col-md-3
+      = will_paginate @topic_posts
   .row
     .col-md-12
       #posts

data/app/views/my_forum/users/edit.haml

@@ -2,6 +2,7 @@
 
 .row
   .col-md-4
+
     = errors_for(current_user)
 
     = form_for current_user, url: user_path(current_user), role: 'form' do |form|
@@ -32,9 +33,4 @@
       - additional_info_attrs.each do |attr|
         .form-group= form.text_field attr, value: current_user.send(attr), class: 'name form-control', placeholder: t("my_forum.additional_info.#{attr.to_s}")
 
-      = form.submit t('.update'), class: 'btn btn-primary btn-sm'
-
-%br
-.row
-  .col-md-12.text-center
-    =link_to t('.back_to_the_forum'), root_path, class: 'btn btn-sm btn-success'
+      = form.submit t('.update'), class: 'btn btn-primary btn-sm'

data/config/locales/ru.yml

@@ -1,7 +1,6 @@
 ru:
   today: "Сегодня"
   my_forum:
-    no_online_users: 'никого нет :('
     pm:
       sent: 'Сообщение отправленно'
     mailer:
@@ -143,9 +142,6 @@ ru:
         update: 'Обновить'
         update_avatar: 'Обновить аватар'
         edit_additional_info: 'Дополнительная информация'
-        back_to_the_forum: 'Вернуться на форум'
-      update:
-        successfully_updated: 'Данные обновлены'
 
 
     private_messages:

data/db/migrate/20160122202142_add_latest_post_info_for_topic.rb

@@ -0,0 +1,8 @@
+class AddLatestPostInfoForTopic < ActiveRecord::Migration
+  def change
+    add_column :my_forum_topics, :latest_post_created_at,   :datetime
+    add_column :my_forum_topics, :latest_post_login,        :string
+
+
+  end
+end

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta43"
+  VERSION = "0.0.1.beta44"
 end

data/spec/dummy/log/development.log

@@ -0,0 +1,12 @@
+  MyForum::User Load (0.1ms)  SELECT  "my_forum_users".* FROM "my_forum_users"  ORDER BY "my_forum_users"."id" DESC LIMIT 1
+SQLite3::SQLException: no such table: my_forum_users: SELECT  "my_forum_users".* FROM "my_forum_users"  ORDER BY "my_forum_users"."id" DESC LIMIT 1
+  MyForum::User Load (0.1ms)  SELECT  "my_forum_users".* FROM "my_forum_users"  ORDER BY "my_forum_users"."id" DESC LIMIT 1
+SQLite3::SQLException: no such table: my_forum_users: SELECT  "my_forum_users".* FROM "my_forum_users"  ORDER BY "my_forum_users"."id" DESC LIMIT 1
+  MyForum::User Load (0.1ms)  SELECT  "my_forum_users".* FROM "my_forum_users"  ORDER BY "my_forum_users"."id" DESC LIMIT 1
+SQLite3::SQLException: no such table: my_forum_users: SELECT  "my_forum_users".* FROM "my_forum_users"  ORDER BY "my_forum_users"."id" DESC LIMIT 1
+   (1.7ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  MyForum::User Load (0.1ms)  SELECT  "my_forum_users".* FROM "my_forum_users"  ORDER BY "my_forum_users"."id" DESC LIMIT 1
+SQLite3::SQLException: no such table: my_forum_users: SELECT  "my_forum_users".* FROM "my_forum_users"  ORDER BY "my_forum_users"."id" DESC LIMIT 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta43
+  version: 0.0.1.beta44
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -283,6 +283,7 @@ files:
 - db/migrate/20151220121140_create_my_forum_emoticons.rb
 - db/migrate/20151221203243_my_forum_rename_user_avatar.rb
 - db/migrate/20151221205045_my_forum_change_user_avatar.rb
+- db/migrate/20160122202142_add_latest_post_info_for_topic.rb
 - lib/my_forum.rb
 - lib/my_forum/engine.rb
 - lib/my_forum/version.rb
@@ -323,6 +324,7 @@ files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -393,6 +395,7 @@ test_files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/log/development.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html