enju_library 0.0.2 → 0.1.0.pre

data/app/controllers/libraries_controller.rb

@@ -18,7 +18,7 @@ class LibrariesController < ApplicationController
 
     @libraries = Library.search(:include => [:shelves]) do
       fulltext query if query.present?
-      paginate :page => page.to_i, :per_page => Library.per_page
+      paginate :page => page.to_i, :per_page => Library.default_per_page
       order_by sort[:sort_by], sort[:order]
     end.results
 
@@ -39,7 +39,7 @@ class LibrariesController < ApplicationController
         order_by(:start_at, :desc)
       end
       page = params[:event_page] || 1
-      search.query.paginate(page.to_i, Event.per_page)
+      search.query.paginate(page.to_i, Event.default_per_page)
       @events = search.execute!.results
     end
 

data/app/controllers/shelves_controller.rb

@@ -28,7 +28,7 @@ class ShelvesController < ApplicationController
 
       search = Shelf.search(:include => [:library]) do
         fulltext query if query.present?
-        paginate :page => page.to_i, :per_page => Shelf.per_page
+        paginate :page => page.to_i, :per_page => Shelf.default_per_page
         if library
           with(:library).equal_to library.name
           order_by :position, :asc

data/app/models/bookstore.rb

@@ -8,9 +8,7 @@ class Bookstore < ActiveRecord::Base
   validates_presence_of :name
   validates :url, :url => true, :allow_blank => true, :length => {:maximum => 255}
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   if defined?(EnjuPurchaseRequest)
     has_many :order_lists

data/app/models/library.rb

@@ -36,9 +36,7 @@ class Library < ActiveRecord::Base
   after_save :clear_all_cache
   after_destroy :clear_all_cache
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def self.all_cache
     if Rails.env == 'production'

data/app/models/search_engine.rb

@@ -12,9 +12,7 @@ class SearchEngine < ActiveRecord::Base
   after_save :clear_all_cache
   after_destroy :clear_all_cache
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def clear_all_cache
     Rails.cache.delete('search_engine_all')

data/app/models/shelf.rb

@@ -24,9 +24,7 @@ class Shelf < ActiveRecord::Base
     integer :position
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def web_shelf?
     return true if self.id == 1

data/app/models/subscription.rb

@@ -17,9 +17,7 @@ class Subscription < ActiveRecord::Base
     integer :work_ids, :multiple => true
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def subscribed(work)
     subscribes.where(:work_id => work.id).first

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

@@ -36,7 +36,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@bookstores) -%>
+<%= paginate(@bookstores) -%>
 </div>
 </div>
 

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

@@ -9,5 +9,5 @@
     <%- end -%>
   </ul>
 
-  <%= will_paginate(@events, :param_name => :event_page, :class => 'content_pagination digg_pagination') -%>
+  <%= paginate(@events, :param_name => :event_page, :remote => true) -%>
 </div>

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

@@ -61,7 +61,7 @@
   </tr>
 <%- end -%>
 </table>
-<%= will_paginate(@libraries) %>
+<%= paginate(@libraries) %>
 
 </div>
 </div>

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

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

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

@@ -59,7 +59,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@shelves) -%>
+<%= paginate(@shelves) -%>
 </div>
 </div>
 

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

@@ -19,7 +19,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@subscribes) -%>
+<%= paginate(@subscribes) -%>
 
 </div>
 </div>

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

@@ -23,7 +23,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@subscrpitions) -%>
+<%= paginate(@subscrpitions) -%>
 
 </div>
 </div>

data/db/migrate/080_create_library_groups.rb

@@ -6,12 +6,11 @@ class CreateLibraryGroups < ActiveRecord::Migration
       t.string :short_name, :null => false
       t.string :email
       t.text :my_networks
-      t.boolean :use_dsbl, :default => false, :null => false
-      t.text :dsbl_list
       t.text :login_banner
       t.text :note
       t.integer :valid_period_for_new_user, :default => 365, :null => false
       t.integer :country_id
