enju_leaf 1.1.0.rc17 → 1.1.0.rc18

data/lib/enju_leaf/export_file.rb

@@ -14,10 +14,10 @@ module ExportFile
 
   module InstanceMethods
     def send_message
-      sender = User.find(1)
+      sender = User.find(1) #system
       message_template = MessageTemplate.localized_template('export_completed', user.profile.locale)
       request = MessageRequest.new
-      request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template})
+      request.assign_attributes({sender: sender, receiver: user, message_template: message_template})
       request.save_message_body
       request.transition_to!(:sent)
     end

data/lib/enju_leaf/helper.rb

@@ -29,15 +29,15 @@ module EnjuLeaf
     end
   
     def locale_display_name(locale)
-      Language.where(:iso_639_1 => locale).first.display_name
+      Language.where(iso_639_1: locale).first.display_name
     end
   
     def locale_native_name(locale)
-      Language.where(:iso_639_1 => locale).first.native_name
+      Language.where(iso_639_1: locale).first.native_name
     end
   
     def move_position(object)
-      render :partial => 'page/position', :locals => {:object => object}
+      render partial: 'page/position', locals: {object: object}
     end
   
     def localized_state(state)
@@ -91,7 +91,7 @@ module EnjuLeaf
         options.delete(:page) if options[:page].to_i == 1
       end
       unless controller_name == 'test'
-        link_to t('page.listing', :model => t("activerecord.models.#{controller_name.singularize}")), url_for(params.merge(:controller => controller_name, :action => :index, :id => nil, :only_path => true).merge(options))
+        link_to t('page.listing', model: t("activerecord.models.#{controller_name.singularize}")), url_for(params.merge(controller: controller_name, action: :index, id: nil, only_path: true).merge(options))
       end
     end
   
@@ -101,15 +101,14 @@ module EnjuLeaf
   
     def markdown_helper(string)
       return unless string
-      if defined?(JRUBY_VERSION)
-        string
-      #  Kramdown::Document.new(string.to_s).to_html.html_safe
-      else
+      if defined?(Redcarpet)
         markdown = Redcarpet::Markdown.new(
           Redcarpet::Render::HTML,
-          :autolink => true, :safe_links_only => true
+          autolink: true, safe_links_only: true
         )
         markdown.render(string.to_s).html_safe
+      else
+        Kramdown::Document.new(string.to_s).to_html.html_safe
       end
     end
 

data/lib/enju_leaf/import_file.rb

@@ -72,21 +72,21 @@ module ImportFile
       else
         output_encoding = '-w'
       end
-      string = NKF.nkf("#{output_encoding} -Lu", line)
+      NKF.nkf("#{output_encoding} -Lu", line)
     end
 
     def create_import_temp_file(attachment)
       tempfile = Tempfile.new(self.class.name.underscore)
-      if Setting.uploaded_file.storage == :s3
-        uploaded_file_path = attachment.expiring_url(10)
+      if ENV['ENJU_STORAGE'] == 's3'
+        tempfile.write Faraday.get(attachment.expiring_url(10)).body.force_encoding('UTF-8')
       else
         uploaded_file_path = attachment.path
