enju_question 0.1.0.pre11 → 0.1.0.pre12

data/app/views/questions/_index.html.erb

@@ -1,10 +1,10 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.question')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.question')) -%></h1>
 
 <div id="content_list">
-  <%= form_for :questions, :url => questions_path, :html => {:method => 'get'} do -%>
+  <%= form_for :questions, url: questions_path, :html => {method: 'get'} do -%>
     <p>
-      <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+      <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
       <%= submit_tag t('page.search') -%>
     </p>
   <%- end -%>
@@ -13,12 +13,12 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <%= render 'solved_facet' -%>
   <ul>
   <%- if can? :create, Question -%>
     <li><%= link_to t('question.my'), user_questions_path(current_user) -%></li>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.question')), new_question_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.question')), new_question_path -%></li>
   <%- end -%>
   </ul>
   <%= render 'crd' -%>

data/app/views/questions/_index_user.html.erb

@@ -1,9 +1,9 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.question')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.question')) -%></h1>
 <div id="content_list">
-  <%= form_for :questions, :url => user_questions_path(@user), :html => {:method => 'get'} do -%>
+  <%= form_for :questions, url: user_questions_path(@user), :html => {method: 'get'} do -%>
     <p>
-      <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+      <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
       <%= submit_tag t('page.search') -%>
     </p>
   <%- end -%>
@@ -12,7 +12,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <%= render 'solved_facet' -%>
   <ul>
     <li><%= link_to t('question.all'), questions_path -%></li>

data/app/views/questions/_list.html.erb

@@ -4,24 +4,24 @@
   <%- if params[:sort_by].blank? -%>
     <strong><%= t('question.last_answered_at') -%></strong>
   <%- else -%>
-    <%= link_to t('question.last_answered_at'), url_for(params.merge(:sort_by => nil, :only_path => true)) -%>
+    <%= link_to t('question.last_answered_at'), url_for(params.merge(sort_by: nil, only_path: true)) -%>
   <%- end -%>
   <%- if params[:sort_by] == 'created_at' -%>
     <strong><%= t('question.created_at') -%></strong>
   <%- else -%>
-    <%= link_to t('question.created_at'), url_for(params.merge(:sort_by => 'created_at', :only_path => true)) -%>
+    <%= link_to t('question.created_at'), url_for(params.merge(sort_by: 'created_at', only_path: true)) -%>
   <%- end -%>
   <%- if params[:sort_by] == 'answers_count' -%>
     <strong><%= t('activerecord.attributes.question.answers_count') -%></strong>
   <%- else -%>
-    <%= link_to t('activerecord.attributes.question.answers_count'), url_for(params.merge(:sort_by => 'answers_count', :only_path => true)) -%>
+    <%= link_to t('activerecord.attributes.question.answers_count'), url_for(params.merge(sort_by: 'answers_count', only_path: true)) -%>
   <%- end -%>
 </p>
 
 <%- if @count[:query_result] > 0 -%>
   <table class="index">
     <tr>
-      <th>ID</th>
+      <th>Id</th>
       <th><%= t('activerecord.models.question') -%></th>
       <th></th>
       <th></th>
@@ -31,8 +31,8 @@
     <tr class="line<%= cycle("0", "1") -%>">
       <td style="width: 30px"><%= question.id -%></td>
       <td>
-        <%= link_to truncate(question.body, :length => 60), question -%>
-        (<%= link_to question.user.username, question.user -%>)
+        <%= link_to truncate(question.body, length: 60), question -%>
+        (<%= link_to question.user.username, question.user.profile if question.user.try(:profile) -%>)
         <br />
         <!--
         <%= t('question.updated_at') %>: <%= l(question.updated_at) -%>
@@ -41,7 +41,7 @@
         <%= t('question.last_answered_at') %>: <%= l(question.answers.last.updated_at) if question.answers.last -%>
       </td>
       <td>
-        <%= link_to image_tag('icons/comments.png', :alt => t('answer.count'), :size => '16x16'), question %>
+        <%= link_to image_tag('icons/comments.png', alt: t('answer.count'), size: '16x16'), question %>
         <%= link_to question.answers.size, question -%>
         <%- if question.solved %>
           <%= t('question.solved') %>
