コミット: d9194a31dd73e37996e89e85008f66307458e027 - kisuge (git)

Web appl using RoR 3.2.14

コミットメタ情報

• リビジョン: d9194a31dd73e37996e89e85008f66307458e027 (tree)
• 日時: 2013-08-28 02:20:41
• 作者: stellecadente <yoichi.k@stel...>
• コミッター: stellecadente

ログメッセージ

added other associations

変更サマリ

• modified: .gitignore
• modified: app/controllers/mountains_controller.rb
• modified: app/controllers/records_controller.rb
• modified: app/models/blog.rb
• modified: app/models/blog_comment.rb
• modified: app/models/mountain.rb
• add: app/models/mountains_records.rb
• modified: app/models/record.rb
• modified: app/models/user.rb
• modified: app/views/layouts/application.html.erb
• modified: app/views/mountains/_form_index_short.html.erb
• modified: app/views/records/_form.html.erb
• add: app/views/records/conquer.html.erb
• modified: app/views/records/edit.html.erb
• modified: app/views/records/index.html.erb
• modified: app/views/records/new.html.erb
• modified: app/views/records/show.html.erb
• modified: config/locales/ja.yml
• modified: config/routes.rb
• delete: create_model_mountains-blogs.sh
• delete: create_scaffold_mountains.sh
• delete: create_scaffold_users.sh
• modified: create_scaffolds.sh
• add: db/migrate/20130827165652_create_mountains_records.rb
• modified: db/schema.rb
• add: test/fixtures/mountains_records.yml
• add: test/unit/mountains_records_test.rb

差分

--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,5 @@
 /tmp
 
 # Ignore Shell Scripts
