enju_leaf 1.1.0.rc17 → 1.1.0.rc18

data/spec/fixtures/user_groups.yml

@@ -35,12 +35,12 @@ user_group_00003:
 # Table name: user_groups
 #
 #  id                               :integer          not null, primary key
-#  name                             :string(255)
+#  name                             :string
 #  display_name                     :text
 #  note                             :text
 #  position                         :integer
-#  created_at                       :datetime         not null
-#  updated_at                       :datetime         not null
+#  created_at                       :datetime
+#  updated_at                       :datetime
 #  deleted_at                       :datetime
 #  valid_period_for_new_user        :integer          default(0), not null
 #  expired_at                       :datetime

data/spec/fixtures/user_has_roles.yml

@@ -35,6 +35,6 @@ user4:
 #  id         :integer          not null, primary key
 #  user_id    :integer
 #  role_id    :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  created_at :datetime
+#  updated_at :datetime
 #

data/spec/fixtures/user_import_files.yml

@@ -32,16 +32,18 @@ two:
 #  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_file_name    :string
+#  user_import_content_type :string
+#  user_import_file_size    :integer
 #  user_import_updated_at   :datetime
-#  user_import_fingerprint  :string(255)
-#  edit_mode                :string(255)
+#  user_import_fingerprint  :string
+#  edit_mode                :string
 #  error_message            :text
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
-#  user_encoding            :string(255)
+#  created_at               :datetime
+#  updated_at               :datetime
+#  user_encoding            :string
 #  default_library_id       :integer
 #  default_user_group_id    :integer
+#  user_import_id           :string
+#  user_import_size         :integer
 #

data/spec/fixtures/user_import_results.yml

@@ -20,6 +20,7 @@ two:
 #  user_import_file_id :integer
 #  user_id             :integer
 #  body                :text
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
+#  created_at          :datetime
+#  updated_at          :datetime
+#  error_message       :text
 #

data/spec/models/profile_spec.rb

@@ -64,3 +64,28 @@ describe Profile do
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: profiles
+#
+#  id                       :integer          not null, primary key
+#  user_id                  :integer
+#  user_group_id            :integer
+#  library_id               :integer
+#  locale                   :string
+#  user_number              :string
+#  full_name                :text
+#  note                     :text
+#  keyword_list             :text
+#  required_role_id         :integer
+#  created_at               :datetime
+#  updated_at               :datetime
+#  checkout_icalendar_token :string
+#  save_checkout_history    :boolean          default(FALSE), not null
+#  expired_at               :datetime
+#  save_search_history      :boolean
+#  share_bookmarks          :boolean
+#  full_name_transcription  :text
+#  date_of_birth            :datetime
+#

data/spec/models/role_spec.rb

@@ -30,8 +30,8 @@ end
 # Table name: roles
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
-#  display_name :string(255)
+#  name         :string           not null
+#  display_name :string
 #  note         :text
 #  created_at   :datetime
 #  updated_at   :datetime

data/spec/models/user_export_file_spec.rb

@@ -19,13 +19,12 @@ end
 #
 # Table name: user_export_files
 #
-#  id                       :integer          not null, primary key
-#  user_id                  :integer
-#  user_export_file_name    :string(255)
-#  user_export_content_type :string(255)
-#  user_export_file_size    :integer
-#  user_export_updated_at   :datetime
-#  executed_at              :datetime
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
+#  id                   :integer          not null, primary key
+#  user_id              :integer
+#  executed_at          :datetime
+#  created_at           :datetime
+#  updated_at           :datetime
+#  user_export_id       :string
+#  user_export_size     :integer
+#  user_import_filename :string
 #

data/spec/models/user_group_spec.rb

@@ -22,12 +22,12 @@ end
 # Table name: user_groups
 #
 #  id                               :integer          not null, primary key
-#  name                             :string(255)
+#  name                             :string
 #  display_name                     :text
 #  note                             :text
 #  position                         :integer
