tokite 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e52d290bef247e47cb6338cfe0b22017a96e5cec
-  data.tar.gz: 36b23d9a7ca39d8022d6902794016548383d7cc2
+  metadata.gz: cd4cf7e3df9af634d1a79b71996448181b6d3992
+  data.tar.gz: 99655b09461cd497c09704ae861a43f72b4bd429
 SHA512:
-  metadata.gz: 79b63454f8089c1af445114363a7f96d464ee8350334c1bbbfedf4c2978a04fe5f07bee8db6d9caa031db19120f5ffc595dbeeae6be3b046acb6eeca463172eb
-  data.tar.gz: a8ed5543b109ba04943f1c4a15a5e997961df7b97961632877a6b2c4a071dd6eea9dfc79941ce3a60b7c0c31970d310818e1910b20c546c63be4c20c578dfdce
+  metadata.gz: b1faa8d9d5bef41d2fe78b5929d4f9d7e307bb616c827e179d755a5d3787cb48953d86b16afe0ccc39a1b1c22de5627561c803fd917c8229166be1f4c9bb2ca2
+  data.tar.gz: 55b16a25db1f016a4e94f116d88d07124f475d790acdd5e9dc1367da895a10189cd38c71665235f8b75ce3da8fcfecd23340ede0fd4af359241fb7d9ebe8714b

data/app/controllers/tokite/rules_controller.rb

@@ -1,11 +1,7 @@
 module Tokite
   class RulesController < ApplicationController
     def index
-      if params[:user_id]
-        @users = User.where(id: params[:user_id]).includes(:rules)
-      else
-        @users = User.all.includes(:rules)
-      end
+      @users = User.all.includes(:rules)
     end
   
     def new
@@ -15,6 +11,7 @@ module Tokite
     def create
       @rule = rule_user.rules.new(rule_params)
       if @rule.save
+        flash[:info] = "Rule created."
         redirect_to edit_user_rule_path(params[:user_id], @rule)
       else
         render "new"
@@ -29,6 +26,7 @@ module Tokite
       @rule = rule_user.rules.find(params[:id])
       @rule.assign_attributes(rule_params)
       if @rule.save
+        flash[:info] = "Rule updated."
         redirect_to edit_user_rule_path(params[:user_id], @rule)
       else
         render "edit"
@@ -38,6 +36,7 @@ module Tokite
     def destroy
       @rule = rule_user.rules.find(params[:id])
       @rule.destroy!
+      flash[:info] = "Rule deleted."
       redirect_to user_rules_path(params[:user_id])
     end
   

data/app/controllers/tokite/sessions_controller.rb

@@ -11,13 +11,14 @@ module Tokite
         provider: auth[:provider],
         uid: auth[:uid],
       )
-      user.assign_attributes(
-        name: auth[:info][:name],
-        email: auth[:info][:email],
-        image_url: auth[:info][:image],
-      )
-      user.save! if user.changed?
-  
+      unless user.persisted?
+        user.update!(
+          name: auth[:info][:name],
+          email: auth[:info][:email],
+          image_url: auth[:info][:image],
+        )
+      end
+
       session[:user_id] = user.id
       redirect_to root_path
     end

data/app/controllers/tokite/users_controller.rb

@@ -3,9 +3,14 @@ module Tokite
     def index
       @users = User.all.order(:id)
     end
-  
+
+    def show
+      @user = User.find(params[:id])
+    end
+
     def create
       @user = User.create_group_user!("group name")
+      flash[:info] = "User created."
       redirect_to edit_user_path(@user)
     end
   
@@ -16,13 +21,15 @@ module Tokite
     def update
       @user = User.find(params[:id])
       @user.update!(user_params)
-      redirect_to edit_user_path(@user)
+      flash[:info] = "User updated."
+      redirect_to user_path(@user)
     end
   
     def destroy
       @user = User.find(params[:id])
       if @user.group_user?
         @user.destroy!
+        flash[:info] = "User deleted."
         redirect_to users_path
       else
         head 400

data/app/views/layouts/tokite/application.html.haml

@@ -17,4 +17,7 @@
             = nav_list_item "Rules", rules_path, ["rules"]
 
     %section.section
+      - if flash[:info]
+        .notification.is-success= flash[:info]
+
       = yield

data/app/views/tokite/users/index.html.haml

@@ -8,9 +8,7 @@
       %tr
         %td= user.id
         %td
-          -#= user.name
-          = link_to user.name, edit_user_path(user)
-          = link_to "Rules", [user, :rules], class: "button is-small"
+          = link_to user.name, user_path(user)
 
 = link_to "Create group", users_path, method: :post, data: { confirm: %(Create Group?) }, class: "button is-primary"
 

data/app/views/tokite/users/show.html.haml

@@ -0,0 +1,5 @@
+%h2.title
+  = @user.name
+  = link_to "Edit", edit_user_path(@user), class: "button is-primary is-small"
+
+= render "tokite/rules/rules", user: @user

data/config/initializers/omniauth.rb

@@ -1,6 +1,6 @@
 require "omniauth-google-oauth2"
 
-Rails.application.config.middleware.use OmniAuth::Builder do
+Tokite::Engine.config.middleware.use OmniAuth::Builder do
   provider :google_oauth2, ENV["GOOGLE_CLIENT_ID"], ENV["GOOGLE_CLIENT_SECRET"], {
     hd: ENV["GOOGLE_HOSTED_DOMAIN"].present? ? ENV["GOOGLE_HOSTED_DOMAIN"] : nil,
   }

data/config/routes.rb

@@ -2,8 +2,8 @@ Tokite::Engine.routes.draw do
   root to: "top#show"
 
   resources :hooks, only: %w(create)
-  resources :users, only: %w(index create edit update destroy) do
-    resources :rules, only: %w(index new create edit update destroy)
+  resources :users, only: %w(index show create edit update destroy) do
+    resources :rules, only: %w(new create edit update destroy)
   end
   resources :rules, only: %w(index)
 

data/lib/tokite/version.rb

@@ -1,3 +1,3 @@
 module Tokite
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tokite
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - hogelog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-27 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -211,6 +211,7 @@ files:
 - app/views/tokite/users/_form.html.haml
 - app/views/tokite/users/edit.html.haml
 - app/views/tokite/users/index.html.haml
+- app/views/tokite/users/show.html.haml
 - config/initializers/omniauth.rb
 - config/initializers/slack_notifier.rb
 - config/routes.rb