enju_seed 0.2.3 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f82f28685be0ce77bbae3b1a5669dd3f8e4efd7a
-  data.tar.gz: 6e850f5e9c2962054d294a256eada15067afa5a5
+  metadata.gz: 12d5406b47c01ad5eff1fddf96780ac07cb9811f
+  data.tar.gz: 58e3757e3a87b1f4007c1a64b3d7d8a2fa688826
 SHA512:
-  metadata.gz: 12a0dad577c19e0f6a5d82101381ddd630bb06d24a3fdd8fc57641f8f661c0c854105d66f75a00b758a39c2e19abb7ba8b200ed5cc1dcc7c10a3918c37d70477
-  data.tar.gz: ffcaaf6327814aff63e4a3bc3f40576b61aebf712287659e35fbfd6b9e90e014e466ad9f4a23283d3741588e0ee41733dc408c677708c3270b07594e9335a0ba
+  metadata.gz: dcf4b2c8b790217b06a9331578e168232571dc7335e4d3f0b411f81629dcf1a3f9efacc26eb0ac36748dfcdf605c2b945473a4994c9e2f2ffe37d535388af5bf
+  data.tar.gz: a30958543f26617543bfacf25d7f04b40cca36b093fbc8cc6426ee21b5c901a6630c1114b52ccf4b9ee5535b3c215d70af4f6071b78dd614f1ccd33293ee3f6f

data/Rakefile

@@ -10,23 +10,32 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'EnjuSeed'
   rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('README.md')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
 load 'rails/tasks/engine.rake'
 
+load 'rails/tasks/statistics.rake'
 
+require 'bundler/gem_tasks'
 
-Bundler::GemHelper.install_tasks
+require 'rake/testtask'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
 end
 
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+  # no rspec available
+end
 
 task default: :spec

data/app/controllers/my_accounts_controller.rb

@@ -18,9 +18,11 @@ class MyAccountsController < ApplicationController
     user_attrs = [
       :id, :email, :current_password, :password, :password_confirmation
     ]
-    user_attrs += [
-      {:user_has_role_attributes => [:id, :role_id]}
-    ] if current_user.has_role?('Administrator')
+    if current_user.has_role?('Administrator')
+      user_attrs += [
+        { user_has_role_attributes: [:id, :role_id] }
+      ]
+    end
 
     user_params = ActionController::Parameters.new(params[:profile][:user_attributes]).permit(*user_attrs)
 
@@ -35,7 +37,7 @@ class MyAccountsController < ApplicationController
           format.json { head :no_content }
         else
           prepare_options
-          format.html { render action: "edit" }
+          format.html { render action: 'edit' }
           format.json { render json: current_user.errors, status: :unprocessable_entity }
         end
       else
@@ -43,7 +45,7 @@ class MyAccountsController < ApplicationController
           @profile.errors[:base] << msg
         end
         prepare_options
-        format.html { render action: "edit" }
+        format.html { render action: 'edit' }
         format.json { render json: current_user.errors, status: :unprocessable_entity }
       end
     end
@@ -59,6 +61,7 @@ class MyAccountsController < ApplicationController
   end
 
   private
+
   def set_profile
     @profile = current_user.profile
     authorize @profile
@@ -73,9 +76,7 @@ class MyAccountsController < ApplicationController
       :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
       :save_search_history # EnjuSearchLog
     ]
-    if current_user.has_role?('Librarian')
-      attrs << :user_group_id
-    end
+    attrs << :user_group_id if current_user.has_role?('Librarian')
     params.require(:profile).permit(*attrs)
   end
 
@@ -84,10 +85,10 @@ class MyAccountsController < ApplicationController
     @roles = Role.order(:position)
     @libraries = Library.order(:position)
     @languages = Language.order(:position)
-    if current_user.active_for_authentication?
-      current_user.locked = '0'
-    else
-      current_user.locked = '1'
-    end
+    current_user.locked = if current_user.active_for_authentication?
+                            '0'
+                          else
+                            '1'
+                          end
   end
 end

data/app/controllers/profiles_controller.rb

@@ -17,7 +17,7 @@ class ProfilesController < ApplicationController
     @query = query.dup
     @count = {}
 
