enju_message 0.1.14.pre23 → 0.1.14.pre24

data/spec/factories/user.rb

@@ -2,7 +2,6 @@ FactoryGirl.define do
   factory :admin, :class => User do |f|
     f.sequence(:username){|n| "admin_#{n}"}
     f.sequence(:email){|n| "admin_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'adminpassword'
     f.password_confirmation 'adminpassword'
     f.after(:create) do |user|
@@ -16,7 +15,6 @@ FactoryGirl.define do
   factory :librarian, :class => User do |f|
     f.sequence(:username){|n| "librarian_#{n}"}
     f.sequence(:email){|n| "librarian_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'librarianpassword'
     f.password_confirmation 'librarianpassword'
     f.after(:create) do |user|
@@ -30,7 +28,6 @@ FactoryGirl.define do
   factory :user, :class => User do |f|
     f.sequence(:username){|n| "user_#{n}"}
     f.sequence(:email){|n| "user_#{n}@example.jp"}
-    f.email_confirmation{|u| u.email}
     f.password 'userpassword'
     f.password_confirmation 'userpassword'
     f.after(:create) do |user|

data/spec/fixtures/library_groups.yml

@@ -10,6 +10,12 @@ one:
   position: 1
   login_banner: "*Next-L Enju*"
   admin_networks: 0.0.0.0/0
+  settings: <% if Rails::VERSION::MAJOR > 3 %>
+    "{\"max_number_of_results\":200,\"family_name_first\":true,\"book_jacket_source\":\"google\",\"screenshot_generator\":\"mozshot\"}"
+  <% else %>
+    "---\n:max_number_of_results: 200\n:family_name_first: true\n:book_jacket_source: \"google\"\n:screenshot_generator: \"mozshot\""
+  <% end %>
+
 
 # == Schema Information
 #

data/spec/fixtures/message_requests.yml

@@ -21,7 +21,6 @@ two:
 #  sent_at             :datetime
 #  deleted_at          :datetime
 #  body                :text
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
+#  created_at          :datetime
+#  updated_at          :datetime
 #
-

data/spec/fixtures/message_templates.yml

@@ -88,12 +88,11 @@ message_template_00012:
 # Table name: message_templates
 #
 #  id         :integer          not null, primary key
-#  status     :string(255)      not null
+#  status     :string           not null
 #  title      :text             not null
 #  body       :text             not null
 #  position   :integer
-#  locale     :string(255)      default("en")
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  locale     :string           default("en")
+#  created_at :datetime
+#  updated_at :datetime
 #
-

data/spec/fixtures/messages.yml

@@ -44,14 +44,13 @@ librarian2_to_user2:
 #  read_at            :datetime
 #  receiver_id        :integer
 #  sender_id          :integer
-#  subject            :string(255)      not null
+#  subject            :string           not null
 #  body               :text
 #  message_request_id :integer
 #  parent_id          :integer
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
+#  created_at         :datetime
+#  updated_at         :datetime
 #  lft                :integer
 #  rgt                :integer
 #  depth              :integer
 #
-

data/spec/models/message_request_spec.rb

@@ -17,6 +17,6 @@ end
 #  sent_at             :datetime
 #  deleted_at          :datetime
 #  body                :text
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
+#  created_at          :datetime
+#  updated_at          :datetime
 #

data/spec/models/message_spec.rb

@@ -45,12 +45,12 @@ end
 #  read_at            :datetime
 #  receiver_id        :integer
 #  sender_id          :integer
-#  subject            :string(255)      not null
+#  subject            :string           not null
 #  body               :text
 #  message_request_id :integer
 #  parent_id          :integer
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
+#  created_at         :datetime
+#  updated_at         :datetime
 #  lft                :integer
 #  rgt                :integer
 #  depth              :integer

data/spec/models/message_template_spec.rb

@@ -11,12 +11,11 @@ end
 # Table name: message_templates
 #
 #  id         :integer          not null, primary key
-#  status     :string(255)      not null
+#  status     :string           not null
 #  title      :text             not null
 #  body       :text             not null
 #  position   :integer
-#  locale     :string(255)      default("en")
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  locale     :string           default("en")
+#  created_at :datetime
+#  updated_at :datetime
 #
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.1.14.pre23
+  version: 0.1.14.pre24
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc18
+        version: 1.1.0.rc19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc18
+        version: 1.1.0.rc19
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -319,7 +319,6 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/ability.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
@@ -475,6 +474,7 @@ files:
 - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
 - spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
 - spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.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
@@ -535,7 +535,6 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/models/ability.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
@@ -691,6 +690,7 @@ test_files:
 - spec/dummy/db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
 - spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
 - spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.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

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

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