enju_library 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,3 +1,3 @@
-= EnjuLibrary
+= EnjuLibrary {<img src="https://secure.travis-ci.org/next-l/enju_library.png?branch=master" alt="Build Status" />}[http://travis-ci.org/next-l/enju_library]
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE.

data/app/controllers/shelves_controller.rb

@@ -38,7 +38,7 @@ class ShelvesController < ApplicationController
       end
       @shelves = search.results
       @library_facet = search.facet(:library).rows
-      @library_names = Library.select(:name).collect(&:name)
+      @library_names = Library.pluck(:name)
     end
 
     respond_to do |format|
@@ -55,6 +55,7 @@ class ShelvesController < ApplicationController
     respond_to do |format|
       format.html # show.html.erb
       format.json { render :json => @shelf }
+      format.mobile
     end
   end
 

data/app/helpers/shelves_helper.rb

@@ -1,13 +1,17 @@
 module ShelvesHelper
-  def library_shelf_facet(library, current_library, facet)
+  def library_shelf_facet(current_library, facet)
+    library = Library.where(:name => facet.value).select([:name, :display_name]).first
+    return nil unless library
     string = ''
     current = true if current_library.try(:name) == library.name
-    if current
-      content_tag :strong do
+    content_tag :li do
+      if current
+        content_tag :strong do
+          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :library_id => library.name, :only_path => true)))
+        end
+      else
         link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :library_id => library.name, :only_path => true)))
       end
-    else
-      link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :library_id => library.name, :only_path => true)))
     end
   end
 end

data/app/models/library.rb

@@ -29,9 +29,8 @@ class Library < ActiveRecord::Base
   validates_uniqueness_of :short_display_name, :case_sensitive => false
   validates_uniqueness_of :isil, :allow_blank => true
   validates :display_name, :uniqueness => true
-  validates :name, :format => {:with => /^[a-z][0-9a-z]{2,254}$/}
+  validates :name, :format => {:with => /^[a-z][0-9a-z\-_]{1,254}$/}
   validates :isil, :format => {:with => /^[A-Za-z]{1,4}-[A-Za-z0-9\/:\-]{2,11}$/}, :allow_blank => true
-  #before_save :set_calil_neighborhood_library
   after_validation :geocode, :if => :address_changed?
   after_create :create_shelf
   after_save :clear_all_cache

data/app/models/library_group.rb

@@ -12,7 +12,7 @@ class LibraryGroup < ActiveRecord::Base
 
   validates :email, :format => {:with => /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i}, :presence => true
   validates :url, :presence => true, :url => true
-  after_save :clear_site_config_cache
+  after_save :clear_site_config_cache, :save_system_email
 
   def clear_site_config_cache
     Rails.cache.delete('library_site_config')
@@ -60,6 +60,12 @@ class LibraryGroup < ActiveRecord::Base
     end
     return false
   end
+
+  def save_system_email
+    user = User.find(1)
+    user.email = email
+    user.save!
+  end
 end
 
 

data/app/models/shelf.rb

@@ -9,6 +9,7 @@ class Shelf < ActiveRecord::Base
   validates_associated :library
   validates_presence_of :library
   validates_uniqueness_of :display_name, :scope => :library_id
+  validates :name, :format => {:with => /^[a-z][0-9a-z\-_]{1,254}$/}
 
   acts_as_list :scope => :library
 

data/app/views/accepts/index.html.erb

@@ -12,7 +12,7 @@
   <%- end -%>
 </div>
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.models.item') -%></th>
     <th></th>
@@ -30,7 +30,7 @@
       </td>
       <td>
         <%- if can? :destroy, accept -%>
-          <%= link_to t('page.destroy'), accept, :confirm => t('page.are_you_sure'), :method => :delete -%>
+          <%= link_to t('page.destroy'), accept, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
         <%- end -%>
       </td>
     </tr>

data/app/views/bookstores/index.html.erb

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.bookstore')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.bookstore.name') -%></th>
@@ -20,7 +20,7 @@
     </td>
     <td>
       <%= link_to bookstore.name, bookstore -%><br />
