enju_leaf 1.1.0.rc10 → 1.1.0.rc11

data/db/migrate/20130221154434_add_additional_attributes_to_user.rb

@@ -2,7 +2,6 @@ class AddAdditionalAttributesToUser < ActiveRecord::Migration
   def change
     add_column :users, :username, :string
     add_column :users, :user_number, :string
-    add_column :users, :state, :string
     add_column :users, :locale, :string
     add_column :users, :deleted_at, :datetime
     add_column :users, :expired_at, :datetime

data/db/migrate/20140110122216_create_user_import_files.rb

@@ -4,7 +4,6 @@ class CreateUserImportFiles < ActiveRecord::Migration
       t.integer :user_id
       t.text :note
       t.datetime :executed_at
-      t.string :state
       t.string :user_import_file_name
       t.string :user_import_content_type
       t.string :user_import_file_size

data/db/migrate/20140122054321_create_profiles.rb

@@ -10,7 +10,6 @@ class CreateProfiles < ActiveRecord::Migration
       t.text :note
       t.text :keyword_list
       t.integer :required_role_id
-      t.string :state
 
       t.timestamps
     end

data/db/migrate/20140628072217_add_user_encoding_to_user_import_file.rb

@@ -0,0 +1,5 @@
+class AddUserEncodingToUserImportFile < ActiveRecord::Migration
+  def change
+    add_column :user_import_files, :user_encoding, :string
+  end
+end

data/lib/enju_leaf/calculate_stat.rb

@@ -12,7 +12,7 @@ module CalculateStat
   module ClassMethods
     def calculate_stat
       self.not_calculated.each do |stat|
-        stat.calculate_count!
+        stat.transition_to!(:started)
       end
     end
   end

data/lib/enju_leaf/import_file.rb

@@ -4,10 +4,66 @@ module ImportFile
   end
 
   module ClassMethods
+    def enju_import_file_model
+      include InstanceMethods
+    end
+
     def expire
       self.stucked.find_each do |file|
         file.destroy
       end
     end
   end
+
+  module InstanceMethods
+    def import_start
+      case edit_mode
+      when 'create'
+        import
+      when 'update'
+        modify
+      when 'destroy'
+        remove
+      else
+        import
+      end
+    end
+
+    def convert_encoding(line)
+      if defined?(CharlockHolmes::EncodingDetector)
+        begin
+          case user_encoding
+          when 'auto_detect'
+            encoding = CharlockHolmes::EncodingDetector.detect(line)[:encoding]
+          when nil
+            encoding = CharlockHolmes::EncodingDetector.detect(line)[:encoding]
+          else
+            encoding = user_encoding
+          end
+          string = line.encode('UTF-8', user_encoding, universal_newline: true)
+        rescue StandardError
+          string = nkf_encode(line)
+        end
+      else
+        string = nkf_encode(line)
+      end
+    end
+
+    private
+    def nkf_encode(line)
+      case user_encoding
+      when 'auto_detect'
+        output_encoding = '-w'
+      when 'UTF-8'
+        output_encoding = ''
+      when 'Shift_JIS'
+        output_encoding = '-Sw'
+      when 'EUC-JP'
+        output_encoding = '-Ew'
+      else
+        output_encoding = '-w'
+      end
+      string = NKF.nkf("#{output_encoding} -Lu", line)
+    end
+  end
 end

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc10"
+  VERSION = "1.1.0.rc11"
 end

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

@@ -16,11 +16,6 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
     append_to_file("Rakefile", "require 'resque/tasks'\n")
     append_to_file("Rakefile", "require 'resque/scheduler/tasks'")
     append_to_file("db/seeds.rb", File.open(File.expand_path('../templates', __FILE__) + '/db/seeds.rb').read)
-    append_to_file 'config/initializers/inflections.rb',  <<EOS
-ActiveSupport::Inflector.inflections do |inflect|
-  inflect.irregular 'reserve', 'reserves'
-end
-EOS
     inject_into_file 'config/environments/development.rb',
       "  config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
       :after => "::Application.configure do\n"

