nippo_core 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bb048e8542f800f97507d2c5159631bcf63920a
-  data.tar.gz: dff7e64c3afa052e464fd48cb2b9933f758b2ba6
+  metadata.gz: b6c7b0a762d8b7bc2f308623389c1ca2289a6fa6
+  data.tar.gz: 7f6bbf9f8a68ae949f6f24ba48610552d17fe485
 SHA512:
-  metadata.gz: a14ddbf89456e67c8d8837719e965bc7d0e15e893fbc4d921af9a982e5d583d6f200ce3f8e655ba4998f94f6970a83f2962863b1f496cc15e18fa76ae7babc3c
-  data.tar.gz: 3fa1aba815dca42db8a5e6f0bb0d041dd066cf9b6283bf0bc1ae00ccadcf8e5ea910abc5dc08a27be3ad8fdb69ac364482e554a31fa1977a8839a0a0aed1f105
+  metadata.gz: 65e1ca2debede9ddcd2d1c80716956d480381b789008ce24f390ca3d8ede46cf66eaed5feae4fd10b4ea594bca1e36b255e180e006acf14b814580b2ee083d06
+  data.tar.gz: bd5ea4a7e234b32837824512711a2c47cd8e39fb96536b2d8ab90deedecad608d54c879ed845988e7e84b23afe628457d876e866262fb8c5fc59791a1fd36040

data/app/controllers/nippo_core/groups_controller.rb

@@ -1,7 +1,9 @@
 module NippoCore
   class GroupsController < ApplicationController
+    include Pundit
+
     before_action :initialize_group, only: [:new, :create]
-    before_action :find_group, only: [:show, :request_join]
+    before_action :find_group, except: [:index, :new]
 
     def index
       @groups = NippoCore::Group.order(created_at: :desc).page(params[:page]).per(10)
@@ -25,6 +27,20 @@ module NippoCore
       end
     end
 
+    def edit
+      authorize @group
+      render layout: nil
+    end
+
+    def update
+      authorize @group
+      if @group.update(group_params)
+        redirect_to @group
+      else
+        head 400
+      end
+    end
+
     def request_join
       result = current_user.send_request(@group)
       render layout: nil

data/app/controllers/nippo_core/reports_controller.rb

@@ -27,6 +27,20 @@ module NippoCore
       end
     end
 
+    def edit
+      authorize @report
+      render layout: nil
+    end
+
+    def update
+      authorize @report
+      if @report.update(report_params)
+        redirect_to [@group, @report]
+      else
+        head 400
+      end
+    end
+
   private
     def initialize_report
       # TODO: selectable reported_at

data/app/policies/nippo_core/group_policy.rb

@@ -0,0 +1,18 @@
+module NippoCore
+  class GroupPolicy < ApplicationPolicy
+    attr_reader :user, :group
+
+    def initialize(user, group)
+      @user = user
+      @group = group
+    end
+
+    def edit?
+      @group.member?(user)
+    end
+
+    def update?
+      @group.member?(user)
+    end
+  end
+end

data/app/policies/nippo_core/report_policy.rb

@@ -1,10 +1,11 @@
 module NippoCore
   class ReportPolicy < ApplicationPolicy
-    attr_reader :user, :group
+    attr_reader :user, :group, :report
 
     def initialize(user, report)
       @user = user
-      @group = report.group
+      @report = report
+      @group = @report.group
     end
 
     # TODO: remove
@@ -23,5 +24,13 @@ module NippoCore
     def create?
       @group.member?(user)
     end
+
+    def edit?
+      @report.user_id == @user.id
+    end
+
+    def update?
+      @report.user_id == @user.id
+    end
   end
 end

data/app/views/kaminari/_first_page.slim

@@ -0,0 +1,3 @@
+li
+  = link_to_unless current_page.first?, raw(t 'views.pagination.first'),
+    url, remote: remote

data/app/views/kaminari/_gap.slim

@@ -0,0 +1,2 @@
+li.disabled
+  = link_to raw(t 'views.pagination.truncate'), '#'

data/app/views/kaminari/_last_page.slim

@@ -0,0 +1,3 @@
+li
+  = link_to_unless current_page.last?, raw(t 'views.pagination.last'),
+    url, remote: remote

data/app/views/kaminari/_next_page.slim

@@ -0,0 +1,3 @@
+li
+  = link_to_unless current_page.last?, raw(t 'views.pagination.next'),
+    url, rel: 'next', remote: remote

