homeland 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3dc40f19e381402dcbbcac13f93f0b20f16c5fd
-  data.tar.gz: 693a301d1ee48eadfee4072493e0eb17200edad4
+  metadata.gz: cfcb275be53c93806dcc275f7c76b2dc846c2193
+  data.tar.gz: 604b6421b2fa89afe5669989c35d55e8fee1fbf4
 SHA512:
-  metadata.gz: 28f7ac022b4d95e797fbbe968e3fe9c7fe78164facb292b4ebdd7f2e602dd1ceb9efaa8e1375edfad11c7a2959b275fa4a3582770f75a42547f9e18e55e1019f
-  data.tar.gz: 26a6bb25221a8c128abd5a55c509950f82f78b85f49b2cd4ad1065ae6aef3e8e8ee746abf760ca60c1ed475c1debda5aaf5eb1f6c15cd445c76559eb1e6b32e1
+  metadata.gz: 797f4b1dd577bcd590c31144380d9a05bf91767fd9d5b2146100a3722b9ef2a05e1ebad7f6012c61611f5e1150f4b257805e3bf245b48fbbc6756d0abc91be25
+  data.tar.gz: 20b207acab1c5f48dd51541779f1f8b8179d3ffc49b9c132950b785e9da4cbdde1531dff315358a344b971723d942653183869c111f61ee6425fa9303126f2de

data/README.md

@@ -112,9 +112,11 @@ end
 
 ```
 
-### 如果你有更高级的需要，可以直接生成出 Homeland 的 View 文件，然后按自己的需要定制：
+### 如果你有更高级的需要，可以直接生成出 Homeland 的 Model, Controller, View 文件，然后按自己的需要定制：
 
 ```bash