-    sort = {sort_by: 'created_at', order: 'desc'}
+    sort = { sort_by: 'created_at', order: 'desc' }
     case params[:sort_by]
     when 'username'
       sort[:sort_by] = 'username'
@@ -87,7 +87,7 @@ class ProfilesController < ApplicationController
         else
           @profile.reset_checkout_icalendar_token
         end
-        render partial: 'feed_token', locals: {profile: @profile}
+        render partial: 'feed_token', locals: { profile: @profile }
         return
       end
     end
@@ -95,9 +95,7 @@ class ProfilesController < ApplicationController
       redirect_to edit_my_account_url
       return
     end
-    if @profile.user.try(:locked_at?)
-      @profile.user.locked = true
-    end
+    @profile.user.locked = true if @profile.user.try(:locked_at?)
   end
 
   # POST /profiles
@@ -105,9 +103,7 @@ class ProfilesController < ApplicationController
   def create
     if current_user.has_role?('Librarian')
       @profile = Profile.new(profile_params)
-      if @profile.user
-        password = @profile.user.set_auto_generated_password
-      end
+      password = @profile.user.set_auto_generated_password if @profile.user
     else
       @profile = Profile.new(profile_params)
     end
@@ -122,7 +118,7 @@ class ProfilesController < ApplicationController
         format.json { render json: @profile, status: :created, location: @profile }
       else
         prepare_options
-        format.html { render action: "new" }
+        format.html { render action: 'new' }
         format.json { render json: @profile.errors, status: :unprocessable_entity }
       end
     end
@@ -133,7 +129,7 @@ class ProfilesController < ApplicationController
   def update
     @profile.update_attributes(profile_update_params)
     if @profile.user
-      if @profile.user.auto_generated_password == "1"
+      if @profile.user.auto_generated_password == '1'
         password = @profile.user.set_auto_generated_password
       end
     end
@@ -145,7 +141,7 @@ class ProfilesController < ApplicationController
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render action: "edit" }
+        format.html { render action: 'edit' }
         format.json { render json: @profile.errors, status: :unprocessable_entity }
       end
     end
@@ -163,6 +159,7 @@ class ProfilesController < ApplicationController
   end
 
   private
+
   def set_profile
     @profile = Profile.find(params[:id])
     authorize @profile
@@ -179,15 +176,17 @@ class ProfilesController < ApplicationController
       :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
       :save_search_history, # EnjuSearchLog
     ]
-    attrs += [
-      :library_id, :expired_at, :birth_date,
-      :user_group_id, :required_role_id, :note, :user_number, {
-        :user_attributes => [
-          :id, :username, :email, :current_password, :locked,
-          {:user_has_role_attributes => [:id, :role_id]}
-        ]
-      }
-    ] if current_user.has_role?('Librarian')
+    if current_user.has_role?('Librarian')
+      attrs += [
+        :library_id, :expired_at, :birth_date,
+        :user_group_id, :required_role_id, :note, :user_number, {
+          user_attributes: [
+            :id, :username, :email, :current_password, :locked,
+            { user_has_role_attributes: [:id, :role_id] }
+          ]
+        }
+      ]
+    end
     params.require(:profile).permit(*attrs)
   end
 
@@ -198,15 +197,17 @@ class ProfilesController < ApplicationController
       :save_checkout_history, :checkout_icalendar_token, # EnjuCirculation
       :save_search_history, # EnjuSearchLog
     ]
-    attrs += [
-      :library_id, :expired_at, :birth_date,
-      :user_group_id, :required_role_id, :note, :user_number, {
-        :user_attributes => [
-          :id, :email, :current_password, :auto_generated_password, :locked,
-          {:user_has_role_attributes => [:id, :role_id]}
-        ]
-      }
-    ] if current_user.has_role?('Librarian')
+    if current_user.has_role?('Librarian')
+      attrs += [
+        :library_id, :expired_at, :birth_date,
+        :user_group_id, :required_role_id, :note, :user_number, {
+          user_attributes: [
+            :id, :email, :current_password, :auto_generated_password, :locked,
+            { user_has_role_attributes: [:id, :role_id] }
+          ]
+        }
+      ]
+    end
     params.require(:profile).permit(*attrs)
   end
 

