enju_event 0.1.17.pre25 → 0.1.17.pre26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b73cb1eeaca0ba46596db500ebe25e5e9f9d02
-  data.tar.gz: 3fb9ca29821157e8ec8a7c7a1ef0eba968b87bc8
+  metadata.gz: 952d9e4be45acb984585b9ca979adee42fd6f4b8
+  data.tar.gz: d0a8884b4b50f4acc1f6d3e7a23998be47df2283
 SHA512:
-  metadata.gz: 9088359922f0543e13076fb09ac5fb4ede02dff85411481f9b3099ccc2dea6a38f9926ffeb900412305e9ab59cacadbdb02d9818bbc6810778967a399c89be55
-  data.tar.gz: 48c4f9d2eb9c332204863be0080bdc658c320e240277593e5ce9d035fb8fef8ef97e10516344b347cd9ebea6351099212d5b0a78b06da4543d7d46aa15acbe39
+  metadata.gz: 1baecb169b72d269d100c809145659f76e63fd2778901bcd281088d09588d01e8a4e0fe713128971ca7d123385787cb5b2f18e8d2a726fb2994a9c630c3ffd91
+  data.tar.gz: 927a4f5952b53547e3d28772b8ee0e461db9e83db2de2426a6629e41fcb4a9c0de9ad832a160d580f83ce6c5707f7454dd95f30cf99a881890197570f094c8ca

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 Kosuke Tanabe
+Copyright 2015 Project Next-L
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/views/event_categories/show.html.erb

@@ -23,7 +23,9 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.edit'), edit_event_category_path(@event_category) -%></li>
+    <%- if can? :update, @event_category -%>
+      <li><%= link_to t('page.edit'), edit_event_category_path(@event_category) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

data/app/views/event_export_files/_form.html.erb

@@ -1,17 +1,7 @@
 <%= form_for(@event_export_file) do |f| %>
   <%= f.error_messages %>
 
-  <%= f.hidden_field :mode, value: 'export' if @event_export_file.new_record? %><br>
-  <!--
-  <div class="field">
-    <%= f.label :user_id %><br>
-    <%= @event_export_file.user.username %>
-  </div>
-  <div class="field">
-    <%= f.label :event_export %><br>
-    <%= f.text_field :event_export %>
-  </div>
-  -->
+  <%= f.hidden_field :mode, value: 'export' if @event_export_file.new_record? %>
   <div class="actions">
     <% if @event_export_file.new_record? %>
       <%= f.submit t('page.export') %>

data/app/views/event_export_files/show.html.erb

@@ -18,6 +18,11 @@
   <%= localized_state(@event_export_file.current_state) -%>
 </p>
 
+<p>
+  <strong><%= t('page.created_at') -%>:</strong>
+  <%= l(@event_export_file.created_at) if @event_export_file.created_at -%>
+</p>
+
 </div>
 </div>
 

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.17.pre25"
+  VERSION = "0.1.17.pre26"
 end

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

@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
   # Include default devise modules. Others available are:
   # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
-  devise :database_authenticatable, :registerable,
+  devise :database_authenticatable, #:registerable,
          :recoverable, :rememberable, :trackable, :validatable
 
   # Setup accessible (or protected) attributes for your model

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

@@ -7,6 +7,11 @@ one:
   note: 
   my_networks: 0.0.0.0/0
   url: "http://localhost:3000/"
+  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/models/event_import_file_spec.rb

@@ -34,7 +34,7 @@ describe EventImportFile do
       @file.executed_at.should be_truthy
 
       @file.reload
-      @file.error_message.should eq "The follwing column(s) were ignored: invalid"
+      @file.error_message.should eq "The following column(s) were ignored: invalid"
     end
 
     it "should send message when import is completed" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 version: !ruby/object:Gem::Version
-  version: 0.1.17.pre25
+  version: 0.1.17.pre26
 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: enju_message
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre22
+        version: 0.1.14.pre24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre22
+        version: 0.1.14.pre24
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     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
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc17
+        version: 1.1.0.rc19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc17
+        version: 1.1.0.rc19
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -374,7 +374,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
@@ -658,7 +657,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

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

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