+      t.integer :position
 
       t.timestamps
     end

data/lib/enju_library/engine.rb

@@ -1,6 +1,6 @@
+require 'enju_core'
 require 'inherited_resources'
 require 'geocoder'
-require 'configatron'
 
 module EnjuLibrary
   class Engine < ::Rails::Engine

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.0.2"
+  VERSION = "0.1.0.pre"
 end

data/lib/generators/enju_library/views_generator.rb

@@ -0,0 +1,26 @@
+module EnjuLibrary
+  module Generators
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../app/views', __FILE__)
+
+      def copy_files
+        directories = %w(
+          bookstores
+          budget_types
+          libraries
+          library_groups
+          request_status_types
+          request_types
+          search_engines
+          shelves
+          subscribes
+          subscriptions
+        )
+
+        directories.each do |dir|
+          directory dir, "app/views/#{dir}"
+        end
+      end
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -182,11 +182,10 @@ ActiveRecord::Schema.define(:version => 20120510140958) do
     t.string   "short_name",                                         :null => false
     t.string   "email"
     t.text     "my_networks"
-    t.boolean  "use_dsbl",     :default => false,                    :null => false
-    t.text     "dsbl_list"
     t.text     "login_banner"
     t.text     "note"
     t.integer  "country_id"
+    t.integer  "position"
     t.datetime "created_at",                                         :null => false
     t.datetime "updated_at",                                         :null => false
     t.string   "url",          :default => "http://localhost:3000/"

data/spec/dummy/solr/data/test/index/{_k.fnm → _1h.fnm}

@@ -1,3 +1,3 @@
-����idtype
+����idtype
 class_namecreated_at_dupdated_at_dwork_ids_im
 title_text

data/spec/fixtures/library_groups.yml

@@ -8,6 +8,7 @@ one:
   note: 
   my_networks: 0.0.0.0/0
   url: "http://localhost:3000/"
+  position: 1
 
 
 # == Schema Information
@@ -26,7 +27,6 @@ one:
 #  created_at                  :datetime        not null
 #  updated_at                  :datetime        not null
 #  admin_networks              :text
-#  allow_bookmark_external_url :boolean         default(FALSE), not null
 #  position                    :integer
 #  url                         :string(255)     default("http://localhost:3000/")
 #

data/spec/requests/budget_types_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe "BudgetTypes" do
+  describe "GET /budget_types" do
+    it "works! (now write some real specs)" do
+      # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
+      get budget_types_path
+      response.status.should be(302)
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.1.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -155,22 +155,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: configatron
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -224,17 +208,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -280,14 +264,6 @@ files:
 - app/models/shelf.rb
 - app/models/subscribe.rb
 - app/models/subscription.rb
-- app/views/accepts/_form.html.erb
-- app/views/accepts/_list.html.erb
-- app/views/accepts/edit.html.erb
-- app/views/accepts/index.csv.erb
-- app/views/accepts/index.html.erb
-- app/views/accepts/index.js.erb
-- app/views/accepts/new.html.erb
-- app/views/accepts/show.html.erb
 - app/views/bookstores/_form.html.erb
 - app/views/bookstores/edit.html.erb
 - app/views/bookstores/index.html.erb
@@ -361,6 +337,7 @@ files:
 - lib/enju_library/engine.rb
 - lib/enju_library/version.rb
 - lib/enju_library.rb
+- lib/generators/enju_library/views_generator.rb
 - lib/tasks/enju_library_tasks.rake
 - MIT-LICENSE
 - Rakefile