-#  created_at                       :datetime         not null
-#  updated_at                       :datetime         not null
+#  created_at                       :datetime
+#  updated_at                       :datetime
 #  deleted_at                       :datetime
 #  valid_period_for_new_user        :integer          default(0), not null
 #  expired_at                       :datetime

data/spec/models/user_has_role_spec.rb

@@ -13,6 +13,6 @@ end
 #  id         :integer          not null, primary key
 #  user_id    :integer
 #  role_id    :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  created_at :datetime
+#  updated_at :datetime
 #

data/spec/models/user_import_file_spec.rb

@@ -6,7 +6,7 @@ describe UserImportFile do
 
   describe "when its mode is 'create'" do
     before(:each) do
-      @file = UserImportFile.new :user_import => File.new("#{Rails.root.to_s}/../../examples/user_import_file_sample.tsv")
+      @file = UserImportFile.new :user_import => File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv")
       @file.default_user_group = UserGroup.find(2)
       @file.default_library = Library.find(3)
       @file.user = users(:admin)
@@ -18,7 +18,7 @@ describe UserImportFile do
       old_import_results_count = UserImportResult.count
       old_profiles_solr_count = Profile.search.total
       @file.current_state.should eq 'pending'
-      @file.import_start.should eq({:user_imported => 5, :user_found => 0, :failed => 0})
+      @file.import_start.should eq({:user_imported => 5, :user_found => 0, :failed => 1})
       User.order('id DESC')[1].username.should eq 'user005'
       User.order('id DESC')[2].username.should eq 'user003'
       User.count.should eq old_users_count + 5
@@ -52,7 +52,8 @@ describe UserImportFile do
       user003.profile.save_search_history.should be_falsy
       user003.profile.share_bookmarks.should be_falsy
       User.where(username: 'user000').first.should be_nil
-      UserImportResult.count.should eq old_import_results_count + 6
+      UserImportResult.count.should eq old_import_results_count + 7
+      UserImportResult.order(:created_at).last.error_message.should eq 'Password is too short (minimum is 6 characters)'
 
       user005 = User.where(username: 'user005').first
       user005.role.name.should eq 'User'
@@ -87,7 +88,7 @@ describe UserImportFile do
       old_users_count = User.count
       old_import_results_count = UserImportResult.count
       @file.user = User.where(username: 'librarian1').first
-      @file.import_start.should eq({:user_imported => 4, :user_found => 0, :failed => 1})
+      @file.import_start.should eq({:user_imported => 4, :user_found => 0, :failed => 2})
       User.order('id DESC')[1].username.should eq 'user005'
       User.count.should eq old_users_count + 4
     end
@@ -95,14 +96,14 @@ describe UserImportFile do
 
   describe "when its mode is 'update'" do
     it "should update users" do
-      @file = UserImportFile.create :user_import => File.new("#{Rails.root.to_s}/../../examples/user_update_file.tsv")
+      @file = UserImportFile.create :user_import => File.new("#{Rails.root}/../../examples/user_update_file.tsv")
       @file.modify
     end
   end
 
   describe "when its mode is 'destroy'" do
     before(:each) do
-      @file = UserImportFile.new :user_import => File.new("#{Rails.root.to_s}/../../examples/user_import_file_sample.tsv")
+      @file = UserImportFile.new :user_import => File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv")
       @file.user = users(:admin)
       @file.default_user_group = UserGroup.find(2)
       @file.default_library = Library.find(3)
@@ -112,14 +113,14 @@ describe UserImportFile do
 
     it "should remove users" do
       old_count = User.count
-      @file = UserImportFile.create :user_import => File.new("#{Rails.root.to_s}/../../examples/user_delete_file.tsv")
+      @file = UserImportFile.create :user_import => File.new("#{Rails.root}/../../examples/user_delete_file.tsv")
       @file.remove
       User.count.should eq old_count - 3
     end
   end
 
   it "should import in background" do
