my_forum 0.0.1.beta60 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 138eb0541cba0d111e3f898a33c48dab5de606ec
-  data.tar.gz: a63f6486787c29e5224afbd4c46c92b9a8e9939a
+  metadata.gz: 2ec79af48419743a46cb08ceacde067a36d5c658
+  data.tar.gz: 1b16082b7f8f5cd4ca953c80ecbfc7453a8bd642
 SHA512:
-  metadata.gz: 8414121575008a2fca3eaa373f27538d7f3f35262cc62cee1fabeeeb7d5222d992f9aa5ffa89df12de3f9a16aaa82325fd50a2ac42487a872598a63573548148
-  data.tar.gz: 9ba385812a3b7a4316daf89b5e45d633428b12d87efa1ca8dadfe75c4abac3e67964371b7ccb10e8328b494a736136f1a36a9a8f25aa11c8c08483c2db3a880e
+  metadata.gz: 69de62c7ab134078ab86b43becd29403e4df93687d1c5b474055b74c7d84dc998d671301ab98c448581593faeefb53e4c0e111024cd79442cbca458fca56e294
+  data.tar.gz: b9603bae08aceb948915a1bf2f00f60386447eb4beb11d2b42fce1fa2c82fb051948d391ab2524d5263f20fa09c10c20ad64de2b5613740c0f34e1c6b302aa82

data/README.rdoc