@@ -409,7 +386,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -482,16 +458,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_k.fdt
-- spec/dummy/solr/data/test/index/_k.fdx
-- spec/dummy/solr/data/test/index/_k.fnm
-- spec/dummy/solr/data/test/index/_k.frq
-- spec/dummy/solr/data/test/index/_k.nrm
-- spec/dummy/solr/data/test/index/_k.prx
-- spec/dummy/solr/data/test/index/_k.tii
-- spec/dummy/solr/data/test/index/_k.tis
+- spec/dummy/solr/data/test/index/_1h.fdt
+- spec/dummy/solr/data/test/index/_1h.fdx
+- spec/dummy/solr/data/test/index/_1h.fnm
+- spec/dummy/solr/data/test/index/_1h.frq
+- spec/dummy/solr/data/test/index/_1h.nrm
+- spec/dummy/solr/data/test/index/_1h.prx
+- spec/dummy/solr/data/test/index/_1h.tii
+- spec/dummy/solr/data/test/index/_1h.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_18
+- spec/dummy/solr/data/test/index/segments_3n
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4AD/470/country_all
@@ -534,6 +510,7 @@ files:
 - spec/models/shelf_spec.rb
 - spec/models/subscribe_spec.rb
 - spec/models/subscription_spec.rb
+- spec/requests/budget_types_spec.rb
 - spec/routing/budget_types_routing_spec.rb
 - spec/routing/libraries_routing_spec.rb
 - spec/spec_helper.rb
@@ -559,9 +536,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -613,7 +590,6 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -686,16 +662,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_k.fdt
-- spec/dummy/solr/data/test/index/_k.fdx
-- spec/dummy/solr/data/test/index/_k.fnm
-- spec/dummy/solr/data/test/index/_k.frq
-- spec/dummy/solr/data/test/index/_k.nrm
-- spec/dummy/solr/data/test/index/_k.prx
-- spec/dummy/solr/data/test/index/_k.tii
-- spec/dummy/solr/data/test/index/_k.tis
+- spec/dummy/solr/data/test/index/_1h.fdt
+- spec/dummy/solr/data/test/index/_1h.fdx
+- spec/dummy/solr/data/test/index/_1h.fnm
+- spec/dummy/solr/data/test/index/_1h.frq
+- spec/dummy/solr/data/test/index/_1h.nrm
+- spec/dummy/solr/data/test/index/_1h.prx
+- spec/dummy/solr/data/test/index/_1h.tii
+- spec/dummy/solr/data/test/index/_1h.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_18
+- spec/dummy/solr/data/test/index/segments_3n
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4AD/470/country_all
@@ -738,6 +714,7 @@ test_files:
 - spec/models/shelf_spec.rb
 - spec/models/subscribe_spec.rb
 - spec/models/subscription_spec.rb
+- spec/requests/budget_types_spec.rb
 - spec/routing/budget_types_routing_spec.rb
 - spec/routing/libraries_routing_spec.rb
 - spec/spec_helper.rb

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

@@ -1,11 +0,0 @@
-<%= simple_form_for(@accept) do |f| %>
-  <%= f.error_notification %>
-
-  <div class="form-inputs">
-    <%= f.input :item_id %>
-  </div>
-
-  <div class="form-actions">
-    <%= f.button :submit %>
-  </div>
-<% end %>

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

@@ -1,31 +0,0 @@
-<div style="color: red"><%= flash[:message] -%></div>
-
-<div class="search_form">
-<%= form_for(@accept, :url => basket_accepts_path(@basket), :remote => true) do |f| %>
-  <%= f.error_messages %>
-  <p>
-    <%= t('activerecord.attributes.item.item_identifier') -%>:
-    <%= f.search_field :item_identifier, :class => 'resource_item_identifier', :value => nil -%>
-    <%= f.submit t('accept.accept'), 'data-disable-with' => t('page.saving') -%>
-  </p>
-<%- end -%>
-</div>
-
-<table class="index">
-  <tr>
-    <th><%= t('activerecord.models.item') -%></th>
-  </tr>
-  <%- @accepts.each_with_index do |accept, i| -%>
-    <tr class="line<%= cycle("0", "1") -%>">
-      <td>
-        <%= render 'manifestations/show_index', :manifestation => accept.item.manifestation %>
-        <%= link_to accept.item.item_identifier, accept.item -%> / <%= accept.item.call_number %>
-        (<%= link_to accept.item.shelf.library.display_name.localize, accept.item.shelf.library %> /
-        <%= link_to accept.item.shelf.display_name.localize, accept.item.shelf %>)<br />
-        <%=l accept.created_at %>
-      </td>
-    </tr>
-  <%- end -%>
-</table>
-
-<%= javascript_tag("$('#accept_item_identifier').focus()") -%>

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