-      end
-      open(uploaded_file_path){|f|
-        f.each{|line|
-          tempfile.puts(convert_encoding(line))
+        open(uploaded_file_path){|f|
+          f.each{|line|
+            tempfile.puts(convert_encoding(line))
+          }
         }
-      }
+      end
       tempfile.close
       tempfile
     end

data/lib/enju_leaf/user.rb

@@ -19,7 +19,7 @@ module EnjuLeaf
         #  :expired_at, :locked, :role_id,
         #  :user_has_role_attributes, :auto_generated_password,
         #  :profile_attributes,
-        #  :as => :admin
+        #  as: :admin
 
         scope :administrators, -> { joins(:role).where('roles.name = ?', 'Administrator') }
         scope :librarians, -> { joins(:role).where('roles.name = ? OR roles.name = ?', 'Administrator', 'Librarian') }
@@ -27,10 +27,10 @@ module EnjuLeaf
         has_one :profile
         if defined?(EnjuBiblio)
           has_many :import_requests
-          has_many :picture_files, :as => :picture_attachable, :dependent => :destroy
+          has_many :picture_files, as: :picture_attachable, dependent: :destroy
         end
-        has_one :user_has_role, :dependent => :destroy
-        has_one :role, :through => :user_has_role
+        has_one :user_has_role, dependent: :destroy
+        has_one :role, through: :user_has_role
         belongs_to :user_group
         belongs_to :library
         belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'
@@ -39,18 +39,18 @@ module EnjuLeaf
         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_date :expired_at, :allow_blank => 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|
+        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
+          v.validates_length_of       :password, allow_blank: true,
+            within: Devise::password_length
         end
 
-        validates_presence_of     :email, :email_confirmation, :on => :create, :if => proc{|user| !user.operator.try(:has_role?, 'Librarian')}
-        validates_confirmation_of :email, :on => :create #, :if => proc{|user| !user.operator.try(:has_role?, 'Librarian')}
+        validates_presence_of     :email, :email_confirmation, on: :create, if: proc{|user| !user.operator.try(:has_role?, 'Librarian')}
+        validates_confirmation_of :email, on: :create #, if: proc{|user| !user.operator.try(:has_role?, 'Librarian')}
 
         before_validation :set_lock_information
         before_destroy :check_role_before_destroy
@@ -61,7 +61,7 @@ module EnjuLeaf
         friendly_id :username
         #has_paper_trail
         normalize_attributes :username
-        normalize_attributes :email, :with => :strip
+        normalize_attributes :email, with: :strip
 
         attr_accessor :operator, :password_not_verified,
           :update_own_account, :auto_generated_password,
@@ -178,7 +178,7 @@ module EnjuLeaf
 
       def check_role_before_destroy
         if self.has_role?('Administrator')
-          raise 'This is the last administrator in this system.' if Role.where(:name => 'Administrator').first.users.size == 1
+          raise 'This is the last administrator in this system.' if Role.where(name: 'Administrator').first.users.size == 1
         end
       end
 
@@ -200,7 +200,7 @@ module EnjuLeaf
 
       def last_librarian?
         if self.has_role?('Librarian')
-          role = Role.where(:name => 'Librarian').first
+          role = Role.where(name: 'Librarian').first
           true if role.users.size == 1
         end
       end
@@ -232,7 +232,7 @@ module EnjuLeaf
 
         # 最後の管理者を削除しようとした
         if has_role?('Administrator')
-          if Role.where(:name => 'Administrator').first.users.size == 1
+          if Role.where(name: 'Administrator').first.users.size == 1
             errors[:base] << I18n.t('user.last_administrator')
           end
         end

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc17"
+  VERSION = "1.1.0.rc18"
 end

data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb

@@ -2,22 +2,15 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
   def quick_install
-    environment = ENV['ENJU_ENV'] || 'development'
+    environment = ENV['RAILS_ENV'] || 'development'
+    rake("enju_leaf_engine:install:migrations")
+    rake("enju_biblio_engine:install:migrations")
+    rake("enju_library_engine:install:migrations")
     if !ENV['SKIP_CONFIG']
-      rake("db:migrate", env: environment)
+      generate("enju_biblio:setup")
+      generate("enju_library:setup")
       generate("enju_circulation:setup")
       generate("enju_subject:setup")
-      gsub_file 'config/schedule.rb', /^set :environment, :development$/,
-        "set :environment, :#{environment}"
-      gsub_file 'config/environments/production.rb',
-        /config.serve_static_assets = false$/,
-        "config.serve_static_assets = true"
-      gsub_file 'config/environments/production.rb',
-        /# config.cache_store = :mem_cache_store$/,
-        "config.cache_store = :dalli_store, {:compress => true}"
-      gsub_file 'config/environments/production.rb',
-        /# config.assets.precompile \+= %w\( search.js \)$/,
-        "config.assets.precompile += %w( mobile.js mobile.css print.css )"
     end
     rake("db:migrate", env: environment)
     rake("enju_leaf:setup", env: environment)
@@ -30,7 +23,7 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
     else
       rake("sunspot:solr:start", env: environment)
       sleep 5
-      rake("environment enju_leaf:reindex", env: environment)
+      rake("environment sunspot:reindex", env: environment)
       rake("sunspot:solr:stop", env: environment)
     end
   end

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

@@ -5,7 +5,6 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_leaf")
     copy_file("Procfile", "Procfile")
-    copy_file("config/application.yml", "config/application.yml")
     copy_file("config/resque.yml", "config/resque.yml")
     copy_file("config/schedule.rb", "config/schedule.rb")
     inject_into_file 'config/application.rb', after: /# config.i18n.default_locale = :de$\n/ do
@@ -33,6 +32,15 @@ EOS
     end
     generate("devise:install")
     generate("devise", "User")
+    generate("sunspot_rails:install")
+    generate("kaminari:config")
+    generate("simple_form:install")
+    gsub_file "config/sunspot.yml",
+      /path: \/solr\/production/,
+      "path: /solr/default"
+    gsub_file 'config/initializers/kaminari_config.rb',
+      /# config.default_per_page = 25$/,
+      "config.default_per_page = 10"
     if Rails::VERSION::MAJOR >= 4
       generate("friendly_id")
       gsub_file 'config/initializers/friendly_id.rb', /# config.use :finders$/, "config.use :finders"
@@ -40,11 +48,6 @@ EOS
         /\/\/= require turbolinks$/,
         ""
     end
-    generate("enju_biblio:setup")
-    generate("enju_library:setup")
-    rake("enju_leaf_engine:install:migrations")
-    rake("enju_biblio_engine:install:migrations")
-    rake("enju_library_engine:install:migrations")
     gsub_file 'config/routes.rb', /devise_for :users$/, "devise_for :users, path: 'accounts'"
     gsub_file 'config/initializers/devise.rb', '# config.email_regexp = /\A[^@]+@[^@]+\z/', 'config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\Z/i'
     gsub_file 'config/initializers/devise.rb', '# config.authentication_keys = [ :email ]', 'config.authentication_keys = [ :username ]'
@@ -58,6 +61,7 @@ EOS
       :lockable, :lock_strategy => :none, :unlock_strategy => :none
   enju_leaf_user_model
 EOS
+
     inject_into_class "app/controllers/application_controller.rb", ApplicationController do
       <<"EOS"
   enju_leaf
@@ -66,7 +70,7 @@ EOS
 
   mobylette_config do |config|
     config[:skip_xhr_requests] = false
-    config[:skip_user_agents] = Setting.enju.skip_mobile_agents.map{|a| a.to_sym}
+    config[:skip_user_agents] = ENV['ENJU_SKIP_MOBILE_AGENTS'].to_s.split.map{|s| s.to_sym}
   end
 
 EOS
@@ -82,6 +86,7 @@ EOS
   end
 EOS
     end
+
     inject_into_file "app/assets/javascripts/application.js", after: /\/\/= require jquery_ujs$\n/ do
       "//= require enju_leaf\n"
     end
@@ -94,15 +99,6 @@ require 'rack/protection'
 use Rack::Protection, except: [:escaped_params, :json_csrf, :http_origin, :session_hijacking, :remote_token]
 EOS
     end
-    generate("sunspot_rails:install")
-    gsub_file "config/sunspot.yml",
-      /path: \/solr\/production/,
-      "path: /solr/default"
-    generate("kaminari:config")
-    generate("simple_form:install")
-    gsub_file 'config/initializers/kaminari_config.rb',
-      /# config.default_per_page = 25$/,
-      "config.default_per_page = 10"
     create_file 'config/initializers/mobile.rb' do <<"EOS"
 ActionController::Responder.class_eval do
   alias :to_mobile :to_html
@@ -111,5 +107,16 @@ EOS
     end
     remove_file "public/index.html"
     remove_file "app/views/layouts/application.html.erb"
+    gsub_file 'config/schedule.rb', /^set :environment, :development$/,
+      "set :environment, :#{environment}"
+    gsub_file 'config/environments/production.rb',
+      /config.serve_static_assets = false$/,
+      "config.serve_static_assets = true"
+    gsub_file 'config/environments/production.rb',
+      /# config.cache_store = :mem_cache_store$/,
+      "config.cache_store = :dalli_store, {:compress => true}"
+    gsub_file 'config/environments/production.rb',
+      /# config.assets.precompile \+= %w\( search.js \)$/,
+      "config.assets.precompile += %w( mobile.js mobile.css print.css )"
   end
 end

data/spec/controllers/my_accounts_controller_spec.rb

@@ -11,14 +11,14 @@ describe MyAccountsController do
       end
 
       it "assigns the requested user as @user" do
-        get :show, :id => 'admin'
+        get :show, id: 'admin'
         expect(response).to be_success
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested user as @user" do
-        get :show, :id => 'admin'
+        get :show, id: 'admin'
         expect(assigns(:user)).to be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
@@ -80,8 +80,8 @@ describe MyAccountsController do
 
   describe "PUT update" do
     before(:each) do
-      @attrs = {:user_attributes => {:email => 'newaddress@example.jp', :current_password => 'password'}, :locale => 'en'}
-      @invalid_attrs = {:user_attributes => {:username => ''}, :user_number => '日本語'}
+      @attrs = {:user_attributes => {email: 'newaddress@example.jp', :current_password => 'password'}, :locale => 'en'}
+      @invalid_attrs = {:user_attributes => {username: ''}, user_number: '日本語'}
       @invalid_passwd_attrs = {:user_attributes => {:current_password=> ''}}
     end
 
@@ -124,11 +124,12 @@ describe MyAccountsController do
           expect(response).to render_template("edit")
         end
       end
+
       describe "with invalid password params" do
         it "assigns the requested user as @user" do
           put :update, profile: @invalid_passwd_attrs
-	  expect(assigns(:profile).errors).not_to be_blank
-	end
+          expect(assigns(:profile).errors).not_to be_blank
+        end
       end
     end
 

data/spec/controllers/profiles_controller_spec.rb

@@ -5,9 +5,9 @@ describe ProfilesController do
   fixtures :all
 
   describe "GET index", :solr => true do
-		before do
-			Profile.reindex
-		end
+    before do
+      Profile.reindex
+    end
 
     describe "When logged in as Administrator" do
       login_fixture_admin
@@ -202,24 +202,24 @@ describe ProfilesController do
 
       describe "with valid params" do
         it "assigns a newly created user as @profile" do
-          post :create, :profile => @attrs
+          post :create, profile: @attrs
           assigns(:profile).should be_valid
         end
 
         it "redirects to the created user" do
-          post :create, :profile => @attrs
+          post :create, profile: @attrs
           response.should redirect_to(profile_url(assigns(:profile)))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved user as @profile" do
-          post :create, :profile => @invalid_attrs
+          post :create, profile: @invalid_attrs
           assigns(:profile).should_not be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, :profile => @invalid_attrs
+          post :create, profile: @invalid_attrs
           response.should render_template("new")
         end
       end
@@ -230,24 +230,24 @@ describe ProfilesController do
 
       describe "with valid params" do
         it "assigns a newly created user as @profile" do
-          post :create, :profile => @attrs
+          post :create, profile: @attrs
           assigns(:profile).should be_valid
         end
 
         it "redirects to the created user" do
-          post :create, :profile => @attrs
+          post :create, profile: @attrs
           response.should redirect_to(profile_url(assigns(:profile)))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved user as @profile" do
-          post :create, :profile => @invalid_attrs
+          post :create, profile: @invalid_attrs
           assigns(:profile).should_not be_valid
         end
 
         it "re-renders the 'new' template" do
-          post :create, :profile => @invalid_attrs
+          post :create, profile: @invalid_attrs
           response.should render_template("new")
         end
       end
@@ -311,7 +311,7 @@ describe ProfilesController do
       end
 
       it "should update other user's role" do
-        put :update, id: profiles(:user1).id, profile: {:user_attributes => {:user_has_role_attributes => {:role_id => 4}, :email => profiles(:user1).user.email, :locale => 'en', :id => profiles(:user1).user.id}}
+        put :update, id: profiles(:user1).id, profile: {:user_attributes => {:user_has_role_attributes => {:role_id => 4}, :email => profiles(:user1).user.email, :locale => 'en', id: profiles(:user1).user.id}}
         response.should redirect_to profile_url(assigns(:profile))
         assigns(:profile).reload
         assigns(:profile).user.role.should eq Role.where(name: 'Administrator').first

data/spec/controllers/roles_controller_spec.rb

@@ -45,7 +45,7 @@ describe RolesController do
 
       it "assigns the requested role as @role" do
         role = Role.find(1)
-        get :show, :id => role.id
+        get :show, id: role.id
         expect(assigns(:role)).to eq(role)
       end
     end
@@ -53,7 +53,7 @@ describe RolesController do
     describe "When not logged in" do
       it "assigns the requested role as @role" do
         role = Role.find(1)
-        get :show, :id => role.id
+        get :show, id: role.id
         expect(assigns(:role)).to eq(role)
       end
     end
@@ -65,7 +65,7 @@ describe RolesController do
 
       it "assigns the requested role as @role" do
         role = Role.find(1)
-        get :edit, :id => role.id
+        get :edit, id: role.id
         expect(assigns(:role)).to eq(role)
       end
     end
@@ -73,7 +73,7 @@ describe RolesController do
     describe "When not logged in" do
       it "should not assign the requested role as @role" do
         role = Role.find(1)
-        get :edit, :id => role.id
+        get :edit, id: role.id
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -83,7 +83,7 @@ describe RolesController do
     before(:each) do
       @role = Role.find(1)
       @attrs = {:display_name => 'guest user'}
-      @invalid_attrs = {:name => ''}
+      @invalid_attrs = {name: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -91,23 +91,23 @@ describe RolesController do
 
       describe "with valid params" do
         it "updates the requested role" do
-          put :update, :id => @role.id, :role => @attrs
+          put :update, id: @role.id, :role => @attrs
         end
 
         it "assigns the requested role as @role" do
-          put :update, :id => @role.id, :role => @attrs
+          put :update, id: @role.id, :role => @attrs
           expect(assigns(:role)).to eq(@role)
         end
 
         it "moves its position when specified" do
-          put :update, :id => @role.id, :role => @attrs, :move => 'lower'
+          put :update, id: @role.id, :role => @attrs, move: 'lower'
           expect(response).to redirect_to(roles_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested role as @role" do
-          put :update, :id => @role.id, :role => @invalid_attrs
+          put :update, id: @role.id, :role => @invalid_attrs
           expect(response).to render_template("edit")
         end
       end
@@ -116,18 +116,18 @@ describe RolesController do
     describe "When not logged in" do
       describe "with valid params" do
         it "updates the requested role" do
-          put :update, :id => @role.id, :role => @attrs
+          put :update, id: @role.id, :role => @attrs
         end
 
         it "should be forbidden" do
-          put :update, :id => @role.id, :role => @attrs
+          put :update, id: @role.id, :role => @attrs
           expect(response).to redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested role as @role" do
-          put :update, :id => @role.id, :role => @invalid_attrs
+          put :update, id: @role.id, :role => @invalid_attrs
           expect(response).to redirect_to(new_user_session_url)
         end
       end