@@ -54,7 +54,7 @@
           <%= link_to t('page.edit'), edit_question_path(question) -%>
         <% end %>
         <%- if can? :delete, question -%>
-          <%= link_to t('page.destroy'), question, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+          <%= link_to t('page.destroy'), question, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
     </tr>
@@ -64,6 +64,6 @@
   <p><%= t('question.no_record_found') -%></p>
 <%- end -%>
 
-<%= paginate(@questions, :remote => true) -%>
+<%= paginate(@questions, remote: true) -%>
 
 </div>

data/app/views/questions/_solved_facet.html.erb

@@ -4,12 +4,12 @@
     <% facet.value ? facet_solved = true : facet_solved = false %>
     <li>
       <%- if @solved == facet_solved -%><strong><%- end -%>
-      <%= link_to localized_boolean(facet.value), url_for(params.merge(:page => nil, :solved => facet.value.to_s, :view => nil, :only_path => true)) -%>
+      <%= link_to localized_boolean(facet.value), url_for(params.merge(page: nil, :solved => facet.value.to_s, view: nil, only_path: true)) -%>
       (<%= facet.count -%>)
       <%- if @solved == facet_solved -%></strong><%- end -%>
     </li>
   <%- end -%>
   <%- if @solved -%>
-    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:solved => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:solved => nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

data/app/views/questions/edit.html.erb

@@ -1,18 +1,18 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.question')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.question')) -%></h1>
 <div id="content_list">
 
-<%= simple_form_for(@question, :validate => true) do |f| -%>
+<%= simple_form_for(@question, validate: true) do |f| -%>
   <%= f.error_notification -%>
 
   <div class="field">
     <%= f.label t('activerecord.models.user') -%><br />
-    <%= link_to @question.user.username, @question.user -%>
+    <%= link_to @question.user.username, @question.user.profile if @question.user.try(:profile) -%>
   </div>
 
   <div class="field">
     <%= f.label :body -%><br />
-    <%= f.text_area :body, :class => 'resource_textarea' -%>
+    <%= f.text_area :body, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">
@@ -36,7 +36,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @question -%></li>
     <li><%= link_to t('page.back'), user_questions_path(@question.user) -%></li>

data/app/views/questions/index.atom.builder

@@ -1,8 +1,8 @@
-atom_feed(:url => questions_url(:format => :atom)) do |feed|
+atom_feed(url: questions_url(format: :atom)) do |feed|
   if @user
     feed.title t('question.user_question', :login_name => @user.username)
   else
-    feed.title t('question.library_group_question', :library_group_name => @library_group.display_name.localize)
+    feed.title t('question.library_group_question', library_group_name: @library_group.display_name.localize)
   end
   feed.updated(@questions.first ? @questions.first.created_at : Time.zone.now)
 

data/app/views/questions/index.mobile.erb

@@ -1,12 +1,12 @@
 <div data-role="header">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.question')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.question')) -%></h1>
 </div>
 
 <div data-role="content">
   <div data-role="fieldcontain">
-    <%= form_for :questions, :html => {:method => 'get'} do -%>
+    <%= form_for :questions, :html => {method: 'get'} do -%>
       <%= label_tag :search_form_top, t('page.search_term') -%>:
-      <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+      <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
       <%= submit_tag t('page.search') -%>
     <% end %>
   </div>
@@ -14,7 +14,7 @@
 
 <ul data-role="listview">
 <% @questions.each do |question| %>
-  <li><%= link_to truncate(question.body, :length => 60), question -%></li>
+  <li><%= link_to truncate(question.body, length: 60), question -%></li>
 <% end %>
 </ul>
 

data/app/views/questions/index.rss.builder

