enju_biblio 0.1.0.pre20 → 0.1.0.pre21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aecbc0477fe4b4c9060346bfda5ac15c2cd035d1
-  data.tar.gz: 56e785276f3708e7675dfeffc3b005841ba09968
+  metadata.gz: 43b1c3ae3a79ff7af5219d194125b2981856ebe8
+  data.tar.gz: 0f0d22a7bea5631a8c74b729d0ebcbd30eea60c9
 SHA512:
-  metadata.gz: 7bec7bf7ef3bc253b7d1b031e02ab5b5073a2dd3dd4f81673aeb9e6e30373e71e38adbb607db040ec954abfbdae11f7cb187928234ed1cc59fc1a0a173e65b7b
-  data.tar.gz: 6cae1aa3708892aa5e323593c5c1f694c786a62f4f3f9d18194f4547bb4545e6ad29131322b05d462fdf03010d336db67c481cc5e7baf6f4f58e23f1e5bc71c8
+  metadata.gz: ce157cf849f7e6c062b03d72eab11f841dc7d1a520807d6469c07f28de684654a0038b99a5ff58ba5d9c1ec72ae1a91ae89b7a33ff23dfab7dc86b174c48cabe
+  data.tar.gz: e621fcbc9bb6f3f7d28cd96a947ef30a8890f06d8fc943568542437da65ebfaf23e76a9ab383a73769ff171cfd482346ab2a11d05e1d3fbb62ef8d51d142e14a

data/app/controllers/countries_controller.rb

@@ -1,8 +1,16 @@
 class CountriesController < InheritedResources::Base
   respond_to :html, :json
-  has_scope :page, :default => 1
   load_and_authorize_resource
 
+  def index
+    @countries = Country.page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render :json => @countries }
+    end
+  end
+
   def update
     @country = Country.find(params[:id])
     if params[:move]

data/app/controllers/languages_controller.rb

@@ -1,8 +1,16 @@
 class LanguagesController < InheritedResources::Base
   respond_to :html, :json
-  has_scope :page, :default => 1
   load_and_authorize_resource
 
+  def index
+    @languages = Language.page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render :json => @languages }
+    end
+  end
+
   def update
     @language = Language.find(params[:id])
     if params[:move]

data/app/models/manifestation.rb

@@ -1,6 +1,6 @@
 class Manifestation < ActiveRecord::Base
   attr_accessible :original_title, :title_alternative, :title_transcription,
-    :classification_number, :manifestation_identifier, :date_copyrighted,
+    :manifestation_identifier, :date_copyrighted,
     :access_address, :language_id, :carrier_type_id, :extent_id, :start_page,
     :end_page, :height, :width, :depth, :isbn, :wrong_isbn, :nbn, :lccn,
     :oclc_number, :issn, :price, :fulltext, :volume_number_string,
@@ -186,6 +186,8 @@ class Manifestation < ActiveRecord::Base
     time :acquired_at
   end
 
+  enju_circulation_model if defined?(EnjuCirculation)
+  enju_subject_model if defined?(EnjuSubject)
   enju_manifestation_viewer if defined?(EnjuManifestationViewer)
   enju_ndl_search if defined?(EnjuNdl)
   #enju_amazon
@@ -465,32 +467,6 @@ class Manifestation < ActiveRecord::Base
     items.where(:shelf_id => Shelf.web.id).first
   end
 
-  if defined?(EnjuCirculation)
-    enju_circulation_model
-  end
-
-  if defined?(EnjuSubject)
-    has_many :work_has_subjects, :foreign_key => 'work_id', :dependent => :destroy
-    has_many :subjects, :through => :work_has_subjects
-
-    searchable do
-      text :subject do
-        subjects.map{|s| [:term, :term_transcription]}.compact
-      end
-      string :subject, :multiple => true do
-        subjects.map{|s| [:term, :term_transcription]}.compact
-      end
-      string :classification, :multiple => true do
-        classifications.collect(&:category)
-      end
-      integer :subject_ids, :multiple => true
-    end
-
-    def classifications
-      subjects.collect(&:classifications).flatten
-    end
-  end
-
   if defined?(EnjuBookmark)
     has_many :bookmarks, :include => :tags, :dependent => :destroy, :foreign_key => :manifestation_id
     has_many :users, :through => :bookmarks

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

@@ -4,7 +4,7 @@
 
 <table class="table table-striped index">
   <tr>
-    <th id="edit_icons">Id</th>
+    <th id="edit_icons">ID</th>
     <th><%= t('activerecord.models.user') -%></th>
     <th><%= t('activerecord.attributes.import_request.isbn') -%></th>
     <th><%= t('page.created_at') -%></th>

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

@@ -4,7 +4,7 @@
 
 <table class="table table-striped index">
   <tr>
-    <th>Id</th>
+    <th>ID</th>
     <th><%= t('activerecord.attributes.patron_import_file.patron_import_file_name') -%></th>
     <th><%= t('activerecord.attributes.patron_import_file.executed_at') -%></th>
     <th><%= t('activerecord.models.user') -%></th>

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

@@ -4,7 +4,7 @@
 
 <table class="table table-striped index">
   <tr>
-    <th>Id</th>
+    <th>ID</th>
     <th><%= t('activerecord.attributes.resource_import_file.resource_import_file_name') -%></th>
     <th><%= t('activerecord.attributes.resource_import_file.executed_at') -%></th>
     <th><%= t('activerecord.models.user') -%></th>

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.1.0.pre20"
+  VERSION = "0.1.0.pre21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre20
+  version: 0.1.0.pre21
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.13.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.13.rc1
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -1140,7 +1140,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_fj
+- spec/dummy/solr/data/test/index/segments_vu
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role
@@ -1570,7 +1570,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_fj
+- spec/dummy/solr/data/test/index/segments_vu
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role