enju_flower 0.1.0.pre22 → 0.1.0.pre23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e837a658f1318a08740d4f9d8d51bd59c378484
-  data.tar.gz: b46ba01b84cc9f686cc03d4617997c134822cd08
+  metadata.gz: 7655037b45dfd20776d9e8e949f94c8865bd0cb8
+  data.tar.gz: a38c82612797330fc478e36c697fa2cd96d0b2df
 SHA512:
-  metadata.gz: 6520336a72526f19ad58fbcf5fe3257c8f13366d924cc369ae0537fd0c3463dec150271ce3cbb4e8e88a4efbaf40c67e578987a969d1233e2f0805d68213f179
-  data.tar.gz: 21a09afd59a548cbed282501ffa9ce1cf17e32f8db227f3cd90d3726ffa0b02969970c99e3d504206e94a2b5dfff3ee657c22321327e29804343911860d3c79d
+  metadata.gz: 5af23cdcdf03b9ca1bec945c16a37d81d868ebf10973b6d47155e64a8dfde69117647aaa0bdbc827e15e45215c8832b39615648c649d22f63957bf3828ff0404
+  data.tar.gz: 7f2734294c1801faaaf6acff8cc7867bb8fe67e0c079c4e9a5371d6fc28a411947e926d6e1ecd5c5d5cda2a217e60d9491e82de728a572bef5da640d3ab2a9ee

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2013 YOURNAME
+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/manifestations/_manifestation.html.erb

@@ -34,12 +34,11 @@
                   <% if manifestation.is_reservable_by?(current_user) %>
                     <%- reserve = manifestation.is_reserved_by?(current_user) -%>
                     <%- if reserve -%>
-                      <%= link_to t('reserve.show'), reserve -%>
+                      <%= link_to t('reserve.show'), reserve -%><br />
                     <%- else -%>
-                      <%= link_to t('activerecord.models.reserve'), new_reserve_path(manifestation_id: manifestation.id) if can? :create, Reserve -%>
+                      <%= link_to t('activerecord.models.reserve'), new_reserve_path(manifestation_id: manifestation.id) if can? :create, Reserve -%><br />
                     <%- end -%>
                   <% end %>
-                  <br />
                 <% end %>
               <% end %>
               <%- if can? :update, manifestation -%>

data/app/views/manifestations/_show_creators.html.erb

@@ -16,8 +16,8 @@
     (<%= manifestation.pub_date -%>)
   <%- end -%>
   <% if defined?(EnjuSubject) %>
-    ;
-    <% manifestation.classifications.each do |classification| %>
+    <%= ';' if manifestation.classifications.count >= 1 %>
+    <% manifestation.classifications.each_with_index do |classification| %>
       <%= link_to "#{classification.classification_type.display_name.localize}: #{classification.category}", manifestations_path(query: "classification_sm:#{classification.classification_type.name}_#{classification.category}") %>
     <% end %>
   <% end %>

data/app/views/manifestations/_show_detail_librarian.html.erb

@@ -77,6 +77,12 @@
                     <%= identifier_link(identifier) %>
                   </li>
                 <% end %>
+                <% if manifestation.manifestation_identifier %>
+                  <li>
+                    <%= t('activerecord.attributes.manifestation.manifestation_identifier') %>:
+                    <%= manifestation.manifestation_identifier %>
+                  </li>
+                <% end %>
               </ul>
             </td>
           </tr>

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

@@ -46,7 +46,7 @@
       <ul>
         <%- if user_signed_in? -%>
           <%- if current_user.email.present? -%>
-            <li><%= link_to t('manifestation.send_email'), manifestation_path(mode: 'send_email'), data: {confirm: t('page.are_you_sure')} -%></li>
+            <li><%= link_to t('manifestation.send_email'), manifestation_path(@manifestation, mode: 'send_email'), data: {confirm: t('page.are_you_sure')} -%></li>
           <%- end -%>
           <% if defined?(EnjuBookmark) %>
             <li><%= link_to_bookmark(@manifestation) %></li>

data/lib/enju_flower/engine.rb

@@ -1,3 +1,5 @@
+require 'enju_biblio'
+
 module EnjuFlower
   class Engine < ::Rails::Engine
   end

data/lib/enju_flower/version.rb

@@ -1,3 +1,3 @@
 module EnjuFlower
-  VERSION = "0.1.0.pre22"
+  VERSION = "0.1.0.pre23"
 end

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

@@ -6,4 +6,5 @@ class User < ActiveRecord::Base
 
   enju_leaf_user_model
   enju_circulation_user_model
+  enju_bookmark_user_model
 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|

data/spec/fixtures/item_has_use_restrictions.yml