@@ -7,20 +7,20 @@ xml.rss('version' => "2.0",
       xml.title t('question.user_question', :login_name => @user.username)
       xml.link user_questions_url(@user)
     else
-      xml.title t('question.library_group_question', :library_group_name => @library_group.display_name.localize)
+      xml.title t('question.library_group_question', library_group_name: @library_group.display_name.localize)
       xml.link questions_url
     end
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
     if @user
-      xml.tag! "atom:link", :rel => 'self', :href => user_questions_url(@user, :format => :rss)
-      xml.tag! "atom:link", :rel => 'alternate', :href => user_questions_url(@user)
+      xml.tag! "atom:link", rel: 'self', href: user_questions_url(@user, format: :rss)
+      xml.tag! "atom:link", rel: 'alternate', href: user_questions_url(@user)
     else
-      xml.tag! "atom:link", :rel => 'self', :href => questions_url(:format => :rss)
-      xml.tag! "atom:link", :rel => 'alternate', :href => questions_url
+      xml.tag! "atom:link", rel: 'self', href: questions_url(format: :rss)
+      xml.tag! "atom:link", rel: 'alternate', href: questions_url
     end
-    #xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/page/opensearch"
+    #xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
     unless params[:query].blank?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @questions.offset + 1

data/app/views/questions/new.html.erb

@@ -1,18 +1,18 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.question')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.question')) -%></h1>
 <div id="content_list">
 
-<%= simple_form_for(@question, :validate => true) do |f| -%>
+<%= simple_form_for(@question, validate: true) do |f| -%>
   <%= f.error_notification -%>
 
   <div class="field">
     <%= f.label t('activerecord.models.user') -%><br />
-    <%= link_to @question.user.username, @question.user -%>
+    <%= link_to @question.user.username, @question.user.profile if @question.user.try(:profile) -%>
   </div>
 
   <div class="field">
     <%= f.label :body -%><br />
-    <%= f.text_area :body, :class => 'resource_textarea' -%>
+    <%= f.text_area :body, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">
@@ -28,7 +28,7 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.back'), user_questions_path(@question.user) -%></li>
   </ul>

data/app/views/questions/show.html.erb

@@ -1,11 +1,11 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.question')) -%></h1>
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.question')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
 <p>
   <strong><%= t('activerecord.models.user') -%>:</strong>
-  <%= link_to @question.user.username, @question.user -%>
+  <%= link_to @question.user.username, @question.user.profile if @question.user.try(:profile) -%>
 </p>
 
 <p>
@@ -28,12 +28,12 @@
 </p>
 
 <p>
-  <strong><%= link_to t('activerecord.models.answer'), question_answers_path(@question) -%>:</strong>
+  <strong><%= link_to t('activerecord.models.answer'), answers_path(question_id: @question.id) -%>:</strong>
 </p>
 
 <ul>
   <%- @question.answers.each do |answer| -%>
-    <li><%= link_to answer.user.username, answer.user -%>
+    <li><%= link_to answer.user.username, answer.user.profile if answer.user.try(:profile) -%>
     (<%=l answer.updated_at %>)<br />
     <%= raw auto_link(textilize(h(answer.body))) -%><br />
     <% unless answer.items.empty? %>
@@ -50,13 +50,13 @@
 </div>
 </div>
 
-<div id="submenu" class="ui-corner-all">
+<div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('question.answer_question'), new_question_answer_path(@question) -%></li>
     <%- if can? :update, @question -%>
       <li><%= link_to t('page.edit'), edit_question_path(@question) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
-    <li><%= link_to 'レファレンス協同データベース用XMLファイル', question_path(@question, :mode => 'crd', :format => 'xml') -%></li>
+    <li><%= link_to 'レファレンス協同データベース用XMLファイル', question_path(@question, mode: 'crd', format: 'xml') -%></li>
   </ul>
 </div>

data/app/views/questions/show.mobile.erb

@@ -1,5 +1,5 @@
 <div data-role="header">
-  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.question')) -%></h1>
+  <h1 class="title"><%= t('page.showing', model: t('activerecord.models.question')) -%></h1>
 </div>
 <div data-role="content">
   <div id="detail">
@@ -11,7 +11,7 @@
 
 <p>
   <strong><%= t('activerecord.models.user') -%>:</strong>
-  <%= link_to @question.user.username, @question.user -%>
+  <%= link_to @question.user.username, @question.user.profile if @question.user.try(:profile) -%>
   <strong><%= t('activerecord.attributes.question.shared') -%>:</strong>
   <%= localized_boolean(@question.shared) -%>
   <strong><%= t('activerecord.attributes.question.solved') -%>:</strong>
@@ -27,7 +27,7 @@
 
 <ul>
   <%- @question.answers.each do |answer| -%>