@@ -1,13 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.accept')) -%></h1>
-<div id="content_list">
-  <%= render 'form' %>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('page.show'), @accept -%></li>
-    <li><%= link_to t('page.back'), accepts_path -%></li>
-  </ul>
-</div>

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

@@ -1,4 +0,0 @@
-item_identifier	basket_id	accepted_at
-<% @accepts.each do |accept| %>
-<%= accept.item.item_identifier %>	<%= accept.basket_id %>	<%= accept.created_at %>
-<% end %>

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

@@ -1,49 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.accept')) -%></h1>
-<div id="content_list">
-
-<div class="search_form">
-  <%= form_for(:accept, :html => {:method => :get}) do |f| %>
-    <p>
-      <%= t('activerecord.attributes.item.item_identifier') -%>:
-      <%= f.search_field :item_identifier, :value => @query, :class => 'resource_item_identifier' -%>
-      <%= f.submit t('page.search') -%>
-    </p>
-  <%- end -%>
-</div>
-
-<table class="table table-striped index">
-  <tr>
-    <th><%= t('activerecord.models.item') -%></th>
-    <th></th>
-  </tr>
-  <%- @accepts.each_with_index do |accept, i| -%>
-    <tr class="line<%= cycle("0", "1") -%>">
-      <td>
-        <% if accept.item %>
-          <%= render 'manifestations/show_index', :manifestation => accept.item.manifestation %>
-          <%= link_to accept.item.item_identifier, accept.item -%> / <%= accept.item.call_number %>
-          (<%= link_to accept.item.shelf.library.display_name.localize, accept.item.shelf.library %> /
-          <%= link_to accept.item.shelf.display_name.localize, accept.item.shelf %>)<br />
-          <%=l accept.created_at %>
-        <% end %>
-      </td>
-      <td>
-        <%- if can? :destroy, accept -%>
-          <%= link_to t('page.destroy'), accept, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
-        <%- end -%>
-      </td>
-    </tr>
-  <%- end -%>
-  </table>
-  <%= javascript_tag("$('#accept_item_identifier').focus()") -%>
-
-  <%= will_paginate(@accepts) %>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.accept')), new_accept_path -%></li>
-  </ul>
-</div>

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

@@ -1 +0,0 @@
-$("#accept_list").html("<%= escape_javascript(render('accepts/list')) %>");

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

@@ -1,14 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.accept')) -%></h1>
-<div id="content_list">
-  <div id="accept_list">
-    <%= render 'list' -%>
-  </div>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('page.back'), accepts_path -%></li>
-  </ul>
-</div>

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

@@ -1,31 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.accept')) -%></h1>
-<div id="content_list">
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong><%= t('activerecord.models.item') -%>:</strong>
-  <% if @accept.item %>
-    <%= link_to @accept.item.item_identifier, @accept.item -%>
-    (<%= link_to @accept.item.manifestation.original_title, @accept.item.manifestation %>)
-  <% end %>
-</p>
-
-<p>
-  <strong><%= t('activerecord.models.user') -%>:</strong>
-  <%= link_to @accept.librarian.username, @accept.librarian if @accept.librarian -%>
-</p>
-
-<p>
-  <strong><%= t('page.created_at') -%>:</strong>
-  <%=l @accept.created_at %>
-</p>
-
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= back_to_index(flash[:page_info]) -%></li>
-  </ul>
-</div>