data/app/views/kaminari/_page.slim

@@ -0,0 +1,3 @@
+li class="#{'active' if page.current?}"
+  = link_to page, page.current? ? '#' : url,
+    remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil

data/app/views/kaminari/_paginator.slim

@@ -0,0 +1,13 @@
+= paginator.render do
+  ul.pagination
+    == first_page_tag unless current_page.first?
+    == prev_page_tag unless current_page.first?
+
+    - each_page do |page|
+      - if page.left_outer? || page.right_outer? || page.inside_window?
+        == page_tag page
+      - elsif !page.was_truncated?
+        == gap_tag
+
+    == next_page_tag unless current_page.last?
+    == last_page_tag unless current_page.last?

data/app/views/kaminari/_prev_page.slim

@@ -0,0 +1,3 @@
+li
+  = link_to_unless current_page.first?, raw(t 'views.pagination.previous'),
+    url, rel: 'prev', remote: remote

data/app/views/layouts/nippo_core/application.slim

@@ -1,8 +1,21 @@
 doctype html
 html
   head
-    title
-      | 日報
+    ruby:
+      metas_hash = {
+        title: 'Nippo',
+        description: 'This is a web application you share and stock daily reports with your teams.',
+        og: {
+          title: 'Nippo',
+          description: 'This is a web application you share and stock daily reports with your teams.'
+        },
+        twitter: {
+          card: 'summary',
+          title: 'Nippo',
+          description: 'This is a web application you share and stock daily reports with your teams.'
+        }
+      }
+    = display_meta_tags metas_hash
     / = stylesheet_link_tag    "nippo_core/application", media: "all"
     link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"
     link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous"
@@ -17,12 +30,10 @@ html
     header.navbar.navbar-default.navbar-fixed-top
       .container
         .navbar-header
-          .navbar-brand
-            = t('daily report')
+          = link_to t('daily report'), root_path, class: 'navbar-brand'
         nav.nav.navbar-nav.navbar-right
           - if user_signed_in?
-            .navbar-text
-              = current_user.nickname
+            = link_to current_user.nickname, users_path, class: 'navbar-text'
           ul.nav.navbar-nav
             - if user_signed_in?
               li
@@ -33,4 +44,5 @@ html
               li
                 = link_to t('sign up'), new_user_registration_path
     .container
+      == breadcrumbs style: :bootstrap
       = yield

data/app/views/nippo_core/application/_link_to_join.slim

@@ -1,4 +1,4 @@
 - if current_user.request_to?(group)
-  = link_to 'Requesting...', '#'
+  = link_to 'Requesting...', '#', class: 'btn btn-warning'
 - else
-  = link_to 'Join us!', group_request_join_path(group), method: :post, remote: true, id: "link-to-join-group_#{group.id}"
+  = link_to 'Join us!', group_request_join_path(group), method: :post, remote: true, id: "link-to-join-group_#{group.id}", class: 'btn btn-info'

data/app/views/nippo_core/group_member_relations/new.slim

@@ -1,3 +1,4 @@
+- breadcrumb :new_group_group_member_relation, @group
 = form_for [@group, @group_member_relations] do |f|
   .form-group
     = f.collection_select :user_id, NippoCore::User.all, :id, :nickname, {}, class: 'form-control'

data/app/views/nippo_core/group_member_relations/unaccepted.slim

@@ -1,3 +1,4 @@
+- breadcrumb :group_group_member_relations, @group
 ul
   - @requests.each do |request|
     li id="request_#{request.id}"

data/app/views/nippo_core/groups/_form.slim

@@ -0,0 +1,9 @@
+= form_for group do |f|
+  .form-group
+    = f.label :name
+    = f.text_field :name, placeholder: 'グループ名 (必須)', class: 'form-control'
+  .form-group
+    = f.label :description
+    = f.text_area :description, placeholder: '説明', class: 'form-control'
+  button.btn.btn-default
+    = group.persisted? ? 'Update Group' : 'Create Group'

data/app/views/nippo_core/groups/edit.js.erb

@@ -0,0 +1 @@
+$("#group-content-area").html('<%= j render 'form', group: @group %>');

data/app/views/nippo_core/groups/index.slim

@@ -1,12 +1,14 @@
+- breadcrumb :groups
 h1
   | Group index
 ul.list-group
   - @groups.each do |group|
     li.list-group-item
