enju_library 0.1.0.pre36 → 0.1.0.pre37

data/app/models/subscription.rb

@@ -20,7 +20,7 @@ class Subscription < ActiveRecord::Base
   paginates_per 10
 
   def subscribed(work)
-    subscribes.where(:work_id => work.id).first
+    subscribes.where(work_id: work.id).first
   end
 
 end

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

@@ -5,7 +5,7 @@
 
   <p>
     <strong><%= t('activerecord.models.user') -%>:</strong>
-    <%= @basket.user.username -%>
+    <%= @basket.user.try(:username) -%>
   </p>
 
   <p>
@@ -18,6 +18,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.edit'), edit_basket_path(@basket) -%></li>
-    <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>
+    <li><%= link_to t('page.back'), baskets_path(user_id: @basket.user_id) -%></li>
   </ul>
 </div>

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

@@ -1,10 +1,14 @@
 <div id="event_list">
-  (<%= link_to t('page.calendar'), controller: :calendar, action: :index, library_id: @library.name -%>)
+  (<%= link_to t('page.calendar'), events_path(library_id: @library.name, mode: 'calendar') -%>)
   <ul>
     <%- @events.each do |event| -%>
       <li>
         <%= link_to event.display_name.localize, event -%>
-        (<%= l(event.start_at) -%> - <%= l(event.end_at) -%>)
+        <% if event.all_day? %>
+          (<%= l(event.start_at, format: :only_date) -%> - <%= l(event.end_at, format: :only_date) -%>)
+        <% else %>
+          (<%= l(event.start_at) -%> - <%= l(event.end_at) -%>)
+        <% end %>
       </li>
     <%- end -%>
   </ul>

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

@@ -42,11 +42,11 @@
         <%= render 'libraries/map', library: @library if @library.latitude and @library.longitude -%>
       </div>
       <div id="tab2">
-        <%- if @library.users.librarians.exists? -%>
+        <%- if @library.profiles.librarians.exists? -%>
           <ul>
-            <%- @library.users.librarians.each do |librarian| -%>
+            <%- @library.profiles.librarians.each do |librarian| -%>
               <li>
-                <%= link_to librarian.username, librarian.profile -%>
+                <%= link_to librarian.user.username, librarian -%>
                 <%- unless librarian.note.blank? -%>
                   <br />
                   <%= librarian.note -%>
@@ -86,7 +86,7 @@
 
       <% if defined?(EnjuEvent) %>
         <div id="tab4">
-          <h3><%= link_to t('activerecord.models.event'), library_events_path(@library) -%></h3>
+          <h3><%= link_to t('activerecord.models.event'), events_path(library_id: @library.name) -%></h3>
           <div id="library_calendar" style="text-align:left">
             <%= render 'calendar' -%>
           </div>

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

@@ -0,0 +1 @@
+$("#library_calendar").html("<%= escape_javascript(render("calendar")) %>");

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

@@ -26,6 +26,20 @@
     <%= f.text_area :login_banner -%>
   </div>
 
+  <div class="field">
+    <%= f.label :color -%><br />
+    <%= f.fields_for :colors do |color_form| %>
+      <%= color_form.text_field :property, disabled: true %>
+      <%= color_form.text_field :code %>
+      <br />
+    <% end %>
+  </div>
+
+  <div class="field">
+    <%= f.label t('activerecord.models.country') -%><br />
+    <%= f.select(:country_id, @countries.collect{|c| [c.display_name.localize, c.id]}) -%>
+  </div>
+
   <% if defined?(EnjuBookmark) %>
     <div class="field">
       <%= f.label :allow_bookmark_external_url -%>
@@ -48,11 +62,6 @@
     <%= f.text_area :note -%>
   </div>
 
-  <div class="field">
-    <%= f.label t('activerecord.models.country') -%><br />
-    <%= f.select(:country_id, @countries.collect{|c| [c.display_name.localize, c.id]}) -%>
-  </div>
-
   <div class="actions">
     <%= f.submit %>
   </div>

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

@@ -28,6 +28,19 @@
   <%= markdown_helper(@library_group.login_banner) -%>
 </div>
 
+<div>
+  <strong><%= t('activerecord.attributes.library_group.color') -%>:</strong>
+  <ul>
+    <% @library_group.colors.each do |color| %>
+      <li>
+        <%= color.property %>:
+        <span style="color: transparent; background-color: #<%= color.code %>">sample</span>
+        ( <%= color.code %> )
+      </li>
+    <% end %>
+  </ul>
+</div>
+
 <% if defined?(EnjuBookmark) %>
   <p>
     <strong><%= t('activerecord.attributes.library_group.allow_bookmark_external_url') -%>:</strong>

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

@@ -33,7 +33,6 @@
 <%- end -%>
 </table>
 