@@ -0,0 +1,60 @@
+--- 
+item_has_use_restriction_00001: 
+  item_id: 1
+  updated_at: 2008-02-13 12:29:36.013448 +09:00
+  id: 1
+  use_restriction_id: 10
+  created_at: 2008-02-13 12:29:36.013448 +09:00
+item_has_use_restriction_00002: 
+  item_id: 2
+  updated_at: 2008-02-13 17:58:37.527556 +09:00
+  id: 2
+  use_restriction_id: 2
+  created_at: 2008-02-13 17:58:37.527556 +09:00
+item_has_use_restriction_00003: 
+  item_id: 3
+  updated_at: 2008-02-13 17:58:49.490086 +09:00
+  id: 3
+  use_restriction_id: 3
+  created_at: 2008-02-13 17:58:49.490086 +09:00
+item_has_use_restriction_00004: 
+  item_id: 17
+  updated_at: 2008-02-13 12:29:36.013448 +09:00
+  id: 4
+  use_restriction_id: 4
+  created_at: 2008-02-13 12:29:36.013448 +09:00
+item_has_use_restriction_00005:
+  item_id: 21
+  updated_at: 2008-02-13 12:29:36.013448 +09:00
+  id: 5
+  use_restriction_id: 4
+  created_at: 2008-02-13 12:29:36.013448 +09:00
+item_has_use_restriction_00006:
+  item_id: 11
+  updated_at: 2008-02-13 12:29:36.013448 +09:00
+  id: 6
+  use_restriction_id: 4
+  created_at: 2008-02-13 12:29:36.013448 +09:00
+item_has_use_restriction_00007:
+  item_id: 6
+  updated_at: 2008-02-13 12:29:36.013448 +09:00
+  id: 7
+  use_restriction_id: 4
+  created_at: 2008-02-13 12:29:36.013448 +09:00
+item_has_use_restriction_00008:
+  item_id: 24
+  updated_at: 2008-02-13 12:29:36.013448 +09:00
+  id: 8
+  use_restriction_id: 4
+  created_at: 2008-02-13 12:29:36.013448 +09:00
+
+# == Schema Information
+#
+# Table name: item_has_use_restrictions
+#
+#  id                 :integer          not null, primary key
+#  item_id            :integer          not null
+#  use_restriction_id :integer          not null
+#  created_at         :datetime
+#  updated_at         :datetime
+#

data/spec/views/manifestations/index.html.erb_spec.rb

@@ -35,39 +35,4 @@ describe "manifestations/index" do
     render
     #expect( rendered ).to have_selector( "div.holding_index tr td:first-child", count: 3, visible: false )
   end
-
-  it "render items with default sort order" do
-    allow(view).to receive(:policy).and_return double(create?: true, update?: true)
-    item1 = FactoryGirl.create( :item_for_checkout, shelf_id: 2 )
-    item2 = FactoryGirl.create( :item_for_checkout, shelf_id: 4 )
-    @manifestations.first.items = [ item1, item2 ]
-    render
-    expect( rendered ).to have_selector( "div.holding_index tr td:first-child a", visible: false, text: item1.item_identifier )
-  end
-
-  it "render items with sort order to prefer user's library" do
-    allow(view).to receive(:policy).and_return double(create?: true, update?: true)
-    user = FactoryGirl.create(:user)
-    user.profile = FactoryGirl.create(:profile, library_id: 3)
-    sign_in( user )
-
-    item1 = FactoryGirl.create( :item_for_checkout, shelf_id: 2 )
-    item2 = FactoryGirl.create( :item_for_checkout, shelf_id: 4 )
-    @manifestations.first.items = [ item1, item2 ]
-    render
-    expect( rendered ).to have_selector( "div.holding_index tr:nth-child(2) td:first-child a", visible: false )
-  end
-
-  it "render items with sort order to prefer user's library for a different user" do
-    allow(view).to receive(:policy).and_return double(create?: true, update?: true)
-    user = FactoryGirl.create(:user)
-    user.profile = FactoryGirl.create(:profile, library_id: 2)
-    sign_in( user )
-
-    item1 = FactoryGirl.create( :item_for_checkout, shelf_id: 2 )
-    item2 = FactoryGirl.create( :item_for_checkout, shelf_id: 4 )
-    @manifestations.first.items = [ item2, item1 ]
-    render
-    expect( rendered ).to have_selector( "div.holding_index tr:nth-child(2) td:first-child a", visible: false, text: item1.item_identifier )
-  end
 end

data/spec/views/manifestations/show.html.erb_spec.rb

@@ -4,10 +4,13 @@ describe "manifestations/show" do
   fixtures :all
 
   before(:each) do
-    @manifestation = assign(:manifestation, FactoryGirl.create(:manifestation))
+    @manifestation = FactoryGirl.create(:manifestation)
     @ability = Object.new
     @ability.extend(CanCan::Ability)
     controller.stub(:current_ability) { @ability }
+    @item1 = FactoryGirl.create( :item_for_checkout, shelf_id: 2 )
+    @item2 = FactoryGirl.create( :item_for_checkout, shelf_id: 4 )
+    assign(:manifestation, @manifestation)
   end
 
   it "renders attributes in <p>" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_flower
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre22
+  version: 0.1.0.pre23
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-09 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -58,14 +58,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: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc18
+        version: 1.1.0.rc20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc18
+        version: 1.1.0.rc20
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre44
+        version: 0.1.0.pre47
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre44
+        version: 0.1.0.pre47
 - !ruby/object:Gem::Dependency
   name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre30
+        version: 0.1.0.pre33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre30
+        version: 0.1.0.pre33
 - !ruby/object:Gem::Dependency
   name: mobylette
   requirement: !ruby/object:Gem::Requirement
@@ -631,6 +631,7 @@ files:
 - spec/fixtures/identifier_types.yml
 - spec/fixtures/identifiers.yml
 - spec/fixtures/import_requests.yml
+- spec/fixtures/item_has_use_restrictions.yml
 - spec/fixtures/items.yml
 - spec/fixtures/languages.yml
 - spec/fixtures/libraries.yml
@@ -688,7 +689,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Next-L Enju Flower
@@ -985,6 +986,7 @@ test_files:
 - spec/fixtures/identifier_types.yml
 - spec/fixtures/identifiers.yml
 - spec/fixtures/import_requests.yml
+- spec/fixtures/item_has_use_restrictions.yml
 - spec/fixtures/items.yml
 - spec/fixtures/languages.yml
 - spec/fixtures/libraries.yml