-      <%= link_to bookstore.url, bookstore.url -%>
+      <%= link_to bookstore.url, bookstore.url if bookstore.url? -%>
     </td>
     <td><%= bookstore.telephone_number -%></td>
     <td><%= bookstore.fax_number -%></td>
@@ -29,7 +29,7 @@
         <%= link_to image_tag('icons/page_white_edit.png', :size => '16x16', :alt => t('page.edit')), edit_bookstore_path(bookstore) -%>
       <% end %>
       <%- if can? :destroy, bookstore -%>
-        <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), bookstore, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), bookstore, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -30,7 +30,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.bookstore.url') -%>:</strong>
-  <%= link_to @bookstore.url, @bookstore.url -%>
+  <%= link_to @bookstore.url, @bookstore.url if @bookstore.url? -%>
 </p>
 
 <p>

data/app/views/budget_types/index.html.erb

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.budget_type')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.budget_type.name') -%></th>
@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_budget_type_path(budget_type) -%>
       <% end %>
       <%- if can? :destroy, budget_type -%>
-        <%= link_to t('page.destroy'), budget_type, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), budget_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -17,12 +17,12 @@
     <%= f.text_area :display_name, :class => 'resource_textarea' -%>
   </div>
 
+  <% unless @library.web? %>
   <div class="field">
     <%= f.label :isil -%><br />
     <%= f.text_field :isil, :class => 'resource_identifierr' -%>
   </div>
 
-  <% unless @library.web? %>
   <div class="field">
     <%= f.label t('activerecord.models.country') -%><br />
     <%= f.select(:country_id, @countries.collect{|c| [c.display_name.localize, c.id]}) -%>

data/app/views/libraries/index.html.erb

@@ -11,11 +11,11 @@
 
 <p>
   <%= t('page.sort_by') -%>:
-  <%= link_to t('activerecord.attributes.tag.name'), libraries_path(:order => 'name') -%>
+  <%= link_to t('activerecord.attributes.library.name'), libraries_path(:order => 'name') -%>
   <%= link_to t('page.created_at'), libraries_path(:sort_by => 'created_at') -%>
 </p>
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.library.name') -%></th>
@@ -55,7 +55,7 @@
         <%= link_to image_tag('icons/page_white_edit.png', :size => '16x16', :alt => t('page.edit')), edit_library_path(library) -%>
       <% end %>
       <%- if can? :destroy, library -%>
-        <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), library, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), library, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -57,7 +57,7 @@
         <%- end -%>
       </div>
       <div id="tab3">
-        <table class="index">
+        <table class="table table-striped index">
           <tr>
             <th><%= t('activerecord.models.shelf') -%></th>
             <th><%= t('library.number_of_item') -%></th>

data/app/views/library_groups/index.html.erb

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.library_group')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.attributes.library_group.display_name') -%></th>
     <th><%= t('activerecord.attributes.library_group.name') -%></th>

data/app/views/request_status_types/index.html.erb

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.request_status_type')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.request_status_type.name') -%></th>
@@ -24,7 +24,7 @@
         <%= link_to t('page.edit'), edit_request_status_type_path(request_status_type) -%>
       <% end %>
       <%- if can? :destroy, request_status_type -%>
-        <%= link_to t('page.destroy'), request_status_type, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), request_status_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>
   </tr>

data/app/views/request_types/index.html.erb

@@ -2,7 +2,7 @@
   <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.request_type')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.request_type.name') -%></th>
@@ -24,7 +24,7 @@
         <%= link_to t('page.edit'), edit_request_type_path(request_type) -%>
       <% end %>
       <%- if can? :destroy, request_type -%>
-        <%= link_to t('page.destroy'), request_type, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), request_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>
   </tr>

data/app/views/search_engines/index.html.erb

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.search_engine')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.search_engine.name') -%></th>
@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_search_engine_path(search_engine) -%>
       <% end %>
       <%- if can? :destroy, search_engine -%>
-        <%= link_to t('page.destroy'), search_engine, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), search_engine, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

data/app/views/shelves/_library_facet.html.erb