data/app/controllers/roles_controller.rb

@@ -39,13 +39,14 @@ class RolesController < ApplicationController
         format.html { redirect_to @role, notice: t('controller.successfully_updated', model: t('activerecord.models.role')) }
         format.json { head :no_content }
       else
-        format.html { render action: "edit" }
+        format.html { render action: 'edit' }
         format.json { render json: @role.errors, status: :unprocessable_entity }
       end
     end
   end
 
   private
+
   def set_role
     @role = Role.find(params[:id])
     authorize @role

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

@@ -21,14 +21,14 @@ module EnjuSeed
       validates :username, presence: true, uniqueness: true, format: {
         with: /\A[0-9A-Za-z][0-9A-Za-z_\-]*[0-9A-Za-z]\z/
       }
-      validates :email, format: Devise::email_regexp, allow_blank: true, uniqueness: true
+      validates :email, format: Devise.email_regexp, allow_blank: true, uniqueness: true
       validates_date :expired_at, allow_blank: true
 
       with_options if: :password_required? do |v|
         v.validates_presence_of     :password
         v.validates_confirmation_of :password
         v.validates_length_of       :password, allow_blank: true,
-          within: Devise::password_length
+                                               within: Devise.password_length
       end
 
       before_validation :set_lock_information
@@ -42,8 +42,8 @@ module EnjuSeed
       strip_attributes only: :email, allow_empty: true
 
       attr_accessor :password_not_verified,
-        :update_own_account, :auto_generated_password,
-        :locked, :current_password #, :agent_id
+                    :update_own_account, :auto_generated_password,
+                    :locked, :current_password # , :agent_id
 
       paginates_per 10
 
@@ -54,13 +54,13 @@ module EnjuSeed
       # 有効期限切れのユーザを一括で使用不可にします。
       def self.lock_expired_users
         User.find_each do |user|
-          user.lock_access! if user.expired? and user.active_for_authentication?
+          user.lock_access! if user.expired? && user.active_for_authentication?
         end
       end
 
       # ユーザの情報をエクスポートします。
       # @param [Hash] options
-      def self.export(options = {format: :txt})
+      def self.export(options = { format: :txt })
         header = %w(
           username
           full_name
@@ -79,14 +79,16 @@ module EnjuSeed
           keyword_list
           note
         )
-        header += %w(
-          checkout_icalendar_token
-          save_checkout_history
-        ) if defined? EnjuCirculation
-        header << "save_search_history" if defined? EnjuSearchLog
-        header << "share_bookmarks" if defined? EnjuBookmark
+        if defined? EnjuCirculation
+          header += %w(
+            checkout_icalendar_token
+            save_checkout_history
+          )
+        end
+        header << 'save_search_history' if defined? EnjuSearchLog
+        header << 'share_bookmarks' if defined? EnjuBookmark
         lines = []
-        User.find_each.map{|u|
+        User.find_each.map do |u|
           line = []
           line << u.username
           line << u.try(:profile).try(:full_name)
@@ -102,7 +104,7 @@ module EnjuSeed
           line << u.created_at
           line << u.updated_at
           line << u.try(:profile).try(:expired_at)
-          line << u.try(:profile).try(:keyword_list).try(:split).try(:join, "//")
+          line << u.try(:profile).try(:keyword_list).try(:split).try(:join, '//')
           line << u.try(:profile).try(:note)
           if defined? EnjuCirculation
             line << u.try(:profile).try(:checkout_icalendar_token)
@@ -111,13 +113,11 @@ module EnjuSeed
           if defined? EnjuSearchLog
             line << u.try(:profile).try(:save_search_history)
           end
-          if defined? EnjuBookmark
-            line << u.try(:profile).try(:share_bookmarks)
-          end
+          line << u.try(:profile).try(:share_bookmarks) if defined? EnjuBookmark
           lines << line
-        }
+        end
         if options[:format] == :txt
-          lines.map{|line| line.to_csv(col_sep: "\t")}.unshift(header.to_csv(col_sep: "\t")).join
+          lines.map { |line| line.to_csv(col_sep: "\t") }.unshift(header.to_csv(col_sep: "\t")).join
         else
           lines
         end