data/lib/generators/enju_leaf/setup/templates/config/schedule.rb

@@ -23,10 +23,6 @@ set :path, '/path/to/enju_leaf'
 set :environment, :development
 set :output, "#{path}/log/cron_log.log"
 
-every 1.hour do
-  rake "enju_biblio:import"
-end
-
 every 1.day, :at => '0:00 am' do
   runner "User.lock_expired_users"
 end
@@ -35,7 +31,3 @@ every 1.day, :at => '3:00 am' do
   rake "sunspot:reindex"
 #  rake "sitemap:refresh:no_ping"
 end
-
-every 1.day, :at => '5:00 am' do
-  rake "enju:import:destroy"
-end

data/spec/controllers/my_accounts_controller_spec.rb

@@ -145,7 +145,7 @@ describe MyAccountsController do
         it "should ignore username" do
           put :update, :user => @invalid_attrs
           response.should render_template("edit")
-          assigns(:user).changed?.should be_true
+          assigns(:user).changed?.should be_truthy
         end
       end
     end

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

@@ -0,0 +1,4 @@
+class Setting < Settingslogic
+  source "#{Rails.root}/config/application.yml"
+  namespace Rails.env
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140610123439) do
+ActiveRecord::Schema.define(:version => 20140628072217) do
 
   create_table "accepts", :force => true do |t|
     t.integer  "basket_id"
@@ -579,7 +579,6 @@ ActiveRecord::Schema.define(:version => 20140610123439) do
     t.text     "note"
     t.text     "keyword_list"
     t.integer  "required_role_id"
-    t.string   "state"
     t.datetime "created_at",       :null => false
     t.datetime "updated_at",       :null => false
   end
@@ -826,7 +825,6 @@ ActiveRecord::Schema.define(:version => 20140610123439) do
     t.integer  "user_id"
     t.text     "note"
     t.datetime "executed_at"
-    t.string   "state"
     t.string   "user_import_file_name"
     t.string   "user_import_content_type"
     t.string   "user_import_file_size"
@@ -836,6 +834,7 @@ ActiveRecord::Schema.define(:version => 20140610123439) do
     t.text     "error_message"
     t.datetime "created_at",               :null => false
     t.datetime "updated_at",               :null => false
+    t.string   "user_encoding"
   end
 
   create_table "user_import_results", :force => true do |t|
@@ -861,7 +860,6 @@ ActiveRecord::Schema.define(:version => 20140610123439) do
     t.datetime "updated_at",                             :null => false
     t.string   "username"
     t.string   "user_number"
-    t.string   "state"
     t.string   "locale"
     t.datetime "deleted_at"
     t.datetime "expired_at"

data/spec/dummy/tmp/cache/stdout