@@ -1,10 +1,7 @@
 <h4><%= t('activerecord.models.library') -%></h4>
 <ul>
   <%- @library_facet.each do |facet| -%>
-    <%- library = Library.where(:name => facet.value).select([:name, :display_name]).first -%>
-    <li>
-      <%= library_shelf_facet(library, @library, facet) %>
-    </li>
+    <%= library_shelf_facet(@library, facet) %>
   <%- end -%>
   <%- if params[:library_id] -%>
     <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:library_id => nil, :page => nil, :only_path => true)) -%></li>

data/app/views/shelves/index.html.erb

@@ -17,7 +17,7 @@
   <%- end -%>
 </div>
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.shelf.name') -%></th>
@@ -52,7 +52,7 @@
         <%= link_to t('page.edit'), edit_shelf_path(shelf) -%>
       <% end %>
       <%- if can? :destroy, shelf -%>
-        <%= link_to t('page.destroy'), shelf, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), shelf, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

data/app/views/shelves/show.mobile.erb

@@ -0,0 +1,33 @@
+<div data-role="header">
+<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.shelf')) -%></h1>
+</div>
+<div data-role="content">
+<% if current_user.try(:has_role?, 'Librarian') %>
+  <p>
+    <strong><%= t('activerecord.attributes.shelf.name') -%>:</strong>
+    <%= @shelf.name %>
+  </p>
+<% end %>
+
+<p>
+  <strong><%= t('activerecord.attributes.shelf.closed') -%>:</strong>
+  <%= localized_boolean(@shelf.closed) -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.shelf.note') -%>:</strong>
+  <%= @shelf.note -%>
+</p>
+
+<p>
+  <strong><%= t('page.created_at') -%>:</strong>
+  <%= l(@shelf.created_at) -%>
+</p>
+
+<p>
+  <strong><%= t('page.updated_at') -%>:</strong>
+  <%= l(@shelf.updated_at) -%>
+</p>
+
+</div>
+</div>

data/app/views/subscribes/index.html.erb

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.subscribe')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th><%= t('activerecord.models.subscription') -%></th>
     <th><%= t('activerecord.models.work') -%></th>
@@ -14,7 +14,7 @@
     <td><%= link_to subscribe.work.original_title, subscribe.work -%></td>
     <td><%= link_to t('page.show'), subscribe -%></td>
     <td><%= link_to t('page.edit'), edit_subscribe_path(subscribe) -%></td>
-    <td><%= link_to t('page.destroy'), subscribe, :confirm => t('page.are_you_sure'), :method => :delete -%></td>
+    <td><%= link_to t('page.destroy'), subscribe, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></td>
   </tr>
 <%- end -%>
 </table>

data/app/views/subscriptions/index.html.erb

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.subscription')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th><%= t('page.title') -%></th>
     <th><%= t('activerecord.attributes.subscription.subscribes_count') -%></th>
@@ -16,7 +16,7 @@
     <td>
       <% if can? :destroy, subscription %>
         <%= link_to t('page.edit'), edit_subscription_path(subscription) -%>
-        <%= link_to t('page.destroy'), subscription, :confirm => t('page.are_you_sure'), :method => :delete -%>
+        <%= link_to t('page.destroy'), subscription, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
       <% end %>
     </td>
   </tr>

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

@@ -13,7 +13,7 @@
   <%= @subscription.note -%>
 </p>
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th><%= t('page.title') -%></th>
   </tr>

data/lib/enju_library/engine.rb

@@ -1,13 +1,5 @@
 require 'inherited_resources'
-require 'cancan'
-require 'acts_as_list'
-require 'attribute_normalizer'
-require 'friendly_id'
-require 'sunspot_rails'
 require 'geocoder'
-require 'devise'
-require 'addressable/uri'
-require 'will_paginate'
 require 'configatron'
 
 module EnjuLibrary

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/enju_library.rb

@@ -1,6 +1,4 @@
 require "enju_library/engine"
-require "enju_library/master_model"
-require "enju_library/url_validator"
 
 module EnjuLibrary
   def self.included(base)