-    <li><%= link_to answer.user.username, answer.user -%>
+    <li><%= link_to answer.user.username, answer.user.profile if answer.user.try(:profile) -%>
     (<%=l answer.updated_at %>)<br />
     <%= raw auto_link(textilize(h(answer.body))) -%><br />
     <% unless answer.items.empty? %>

data/lib/enju_question/version.rb

@@ -1,3 +1,3 @@
 module EnjuQuestion
-  VERSION = "0.1.0.pre11"
+  VERSION = "0.1.0.pre12"
 end

data/spec/controllers/questions_controller_spec.rb

@@ -289,6 +289,7 @@ describe QuestionsController do
       describe "with valid params" do
         it "assigns a newly created question as @question" do
           post :create, :question => @attrs
+          assigns(:question).user.save!
           assigns(:question).should be_valid
         end
 

data/spec/dummy/app/models/user.rb

@@ -1,29 +1,9 @@
+# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-
-  has_one :user_has_role
-  has_one :role, :through => :user_has_role
-  belongs_to :user_group
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
+  devise :database_authenticatable, #:registerable,
+    :recoverable, :rememberable, :trackable, #, :validatable
+    :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
+  enju_leaf_user_model
   enju_question_user_model
-
-  def has_role?(role_in_question)
-    return false unless role
-    return true if role.name == role_in_question
-    case role.name
-    when 'Administrator'
-      return true
-    when 'Librarian'
-      return true if role_in_question == 'User'
-    else
-      false
-    end
-  end
 end

data/spec/dummy/db/migrate/001_create_agents.rb

@@ -40,7 +40,6 @@ class CreateAgents < ActiveRecord::Migration
       t.text :note
       t.integer :required_role_id, :default => 1, :null => false
       t.integer :required_score, :default => 0, :null => false
-      t.string :state
       t.text :email
       t.text :url
     end

data/spec/dummy/db/migrate/002_devise_create_users.rb

@@ -0,0 +1,46 @@
+class DeviseCreateUsers < ActiveRecord::Migration
+  def change
+    create_table(:users) do |t|
+      ## Database authenticatable
+      t.string :email,              :null => false, :default => ""
+      t.string :encrypted_password, :null => false, :default => ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, :default => 0
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+      ## Token authenticatable
+      # t.string :authentication_token
+
+
+      t.timestamps
+    end
+
+    add_index :users, :email,                :unique => true
+    add_index :users, :reset_password_token, :unique => true
+    # add_index :users, :confirmation_token,   :unique => true
+    # add_index :users, :unlock_token,         :unique => true
+    # add_index :users, :authentication_token, :unique => true
+  end
+end

data/spec/dummy/db/migrate/005_create_manifestations.rb

@@ -19,38 +19,26 @@ class CreateManifestations < ActiveRecord::Migration
       t.integer :height
       t.integer :width
       t.integer :depth
-      t.string :isbn
-      t.string :isbn10
-      t.string :wrong_isbn
-      t.string :nbn
-      t.string :lccn
-      t.string :oclc_number
-      t.string :issn
       t.integer :price # TODO: 通貨単位
       t.text :fulltext
-      t.string :volume_number_list
-      t.string :issue_number_list
-      t.string :serial_number_list
+      t.string :volume_number_string
+      t.string :issue_number_string
+      t.string :serial_number_string
       t.integer :edition
       t.text :note
       t.boolean :repository_content, :default => false, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.integer :required_role_id, :default => 1, :null => false
-      t.string :state
       t.integer :required_score, :default => 0, :null => false
       t.integer :frequency_id, :default => 1, :null => false
       t.boolean :subscription_master, :default => false, :null => false
     end
-    add_index :manifestations, :carrier_type_id
-    add_index :manifestations, :required_role_id
-    add_index :manifestations, :isbn
-    add_index :manifestations, :nbn
-    add_index :manifestations, :lccn
-    add_index :manifestations, :oclc_number
-    add_index :manifestations, :issn
+    #add_index :manifestations, :carrier_type_id
+    #add_index :manifestations, :required_role_id
     add_index :manifestations, :access_address
-    add_index :manifestations, :frequency_id
+    #add_index :manifestations, :frequency_id
     add_index :manifestations, :manifestation_identifier
     add_index :manifestations, :updated_at
+    add_index :manifestations, :date_of_publication
   end
 end