@@ -150,9 +150,9 @@ module EnjuSeed
 
     # ユーザに使用不可の設定を反映させます。
     def set_lock_information
-      if locked == '1' and self.active_for_authentication?
+      if (locked == '1') && active_for_authentication?
         lock_access!
-      elsif locked == '0' and !self.active_for_authentication?
+      elsif (locked == '0') && !active_for_authentication?
         unlock_access!
       end
     end
@@ -240,9 +240,7 @@ module EnjuSeed
           errors[:base] << I18n.t('user.only_administrator_can_destroy')
         end
         # 最後の図書館員を削除しようとした
-        if last_librarian?
-          errors[:base] << I18n.t('user.last_librarian')
-        end
+        errors[:base] << I18n.t('user.last_librarian') if last_librarian?
       end
 
       # 最後の管理者を削除しようとした
@@ -261,7 +259,6 @@ module EnjuSeed
   end
 end
 
-
 # == Schema Information
 #
 # Table name: users
@@ -306,4 +303,3 @@ end
 #  save_search_history      :boolean
 #  answer_feed_token        :string(255)
 #
-

data/app/models/concerns/master_model.rb

@@ -3,7 +3,7 @@ module MasterModel
 
   included do
     acts_as_list
-    validates_uniqueness_of :name, case_sensitive: false
+    validates :name, uniqueness: { case_sensitive: false }
     validates :name, presence: true
     validate :name do
       valid_name?
@@ -22,6 +22,7 @@ module MasterModel
   end
 
   private
+
   def valid_name?
     unless name =~ /\A[a-z][0-9a-z_]*[0-9a-z]\z/
       errors.add(:name, I18n.t('page.only_lowercase_letters_and_numbers_are_allowed'))
@@ -29,10 +30,8 @@ module MasterModel
   end
 
   def valid_yaml?
-    begin
-      YAML.load(display_name)
-    rescue Psych::SyntaxError
-      errors.add(:display_name, I18n.t('page.cannot_parse_yaml_header'))
-    end
+    YAML.load(display_name)
+  rescue Psych::SyntaxError
+    errors.add(:display_name, I18n.t('page.cannot_parse_yaml_header'))
   end
 end

data/app/models/identity.rb

@@ -1,6 +1,6 @@
 class Identity < ActiveRecord::Base
   belongs_to :profile
-  validates :name, presence: true, uniqueness: {scope: :provider}
+  validates :name, presence: true, uniqueness: { scope: :provider }
   validates :provider, presence: true
 
   def self.find_for_oauth(auth)

data/app/models/profile.rb

@@ -6,14 +6,14 @@ class Profile < ActiveRecord::Base
   belongs_to :user, dependent: :destroy
   belongs_to :library, validate: true
   belongs_to :user_group
-  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id' #, validate: true
+  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id' # , validate: true
   has_many :identities
   has_many :agents
   accepts_nested_attributes_for :identities, allow_destroy: true, reject_if: :all_blank
 
   validates_associated :user_group, :library
-  validates :user, uniqueness: true, associated: true, allow_blank: true
-  validates_presence_of :user_group, :library, :locale #, :user_number
+  validates_associated :user
+  validates :user_group, :library, :locale, presence: true # , :user_number
   validates :user_number, uniqueness: true, format: { with: /\A[0-9A-Za-z_]+\z/ }, allow_blank: true
   validates :user_id, uniqueness: true, allow_blank: true
   validates :birth_date, format: { with: /\A\d{4}-\d{1,2}-\d{1,2}\z/ }, allow_blank: true

data/app/models/role.rb

@@ -15,7 +15,7 @@ class Role < ActiveRecord::Base
 
   def self.all_cache
     if Rails.env == 'production'
-      Rails.cache.fetch('role_all'){ Role.select(:name).all }
+      Rails.cache.fetch('role_all') { Role.select(:name).all }
     else
       Role.select(:name)
     end
@@ -30,6 +30,7 @@ class Role < ActiveRecord::Base
   end
 
   private
+
   def valid_name?
     true
   end