-<%= paginate(@search_engines) -%>
 </div>
 </div>
 

data/config/locales/translation_en.yml

@@ -53,6 +53,7 @@ en:
         login_banner: Login banner
         post_to_union_catalog: Post to union catalog
         url: URL
+        color: Color
       bookstore:
         name: Name
         zip_code: Zip code

data/config/locales/translation_ja.yml

@@ -53,6 +53,7 @@ ja:
         login_banner: ログイン画面でのメッセージ
         post_to_union_catalog: 総合目録に登録する
         url: URL
+        color: 色
       bookstore:
         name: 名前
         zip_code: 郵便番号

data/db/migrate/20140821151023_create_colors.rb

@@ -0,0 +1,14 @@
+class CreateColors < ActiveRecord::Migration
+  def change
+    create_table :colors do |t|
+      t.integer :library_group_id
+      t.string :property
+      t.string :code
+      t.integer :position
+
+      t.timestamps
+    end
+
+    add_index :colors, :library_group_id
+  end
+end

data/lib/enju_library.rb

@@ -20,7 +20,7 @@ module EnjuLibrary
     end
 
     def get_shelf
-      @shelf = Shelf.find(params[:shelf_id], :include => :library) if params[:shelf_id]
+      @shelf = Shelf.includes(:library).find(params[:shelf_id]) if params[:shelf_id]
     end
 
     def get_library

data/lib/enju_library/engine.rb

@@ -1,6 +1,7 @@
 require 'enju_seed'
 require 'geocoder'
 require 'ipaddr'
+require "protected_attributes" if Rails::VERSION::MAJOR == 4
 
 module EnjuLibrary
   class Engine < ::Rails::Engine

data/lib/enju_library/item.rb

@@ -10,7 +10,7 @@ module EnjuLibrary
         has_one :accept
         scope :accepted_between, lambda{|from, to| includes(:accept).where('items.created_at BETWEEN ? AND ?', Time.zone.parse(from).beginning_of_day, Time.zone.parse(to).end_of_day)}
 
-        belongs_to :shelf, :counter_cache => true, :validate => true
+        belongs_to :shelf, counter_cache: true, validate: true
         validates_associated :shelf
 
         searchable do
@@ -27,12 +27,12 @@ module EnjuLibrary
       end
 
       def hold?(library)
-        return true if self.shelf.library == library
+        return true if shelf.library == library
         false
       end
 
       def library_url
-        "#{LibraryGroup.site_config.url}libraries/#{self.shelf.library.name}"
+        "#{LibraryGroup.site_config.url}libraries/#{shelf.library.name}"
       end
     end
   end

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre36"
+  VERSION = "0.1.0.pre37"
 end

data/lib/generators/enju_library/setup/setup_generator.rb

@@ -1,8 +1,10 @@
 class EnjuLibrary::SetupGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
+  argument :file, :type => :string, :default => "all"
 
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_library")
+    return if file == 'fixture'
     rake("enju_library_engine:install:migrations")
   end
 end

data/lib/generators/enju_library/setup/templates/db/fixtures/colors.yml

@@ -0,0 +1,25 @@
+--- 
+color_00001: 
+  property: header_title
+  code: "5970B2"
+  id: 1
+  position: 1
+  library_group_id: 1
+color_00002: 
+  property: table_line0
+  code: "d7ebf9"
+  id: 2
+  position: 2
+  library_group_id: 1
+color_00003: 
+  property: table_line1
+  code: "ffffff"
+  id: 3
+  position: 3
+  library_group_id: 1
+color_00004: 
+  property: table_border
+  code: "2779aa"
+  id: 4
+  position: 4
+  library_group_id: 1

data/lib/generators/enju_library/setup/templates/db/fixtures/request_types.yml

@@ -14,11 +14,13 @@ request_type_00002:
 request_type_00003: 
   name: Loan  
   display_name: Loan
+  id: 3
   position: 3
   note: ""
 request_type_00004: 
   name: Non-Returnable Copy  
   display_name: Non-Returnable Copy
+  id: 4
   position: 4
   note: ""
 request_type_00005: 

data/lib/tasks/color.rb

@@ -0,0 +1,12 @@
+def update_color
+  colors = YAML.load(open('db/fixtures/enju_library/colors.yml').read)
+  library_group = LibraryGroup.site_config
+  colors.each do |line|
+    l = line[1].select!{|k, v| %w(property code).include?(k)}
+    color = Color.where(property: l["property"]).first
+    unless color
+      color = Color.create!(l)
+      library_group.colors << color
+    end
+  end
+end

data/lib/tasks/enju_library_tasks.rake

@@ -1,4 +1,6 @@
 require 'active_record/fixtures'
+require 'tasks/color'
+
 desc "create initial records for enju_library"
 namespace :enju_library do
   task :setup => :environment do