+$ rails g homeland:models
+$ rails g homeland:controllers
 $ rails g homeland:views
 ```
 

data/app/assets/javascripts/homeland/homeland/nodes.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/javascripts/homeland/nodes.js

@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/homeland/application.scss

@@ -22,6 +22,8 @@
   border-radius: 180px;
 }
 
+.timeago { color: #999; text-decoration: none; }
+
 .btn-opt {
   line-height: 100%;
   padding: 6px 8px 8px 8px;
@@ -112,3 +114,34 @@
     box-shadow: 0 1px 4px rgba(0,0,0,0.28);
   }
 }
+
+.nodes {
+  margin-bottom: 20px;
+
+  .node-item {
+    padding: 15px 15px;
+    border: 1px solid #eee;
+    &:last-child {
+      border-bottom: 1px solid #eee;
+    }
+    border-bottom: 0px;
+    border-left: 5px solid #EEE;
+
+
+    .info {
+      .title {
+        font-size: 18px; font-weight: bold;
+        .count { font-weight: normal; font-size: 14px; }
+      }
+      .desc { color: #666; margin-top: 10px; }
+    }
+
+    .topics {
+      .item {
+        margin: 3px;
+        a { color: #333;  font-size: 13px; }
+        .timeago { font-size: 12px; }
+      }
+    }
+  }
+}

data/app/assets/stylesheets/homeland/homeland/nodes.css

@@ -0,0 +1,4 @@
+/*
+  Place all the styles related to the matching controller here.
+  They will automatically be included in application.css.
+*/

data/app/controllers/homeland/application_controller.rb

@@ -3,7 +3,7 @@ module Homeland
     helper Homeland::ActionView::WillPaginate
     helper Homeland::ApplicationHelper
 
-    helper_method :current_user, :owner?
+    helper_method :current_user, :owner?, :admin?
 
     alias_method :origin_current_user, Homeland.config.current_user_method.to_sym
     alias_method :origin_authenticate_user!, Homeland.config.authenticate_user_method.to_sym
@@ -22,6 +22,12 @@ module Homeland
       end
     end
 
+    def authorize_admin!
+      if !admin?
+        redirect_to homeland.root_path, alert: t('homeland.access_denied')
+      end
+    end
+
     def set_seo_meta(title = '', meta_keywords = '', meta_description = '')
       @page_title = "#{title}" if title.length > 0
       @meta_keywords = meta_keywords
@@ -35,5 +41,10 @@ module Homeland
 
       obj.user_id == current_user.id
     end
+
+    def admin?
+      return false if current_user.blank?
+      current_user.send(Homeland.config.user_admin_method) == true
+    end
   end
 end

data/app/controllers/homeland/nodes_controller.rb

@@ -0,0 +1,49 @@
+module Homeland
+  class NodesController < Homeland::ApplicationController
+    before_action :authorize_admin!, except: [:index]
+    before_action :node, only: [:edit, :update, :destroy]
+
+    def index
+      @nodes = Node.order('sort desc')
+    end
+
+    def new
+      @node = Node.new
+    end
+
+    def create
+      @node = Node.new(node_params)
+      if @node.save
+        redirect_to(node_topics_path(@node), notice: t('homeland.node_created'))
+      else
+        render action: "new"
+      end
+    end
+
+    def edit
+    end
+
+    def update
+      if @node.update_attributes(node_params)
+        redirect_to(node_topics_path(@node), notice: t('homeland.node_updated'))
+      else
+        render action: "new"
+      end
+    end
+
+    def destroy
+      @node.destroy
+      redirect_to(nodes_path, notice: t('homeland.node_deleted'))
+    end
+
+    private
+
+    def node
+      @node ||= Node.find(params[:id])
+    end
+
+    def node_params
+      params.require(:node).permit(:name, :description, :color, :sort)
+    end
+  end
+end

data/app/models/homeland/reply.rb

@@ -1,9 +1,10 @@
 module Homeland
   class Reply < ActiveRecord::Base
     include Homeland::Concerns::SoftDelete
-    include Homeland::Concerns::MarkdownBody
-    include Homeland::Concerns::UserMethods
-    include Homeland::Concerns::Pagination
+    include Homeland::Concerns::Markup
+    include Homeland::Concerns::UserDelegates
+
+    self.per_page = Homeland.config.per_page
 
     belongs_to :user, class_name: Homeland.config.user_class.to_s
     belongs_to :topic, class_name: 'Homeland::Topic'

data/app/models/homeland/topic.rb

@@ -1,13 +1,14 @@
 module Homeland
   class Topic < ActiveRecord::Base
     include Homeland::Concerns::SoftDelete
-    include Homeland::Concerns::MarkdownBody
-    include Homeland::Concerns::UserMethods
-    include Homeland::Concerns::Pagination
+    include Homeland::Concerns::Markup
+    include Homeland::Concerns::UserDelegates
+
+    self.per_page = Homeland.config.per_page
 
     belongs_to :user, class_name: Homeland.config.user_class.to_s
     belongs_to :last_reply_user, class_name: Homeland.config.user_class.to_s
-    belongs_to :node, class_name: 'Homeland::Node'
+    belongs_to :node, class_name: 'Homeland::Node', counter_cache: true
     has_many :replies, class_name: 'Homeland::Reply'
 
     validates :user_id, :title, :body, :node_id, presence: true

data/app/views/homeland/nodes/_form.html.erb

@@ -0,0 +1,27 @@
+<%= form_for(@node) do |f| %>
+  <%= render_errors @node %>
+
+  <div class="form-group">
+    <%= f.label :name %>
+    <%= f.text_field :name, class: 'form-control' %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :description %>
+    <%= f.text_area :description, rows: 4, class: 'form-control' %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :color %>
+    <%= f.select :color, Homeland.config.node_colors , {}, class: 'form-control' %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :sort %>
+    <%= f.text_field :sort, class: 'form-control' %>
+  </div>
+
+  <div class="form-group">
+    <button type="submit" class="btn btn-primary btn-lg" data-disable-with="<%= t('homeland.submiting') %>"><%= t('homeland.submit') %></button>
+  </div>
+<% end %>

data/app/views/homeland/nodes/_node.html.erb

@@ -0,0 +1,25 @@
+<div class="node-item row" style="border-left-color: <%= node.badge_color %>;">
+  <div class="info col-sm-5">
+    <div class="title"><%= link_to node.name, homeland.node_topics_path(node) %> <span class="count"><%= node.topics_count %></span></div>
+    <div class="desc">
+      <%= simple_format node.description %>
+    </div>
+    <div class="opts">
+      <% if admin? %>
+      <a class="btn-opt edit" href="<%= homeland.edit_node_path(node) %>"><i class="fa fa-pencil"></i></a>
+
+      <a class="btn-opt delete" href="<%= homeland.node_path(node) %>" data-method="DELETE" data-confirm="<%= t('homeland.are_you_sure_to_delete') %>"><i class="fa fa-trash"></i></a>
+      <% end %>
+    </div>
+  </div>
+  <div class="topics col-sm-7">
+    <%= cache(node, 'topics-recent-5') do %>
+      <% node.topics.recent.limit(3).each do |topic| %>
+      <div class="item">
+        <%= link_to topic.title, homeland.topic_path(topic) %>
+        <%= timeago topic.created_at %>
+      </div>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/homeland/nodes/edit.html.erb

@@ -0,0 +1,8 @@
+<ol class="breadcrumb">
+  <li><a href="<%= homeland.root_path %>"><%= t('homeland.nav.home') %></a></li>
+  <li><a href="<%= homeland.nodes_path %>"><%= t('homeland.nav.channels') %></a></li>
+  <li><a href="<%= homeland.node_topics_path %>"><%= @node.name %></a></li>
+  <li class="active"><%= t('homeland.nav.edit') %></li>
+</ol>
+
+<%= render 'form' %>

data/app/views/homeland/nodes/index.html.erb

@@ -0,0 +1,14 @@
+<% if admin? %>
+<ul class="nav nav-pills" style="margin-bottom:20px ">
+  <li class="nav-item">
+    <a class="nav-link active" href="<%= homeland.nodes_path %>"><%= t("homeland.channels") %></a>
+  </li>
+  <li class="nav-item">
+    <a class="nav-link" href="<%= homeland.new_node_path %>"><%= t("homeland.new_node") %></a>
+  </li>
+</ul>
+<% end %>
+
+<div class="nodes">
+  <%= render @nodes %>
+</div>

data/app/views/homeland/nodes/new.html.erb

@@ -0,0 +1,7 @@
+<ol class="breadcrumb">
+  <li><a href="<%= homeland.root_path %>"><%= t('homeland.nav.home') %></a></li>
+  <li><a href="<%= homeland.nodes_path %>"><%= t('homeland.nav.channels') %></a></li>
+  <li class="active"><%= t('homeland.nav.new') %></li>
+</ol>
+
+<%= render 'form' %>

data/app/views/homeland/nodes/update.html.erb

@@ -0,0 +1,2 @@
+<h1>Nodes#update</h1>
+<p>Find me in app/views/homeland/nodes/update.html.erb</p>

data/app/views/homeland/topics/_node_info.html.erb

@@ -3,7 +3,11 @@
   <div class="card-block">
     <h4 class="card-title"><%= node_tag(@node) %></h4>
     <p class="card-text"><%= simple_format @node.description %></p>
-    <a href="<%= homeland.new_topic_path %>" class="btn btn-primary"><%= t('homeland.nav.new') %></a>
+    <% if admin? %>
+    <a class="btn-opt" href="<%= homeland.edit_node_path(@node) %>"><i class="fa fa-pencil"></i></a>
+
+    <a class="btn-opt" href="<%= homeland.node_path(@node) %>" data-method="DELETE" data-confirm="<%= t('homeland.are_you_sure_to_delete') %>"><i class="fa fa-trash"></i></a>
+    <% end %>
   </div>
 </div>
 <% end %>

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

@@ -21,6 +21,9 @@
         <li class="nav-item<%= ' active' if controller_name == 'topics' and action_name == 'recent' %>">
           <a class="nav-link" href="<%= homeland.recent_topics_path %>"><%= t('homeland.nav.recent') %></a>
         </li>
+        <li class="nav-item<%= ' active' if controller_name == 'nodes' %>">
+          <a class="nav-link" href="<%= homeland.nodes_path %>"><%= t('homeland.nav.channels') %></a>
+        </li>
       </ul>
       <ul class="nav navbar-nav pull-xs-right">
         <li class="nav-item<%= ' active' if controller_name == 'topics' and action_name == 'new' %>">

data/config/locales/homeland.en.yml

@@ -20,7 +20,7 @@ en:
       features: 'Features'
       recent: 'Recent'
       node: "Channel"
-      new: "New Topic"
+      new: "New"
       edit: 'Edit'
     topics:
       empty: 'Ther have no subject created.'
@@ -38,3 +38,6 @@ en:
     reply_created: "Reply created success."
     reply_deleted: "Reply deleted success."
     reply_updated: "Reply updated success."
+    node_created: "Channel created success."
+    node_updated: "Channel updated success."
+    node_deleted: "Channel deleted success."

data/config/locales/homeland.zh-CN.yml

@@ -1,8 +1,43 @@
 zh-CN:
+  activerecord:
+    models:
+      homeland/topic: "话题"
+      homeland/reply: "回帖"
+    attributes:
+      homeland/topic:
+        title: "标题"
+        body: "正文"
+        node: "频道"
+        replies_count: "回帖量"
+        user: "作者"
+        activity: "更新"
+      homeland/reply:
+        body: "正文"
   homeland:
     nav:
-      home: '网站首页'
-      topics: '讨论区'
-    submiting: '提交中...'
+      home: 'Homeland'
+      latest: '话题'
+      features: '精华帖'
+      recent: '最新发布'
+      node: "频道"
+      new: "发帖"
+      edit: '编辑'
+    topics:
+      empty: '没有查到任何话题'
+      type_reply: '在这里输入你要参与回复的内容...'
+      reply_to: "回复"
+    submiting: '提交中，请稍后...'
     submit: '提交'
     cancel: '取消'
+    reply: '回复'
+    access_denied: "拒绝访问."
+    are_you_sure_to_delete: "确定要删除么？"
+    topic_created: "话题创建成功"
+    topic_updated: "话题修改成功"
+    topic_deleted: "话题删除成功"
+    reply_created: "回帖创建成功"
+    reply_deleted: "话题删除成功"
+    reply_updated: "话题修改成功"
+    node_created: "节点创建成功"
+    node_updated: "节点修改成功"
+    node_deleted: "节点删除成功"

data/config/routes.rb

@@ -11,4 +11,5 @@ Homeland::Engine.routes.draw do
     end
   end
   resources :replies, path: 'r'
+  resources :nodes
 end

data/lib/generators/homeland/controllers_generator.rb

@@ -4,10 +4,18 @@ module Homeland
   module Generators
     class ControllersGenerator < Rails::Generators::Base #:nodoc:
       source_root File.expand_path("../../../../app/controllers", __FILE__)
-      desc "Used to copy Homeland's views to your application's views."
+      desc "Used to copy Homeland's controllers to your application's controllers."
 
       def copy_controllers
-        directory 'homeland', "app/controllers/homeland"
+        %w(nodes replies topics).each do |fname|
+          path = "#{Rails.root}/app/controllers/homeland/#{fname}_controller.rb"
+          if File.exists?(path)
+            puts "Skipping homeland/#{fname}_controller.rb creation, as file already exists!"
+          else
+            puts "Adding model (homeland/#{fname}_controller.rb)..."
+            template "homeland/#{fname}_controller.rb", path
+          end
+        end
       end
     end
   end

data/lib/generators/homeland/models_generator.rb

@@ -0,0 +1,22 @@
+# coding: utf-8
+require 'rails/generators'
+module Homeland
+  module Generators
+    class ModelsGenerator < Rails::Generators::Base #:nodoc:
+      source_root File.expand_path("../../../../app/models", __FILE__)
+      desc "Used to copy Homeland's models to your application's models."
+
+      def copy_models
+        %w(node reply topic).each do |fname|
+          path = "#{Rails.root}/app/models/homeland/#{fname}.rb"
+          if File.exists?(path)
+            puts "Skipping homeland/#{fname}.rb creation, as file already exists!"
+          else
+            puts "Adding model (homeland/#{fname}.rb)..."
+            template "homeland/#{fname}.rb", path
+          end
+        end
+      end
+    end
+  end
+end

data/lib/homeland.rb

@@ -3,6 +3,11 @@ require "homeland/engine"
 require 'homeland/configuration'
 require 'homeland/markup'
 require 'homeland/action_view/will_paginate'
+require 'homeland/concerns/markup'
+require 'homeland/concerns/soft_delete'
+require 'homeland/concerns/user_delegates'
+require 'will_paginate'
+require 'will_paginate/active_record'
 require 'font-awesome-rails'
 
 module Homeland
@@ -22,11 +27,16 @@ module Homeland
       @config.user_profile_url_method = 'profile_url'
       @config.authenticate_user_method = 'authenticate_user!'
       @config.current_user_method = 'current_user'
+      @config.node_colors = ['#0E76BD', '#CEA9A9', '#e9dd00', '#222', '#F7941D', '#AB9364', '#76923C', '#33b']
       @config
     end
 
     def configure(&block)
       config.instance_exec(&block)
     end
+
+    def node_colors
+
+    end
   end
 end

data/{app/models/homeland/concerns/markdown_body.rb → lib/homeland/concerns/markup.rb}

@@ -1,6 +1,6 @@
 module Homeland
   module Concerns
-    module MarkdownBody
+    module Markup
       extend ActiveSupport::Concern
 
       included do

data/{app/models → lib}/homeland/concerns/soft_delete.rb

@@ -4,9 +4,9 @@ module Homeland
       extend ActiveSupport::Concern
 
       included do
-        default_scope -> { where(deleted_at: nil) }
-
         alias_method :destroy!, :destroy
+
+        default_scope -> { where(deleted_at: nil) }
       end
 
       def destroy

data/{app/models/homeland/concerns/user_methods.rb → lib/homeland/concerns/user_delegates.rb}

@@ -1,6 +1,6 @@
 module Homeland
   module Concerns
-    module UserMethods
+    module UserDelegates
       extend ActiveSupport::Concern
 
       included do

data/lib/homeland/configuration.rb

@@ -62,5 +62,7 @@ module Homeland
 
     # Content markup, allow: [:markdown, :html, :simple], default: :markdown
     attr_accessor :markup
+
+    attr_accessor :node_colors
   end
 end

data/lib/homeland/version.rb

@@ -1,3 +1,3 @@
 module Homeland
-  VERSION = "1.0.0.beta2"
+  VERSION = "1.0.0.beta3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: homeland
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Jason Lee
@@ -125,24 +125,30 @@ files:
 - Rakefile
 - app/assets/javascripts/homeland/application.coffee
 - app/assets/javascripts/homeland/bootstrap.min.js
+- app/assets/javascripts/homeland/homeland/nodes.js
 - app/assets/javascripts/homeland/jquery.timeago.js
+- app/assets/javascripts/homeland/nodes.js
 - app/assets/javascripts/homeland/tether.min.js
 - app/assets/stylesheets/homeland/application.scss
 - app/assets/stylesheets/homeland/bootstrap-theme.scss
 - app/assets/stylesheets/homeland/bootstrap.min.css
+- app/assets/stylesheets/homeland/homeland/nodes.css
 - app/assets/stylesheets/homeland/markdown.scss
 - app/assets/stylesheets/homeland/tether.min.css
 - app/controllers/homeland/application_controller.rb
+- app/controllers/homeland/nodes_controller.rb
 - app/controllers/homeland/replies_controller.rb
 - app/controllers/homeland/topics_controller.rb
 - app/helpers/homeland/application_helper.rb
-- app/models/homeland/concerns/markdown_body.rb
-- app/models/homeland/concerns/pagination.rb
-- app/models/homeland/concerns/soft_delete.rb
-- app/models/homeland/concerns/user_methods.rb
 - app/models/homeland/node.rb
 - app/models/homeland/reply.rb
 - app/models/homeland/topic.rb
+- app/views/homeland/nodes/_form.html.erb
+- app/views/homeland/nodes/_node.html.erb
+- app/views/homeland/nodes/edit.html.erb
+- app/views/homeland/nodes/index.html.erb
+- app/views/homeland/nodes/new.html.erb
+- app/views/homeland/nodes/update.html.erb
 - app/views/homeland/replies/_reply.html.erb
 - app/views/homeland/replies/edit.html.erb
 - app/views/homeland/shared/_error_messages.html.erb
@@ -165,10 +171,14 @@ files:
 - lib/generators/homeland/controllers_generator.rb
 - lib/generators/homeland/i18n_generator.rb
 - lib/generators/homeland/install_generator.rb
+- lib/generators/homeland/models_generator.rb
 - lib/generators/homeland/templates/config/initializers/homeland.rb
 - lib/generators/homeland/views_generator.rb
 - lib/homeland.rb
 - lib/homeland/action_view/will_paginate.rb
+- lib/homeland/concerns/markup.rb
+- lib/homeland/concerns/soft_delete.rb
+- lib/homeland/concerns/user_delegates.rb
 - lib/homeland/configuration.rb
 - lib/homeland/engine.rb
 - lib/homeland/markup.rb

data/app/models/homeland/concerns/pagination.rb

@@ -1,14 +0,0 @@
-require 'will_paginate'
-require 'will_paginate/active_record'
-
-module Homeland
-  module Concerns
-    module Pagination
-      extend ActiveSupport::Concern
-
-      included do
-        self.per_page = Homeland.config.per_page
-      end
-    end
-  end
-end