@@ -0,0 +1,103 @@
+[28622] 05 Jul 14:52:21.051 * Increased maximum number of open files to 10032 (it was originally set to 256).
+[28622] 05 Jul 14:52:21.052 # Creating Server TCP listening socket *:9736: bind: Address already in use
+[28741] 05 Jul 14:53:45.547 * Increased maximum number of open files to 10032 (it was originally set to 256).
+                _._                                                  
+           _.-``__ ''-._                                             
+      _.-``    `.  `_.  ''-._           Redis 2.8.12 (00000000/0) 64 bit
+  .-`` .-```.  ```\/    _.,_ ''-._                                   
+ (    '      ,       .-`  | `,    )     Running in stand alone mode
+ |`-._`-...-` __...-.``-._|'` _.-'|     Port: 9736
+ |    `-._   `._    /     _.-'    |     PID: 28741
+  `-._    `-._  `-./  _.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |           http://redis.io        
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |                                  
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+      `-._    `-.__.-'    _.-'                                       
+          `-._        _.-'                                           
+              `-.__.-'                                               
+
+[28741] 05 Jul 14:53:45.548 # Server started, Redis version 2.8.12
+[28741] 05 Jul 14:53:45.548 * The server is now ready to accept connections on port 9736
+[28741] 05 Jul 14:53:45.549 - 0 clients connected (0 slaves), 952656 bytes in use
+[28741] 05 Jul 14:53:50.579 - 0 clients connected (0 slaves), 952656 bytes in use
+[28741] 05 Jul 14:53:55.606 - 0 clients connected (0 slaves), 952656 bytes in use
+[28741] 05 Jul 14:54:00.636 - 0 clients connected (0 slaves), 952656 bytes in use
+[28741] 05 Jul 14:54:05.661 - 0 clients connected (0 slaves), 952656 bytes in use
+[28830] 05 Jul 14:54:32.487 * Increased maximum number of open files to 10032 (it was originally set to 256).
+                _._                                                  
+           _.-``__ ''-._                                             
+      _.-``    `.  `_.  ''-._           Redis 2.8.12 (00000000/0) 64 bit
+  .-`` .-```.  ```\/    _.,_ ''-._                                   
+ (    '      ,       .-`  | `,    )     Running in stand alone mode
+ |`-._`-...-` __...-.``-._|'` _.-'|     Port: 9736
+ |    `-._   `._    /     _.-'    |     PID: 28830
+  `-._    `-._  `-./  _.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |           http://redis.io        
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |                                  
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+      `-._    `-.__.-'    _.-'                                       
+          `-._        _.-'                                           
+              `-.__.-'                                               
+
+[28830] 05 Jul 14:54:32.490 # Server started, Redis version 2.8.12
+[28830] 05 Jul 14:54:32.490 * The server is now ready to accept connections on port 9736
+[28830] 05 Jul 14:54:32.490 - 0 clients connected (0 slaves), 952656 bytes in use
+[28830] 05 Jul 14:54:37.522 - 0 clients connected (0 slaves), 952656 bytes in use
+[28830] 05 Jul 14:54:42.561 - 0 clients connected (0 slaves), 952656 bytes in use
+[28830] 05 Jul 14:54:47.608 - 0 clients connected (0 slaves), 952656 bytes in use
+[28965] 05 Jul 14:55:55.850 * Increased maximum number of open files to 10032 (it was originally set to 256).
+                _._                                                  
+           _.-``__ ''-._                                             
+      _.-``    `.  `_.  ''-._           Redis 2.8.12 (00000000/0) 64 bit
+  .-`` .-```.  ```\/    _.,_ ''-._                                   
+ (    '      ,       .-`  | `,    )     Running in stand alone mode
+ |`-._`-...-` __...-.``-._|'` _.-'|     Port: 9736
+ |    `-._   `._    /     _.-'    |     PID: 28965
+  `-._    `-._  `-./  _.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |           http://redis.io        
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |                                  
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+      `-._    `-.__.-'    _.-'                                       
+          `-._        _.-'                                           
+              `-.__.-'                                               
+
+[28965] 05 Jul 14:55:55.852 # Server started, Redis version 2.8.12
+[28965] 05 Jul 14:55:55.852 * The server is now ready to accept connections on port 9736
+[28965] 05 Jul 14:55:55.852 - 0 clients connected (0 slaves), 952656 bytes in use
+[28965] 05 Jul 14:56:00.884 - 0 clients connected (0 slaves), 952656 bytes in use
+[28965] 05 Jul 14:56:05.924 - 0 clients connected (0 slaves), 952656 bytes in use
+[28965] 05 Jul 14:56:10.968 - 0 clients connected (0 slaves), 952656 bytes in use
+[34262] 05 Jul 17:31:09.371 * Increased maximum number of open files to 10032 (it was originally set to 256).
+                _._                                                  
+           _.-``__ ''-._                                             
+      _.-``    `.  `_.  ''-._           Redis 2.8.12 (00000000/0) 64 bit
+  .-`` .-```.  ```\/    _.,_ ''-._                                   
+ (    '      ,       .-`  | `,    )     Running in stand alone mode
+ |`-._`-...-` __...-.``-._|'` _.-'|     Port: 9736
+ |    `-._   `._    /     _.-'    |     PID: 34262
+  `-._    `-._  `-./  _.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |           http://redis.io        
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |                                  
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+      `-._    `-.__.-'    _.-'                                       
+          `-._        _.-'                                           
+              `-.__.-'                                               
+
+[34262] 05 Jul 17:31:09.382 # Server started, Redis version 2.8.12
+[34262] 05 Jul 17:31:09.383 * The server is now ready to accept connections on port 9736
+[34262] 05 Jul 17:31:10.377 - 0 clients connected (0 slaves), 952656 bytes in use
+[34262] 05 Jul 17:31:15.402 - 0 clients connected (0 slaves), 952656 bytes in use
+[34262] 05 Jul 17:31:20.427 - 0 clients connected (0 slaves), 952656 bytes in use
+[34262] 05 Jul 17:31:25.475 - 0 clients connected (0 slaves), 952656 bytes in use

data/spec/dummy/tmp/pids/redis-test.pid

@@ -0,0 +1 @@
+34262

data/spec/fixtures/roles.yml

@@ -1,17 +1,3 @@
-# == Schema Information
-#
-# Table name: roles
-#
-#  id           :integer          not null, primary key
-#  name         :string(255)      not null
-#  display_name :string(255)
-#  note         :text
-#  created_at   :datetime
-#  updated_at   :datetime
-#  score        :integer          default(0), not null
-#  position     :integer
-#
-
 --- 
 role_00001: 
   name: Guest  
@@ -36,4 +22,18 @@ role_00004:
   display_name: Administrator
   id: 4
   score: 4
-  note: 
+  note:
+
+# == Schema Information
+#
+# Table name: roles
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)      not null
+#  display_name :string(255)
+#  note         :text
+#  created_at   :datetime
+#  updated_at   :datetime
+#  score        :integer          default(0), not null
+#  position     :integer
+#

data/spec/fixtures/user_has_roles.yml

@@ -1,14 +1,3 @@
-# == Schema Information
-#
-# Table name: user_has_roles
-#
-#  id         :integer          not null, primary key
-#  user_id    :integer
-#  role_id    :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#
-
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 
 admin:
@@ -38,3 +27,14 @@ user3:
 user4:
   user_id: 7
   role_id: 2
+
+# == Schema Information
+#
+# Table name: user_has_roles
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer
+#  role_id    :integer
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#

data/spec/fixtures/user_import_files.yml

@@ -4,7 +4,6 @@ one:
   user_id: 1
   note: MyText
   executed_at: 2014-01-10 21:22:16
-  state: pending
   user_import_file_name: MyString
   user_import_content_type: text/csv
   user_import_file_size: 1
@@ -17,7 +16,6 @@ two:
   user_id: 1
   note: MyText
   executed_at: 2014-01-10 21:22:16
-  state: pending
   user_import_file_name: MyString
   user_import_content_type: text/csv
   user_import_file_size: 1
@@ -25,3 +23,23 @@ two:
   user_import_fingerprint: MyString
   edit_mode: MyString
   error_message: MyText
+
+# == Schema Information
+#
+# Table name: user_import_files
+#
+#  id                       :integer          not null, primary key
+#  user_id                  :integer
+#  note                     :text
+#  executed_at              :datetime
+#  user_import_file_name    :string(255)
+#  user_import_content_type :string(255)
+#  user_import_file_size    :string(255)
+#  user_import_updated_at   :datetime
+#  user_import_fingerprint  :string(255)
+#  edit_mode                :string(255)
+#  error_message            :text
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  user_encoding            :string(255)
+#