@@ -1,14 +1,3 @@
-{<img src="https://travis-ci.org/vintyara/my_forum.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/vintyara/my_forum]
-
 = MyForum
 
-This project rocks and uses MIT-LICENSE.
-
-INSTALLATION
-rake my_forum:install:migrations
-
-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
-...
+This project rocks and uses MIT-LICENSE.

data/Rakefile

@@ -14,20 +14,19 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
 
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.pattern = 'spec/**/*_spec.rb'
+  t.pattern = 'test/**/*_test.rb'
   t.verbose = false
 end
 

data/app/assets/javascripts/my_forum/application.js

@@ -10,10 +10,4 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
-//= require jquery_ujs
-//= require bootstrap-sprockets
-//= require bootstrap
-//= jquery.selection.js
-//= jquery.scrollTo.min.js
 //= require_tree .

data/{spec/dummy/app/assets/stylesheets → app/assets/stylesheets/my_forum}/application.css

@@ -10,6 +10,6 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require_tree
+ *= require_tree .
  *= require_self
  */

data/app/controllers/my_forum/application_controller.rb

@@ -1,85 +1,4 @@
 module MyForum
   class ApplicationController < ActionController::Base
-
-    before_filter :user_activity
-
-    helper_method :attachment_img_path, :emoticons_list, :is_admin?
-
-    def authenticate_user!
-      redirect_to admin_signin_path unless current_user
-    end
-
-    def current_user
-      return session[:user_id].blank? ? nil : User.where(id: session[:user_id]).first
-    end
-    helper_method :current_user
-
-    def current_user_id
-      session[:user_id]
-    end
-    helper_method :current_user_id
-
-    def is_admin?
-      return false unless current_user
-      current_user.is_admin?
-    end
-
-    def current_user_groups
-      return [].push UserGroup::GUEST_GROUP.name unless current_user
-      current_user.user_groups.map &:name
-    end
-
-    def new_pm_count
-      return unless current_user
-      PrivateMessage.unread_count_for(current_user)
-    end
-    helper_method :new_pm_count
-
-    def forum_time(time)
-      local_time = time
-
-      if local_time.to_date == Time.now.to_date
-        return t('my_forum.today', hhmm: local_time.strftime('%H:%M'))
-      elsif local_time.to_date == (Time.now - 1.day).to_date
-        return t('my_forum.yesterday', hhmm: local_time.strftime('%H:%M'))
-      end
-
-      local_time.strftime('%Y-%m-%d %H:%M')
-    end
-    helper_method :forum_time
-
-    private
-
-    def user_activity
-      current_user.touch if current_user
-    end
-
-    def verify_admin
-      redirect_to root_path unless current_user && current_user.is_admin
-    end
-
-    def check_access_permissions(obj)
-      return true if current_user && current_user.is_admin
-
-      category_user_groups = case obj.class.to_s
-                               when 'MyForum::Forum'
-                                 obj.category.user_groups
-                               when 'MyForum::Topic'
-                                 obj.forum.category.user_groups
-                               else
-                                 []
-                             end
-
-      redirect_to root_path if (category_user_groups.map(&:name) & current_user_groups).blank?
-    end
-
-    def attachment_img_path(attachment_id)
-      attachment = Attachment.find_by_id(attachment_id.to_i)
-      File.join(Attachment::URL, attachment.user_id.to_s, attachment.file_name)
-    end
-
-    def emoticons_list
-      @emoticson ||= Emoticon.all.inject({}) {|hash, smile| hash.merge!(smile.code => File.join(Emoticon::URL, smile.file_name) ) }
-    end
   end
 end

data/app/helpers/my_forum/application_helper.rb

@@ -1,47 +1,4 @@
 module MyForum
   module ApplicationHelper
-
-    def draw_navigation
-      html_li  = content_tag :li, link_to('Forums', root_path)
-
-      if @forum
-        html_li += content_tag :li, '→'.html_safe
-        html_li += content_tag :li, link_to(@forum.name, forum_path(@forum))
-      end
-
-      if @forum && @topic && !@topic.new_record?
-        html_li += content_tag :li, '→'.html_safe
-        html_li += content_tag :li, link_to(@topic.name.html_safe, forum_topic_path(@forum, @topic))
-      end
-
-      html = content_tag :ul, class: 'draw-navigation' do
-        html_li
-      end
-
-      html.html_safe
-    end
-
-    def online_users
-      User.online.pluck(:login).join(', ')
-    end
-
-    def today_was_users
-      User.today_visited.pluck(:login).join(', ')
-    end
-
-    def errors_for(obj)
-      return if obj.errors.blank?
-
-      content_tag :div, obj.errors.full_messages.to_sentence, class: 'errors_for'
-    end
-
-    # TODO deprecate!
-    def time(datetime)
-      forum_time(datetime)
-    end
-
-    def upload_allowed_extensions
-      Attachment::ALLOWED_FILE_EXTENSIONS
-    end
   end
 end

data/app/views/layouts/my_forum/application.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>MyForum</title>
+  <%= stylesheet_link_tag    "my_forum/application", media: "all" %>
+  <%= javascript_include_tag "my_forum/application" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+
+<%= yield %>
+
+</body>
+</html>

data/config/routes.rb

@@ -1,50 +1,2 @@
 MyForum::Engine.routes.draw do
-  root 'welcome#index'
-
-  match 'signin', to: 'users#signin', via: [:get, :post]
-  match 'logout', to: 'users#logout', via: [:get]
-  match 'forgot_password',  to: 'users#forgot_password',    via: [:get, :post]
-
-  match 'unread_topics',    to: 'forums#unread_topics',     via: [:get],    as: :unread_topics
-  match 'mark_all_as_read', to: 'forums#mark_all_as_read',  via: [:get],    as: :mark_all_as_read
-
-  match 'post/:id',         to: 'posts#show',               via: [:get],    as: :post_content
-  match 'post/preview',     to: 'posts#preview',            via: [:post],   as: :post_preview
-
-  resources :images
-  resources :avatars
-  resources :attachments
-
-  resources :users do
-    patch :avatar_update
-
-    collection do
-      get :autocomplete
-    end
-  end
-
-  resources :private_messages
-
-  resources :forums, only: [:index, :show] do
-    resources :topics do
-      patch :pin
-      patch :close
-      patch :delete
-      resources :posts
-    end
-  end
-
-  namespace :admin do
-    root 'dashboard#index'
-
-    match 'forums', to: 'forums#index', via: [:get]
-    match 'mail_list', to: 'mail#index', via: [:get, :post]
-
-    resources :emoticons
-    resources :users
-    resources :roles
-    resources :categories do
-      resources :forums
-    end
-  end
 end

data/lib/my_forum/engine.rb

@@ -1,36 +1,5 @@
 module MyForum
   class Engine < ::Rails::Engine
     isolate_namespace MyForum
-
-    require 'jquery-rails'
-    require 'bootstrap-sass'
-
-    config.after_initialize do
-      ActionView::Base.sanitized_allowed_tags = %w(strong em a img br p i pre div span iframe)
-      ActionView::Base.sanitized_allowed_attributes = %w(href title class src width height target)
-    end
-
-    config.generators do |g|
-      g.test_framework      :rspec,        :fixture => false
-      g.assets false
-      g.helper false
-    end
-
-    USE_CUSTOM_USER_MODEL       = false
-    CUSTOM_USER_CLASS           = 'User'
-    CUSTOM_USER_LOGIN_ATTR      = 'login'
-    CUSTOM_USER_PASSWORD_ATTR   = 'password'
-    CUSTOM_AUTHENTICATE_METHOD  = 'users#authenticate'
-
-    attr_accessor :use_custom_user_model, :custom_user_class, :custom_user_login_attr, :custom_user_password_attr,
-                  :custom_authenticate_method
-
-    def initialize
-      self.use_custom_user_model      = USE_CUSTOM_USER_MODEL
-      self.custom_user_class          = CUSTOM_USER_CLASS
-      self.custom_user_login_attr     = CUSTOM_USER_LOGIN_ATTR
-      self.custom_user_password_attr  = CUSTOM_USER_PASSWORD_ATTR
-      self.custom_authenticate_method = CUSTOM_AUTHENTICATE_METHOD
-    end
   end
 end

data/lib/my_forum/version.rb

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

data/lib/tasks/my_forum_tasks.rake

@@ -1,155 +1,4 @@
-namespace :my_forum do
-  namespace :service do
-    desc 'Recalculate category posts count'
-    task recalculate_posts_count: :environment do
-      MyForum::Forum.all.each do |forum|
-        topic_ids = MyForum::Topic.where(forum_id: forum.id).pluck(:id)
-        count     = MyForum::Post.where(topic_id: topic_ids).count
-        forum.update(posts_count: count)
-      end
-    end
-  end
-
-  namespace :import do
-    namespace :smf do
-
-      if Rails.env.test?
-        require 'sqlite3'
-        $connection = SQLite3::Database.new('test.db')
-      else
-        $connection = Mysql2::Client.new(Rails.configuration.database_configuration['smf_import'])
-      end
-
-      desc "Import Boards"
-      task boards: :environment do
-        MyForum::Category.delete_all
-        MyForum::Forum.delete_all
-
-        sql = <<-SQL
-          SELECT
-            `smf_categories`.`name` AS category_name,
-            `smf_boards`.`name` AS board_name,
-            `smf_boards`.`description` AS board_description
-          FROM smf_boards
-          INNER JOIN `smf_categories` ON `smf_boards`.`id_cat` = `smf_categories`.`id_cat`
-        SQL
-
-        user_groups = MyForum::UserGroup.all
-
-        result = $connection.query sql
-        result.each do |row|
-          category = MyForum::Category.find_or_create_by(name: row['category_name'])
-          category.user_groups << user_groups if user_groups.any?
-
-          category.forums.create(name: row['board_name'], description: row['board_description'])
-        end
-      end
-
-      desc "Import Users"
-      task users: :environment do
-        MyForum::User.destroy_all
-
-        user_group = MyForum::UserGroup.where(name: 'Member').first
-
-        sql = "SELECT member_name, date_registered, real_name, email_address, personal_text, birthdate, website_title, website_url, signature, avatar, is_activated FROM smf_members;"
-        result = $connection.query sql
-        result.each do |row|
-          begin
-            date_registered = Time.at(row['date_registered'].to_i) rescue nil
-            user = MyForum::User.create!(
-              login:      row['member_name'],
-              email:      row['email_address'],
-              real_name:  row['real_name'],
-              birthdate:  row['birthdate'],
-              signature:  row['signature'],
-              avatar:     row['avatar'],
-              created_at: date_registered,
-              additional_info: {
-                personal_text:  row['personal_text'],
-                website_title:  row['website_title'],
-                website_url:    row['website_url'],
-                is_activated:   row['is_activated']
-            })
-
-            user.user_groups << user_group if user_group
-          rescue => e
-            print e
-          end
-        end
-      end
-
-      desc "Import Topics and Posts"
-      task topics: :environment do
-        MyForum::Topic.delete_all
-        MyForum::Post.delete_all
-
-        sql = <<-SQL
-          SELECT
-            `smf_boards`.`name` AS board_name, `smf_messages`.`poster_email`, `smf_messages`.`poster_name`, `smf_messages`.`body`,
-            `smf_messages`.`subject`, `smf_messages`.`poster_time`, `smf_messages`.`id_topic`
-          FROM `smf_messages`
-          INNER JOIN `smf_boards` ON `smf_messages`.`id_board` = `smf_boards`.`id_board`
-          ORDER BY `id_msg` ASC, `id_topic` ASC;
-        SQL
-        result = $connection.query sql
-        result.each do |row|
-          begin
-            user = MyForum::User.find_by_email(row['poster_email']) || MyForum::User.find_by_login(row['poster_name'])
-            user = MyForum::User.create!(login: row['poster_name'], email: row['poster_email'], is_deleted: true) unless user
-
-            forum = MyForum::Forum.find_or_create_by(name: row['board_name'])
-
-            # smf does not uses description field, so i use it temponary while import process
-            unless topic = MyForum::Topic.where(description: row['id_topic']).first
-              topic = forum.topics.create!(name: row['subject'], description: row['id_topic'])
-            end
-
-            post_time = Time.at(row['poster_time'].to_i)
-            topic.posts.create!(user: user, text: row['body'], forum_id: forum.id, created_at: post_time, updated_at: post_time)
-          rescue => e
-            print e
-          end
-        end
-        MyForum::Topic.update_all(description: nil)
-
-      end
-
-      desc "Import Private Messages"
-      task pms: :environment do
-        MyForum::PrivateMessage.delete_all
-
-        sql = <<-SQL
-          SELECT
-            smf_personal_messages.msgtime, smf_personal_messages.subject, smf_personal_messages.body, smf_personal_messages.from_name,
-            smf_pm_recipients.id_member as to_member, smf_members.member_name
-          FROM smf_personal_messages
-          LEFT JOIN smf_pm_recipients ON smf_personal_messages.id_pm = smf_pm_recipients.id_pm
-          LEFT JOIN smf_members ON smf_members.id_member = smf_pm_recipients.id_member
-        SQL
-
-        result = $connection.query sql
-        result.each do |row|
-          sender = MyForum::User.find_by_login(row['from_name'])
-          recipient = MyForum::User.find_by_login(row['member_name'])
-          next unless sender and recipient
-
-          pm_time = Time.at(row['msgtime'].to_i)
-
-          MyForum::PrivateMessage.create!(
-            sender_id: sender.id,
-            sender_login: sender.login,
-            recipient_id: recipient.id,
-            recipient_login: recipient.login,
-            sender_deleted: false,
-            recipient_deleted: false,
-            unread: false,
-            subject: row['subject'],
-            body: row['body'],
-            created_at: pm_time,
-            updated_at: pm_time)
-        end
-
-      end
-    end
-  end
-end
+# desc "Explaining what the task does"
+# task :my_forum do
+#   # Task goes here
+# end

data/{spec → test}/dummy/app/assets/javascripts/application.js

@@ -10,4 +10,4 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree
+//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css

@@ -0,0 +1,15 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
+ *
+ *= require_tree .
+ *= require_self
+ */

data/{spec → test}/dummy/config/environments/production.rb

@@ -20,7 +20,7 @@ Rails.application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_files = false
+  config.serve_static_assets = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/{spec → test}/dummy/config/environments/test.rb

@@ -13,7 +13,7 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files  = true
+  config.serve_static_assets  = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.

data/test/integration/navigation_test.rb

@@ -0,0 +1,10 @@
+require 'test_helper'
+
+class NavigationTest < ActionDispatch::IntegrationTest
+  fixtures :all
+
+  # test "the truth" do
+  #   assert true
+  # end
+end
+

data/test/my_forum_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class MyForumTest < ActiveSupport::TestCase
+  test "truth" do
+    assert_kind_of Module, MyForum
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,15 @@
+# Configure Rails Environment
+ENV["RAILS_ENV"] = "test"
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails/test_help"
+
+Rails.backtrace_cleaner.remove_silencers!
+
+# Load support files
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+# Load fixtures from the engine
+if ActiveSupport::TestCase.method_defined?(:fixture_path=)
+  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
+end