enju_question 0.1.0.pre10 → 0.1.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1802c27f967e2ff02d1ea249a09f172ec71528b
-  data.tar.gz: 64159472274d09952fe33d4f32edce8e11052465
+  metadata.gz: 6ae5ecf6b5d7c744216cc19d1f8a08922e125dc7
+  data.tar.gz: 736fbeaa3c33d0209916045ba95e8d286cc7242a
 SHA512:
-  metadata.gz: 4a429ca9943150b6a99c75e1890cbbc083ab82ac7dc3bb11d1419e72a115ceb58660e839f24b8678422e701334faf523188014cc452d93d76bbc80666b05a977
-  data.tar.gz: 7e74e062eab0855880c2cf3c5c9fe413493a9db6fe991974ea5dcb2acb311298792bdcccb5fb0feff3e0620e3a067b5eae6cdfdecbfbd21a1bf6f8f2f1eb4100
+  metadata.gz: 918e131260467456addb99f840bad845eb770c5924ee93f58acb9c16bc330fb108693e5d7b6099ed51589e9f65423000654c06f7eb6a9beea4b94cec02309572
+  data.tar.gz: fc493900650fb08c4f68587d3108198b4e078ce77def5771741a6e83b59bacf81d3ebf0cc89e1301c3c5168fc355431f253d01591e8a13541a0b0740cac8b449

data/app/models/question.rb

@@ -1,5 +1,4 @@
 # -*- encoding: utf-8 -*-
-require 'timeout'
 class Question < ActiveRecord::Base
   attr_accessible :body, :shared, :solved, :note
   default_scope :order => 'id DESC'

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

@@ -24,7 +24,7 @@
       <th>ID</th>
       <th><%= t('activerecord.models.question') -%></th>
       <th></th>
-      <th id="edit_icons"></th>
+      <th></th>
     </tr>
 
   <%- @questions.each_with_index do |question, i| -%>
@@ -51,10 +51,10 @@
       </td>
       <td>
         <%- if can? :update, question -%>
-          <%= link_to image_tag('icons/page_white_edit.png', :alt => t('page.edit'), :size => '16x16'), edit_question_path(question) -%>
+          <%= link_to t('page.edit'), edit_question_path(question) -%>
         <% end %>
         <%- if can? :delete, question -%>
-          <%= link_to image_tag('icons/delete.png', :alt => t('page.destroy'), :size => '16x16'), 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>

data/lib/enju_question/version.rb

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

data/lib/enju_question.rb

@@ -2,6 +2,7 @@ require "enju_question/engine"
 require "enju_question/user"
 require "enju_question/manifestation"
 require "enju_question/item"
+require "timeout"
 
 module EnjuQuestion
   def self.included(base)

data/spec/controllers/answers_controller_spec.rb

@@ -307,7 +307,7 @@ describe AnswersController do
     describe "When logged in as User" do
       login_fixture_user
 
-      it "should create answer sithout user_id" do
+      it "should create answer without user_id" do
         post :create, :answer => {:question_id => 1, :body => 'hoge'}
         response.should redirect_to answer_url(assigns(:answer))
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_question
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre10
+  version: 0.1.0.pre11
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_seed
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre8
+        version: 0.1.1.pre9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1.pre8
+        version: 0.1.1.pre9
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc7
+        version: 1.1.0.rc9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc7
+        version: 1.1.0.rc9
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre30
+        version: 0.1.0.pre31
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre30
+        version: 0.1.0.pre31
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
         version: '0'
 description: Question and answer management for Next-L Enju
 email:
-- tanabe@mwr.mediacom.keio.ac.jp
+- nabeta@fastmail.fm
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -259,16 +259,9 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/page/403.html.erb
-- spec/dummy/app/views/page/403.mobile.erb
-- spec/dummy/app/views/page/403.xml.erb
-- spec/dummy/app/views/page/404.html.erb
-- spec/dummy/app/views/page/404.mobile.erb
-- spec/dummy/app/views/page/404.xml.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/application.yml
@@ -386,17 +379,17 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_4j
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000152
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000153
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000154
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000155
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000156
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000157
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000158
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000159
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000160
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000161
+- spec/dummy/solr/default/data/index/segments_128
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001365
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001366
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001367
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001368
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001369
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001370
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001371
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001372
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001373
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001374
 - spec/dummy/solr/development/data/index/segments.gen
 - spec/dummy/solr/development/data/index/segments_1
 - spec/dummy/solr/solr.xml
@@ -438,7 +431,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: enju_queestion plugin
@@ -452,16 +445,9 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/views/page/403.html.erb
-- spec/dummy/app/views/page/403.mobile.erb
-- spec/dummy/app/views/page/403.xml.erb
-- spec/dummy/app/views/page/404.html.erb
-- spec/dummy/app/views/page/404.mobile.erb
-- spec/dummy/app/views/page/404.xml.erb
 - spec/dummy/config/application.rb
 - spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
@@ -580,17 +566,17 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_4j
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000152
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000153
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000154
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000155
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000156
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000157
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000158
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000159
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000160
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000000161
+- spec/dummy/solr/default/data/index/segments_128
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001365
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001366
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001367
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001368
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001369
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001370
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001371
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001372
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001373
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000001374
 - spec/dummy/solr/development/data/index/segments.gen
 - spec/dummy/solr/development/data/index/segments_1
 - spec/dummy/solr/solr.xml

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

@@ -1,44 +0,0 @@
-#module EnjuQuestion
-  class Ability
-    include CanCan::Ability
-  
-    def initialize(user, ip_address = nil)
-      case user.try(:role).try(:name)
-      when 'Administrator'
-        can :manage, Answer
-        can :manage, Question
-      when 'Librarian'
-        can :manage, Answer
-        can :manage, Question
-      when 'User'
-        can [:index, :create], Answer
-        can :show, Answer do |answer|
-          if answer.user == user
-            true
-          elsif answer.question.shared
-            true
-          end
-        end
-        can [:update, :destroy, :delete], Answer do |answer|
-          answer.user == user
-        end
-        can [:index, :create], Question
-        can [:update, :destroy, :delete], Question do |question|
-          question.user == user
-        end
-        can :show, Question do |question|
-          question.user == user or question.shared
-        end
-      else
-        can :index, Answer
-        can :show, Answer do |answer|
-          answer.question.shared
-        end
-        can :index, Question
-        can :show, Question do |question|
-          question.shared
-        end
-      end
-    end
-  end
-#end

data/spec/dummy/app/views/page/403.html.erb

@@ -1,9 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-  <h1 class="title"><%= t('page.access_denied') -%></h1>
-  <div id="content_list">
-    <%= render 'page/search_form' %>
-  </div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-</div>

data/spec/dummy/app/views/page/403.mobile.erb

@@ -1,5 +0,0 @@
-<div data-role="header">
-  <h2 class="title"><%= t('page.access_denied') -%></h2>
-</div>
-<div data-role="content">
-</div>

data/spec/dummy/app/views/page/403.xml.erb

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<error>
-  <status>403</status>
-</error>

data/spec/dummy/app/views/page/404.html.erb

@@ -1,9 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-  <h1 class="title"><%= t('page.not_found') -%></h1>
-  <div id="content_list">
-    <%= render 'page/search_form' %>
-  </div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-</div>

data/spec/dummy/app/views/page/404.mobile.erb

@@ -1,5 +0,0 @@
-<div data-role="header">
-  <h2 class="title"><%= t('page.not_found') -%></h2>
-</div>
-<div data-role="content">
-</div>

data/spec/dummy/app/views/page/404.xml.erb

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<error>
-  <status>404</status>
-</error>