-/*.sh
+*.sh
 

--- a/app/controllers/mountains_controller.rb
+++ b/app/controllers/mountains_controller.rb
@@ -4,7 +4,7 @@ class MountainsController < ApplicationController
   def index
     # @mountains = Mountain.all
     @mountains = Mountain.order('id ASC').
-      paginate(:page => params[:page], :per_page => 10)
+      paginate(:page => params[:page], :per_page => 20)
 
     respond_to do |format|
       format.html # index.html.erb

--- a/app/controllers/records_controller.rb
+++ b/app/controllers/records_controller.rb
@@ -3,6 +3,8 @@ class RecordsController < ApplicationController
   # GET /records.json
   def index
     @records = Record.all
+    @records = Record.order('id ASC').
+      paginate(:page => params[:page], :per_page => 10)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -80,4 +82,10 @@ class RecordsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  # Show one's records of conquering mountains
+  def conquer
+     @user = User.where(:name => 'yoichi.k' ).first
+  end
+
 end

--- a/app/models/blog.rb
+++ b/app/models/blog.rb
@@ -2,4 +2,5 @@ class Blog < ActiveRecord::Base
   attr_accessible :body, :id, :issue_dt, :title, :user_id, :mountain_id
   belongs_to :mountain
   belongs_to :user
+  has_many :blog_comments
 end

--- a/app/models/blog_comment.rb
+++ b/app/models/blog_comment.rb
@@ -1,3 +1,4 @@
 class BlogComment < ActiveRecord::Base
   attr_accessible :blog_id, :body, :fl_publish, :id, :issue_dt, :title, :user_id
+  belongs_to :blogs
 end

--- a/app/models/mountain.rb
+++ b/app/models/mountain.rb
@@ -2,4 +2,5 @@ class Mountain < ActiveRecord::Base
   attr_accessible :district, :elevation, :fl_100meizan, :fl_200meizan, :fl_300meizan, :fl_aizu, :fl_gumma, :fl_hana, :fl_hokkaido, :fl_kansai, :fl_kanto, :fl_kyuushuu, :fl_niigata, :fl_shikoku, :fl_shinhana, :fl_shinhyaku, :fl_tochigi, :fl_tohoku, :fl_utsukushima, :fl_yama1000, :fl_yamanashi, :id, :kana, :latitude, :longitude, :map025, :map050, :map200, :name1, :name2, :name3, :number_300meizan, :prefs, :uname
   has_many :blogs
   has_many :users, :through => :blogs
+  has_many :users, :through => :records
 end

--- /dev/null
+++ b/app/models/mountains_records.rb
@@ -0,0 +1,5 @@
+class MountainsRecords < ActiveRecord::Base
+  belongs_to :mountain
+  belongs_to :record
+  # attr_accessible :title, :body
+end

--- a/app/models/record.rb
+++ b/app/models/record.rb
@@ -1,3 +1,4 @@
 class Record < ActiveRecord::Base
   attr_accessible :body, :end_d, :id, :mountain_id, :publish_d, :start_d, :title, :user_id
+  belongs_to :users
 end

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,4 +2,5 @@ class User < ActiveRecord::Base
   attr_accessible :authority, :birth_d, :email, :id, :name, :password, :password_digest, :pref, :realname, :register_d, :selfintro
   has_many :blogs
   has_many :mountains, :through => :blogs
+  has_many :records
 end

--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -13,7 +13,8 @@
 
 <hr />
 <div>
-  <p>Powered by Ruby on Rails</p>
+  <p><%= t 'application.footer' %></p>
+  <p><%= t 'application.copyright' %></p>
 </div>
 </body>
 </html>

--- a/app/views/mountains/_form_index_short.html.erb
+++ b/app/views/mountains/_form_index_short.html.erb
@@ -5,7 +5,7 @@
       <th><%= t "attributes.uname" %></th>
       <th><%= t "attributes.elevation" %></th>
       <th><%= t "attributes.district" %></th>
-      <th><%= t "attributes.number_300meizan" %></th>
+      <th><%= "通番" %></th>
       <th><%= t "attributes.100meizan" %></th>
       <th><%= t "attributes.200meizan" %></th>
       <th><%= t "attributes.300meizan" %></th>
@@ -18,7 +18,7 @@
 
   <tbody>
     <% @mountains.each do |mountain| %>
-    <tr style="background-color:<%= cycle('#DDddDD', '#FFff99') %>">
+    <tr style="background-color:<%= cycle('#DDddDD', '#FFff55') %>">
         <td width=10 align=right><%= mountain.id %></td>
         <td width=140><%= mountain.uname %></td>
         <td><%= mountain.elevation %>m</td>

--- a/app/views/records/_form.html.erb
+++ b/app/views/records/_form.html.erb
@@ -41,7 +41,7 @@
   </div>
   <div class="field">
     <%= f.label :body %><br />
-    <%= f.text_field :body %>
+    <%= f.text_area :body, {:cols=>40, :rows=>3 } %>
   </div>
   <div class="actions">
     <%= f.submit %>

--- /dev/null
+++ b/app/views/records/conquer.html.erb
@@ -0,0 +1,12 @@
+<h1>「<%= @user.name %>」が登った山</h1>
+<hr />
+<p id="notice"><%= notice %></p>
+
+<% @user.mountains.each do |mountain| %>
+  <h3><%= mountain.uname %></h3>
+  <p>
+    標高： <%= mountain.elevation %>m, 
+    山域名：<%= mountain.district %>
+   </p>
+<% end %>
+

--- a/app/views/records/edit.html.erb
+++ b/app/views/records/edit.html.erb
@@ -1,6 +1,7 @@
 <h1>Editing record</h1>
+<%= link_to 'Show', @record %> |
+<%= link_to 'Back', records_path %>
+<hr />
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @record %> |
-<%= link_to 'Back', records_path %>

--- a/app/views/records/index.html.erb
+++ b/app/views/records/index.html.erb
@@ -1,4 +1,6 @@
 <h1>Listing records</h1>
+<%= link_to 'New Record', new_record_path %>
+<hr />
 
 <table>
   <tr>
@@ -16,7 +18,7 @@
   </tr>
 
 <% @records.each do |record| %>
-  <tr>
+  <tr style="background-color:<%= cycle('#DDddDD', '#99ffFF') %>">
     <td><%= record.id %></td>
     <td><%= record.mountain_id %></td>
     <td><%= record.user_id %></td>
@@ -30,8 +32,7 @@
     <td><%= link_to 'Destroy', record, method: :delete, data: { confirm: 'Are you sure?' } %></td>
   </tr>
 <% end %>
+<%= will_paginate @users %>
 </table>
 
 <br />
-
-<%= link_to 'New Record', new_record_path %>

--- a/app/views/records/new.html.erb
+++ b/app/views/records/new.html.erb
@@ -1,5 +1,6 @@
 <h1>New record</h1>
+<%= link_to 'Back', records_path %>
+<hr />
 
 <%= render 'form' %>
 
-<%= link_to 'Back', records_path %>

--- a/app/views/records/show.html.erb
+++ b/app/views/records/show.html.erb
@@ -1,4 +1,7 @@
+<%= link_to 'Edit', edit_record_path(@record) %> |
+<%= link_to 'Back', records_path %>
 <p id="notice"><%= notice %></p>
+<hr />
 
 <p>
   <b>Id:</b>
@@ -41,5 +44,3 @@
 </p>
 
 
-<%= link_to 'Edit', edit_record_path(@record) %> |
-<%= link_to 'Back', records_path %>

--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -279,6 +279,8 @@ ja:
       link: '編集'
   application:
     title: キスゲプロジェクト
+    footer: Powered by Ruby on Rails
+    copyright: (C)Yoichi Kanno, 2013
   users:
     title:
       list: 〈メンバー〉データ一覧表

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -20,7 +20,16 @@ Kisuge::Application.routes.draw do
     post 'destroy'
   end
 
-  resources :records
+  resources :records do
+    collection do
+      get 'conquer' => 'records#conquer'
+    end
+    get 'index'
+    get 'show'
+    post 'new'
+    post 'edit'
+    post 'destroy'
+  end
 
 
   # The priority is based upon order of creation:

--- a/create_model_mountains-blogs.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-rails generate model mountains-blogs \
-  mountain_id:references \
-  brog_id:references \
-

--- a/create_scaffold_mountains.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-rails generate scaffold mountains \
-  id:integer \
-  uname:string \
-  kana:string  \
-  name1:string \
-  name2:string \
-  name3:string \
-  elevation:integer \
-  number_300meizan \
-  district:string \
-  latitude:float \
-  longitude:float \
-  prefs:string \
-  map200:string \
-  map050:string \
-  map025:string \
-  fl_yama1000:boolean \
-  fl_100meizan:boolean \
-  fl_200meizan:boolean \
-  fl_300meizan:boolean \
-  fl_hana:boolean \
-  fl_shinhana:boolean \
-  fl_shinhyaku:boolean \
-  fl_kanto:boolean \
-  fl_kansai:boolean \
-  fl_kyuushuu:boolean \
-  fl_yamanashi:boolean \
-  fl_tohoku:boolean \
-  fl_niigata:boolean \
-  fl_utsukushima:boolean \
-  fl_aizu:boolean \
-  fl_hokkaido:boolean \
-  fl_shikoku:boolean \
-  fl_tochigi:boolean \
-  fl_gumma:boolean \
-

--- a/create_scaffold_users.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-rails generate scaffold users \
-  id:integer \
-  name:string \
-  realname:string \
-  password:string \
-  password_digest:string \
-  birth_d:date \
-  register_d:date \
-  authority:string \
-  email:string \
-  pref:string \
-  selfintro:string \

--- a/create_scaffolds.sh
+++ b/create_scaffolds.sh
@@ -80,3 +80,7 @@ rails generate model mountains-blogs \
   mountain:references \
   blog:references \
 
+rails generate model mountains-records \
+  mountain:references \
+  record:references \
+

--- /dev/null
+++ b/db/migrate/20130827165652_create_mountains_records.rb
@@ -0,0 +1,11 @@
+class CreateMountainsRecords < ActiveRecord::Migration
+  def change
+    create_table :mountains_records, :id => false do |t|
+      t.references :mountain
+      t.references :record
+
+    end
+    add_index :mountains_records, :mountain_id
+    add_index :mountains_records, :record_id
+  end
+end

--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130827105700) do
+ActiveRecord::Schema.define(:version => 20130827165652) do
 
   create_table "blog_comments", :force => true do |t|
     t.integer  "blog_id"
@@ -80,6 +80,14 @@ ActiveRecord::Schema.define(:version => 20130827105700) do
   add_index "mountains_blogs", ["blog_id"], :name => "index_mountains_blogs_on_blog_id"
   add_index "mountains_blogs", ["mountain_id"], :name => "index_mountains_blogs_on_mountain_id"
 
+  create_table "mountains_records", :id => false, :force => true do |t|
+    t.integer "mountain_id"
+    t.integer "record_id"
+  end
+
+  add_index "mountains_records", ["mountain_id"], :name => "index_mountains_records_on_mountain_id"
+  add_index "mountains_records", ["record_id"], :name => "index_mountains_records_on_record_id"
+
   create_table "records", :force => true do |t|
     t.string   "mountain_id"
     t.string   "user_id"

--- /dev/null
+++ b/test/fixtures/mountains_records.yml
@@ -0,0 +1,17 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  mountain_id: 2
+  record_id: 1
+
+two_id:
+  mountain_id: 1
+  record_id: 3
+
+three_id:
+  mountain_id: 3
+  record_id: 4
+
+four_id:
+  mountain_id: 289
+  record_id: 5

--- /dev/null
+++ b/test/unit/mountains_records_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class MountainsRecordsTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end