-      = link_to group.name, group
-      p
+      div style="display: flex; justify-content: space-between; align-items: center"
+        = link_to group.name, group
         - if group.member?(current_user)
-          | Member
+          .btn.btn-success
+            | Member
         - else
           = render 'link_to_join', group: group
 = paginate @groups

data/app/views/nippo_core/groups/new.slim

@@ -1,9 +1,2 @@
-= form_for @group do |f|
-  .form-group
-    = f.label :name
-    = f.text_field :name, placeholder: 'グループ名 (必須)', class: 'form-control'
-  .form-group
-    = f.label :description
-    = f.text_area :description, placeholder: '説明', class: 'form-control'
-  button.btn.btn-default
-    | Create Group
+- breadcrumb :new_group
+= render 'form', group: @group

data/app/views/nippo_core/groups/request_join.js.erb

@@ -1,2 +1,2 @@
 let $link = $("#link-to-join-group_<%= @group.id %>");
-$link.attr("href", "#").text("Requesting...");
+$link.attr("href", "#").text("Requesting...").attr("class", "btn btn-warning");

data/app/views/nippo_core/groups/show.slim

@@ -1,40 +1,48 @@
-h1
-  = @group.name
-section
-  h2
-    | something
-  = simple_format @group.description
-  section
-    h3
-      | Member
-    ul
-      - @members.each do |m|
-        li
-          = m.nickname
-section
-  - if @group.member?(current_user)
+- breadcrumb :group, @group
+#group-area.panel.panel-default
+  .panel-heading
+    div style="display: flex; justify-content: space-between; align-items: center"
+      h1.panel-title
+        | Group name: 
+        = @group.name
+      - if policy(@group).edit?
+        = link_to 'edit', edit_group_path(@group), remote: true, class: 'btn btn-default'
+  .panel-body#group-content-area
     section
       h2
-        | recently activity
-      ul
-        - @reports.each do |report|
-          li
-            = link_to report.title, [@group, report]
-      .btn-group
-      = link_to 'more', group_reports_path(group_id: @group.id), class: 'btn btn-link'
-      = link_to 'new report', new_group_report_path(group_id: @group.id), class: 'btn btn-link'
+        | Introduction
+      = simple_format @group.description
+      section
+        h3
+          | Member
+        ul.list-group
+          - @members.each do |m|
+            li.list-group-item
+              = m.nickname
     section
-      h2
-        | requests
-      ul
-        - @requests.each do |request|
-          li id="request_#{request.id}"
-            = request.user.nickname
-            |  
-            = link_to 'accept', group_member_relation_accept_path(group_member_relation_id: request.id), method: :post, remote: true, id: "link-to-accept-request_#{request.id}"
-      = link_to 'more', unaccepted_group_group_member_relations_path(group_id: @group.id), class: 'btn btn-link'
-      = link_to 'invite_member', new_group_group_member_relation_path(group_id: @group.id), class: 'btn btn-link'
-  - else
-    h2
-      | Join us?
-    = render 'link_to_join', group: @group
+      - if @group.member?(current_user)
+        section
+          h2
+            | recently activity
+          ul.list-group
+            - @reports.each do |report|
+              li.list-group-item
+                = link_to report.title, [@group, report]
+          .btn-group
+          = link_to 'more', group_reports_path(group_id: @group.id), class: 'btn btn-link'
+          = link_to 'new report', new_group_report_path(group_id: @group.id), class: 'btn btn-link'
+        section
+          h2
+            | requests
+          ul.list-group
+            - @requests.each do |request|
+              li.list-group-item id="request_#{request.id}"
+                = request.user.nickname
+                |  
+                = link_to 'accept', group_member_relation_accept_path(group_member_relation_id: request.id), method: :post, remote: true, id: "link-to-accept-request_#{request.id}"
+          = link_to 'more', unaccepted_group_group_member_relations_path(group_id: @group.id), class: 'btn btn-link'
+          = link_to 'invite_member', new_group_group_member_relation_path(group_id: @group.id), class: 'btn btn-link'
+      - else
+        h2
+          | Join us?
+        = render 'link_to_join', group: @group, class: 'btn btn-link'

data/app/views/nippo_core/home/index.slim

@@ -1,3 +1,4 @@
+- breadcrumb :root
 - if user_signed_in?
   h1
     | Welcome to Nippo!

data/app/views/nippo_core/reports/_form.slim