-    file = UserImportFile.new :user_import => File.new("#{Rails.root.to_s}/../../examples/user_import_file_sample.tsv")
+    file = UserImportFile.new :user_import => File.new("#{Rails.root}/../../examples/user_import_file_sample.tsv")
     file.user = users(:admin)
     file.default_user_group = UserGroup.find(2)
     file.default_library = Library.find(3)
@@ -136,16 +137,18 @@ end
 #  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_file_name    :string
+#  user_import_content_type :string
+#  user_import_file_size    :integer
 #  user_import_updated_at   :datetime
-#  user_import_fingerprint  :string(255)
-#  edit_mode                :string(255)
+#  user_import_fingerprint  :string
+#  edit_mode                :string
 #  error_message            :text
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
-#  user_encoding            :string(255)
+#  created_at               :datetime
+#  updated_at               :datetime
+#  user_encoding            :string
 #  default_library_id       :integer
 #  default_user_group_id    :integer
+#  user_import_id           :string
+#  user_import_size         :integer
 #

data/spec/models/user_import_result_spec.rb

@@ -14,6 +14,7 @@ end
 #  user_import_file_id :integer
 #  user_id             :integer
 #  body                :text
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
+#  created_at          :datetime
+#  updated_at          :datetime
+#  error_message       :text
 #

data/spec/routing/accounts_spec.rb

@@ -4,11 +4,11 @@ describe ProfilesController do
   describe "routing" do
 
     it "recognizes and generates #new" do
-      { :get => "/accounts/sign_in" }.should route_to(:controller => "devise/sessions", :action => "new")
+      { get: "/accounts/sign_in" }.should route_to(controller: "devise/sessions", action: "new")
     end
 
     it "recognizes and generates #destroy" do
-      { :delete => "/accounts/sign_out" }.should route_to(:controller => "devise/sessions", :action => "destroy")
+      { delete: "/accounts/sign_out" }.should route_to(controller: "devise/sessions", action: "destroy")
     end
   end
 end

data/spec/routing/profiles_routing_spec.rb

@@ -4,31 +4,31 @@ describe ProfilesController do
   describe "routing" do
 
     it "recognizes and generates #index" do
-      { :get => "/profiles" }.should route_to(:controller => "profiles", :action => "index")
+      { get: "/profiles" }.should route_to(controller: "profiles", action: "index")
     end
 
     it "recognizes and generates #new" do
-      { :get => "/profiles/new" }.should route_to(:controller => "profiles", :action => "new")
+      { get: "/profiles/new" }.should route_to(controller: "profiles", action: "new")
     end
 
     it "recognizes and generates #show" do
-      { :get => "/profiles/1" }.should route_to(:controller => "profiles", :action => "show", :id => "1")
+      { get: "/profiles/1" }.should route_to(controller: "profiles", action: "show", id: "1")
     end
 
     it "recognizes and generates #edit" do
-      { :get => "/profiles/1/edit" }.should route_to(:controller => "profiles", :action => "edit", :id => "1")
+      { get: "/profiles/1/edit" }.should route_to(controller: "profiles", action: "edit", id: "1")
     end
 
     it "recognizes and generates #create" do
-      { :post => "/profiles" }.should route_to(:controller => "profiles", :action => "create")
+      { post: "/profiles" }.should route_to(controller: "profiles", action: "create")
     end
 
     it "recognizes and generates #update" do
-      { :put => "/profiles/1" }.should route_to(:controller => "profiles", :action => "update", :id => "1")
+      { put: "/profiles/1" }.should route_to(controller: "profiles", action: "update", id: "1")
     end
 
     it "recognizes and generates #destroy" do
-      { :delete => "/profiles/1" }.should route_to(:controller => "profiles", :action => "destroy", :id => "1")
+      { delete: "/profiles/1" }.should route_to(controller: "profiles", action: "destroy", id: "1")
     end
 
   end

data/spec/routing/resource_import_files_routing_spec.rb

@@ -12,11 +12,11 @@ describe UserImportFilesController do
     end
 
     it "routes to #show" do
-      get("/user_import_files/1").should route_to("user_import_files#show", :id => "1")
+      get("/user_import_files/1").should route_to("user_import_files#show", id: "1")
     end
 
     it "routes to #edit" do
