enju_question 0.1.1 → 0.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6cc421b33ff41765a15d307802355486dff7b2d
-  data.tar.gz: 335a5ff8bd0ee6b47bcd9e8269008a5e0819a1b1
+  metadata.gz: f8c50fbc3dbbf2769dc61f5bdf8a351f6d09c9b6
+  data.tar.gz: 09696786aa59405978fd1a418361c4e290708afc
 SHA512:
-  metadata.gz: 8712d35da40334f26fbce2af06b4e3a8b62bc308b0fbcacd6b9baa5f075a200a9f0b2ae2deb689bea118a510e2ee707cb0919bde3451c613f77a5eee5a5faba1
-  data.tar.gz: e59b57072fd5b31a15e237212c226573d66a19b0e8a6fdc16064441a5fc2987d0a2dd4ad71c80821100665ebc03275105b172a151d44f13f7fe8858e015462ff
+  metadata.gz: 661ebfda2216670479e3d015d31380c29770498725dd35d40456770fd8057e52313de3a914206ae78abd2bf19444cee6efa37627968f70e31605e93a9d1e0938
+  data.tar.gz: 6f05e23fbc850c192f48a833fab195496e67e22470ad574912220351e9b93315bc5d7e78aa1379000aec0fb07da7c2a02e1bab506b065ea4e8eb875fa6eac723

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuQuestion
-{<img src="https://travis-ci.org/next-l/enju_question.svg?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_question]
-{<img src="https://coveralls.io/repos/next-l/enju_question/badge.svg?branch=1.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_question?branch=1.1]
-{<img src="https://hakiri.io/github/next-l/enju_question/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_question/1.1]
+{<img src="https://travis-ci.org/next-l/enju_question.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_question]
+{<img src="https://coveralls.io/repos/next-l/enju_question/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_question?branch=1.2]
+{<img src="https://hakiri.io/github/next-l/enju_question/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_question/1.2]
 
 This project rocks and uses MIT-LICENSE.
 

data/app/controllers/answers_controller.rb

@@ -1,10 +1,8 @@
-# -*- encoding: utf-8 -*-
 class AnswersController < ApplicationController
-  load_and_authorize_resource except: :index
-  authorize_resource only: :index
-  before_filter :store_location, only: [:index, :show, :new, :edit]
-  before_filter :get_user, except: [:edit]
-  before_filter :get_question
+  before_action :set_answer, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_user, except: [:edit]
+  before_action :get_question
 
   # GET /answers
   # GET /answers.json
@@ -103,11 +101,9 @@ class AnswersController < ApplicationController
         flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.answer'))
         format.html { redirect_to @answer }
         format.json { render json: @answer, status: :created, location: answer_url(@answer) }
-        format.mobile { redirect_to question_url(@answer.question) }
       else
         format.html { render action: "new" }
         format.json { render json: @answer.errors, status: :unprocessable_entity }
-        format.mobile { render action: "new" }
       end
     end
   end
@@ -139,6 +135,15 @@ class AnswersController < ApplicationController
   end
 
   private
+  def set_answer
+    @answer = Answer.find(params[:id])
+    authorize @answer
+  end
+
+  def check_policy
+    authorize Answer
+  end
+
   def answer_params
     params.require(:answer).permit(
       :question_id, :body, :item_identifier_list, :url_list

data/app/controllers/concerns/enju_question/controller.rb

@@ -0,0 +1,10 @@
+module EnjuQuestion
+  module Controller
+    extend ActiveSupport::Concern
+
+    def get_question
+      @question = Question.find(params[:question_id]) if params[:question_id]
+      authorize @question, :show? if @question
+    end
+  end
+end

data/app/controllers/questions_controller.rb

@@ -1,14 +1,11 @@
-# -*- encoding: utf-8 -*-
 class QuestionsController < ApplicationController
-  before_filter :store_location, only: [:index, :show, :new, :edit]
-  load_and_authorize_resource
-  before_filter :get_user, except: [:edit]
-  after_filter :solr_commit, only: [:create, :update, :destroy]
+  before_action :set_question, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_user, except: [:edit]
 
   # GET /questions
   # GET /questions.json
   def index
-    store_location
     if @user and user_signed_in?
       user = @user
     end
@@ -171,6 +168,15 @@ class QuestionsController < ApplicationController
   end
 
   private
+  def set_question
+    @question = Question.find(params[:id])
+    authorize @question
+  end
+
+  def check_policy
+    authorize Question
+  end
+
   def question_params
     params.require(:question).permit(:body, :shared, :solved, :note)
   end

data/app/models/concerns/enju_question/enju_item.rb

@@ -0,0 +1,10 @@
+module EnjuQuestion
+  module EnjuItem
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :answer_has_items, dependent: :destroy
+      has_many :answers, through: :answer_has_items
+    end
+  end
+end

data/app/models/concerns/enju_question/enju_manifestation.rb

@@ -0,0 +1,23 @@
+module EnjuQuestion
+  module EnjuManifestation
+    extend ActiveSupport::Concern
+
+    def questions(options = {})
+      id = self.id
+      options = {page: 1, per_page: Question.default_per_page}.merge(options)
+      page = options[:page]
+      per_page = options[:per_page]
+      user = options[:user]
+      Question.search do
+        with(:manifestation_id).equal_to id
+        any_of do
+          unless user.try(:has_role?, 'Librarian')
+            with(:shared).equal_to true
+          #  with(:username).equal_to user.try(:username)
+          end
+        end
+        paginate page: page, per_page: per_page
+      end.results
+    end
+  end
+end

data/app/models/concerns/enju_question/enju_user.rb

@@ -0,0 +1,18 @@
+module EnjuQuestion
+  module EnjuUser
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :questions
+      has_many :answers
+    end
+
+    def reset_answer_feed_token
+      self.answer_feed_token = Devise.friendly_token
+    end
+
+    def delete_answer_feed_token
+      self.answer_feed_token = nil
+    end
+  end
+end

data/app/policies/answer_policy.rb

@@ -0,0 +1,43 @@
+class AnswerPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    case user.try(:role).try(:name)
+    when 'Administrator'
+      true
+    when 'Librarian'
+      true
+    when 'User'
+      if record.user == user
+        true
+      elsif record.question.shared?
+        true
+      else
+        false
+      end
+    else
+      true if record.question.shared?
+    end
+  end
+
+  def create?
+    user.try(:has_role?, 'User')
+  end
+
+  def update?
+    case user.try(:role).try(:name)
+    when 'Administrator'
+      true
+    when 'Librarian'
+      true
+    when 'User'
+      true if record.user == user
+    end
+  end
+
+  def destroy?
+    update?
+  end
+end

data/app/policies/question_policy.rb

@@ -0,0 +1,43 @@
+class QuestionPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    case user.try(:role).try(:name)
+    when 'Administrator'
+      true
+    when 'Librarian'
+      true
+    when 'User'
+      if record.user == user
+        true
+      elsif record.shared?
+        true
+      else
+        false
+      end
+    else
+      true if record.shared?
+    end
+  end
+
+  def create?
+    user.try(:has_role?, 'User')
+  end
+
+  def update?
+    case user.try(:role).try(:name)
+    when 'Administrator'
+      true
+    when 'Librarian'
+      true
+    when 'User'
+      true if record.user == user
+    end
+  end
+
+  def destroy?
+    update?
+  end
+end

data/app/views/answers/index.html.erb

@@ -22,8 +22,10 @@
     <td><%= l(answer.created_at) -%></td>
     <td><%= l(answer.updated_at) -%></td>
     <td>
-      <%- if can? :delete, answer -%>
+      <%- if policy(answer).update? -%>
         <%= link_to t('page.edit'), edit_answer_path(answer) -%>
+      <%- end -%>
+      <%- if policy(answer).destroy? -%>
         <%= link_to t('page.destroy'), answer, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>

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

@@ -8,7 +8,7 @@ xml.rss('version' => "2.0",
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: :rss, only_path: true))}"
     xml.tag! "atom:link", rel: 'alternate', href: "#{request.protocol}#{request.host_with_port}"
     #xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
     unless params[:query].blank?

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

@@ -47,7 +47,7 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <%- if can? :update, @answer -%>
+    <%- if policy(@answer).update? -%>
       <li><%= link_to t('page.edit'), edit_answer_path(@answer) -%></li>
     <%- end -%>
     <li><%= link_to t('page.back'), question_answers_path(@answer.question) -%></li>

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

@@ -16,7 +16,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%= render 'solved_facet' -%>
   <ul>
-  <%- if can? :create, Question -%>
+  <%- if policy(Question).create? -%>
     <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>
   <%- end -%>

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

@@ -4,17 +4,17 @@
   <%- 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.permit.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.permit.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.permit.merge(sort_by: 'answers_count', only_path: true)) -%>
   <%- end -%>
 </p>
 
@@ -50,10 +50,10 @@
         <% end %>
       </td>
       <td>
-        <%- if can? :update, question -%>
+        <%- if policy(question).update? -%>
           <%= link_to t('page.edit'), edit_question_path(question) -%>
         <% end %>
-        <%- if can? :delete, question -%>
+        <%- if policy(question).destroy? -%>
           <%= link_to t('page.destroy'), question, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>

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.permit.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.permit.merge(solved: nil, page: nil, view: nil, only_path: true)) -%></li>
   <%- end -%>
 </ul>

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

@@ -53,7 +53,7 @@
 <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 -%>
+    <%- if policy(@question).update? -%>
       <li><%= link_to t('page.edit'), edit_question_path(@question) -%></li>
     <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>

data/lib/enju_question.rb

@@ -1,31 +1,5 @@
 require "enju_question/engine"
-require "enju_question/user"
-require "enju_question/manifestation"
-require "enju_question/item"
 require "timeout"
 
 module EnjuQuestion
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def enju_question
-      include EnjuQuestion::InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    private
-
-    def get_question
-      @question = Question.find(params[:question_id]) if params[:question_id]
-      authorize! :show, @question if @question
-    end
-  end
 end
-
-ActionController::Base.send(:include, EnjuQuestion)
-ActiveRecord::Base.send :include, EnjuQuestion::QuestionUser
-ActiveRecord::Base.send :include, EnjuQuestion::QuestionManifestation
-ActiveRecord::Base.send :include, EnjuQuestion::QuestionItem

data/lib/enju_question/version.rb

@@ -1,3 +1,3 @@
 module EnjuQuestion
-  VERSION = "0.1.1"
+  VERSION = "0.2.0.beta.1"
 end

data/lib/generators/enju_question/setup/setup_generator.rb

@@ -3,7 +3,21 @@ class EnjuQuestion::SetupGenerator < Rails::Generators::Base
 
   def setup
     rake("enju_question_engine:install:migrations")
-    inject_into_file 'app/models/user.rb',
-      "  enju_question_user_model\n", :after => "enju_leaf_user_model\n"
+    inject_into_class "app/models/user.rb", User do
+      <<"EOS"
+  include EnjuQuestion::EnjuUser
+EOS
+    end
+    inject_into_class "app/controllers/application.rb", User do
+      <<"EOS"
+  include EnjuQuestion::Controller
+EOS
+    end
+    append_to_file("config/initializers/enju_leaf.rb") do
+      <<"EOS"
+Manifestation.include(EnjuQuestion::EnjuManifestation)
+Item.include(EnjuQuestion::EnjuItem)
+EOS
+    end
   end
 end

data/spec/controllers/answers_controller_spec.rb

@@ -189,7 +189,8 @@ describe AnswersController do
 
       it "assigns the requested answer as @answer" do
         get :new
-        assigns(:answer).should_not be_valid
+        assigns(:answer).should be_nil
+        response.should redirect_to questions_url
       end
     end
 
@@ -198,7 +199,8 @@ describe AnswersController do
 
       it "assigns the requested answer as @answer" do
         get :new
-        assigns(:answer).should_not be_valid
+        assigns(:answer).should be_nil
+        response.should redirect_to questions_url
       end
     end
 
@@ -207,7 +209,8 @@ describe AnswersController do
 
       it "should assign the requested answer as @answer" do
         get :new
-        assigns(:answer).should_not be_valid
+        assigns(:answer).should be_nil
+        response.should redirect_to questions_url
       end
 
       it "should get new template with question_id" do
@@ -220,7 +223,7 @@ describe AnswersController do
     describe "When not logged in" do
       it "should not assign the requested answer as @answer" do
         get :new
-        assigns(:answer).should_not be_valid
+        assigns(:answer).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -329,7 +332,7 @@ describe AnswersController do
       describe "with valid params" do
         it "assigns a newly created answer as @answer" do
           post :create, answer: @attrs
-          assigns(:answer).should_not be_valid
+          assigns(:answer).should be_nil
         end
 
         it "redirects to the created answer" do
@@ -341,7 +344,7 @@ describe AnswersController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved answer as @answer" do
           post :create, answer: @invalid_attrs
-          assigns(:answer).should_not be_valid
+          assigns(:answer).should be_nil
         end
 
         it "re-renders the 'new' template" do

data/spec/controllers/questions_controller_spec.rb

@@ -186,7 +186,7 @@ describe QuestionsController do
     describe "When not logged in" do
       it "should not assign the requested question as @question" do
         get :new
-        assigns(:question).should_not be_valid
+        assigns(:question).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -344,7 +344,7 @@ describe QuestionsController do
       describe "with valid params" do
         it "assigns a newly created question as @question" do
           post :create, question: @attrs
-          assigns(:question).should_not be_valid
+          assigns(:question).should be_nil
         end
 
         it "should be forbidden" do
@@ -356,7 +356,7 @@ describe QuestionsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved question as @question" do
           post :create, question: @invalid_attrs
-          assigns(:question).should_not be_valid
+          assigns(:question).should be_nil
         end
 
         it "should be forbidden" do

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,7 +1,11 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+  include EnjuLeaf::Controller
+  include EnjuBiblio::Controller
+  include EnjuLibrary::Controller
+  include EnjuQuestion::Controller
+  before_action :set_paper_trail_whodunnit
+  after_action :verify_authorized
 
-  enju_leaf
-  enju_library
-  enju_question
+  include Pundit
 end

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

@@ -1,9 +1,8 @@
-# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  enju_leaf_user_model
-  enju_question_user_model
+  include EnjuLeaf::EnjuUser
+  include EnjuQuestion::EnjuUser
 end

data/spec/dummy/config/application.rb

@@ -2,8 +2,9 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require
-require "enju_question"
+Bundler.require(*Rails.groups)
+require 'enju_question'
+require 'enju_leaf'
 
 module Dummy
   class Application < Rails::Application
@@ -11,16 +12,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -29,18 +20,8 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 
-require 'enju_leaf'

data/spec/dummy/config/environments/development.rb

@@ -1,37 +1,41 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
+  # Do not eager load code on boot.
+  config.eager_load = false
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Don't care if the mailer can't send
+  # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
-  # Print deprecation notices to the Rails logger
+  # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
+  # Raise an error on page load if there are pending migrations.
+  config.active_record.migration_error = :page_load
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  # Debug mode disables concatenation and preprocessing of assets.
+  # This option may cause significant delays in view rendering with a large
+  # number of complex assets.
+  config.assets.debug = true
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
 
-  # Do not compress assets
-  config.assets.compress = false
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
 
-  # Expands the lines which load the assets
-  config.assets.debug = true
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end

data/spec/dummy/config/environments/production.rb

@@ -1,67 +1,79 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
-  # Code is not reloaded between requests
+  # Code is not reloaded between requests.
   config.cache_classes = true
 
-  # Full error reports are disabled and caching is turned on
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both threaded web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  # Enable Rack::Cache to put a simple HTTP cache in front of your application
+  # Add `rack-cache` to your Gemfile before enabling this.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
+  # config.action_dispatch.rack_cache = true
+
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
+  # Compress JavaScripts and CSS.
+  config.assets.js_compressor = :uglifier
+  # config.assets.css_compressor = :sass
 
-  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # Specifies the header that your server uses for sending files.
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
 
-  # Prepend all log lines with the following tags
+  # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
 
-  # Use a different logger for distributed setups
+  # Use a different logger for distributed setups.
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Use a different cache store in production
+  # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
-  # Disable delivery errors, bad email addresses will be ignored
+  # Ignore bad email addresses and do not raise email delivery errors.
+  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
-  # Send deprecation notices to registered listeners
+  # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
+  # Use default logging formatter so that PID and timestamp are not suppressed.
+  config.log_formatter = ::Logger::Formatter.new
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end

data/spec/dummy/config/environments/test.rb

@@ -1,5 +1,5 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
+Rails.application.configure do
+  # Settings specified here will take precedence over those in config/application.rb.
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that
@@ -7,31 +7,38 @@ Dummy::Application.configure do
   # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  # Do not eager load code on boot. This avoids loading your whole application
+  # just for the purpose of running a single test. If you are using a tool that
+  # preloads Rails for running tests, you may have to set it to true.
+  config.eager_load = false
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
+  config.static_cache_control = 'public, max-age=3600'
 
-  # Show full error reports and disable caching
+  # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
-  # Raise exceptions instead of rendering exception templates
+  # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  # Disable request forgery protection in test environment.
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  #config.active_record.mass_assignment_sanitizer = :strict
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
 
-  # Print deprecation notices to the stderr
+  # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
+
+  config.action_mailer.default_url_options = {:host => 'localhost:3000'}
 end

data/spec/dummy/config/initializers/enju_leaf.rb

@@ -0,0 +1,2 @@
+Manifestation.include(EnjuQuestion::EnjuManifestation)
+Item.include(EnjuQuestion::EnjuItem)

data/spec/support/devise.rb

@@ -1,4 +1,4 @@
 RSpec.configure do |config|
-  config.include Devise::TestHelpers, :type => :controller
-  config.include Devise::TestHelpers, :type => :view
+  config.include Devise::Test::ControllerHelpers, type: :controller
+  config.include Devise::Test::ControllerHelpers, type: :view
 end

data/spec/views/questions/index.rss.builder_spec.rb

@@ -9,9 +9,6 @@ describe "questions/index.rss.builder" do
     assign(:count, {query_result: Question.count})
     assign(:library_group, LibraryGroup.site_config)
     view.stub(:current_user).and_return(User.where(username: 'enjuadmin').first)
-    @ability = Object.new
-    @ability.extend(CanCan::Ability)
-    controller.stub(:current_ability) { @ability }
   end
 
   it "renders the XML template" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_question
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0.beta.1
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
@@ -70,16 +70,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.20
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -142,28 +142,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_library
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_biblio
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_manifestation_viewer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
   name: enju_ndl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0.beta.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -259,11 +301,16 @@ files:
 - README.rdoc
 - Rakefile
 - app/controllers/answers_controller.rb
+- app/controllers/concerns/enju_question/controller.rb
 - app/controllers/questions_controller.rb
 - app/models/answer.rb
 - app/models/answer_has_item.rb
-- app/models/enju_question/ability.rb
+- app/models/concerns/enju_question/enju_item.rb
+- app/models/concerns/enju_question/enju_manifestation.rb
+- app/models/concerns/enju_question/enju_user.rb
 - app/models/question.rb
+- app/policies/answer_policy.rb
+- app/policies/question_policy.rb
 - app/views/answers/_form.html.erb
 - app/views/answers/edit.html.erb
 - app/views/answers/index.atom.builder
@@ -298,9 +345,6 @@ files:
 - db/migrate/20120418124018_add_answer_feed_token_to_user.rb
 - lib/enju_question.rb
 - lib/enju_question/engine.rb
-- lib/enju_question/item.rb
-- lib/enju_question/manifestation.rb
-- lib/enju_question/user.rb
 - lib/enju_question/version.rb
 - lib/generators/enju_question/setup/USAGE
 - lib/generators/enju_question/setup/setup_generator.rb
@@ -323,7 +367,6 @@ files:
 - spec/dummy/bin/setup
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
-- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
@@ -332,6 +375,7 @@ files:
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/enju_leaf.rb
 - spec/dummy/config/initializers/friendly_id.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
@@ -511,12 +555,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: enju_queestion plugin
@@ -537,7 +581,6 @@ test_files:
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
 - spec/dummy/config/application.rb
-- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
@@ -546,6 +589,7 @@ test_files:
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/devise.rb
+- spec/dummy/config/initializers/enju_leaf.rb
 - spec/dummy/config/initializers/friendly_id.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb

data/app/models/enju_question/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/lib/enju_question/item.rb

@@ -1,14 +0,0 @@
-module EnjuQuestion
-  module QuestionItem
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def enju_question_item_model
-        has_many :answer_has_items, :dependent => :destroy
-        has_many :answers, :through => :answer_has_items
-      end
-    end
-  end
-end

data/lib/enju_question/manifestation.rb

@@ -1,33 +0,0 @@
-module EnjuQuestion
-  module QuestionManifestation
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def enju_question_manifestation_model
-        include InstanceMethods
-      end
-    end
-
-    module InstanceMethods
-      def questions(options = {})
-        id = self.id
-        options = {:page => 1, :per_page => Question.default_per_page}.merge(options)
-        page = options[:page]
-        per_page = options[:per_page]
-        user = options[:user]
-        Question.search do
-          with(:manifestation_id).equal_to id
-          any_of do
-            unless user.try(:has_role?, 'Librarian')
-              with(:shared).equal_to true
-            #  with(:username).equal_to user.try(:username)
-            end
-          end
-          paginate :page => page, :per_page => per_page
-        end.results
-      end
-    end
-  end
-end

data/lib/enju_question/user.rb

@@ -1,25 +0,0 @@
-module EnjuQuestion
-  module QuestionUser
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def enju_question_user_model
-        include InstanceMethods
-        has_many :questions
-        has_many :answers
-      end
-    end
-
-    module InstanceMethods
-      def reset_answer_feed_token
-        self.answer_feed_token = Devise.friendly_token
-      end
-
-      def delete_answer_feed_token
-        self.answer_feed_token = nil
-      end
-    end
-  end
-end

data/spec/dummy/config/application.yml

@@ -1,38 +0,0 @@
-defaults: &defaults
-  enju:
-    web_hostname: localhost
-    web_port_number: 3000
-
-  family_name_first: true
-  max_number_of_results: 500
-  write_search_log_to_file: true
-  csv_charset_conversion: true
-
-# Choose a locale from 'ca', 'de', 'fr', 'jp', 'uk', 'us'
-#AMAZON_AWS_HOSTNAME = 'ecs.amazonaws.com'
-  amazon:
-    aws_hostname: ecs.amazonaws.jp
-    hostname: www.amazon.co.jp
-    access_key: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
-    secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
-
-# :google, :amazon
-  book_jacket:
-    source: :google
-    unknown_resource:
-
-# :mozshot, :simpleapi, :heartrails, :thumbalizr
-  screenshot:
-    generator: :mozshot
-
-  uploaded_file:
-    storage: :local
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults