enju_subject 0.1.0.pre30 → 0.1.0.pre31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 291c84130b361ec67fa94ce68ec8dd81e593d436
-  data.tar.gz: b031cff81394362c73638ee9f49dbcbbe615a931
+  metadata.gz: 34d59a4efc1f24088a2d558635730bb44073bc19
+  data.tar.gz: a67e2c171b772128a2306523a18af8bbb9b53052
 SHA512:
-  metadata.gz: b8847266c74950b354995294fff9f9b2b6100f78615e38480ff830dfeba2875931f918eae8c82b6966098d5c1588e6ca65c66a5d6d27e496da1143a9e372a254
-  data.tar.gz: 4bdf4f681e3e07f4689cd20857242476f1dcb679667367aec367129ce2ea4edb24fc09883c159d068fe89fabdbfc4632b7f0475d9c9ba06b5a5140380cfef254
+  metadata.gz: 05c034557a0c87a1c86b06a2c0d137ffeb9674387720b76734974395164b11d885a53bb2952d5e4cb0353c692b08db66199a2d3974be5579cad98a732d1d75fc
+  data.tar.gz: bea7a5a2861b2a72fd622e8a43b6b2f558a5f7d5cf5b1ce917e75de07b08fd787dfe3e4f50190ee5459215309b104e2bd78c993196756dcdf140173f59616333

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/classification_types/show.html.erb

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

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

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

data/app/views/subject_heading_types/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_subject_heading_type_path(@subject_heading_type) -%></li>
+    <%- if can? :update, @subject_heading_type -%>
+      <li><%= link_to t('page.edit'), edit_subject_heading_type_path(@subject_heading_type) -%></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
 </div>

data/app/views/subject_types/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_subject_type_path(@subject_type) %></li>
+    <%- if can? :update, @subject_type -%>
+      <li><%= link_to t('page.edit'), edit_subject_type_path(@subject_type) %></li>
+    <%- end -%>
     <li><%= back_to_index(flash[:page_info]) %></li>
   </ul>
 </div>

data/lib/enju_subject/version.rb

@@ -1,3 +1,3 @@
 module EnjuSubject
-  VERSION = "0.1.0.pre30"
+  VERSION = "0.1.0.pre31"
 end

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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_subject
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre30
+  version: 0.1.0.pre31
 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: dynamic_form
@@ -72,14 +72,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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ 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: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -285,7 +285,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
@@ -520,7 +519,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