@@ -0,0 +1,6 @@
+= form_for [report.group, report] do |f|
+  .form-group
+    = f.label :body
+    = f.text_area :body, class: 'form-control'
+  button.btn.btn-default
+    = report.persisted? ? 'Update Report' : 'Create Report'

data/app/views/nippo_core/reports/edit.js.erb

@@ -0,0 +1 @@
+$("#report-area").html('<%= j render 'form', report: @report %>');

data/app/views/nippo_core/reports/index.slim

@@ -1,3 +1,4 @@
+- breadcrumb :group_reports, @group
 ul.list-group
   - @reports.each do |report|
     li.list-group-item

data/app/views/nippo_core/reports/new.slim

@@ -1,10 +1,9 @@
-h2
-  = Date.today
-  |  
-  = current_user.nickname
-= form_for [@group, @report] do |f|
-  .form-group
-    = f.label :body
-    = f.text_area :body, class: 'form-control'
-  button.btn.btn-default
-    | Create Report
+- breadcrumb :new_group_report, @group
+.panel.panel-default
+  .panel-heading
+    h1.panel-title
+      = Date.today
+      |  
+      = current_user.nickname
+  .panel-body
+    = render 'form', report: @report

data/app/views/nippo_core/reports/show.slim

@@ -1,6 +1,10 @@
+- breadcrumb :group_report, @report
 .panel.panel-default
   .panel-heading
-    h2.panel-title
-      = @report.title
-  div.panel-body
+    div style="display: flex; justify-content: space-between; align-items: center"
+      h2.panel-title
+        = @report.title
+      - if policy(@report).edit?
+        = link_to 'edit', edit_group_report_path(@report, group_id: @group.id), remote: true, class: 'btn btn-default'
+  div.panel-body#report-area
     == @report.markdowned_body

data/app/views/nippo_core/users/registrations/edit.slim

@@ -1,42 +1,43 @@
+- breadcrumb :edit_user
 h2
   | Edit 
   = resource_name.to_s.humanize
-= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
+= form_for resource, as: resource_name, url: registration_path(resource_name), html: { method: :put } do |f|
   = devise_error_messages!
-  .field
+  .form-group
     = f.label :email
     br
-    = f.email_field :email, autofocus: true
+    = f.email_field :email, autofocus: true, class: 'form-control'
   - if devise_mapping.confirmable? && resource.pending_reconfirmation?
     div
       | Currently waiting confirmation for: 
       = resource.unconfirmed_email