-      get("/user_import_files/1/edit").should route_to("user_import_files#edit", :id => "1")
+      get("/user_import_files/1/edit").should route_to("user_import_files#edit", id: "1")
     end
 
     it "routes to #create" do
@@ -24,11 +24,11 @@ describe UserImportFilesController do
     end
 
     it "routes to #update" do
-      put("/user_import_files/1").should route_to("user_import_files#update", :id => "1")
+      put("/user_import_files/1").should route_to("user_import_files#update", id: "1")
     end
 
     it "routes to #destroy" do
-      delete("/user_import_files/1").should route_to("user_import_files#destroy", :id => "1")
+      delete("/user_import_files/1").should route_to("user_import_files#destroy", id: "1")
     end
 
   end

data/spec/views/profiles/new.html.erb_spec.rb

@@ -18,8 +18,8 @@ describe "profiles/new" do
     render
 
     # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form", :action => profiles_path, :method => "post" do
-      assert_select "input#profile_user_number", :name => "profile[user_number]"
+    assert_select "form", action: profiles_path, method: "post" do
+      assert_select "input#profile_user_number", name: "profile[user_number]"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_leaf
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc17
+  version: 1.1.0.rc18
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre64
+        version: 0.1.0.pre65
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre64
+        version: 0.1.0.pre65
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: resque
   requirement: !ruby/object:Gem::Requirement
@@ -198,20 +198,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: settingslogic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dalli
   requirement: !ruby/object:Gem::Requirement
@@ -367,7 +353,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -442,14 +428,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre42
+        version: 0.1.0.pre44
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre42
+        version: 0.1.0.pre44
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
@@ -470,14 +456,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre10
+        version: 0.1.0.pre11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre10
+        version: 0.1.0.pre11
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -526,14 +512,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
   requirement: !ruby/object:Gem::Requirement
@@ -590,6 +576,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: integrated library system
 email:
 - nabeta@fastmail.fm
@@ -695,7 +695,6 @@ files:
 - app/models/enju_leaf/ability.rb
 - app/models/profile.rb
 - app/models/role.rb
-- app/models/setting.rb
 - app/models/user_export_file.rb
 - app/models/user_export_file_state_machine.rb
 - app/models/user_export_file_transition.rb
@@ -820,6 +819,7 @@ files:
 - app/workers/user_import_file_queue.rb
 - config/initializers/mime_types.rb
 - config/initializers/paperclip.rb
+- config/initializers/redis.rb
 - config/initializers/resque.rb
 - config/initializers/statesman.rb
 - config/locales/devise.en.yml
@@ -851,6 +851,7 @@ files:
 - db/migrate/20140811031145_add_expired_at_to_profile.rb
 - db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
 - db/migrate/20141003182825_add_date_of_birth_to_profile.rb
+- db/migrate/20150506105356_add_error_message_to_user_import_result.rb
 - lib/enju_leaf.rb
 - lib/enju_leaf/calculate_stat.rb
 - lib/enju_leaf/controller.rb
@@ -868,7 +869,6 @@ files:
 - lib/generators/enju_leaf/quick_install/quick_install_generator.rb
 - lib/generators/enju_leaf/setup/setup_generator.rb
 - lib/generators/enju_leaf/setup/templates/Procfile
-- lib/generators/enju_leaf/setup/templates/config/application.yml
 - lib/generators/enju_leaf/setup/templates/config/resque.yml
 - lib/generators/enju_leaf/setup/templates/config/schedule.rb
 - lib/generators/enju_leaf/setup/templates/db/fixtures/roles.yml
@@ -909,7 +909,6 @@ files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
@@ -1135,6 +1134,7 @@ files:
 - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
 - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
 - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
+- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -1342,7 +1342,6 @@ test_files:
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
@@ -1568,6 +1567,7 @@ test_files:
 - spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
 - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
 - spec/dummy/db/migrate/20141014065831_add_shelf_id_to_checkout.rb
+- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html