@@ -6,4 +8,12 @@ namespace :enju_library do
       ActiveRecord::Fixtures.create_fixtures('db/fixtures/enju_library', File.basename(file, '.*'))
     end
   end
+
+  desc "upgrade enju_library"
+  task :upgrade => :environment do
+    LibraryGroup.transaction do
+      update_color
+    end
+    puts 'enju_library: The upgrade completed successfully.'
+  end
 end

data/spec/controllers/search_engines_controller_spec.rb

@@ -19,7 +19,7 @@ describe SearchEnginesController do
 
       it "assigns all search_engines as @search_engines" do
         get :index
-        assigns(:search_engines).should eq(SearchEngine.page(1))
+        assigns(:search_engines).should eq(SearchEngine.all)
       end
     end
 
@@ -28,7 +28,7 @@ describe SearchEnginesController do
 
       it "assigns all search_engines as @search_engines" do
         get :index
-        assigns(:search_engines).should eq(SearchEngine.page(1))
+        assigns(:search_engines).should eq(SearchEngine.all)
       end
     end
 

data/spec/controllers/subscribes_controller_spec.rb

@@ -17,7 +17,7 @@ describe SubscribesController do
 
       it "assigns all subscribes as @subscribes" do
         get :index
-        assigns(:subscribes).should eq(Subscribe.all)
+        assigns(:subscribes).should eq(Subscribe.page(1))
       end
     end
 
@@ -26,7 +26,7 @@ describe SubscribesController do
 
       it "assigns all subscribes as @subscribes" do
         get :index
-        assigns(:subscribes).should eq(Subscribe.all)
+        assigns(:subscribes).should eq(Subscribe.page(1))
       end
     end
 

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

data/spec/dummy/config/initializers/friendly_id.rb

@@ -0,0 +1,90 @@
+# FriendlyId Global Configuration
+#
+# Use this to set up shared configuration options for your entire application.
+# Any of the configuration options shown here can also be applied to single
+# models by passing arguments to the `friendly_id` class method or defining
+# methods in your model.
+#
+# To learn more, check out the guide:
+#
+# http://norman.github.io/friendly_id/file.Guide.html
+
+if Rails::VERSION::MAJOR == 4
+FriendlyId.defaults do |config|
+  # ## Reserved Words
+  #
+  # Some words could conflict with Rails's routes when used as slugs, or are
+  # undesirable to allow as slugs. Edit this list as needed for your app.
+  config.use :reserved
+
+  config.reserved_words = %w(new edit index session login logout users admin
+    stylesheets assets javascripts images)
+
+  #  ## Friendly Finders
+  #
+  # Uncomment this to use friendly finders in all models. By default, if
+  # you wish to find a record by its friendly id, you must do:
+  #
+  #    MyModel.friendly.find('foo')
+  #
+  # If you uncomment this, you can do:
+  #
+  #    MyModel.find('foo')
+  #
+  # This is significantly more convenient but may not be appropriate for
+  # all applications, so you must explicity opt-in to this behavior. You can
+  # always also configure it on a per-model basis if you prefer.
+  #
+  # Something else to consider is that using the :finders addon boosts
+  # performance because it will avoid Rails-internal code that makes runtime
+  # calls to `Module.extend`.
+  #
+  config.use :finders
+  #
+  # ## Slugs
+  #
+  # Most applications will use the :slugged module everywhere. If you wish
+  # to do so, uncomment the following line.
+  #
+  # config.use :slugged
+  #
+  # By default, FriendlyId's :slugged addon expects the slug column to be named
+  # 'slug', but you can change it if you wish.
+  #
+  # config.slug_column = 'slug'
+  #
+  # When FriendlyId can not generate a unique ID from your base method, it appends
+  # a UUID, separated by a single dash. You can configure the character used as the
+  # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
+  # with two dashes.
+  #
+  # config.sequence_separator = '-'
+  #
+  #  ## Tips and Tricks
+  #
+  #  ### Controlling when slugs are generated
+  #
+  # As of FriendlyId 5.0, new slugs are generated only when the slug field is
+  # nil, but if you're using a column as your base method can change this
+  # behavior by overriding the `should_generate_new_friendly_id` method that
+  # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
+  # more like 4.0.
+  #
+  # config.use Module.new {
+  #   def should_generate_new_friendly_id?
+  #     slug.blank? || <your_column_name_here>_changed?
+  #   end
+  # }
+  #
+  # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
+  # languages that don't use the Roman alphabet, that's not usually suffient. Here
+  # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
+  # you use this, don't forget to add "babosa" to your Gemfile.
+  #
+  # config.use Module.new {
+  #   def normalize_friendly_id(text)
+  #     text.to_slug.normalize! :transliterations => [:russian, :latin]
+  #   end
+  # }
+end
+end