-  .field
+  .form-group
     = f.label :password
     i
       | (leave blank if you don't want to change it)
     br
-    = f.password_field :password, autocomplete: "off"
+    = f.password_field :password, autocomplete: "off", class: 'form-control'
     - if @minimum_password_length
       br
       em
         = @minimum_password_length
         |  characters minimum
-  .field
+  .form-group
     = f.label :password_confirmation
     br
-    = f.password_field :password_confirmation, autocomplete: "off"
-  .field
+    = f.password_field :password_confirmation, autocomplete: "off", class: 'form-control'
+  .form-group
     = f.label :current_password
     i
       | (we need your current password to confirm your changes)
     br
-    = f.password_field :current_password, autocomplete: "off"
+    = f.password_field :current_password, autocomplete: "off", class: 'form-control'
   .actions
-    = f.submit "Update"
-h3
+    button.btn.btn-default
+      | Update
+/ h3
   | Cancel my account
-p
+/ p
   | Unhappy? 
   = button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete
-= link_to "Back", :back

data/app/views/nippo_core/users/show.slim

@@ -1,3 +1,4 @@
+- breadcrumb :user
 h1
   | Your Profile
 section
@@ -12,6 +13,7 @@ section
       | Nickame
     dd
       = current_user.nickname
+    = link_to 'edit', edit_user_registration_path, class: 'btn btn-default'
 section
   h2
     | Groups you created

data/config/breadcrumbs.rb

@@ -0,0 +1,53 @@
+crumb :root do
+  link "Home", root_path
+end
+
+crumb :user do
+  link 'user profile', users_path
+  parent :root
+end
+
+crumb :edit_user do
+  link 'edit user profile', edit_user_registration_path
+  parent :user
+end
+
+crumb :new_group do
+  link 'new group', new_group_path
+  parent :root
+end
+
+crumb :groups do
+  link 'groups index', groups_path
+  parent :root
+end
+
+crumb :group do |group|
+  link group.name, group
+  parent :groups
+end
+
+crumb :group_reports do |group|
+  link 'reports', [group, :reports]
+  parent :group, group
+end
+
+crumb :group_report do |report|
+  link report.title, [report.group, report]
+  parent :group_reports, report.group
+end
+
+crumb :new_group_report do |group|
+  link 'new report', new_group_report_path(group_id: group)
+  parent :group_reports, group
+end
+
+crumb :group_group_member_relations do |group|
+  link 'unaccepted requests', [group, :group_member_relations]
+  parent :group, group
+end
+
+crumb :new_group_group_member_relation do |group|
+  link 'invite user', new_group_group_member_relation_path(group_id: group.id)
+  parent :group, group
+end

data/config/locales/en.yml

@@ -0,0 +1,8 @@
+en:
+  views:
+    pagination:
+      truncate: ...
+      next: '>'
+      previous: '<'
+      first: '≪'
+      last: '≫'

data/config/locales/ja.yml

@@ -3,6 +3,13 @@ ja:
   sign up: サインアップ
   sign in: サインイン
   sign out: サインアウト
+  views:
+    pagination:
+      truncate: ...
+      next: '>'
+      previous: '<'
+      first: '≪'
+      last: '≫'
   activerecord:
     attributes:
       nippo_core/user:

data/config/routes.rb

@@ -1,13 +1,13 @@
 NippoCore::Engine.routes.draw do
   devise_for :users, class_name: "NippoCore::User", module: :'nippo_core/users'
   resource :users, path: :user, only: :show
-  resources :groups, except: [:edit, :update] do
+  resources :groups, except: [:destroy] do
     # resources :users, module: :groups, only: [] do
     # end
     resources :group_member_relations, path: :group_members, only: [:new, :create] do
       get :unaccepted, on: :collection
     end
-    resources :reports, except: [:edit, :update]
+    resources :reports, except: [:destroy]
     post :request_join
   end
   resources :group_member_relations, path: :group_members, only: [] do

data/lib/nippo_core/engine.rb

@@ -4,6 +4,8 @@ require 'active_decorator'
 require 'redcarpet'
 require 'pundit'
 require 'kaminari'
+require 'gretel'
+require 'meta-tags'
 
 module NippoCore
   class Engine < ::Rails::Engine

data/lib/nippo_core/version.rb

@@ -1,3 +1,3 @@
 module NippoCore
-  VERSION = '0.3.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nippo_core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Takumu Uyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gretel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: meta-tags
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -204,17 +232,29 @@ files:
 - app/models/nippo_core/report.rb
 - app/models/nippo_core/user.rb
 - app/policies/application_policy.rb
+- app/policies/nippo_core/group_policy.rb
 - app/policies/nippo_core/report_policy.rb
+- app/views/kaminari/_first_page.slim
+- app/views/kaminari/_gap.slim
+- app/views/kaminari/_last_page.slim
+- app/views/kaminari/_next_page.slim
+- app/views/kaminari/_page.slim
+- app/views/kaminari/_paginator.slim
+- app/views/kaminari/_prev_page.slim
 - app/views/layouts/nippo_core/application.slim
 - app/views/nippo_core/application/_link_to_join.slim
 - app/views/nippo_core/group_member_relations/accept.js.erb
 - app/views/nippo_core/group_member_relations/new.slim
 - app/views/nippo_core/group_member_relations/unaccepted.slim
+- app/views/nippo_core/groups/_form.slim
+- app/views/nippo_core/groups/edit.js.erb
 - app/views/nippo_core/groups/index.slim
 - app/views/nippo_core/groups/new.slim
 - app/views/nippo_core/groups/request_join.js.erb
 - app/views/nippo_core/groups/show.slim
 - app/views/nippo_core/home/index.slim
+- app/views/nippo_core/reports/_form.slim
+- app/views/nippo_core/reports/edit.js.erb
 - app/views/nippo_core/reports/index.slim
 - app/views/nippo_core/reports/new.slim
 - app/views/nippo_core/reports/show.slim
@@ -232,9 +272,11 @@ files:
 - app/views/nippo_core/users/shared/_links.slim
 - app/views/nippo_core/users/show.slim
 - app/views/nippo_core/users/unlocks/new.slim
+- config/breadcrumbs.rb
 - config/initializers/devise.rb
 - config/locales/devise.en.yml
 - config/locales/devise.ja.yml
+- config/locales/en.yml
 - config/locales/ja.yml
 - config/routes.rb
 - db/migrate/20170420094814_devise_create_nippo_core_users.rb