enju_flower 0.1.0.pre7 → 0.1.0.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af1bdc45938c39281d8451ebee09b82ee8d4204e
-  data.tar.gz: 9c2830d2fdcf51f76b7e747952aeafb53ff4ea92
+  metadata.gz: 13cfdbaeabf732a60a51167adb7ace795059298d
+  data.tar.gz: 12f7288448433264f5c3ce84750488a43b0827db
 SHA512:
-  metadata.gz: 041fca3fb1f9e4803ea9bea431417d1daefca68d17e8fc7c9fee06553f636b0f188e13e6da61b643368059bd8b3016ab6105e77ba6cb8795b174946be5f90c53
-  data.tar.gz: 5430b12e38ec09e185784effe14e230179d5e6433b542faac6b5b1342b763df569e4a5594ea1b562cb326518c06e158222fc5c020aa2186202add783d162d2a8
+  metadata.gz: c04aad383057b917253ad028b91b0df5c1c4ba4e4b88c514917c83d20e467e82589df4e47a1d33d7b60b97c01cb90269eaf3aec5b3ceebeb5efe70125748ed75
+  data.tar.gz: bb434e4d227cae10044b1eae16b281461818c8d4bb3ba3cb7d28772013b6cf875510259db22fc810ce9d981c04969d8812133ece6b9f57882546d0b1317cc660

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

@@ -14,8 +14,8 @@
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
             <td style="width: 500px">
               <%= render 'show_series_detail', :manifestation => manifestation %>
-              <%- if manifestation.issn.present? -%>
-                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
+              <%- unless manifestation.identifier_contents(:issn).empty? -%>
+                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.identifier_contents(:issn).join(" ") -%>)
               <%- end -%>
             </td>
           </tr>
@@ -64,19 +64,9 @@
           <tr>
             <td><%= t('page.identifier') -%>:</td>
             <td>
-              <%- if manifestation.isbn.present? -%>
-                ISBN: <span itemprop="isbn"><%= manifestation.isbn -%></span>
-                <%- if manifestation.isbn10.present? -%>
-                  ( <%= manifestation.isbn10 -%> )
-                <%- end -%>
-              <%- end -%>
-              <%- if manifestation.nbn.present? -%>
-                NBN: <%= manifestation.nbn -%>
-              <%- end -%>
-              <%- if manifestation.lccn.present? -%>
-                <br />
-                LCCN: <%= manifestation.lccn -%>
-              <%- end -%>
+              <% manifestation.identifiers.each do |identifier| %>
+                <%= "#{identifier.identifier_type.display_name.localize}: #{identifier.body}" %>
+              <% end %>
             </td>
           </tr>
         <%- end -%>

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

@@ -14,8 +14,8 @@
             <td style="width: 200px"><%= t('activerecord.models.series_statement') -%>:</td>
             <td style="width: 500px">
               <%= render 'show_series_detail', :manifestation => manifestation %>
-              <%- if manifestation.issn.present? -%>
-                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.issn -%>)
+              <%- unless manifestation.identifier_contents(:issn).empty? -%>
+                (<%= t('activerecord.attributes.manifestation.issn') -%>: <%= manifestation.identifier_contents(:issn).join(" ") -%>)
               <%- end -%>
             </td>
           </tr>
@@ -66,19 +66,9 @@
           <tr>
             <td><%= t('page.identifier') -%>:</td>
             <td>
-              <%- if manifestation.isbn.present? -%>
-                ISBN: <span itemprop="isbn"><%= manifestation.isbn -%></span>
-                <%- if manifestation.isbn10.present? -%>
-                  ( <%= manifestation.isbn10 -%> )
-                <%- end -%>
-              <%- end -%>
-              <%- if manifestation.nbn.present? -%>
-                NBN: <%= manifestation.nbn -%>
-              <%- end -%>
-              <%- if manifestation.lccn.present? -%>
-                <br />
-                LCCN: <%= manifestation.lccn -%>
-              <%- end -%>
+              <% manifestation.identifiers.each do |identifier| %>
+                <%= "#{identifier.identifier_type.display_name.localize}: #{identifier.body}" %>
+              <% end %>
             </td>
           </tr>
         <%- end -%>

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

@@ -1,6 +1,6 @@
 <strong>
   <% if manifestation.root_series_statement %>
-    <%= link_to manifestation.root_series_statement.original_title, series_statement_manifestations_path(manifestation.root_series_statement, :query => @query) %>
+    <%= link_to manifestation.original_title, manifestations_path(:parent => manifestation.id, :query => @query) %>
   <% else %>
     <%= link_to title_with_volume_number(manifestation), manifestation -%>
   <% end %>

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

@@ -1,4 +1,4 @@
 manifestation_identifier  original_title	creator	publisher	isbn	pub_date	note
 <%- @manifestations.each do |manifestation| -%>
-<%= manifestation.manifestation_identifier %> "<%=raw manifestation.original_title.gsub(/"/, '""') -%>"	<%=raw manifestation.creators.pluck(:full_name).join('; ') -%>	<%=raw manifestation.publishers.pluck(:full_name).join('; ') -%>	<%= manifestation.isbn -%>	<%= manifestation.pub_date -%>	<%= manifestation.note -%><%= "\n" -%>
+<%= manifestation.manifestation_identifier %> "<%=raw manifestation.original_title.gsub(/"/, '""') -%>"	<%=raw manifestation.creators.pluck(:full_name).join('; ') -%>	<%=raw manifestation.publishers.pluck(:full_name).join('; ') -%>	<%= manifestation.identifier_contents(:isbn) -%>	<%= manifestation.pub_date -%>	<%= manifestation.note -%><%= "\n" -%>
 <%- end -%>

data/app/views/manifestations/index.rss.builder

@@ -30,12 +30,9 @@ xml.rss('version' => "2.0",
             xml.pubDate manifestation.date_of_publication.try(:utc).try(:rfc822)
             xml.link manifestation_url(manifestation)
             xml.guid manifestation_url(manifestation), :isPermaLink => "true"
-            if defined?(EnjuBookmark)
-              manifestation.tags.each do |tag|
-                xml.category tag
-              end
+            manifestation.identifier_contents(:isbn).each do |i|
+              xml.tag! "dc:identifier", i
             end
-            xml.tag! "dc:identifier", manifestation.isbn
           end
         end
     end

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

@@ -7,7 +7,7 @@
 <table class="table table-striped">
 <tr>
 <th>ISBN</th>
-<td><%= @manifestation.isbn %></td>
+<td><%= @manifestation.identifier_contents(:isbn).join(' ') %></td>
 </tr>
 <tr>
 <th><%= t('activerecord.attributes.manifestation.price') %></th>

data/lib/enju_flower/version.rb

@@ -1,3 +1,3 @@
 module EnjuFlower
-  VERSION = "0.1.0.pre7"
+  VERSION = "0.1.0.pre8"
 end

data/spec/controllers/manifestations_controller_spec.rb

@@ -155,6 +155,18 @@ describe ManifestationsController do
         response.should be_success
         response.should render_template("manifestations/_tag_cloud")
       end
+
+      it "should show manifestation with isbn", :solr => true do
+        get :index, :isbn => "4798002062"
+        response.should be_success
+        assigns(:manifestations).count.should eq 1
+      end
+
+      it "should not show missing manifestation with isbn", :solr => true do
+        get :index, :isbn => "47980020620"
+        response.should be_success
+        assigns(:manifestations).should be_empty
+      end
     end
   end
 
@@ -220,16 +232,6 @@ describe ManifestationsController do
         response.should render_template("manifestations/show")
       end
 
-      it "should show_manifestation with isbn" do
-        get :show, :isbn => "4798002062"
-        response.should redirect_to manifestation_url(assigns(:manifestation))
-      end
-
-      it "should not show missing manifestation with isbn" do
-        get :show, :isbn => "47980020620"
-        response.should be_missing
-      end
-
       it "should show manifestation with holding" do
         get :show, :id => 1, :mode => 'holding'
         response.should be_success

data/spec/dummy/db/migrate/20130506175303_create_identifier_types.rb

@@ -0,0 +1,12 @@
+class CreateIdentifierTypes < ActiveRecord::Migration
+  def change
+    create_table :identifier_types do |t|
+      t.string :name
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb

@@ -0,0 +1,14 @@
+class CreateIdentifiers < ActiveRecord::Migration
+  def change
+    create_table :identifiers do |t|
+      t.string :body, :null => false
+      t.integer :identifier_type_id, :null => false
+      t.integer :manifestation_id
+      t.boolean :primary
+      t.integer :position
+
+      t.timestamps
+    end
+    add_index :identifiers, [:body, :identifier_type_id]
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130429020822) do
+ActiveRecord::Schema.define(:version => 20130506175834) do
 
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
@@ -358,6 +358,27 @@ ActiveRecord::Schema.define(:version => 20130429020822) do
     t.datetime "updated_at",   :null => false
   end
 
+  create_table "identifier_types", :force => true do |t|
+    t.string   "name"
+    t.text     "display_name"
+    t.text     "note"
+    t.integer  "position"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "identifiers", :force => true do |t|
+    t.string   "body",               :null => false
+    t.integer  "identifier_type_id", :null => false
+    t.integer  "manifestation_id"
+    t.boolean  "primary"
+    t.integer  "position"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "identifiers", ["body", "identifier_type_id"], :name => "index_identifiers_on_body_and_identifier_type_id"
+
   create_table "import_requests", :force => true do |t|
     t.string   "isbn"
     t.string   "state"

data/spec/dummy/solr/data/test/index/{_ux.fnm → _149.fnm}

@@ -1,7 +1,7 @@
-����*idtype
+����,idtype
 class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
 library_sm
 language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
 end_page_inumber_of_pages_irepository_content_b
 creator_smsort_title_speriodical_bseries_master_bresource_master_b
-title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_im
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
issn_smoriginal_manifestation_ids_im

data/spec/dummy/solr/data/test/index/{_ux.nrm → _149.nrm}

@@ -1 +1 @@
-NRM�turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttptxy|||||||||||tuuu|||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||u|||||||||||||||||uvw|||||||x|||||||||||||||||||||||||||||||||||||||y||||||||||||w���|||||||||||||||||||||||||||||||||��|||||||||||w���|||||||||||||||||||||||||||||||||xy|||||||||||tuuu|||||||||||||||||||||||||||||||||turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttpt||||��|||||��|||||||||||||||||||||||||||||||||||||
+NRM�turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttptxy|||||||||||tuuu|||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||||||||||||||||||||wxwwx|||||||||||||||||||||||||||u|||||||||||||||||uvw|||||||x|||||||||||||||||||||||||||||||||||||||y||||||||||||w���|||||||||||||||||||||||||||||||||��|||||||||||w���|||||||||||||||||||||||||||||||||xy|||||||||||tuuu|||||||||||||||||||||||||||||||||turxtuxutrtwsssuuvyrttrvrrtxtxswuywtrtyvywtuwwttpty|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||

data/spec/dummy/solr/data/test/index/{_uy.fnm → _14a.fnm}

@@ -1,7 +1,7 @@
-����*idtype
+����,idtype
 class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
 library_sm
 language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
 end_page_inumber_of_pages_irepository_content_b
 creator_smsort_title_speriodical_bseries_master_bresource_master_b
-title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_im
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
issn_smoriginal_manifestation_ids_im

data/spec/dummy/solr/data/test/index/{_uy.nrm → _14a.nrm}

@@ -1 +1 @@
-NRM�xuuwuyutxxvxvxwtyvxwxxxvvtwwxvytwxwrwvxxyxuyxyuysx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xuuwuyutxxvxvxwtyvxwxxxvvtwwxvytwxwrwvxxyxuyxyuysx||||||||||||||||||||||||||||||||||||||||||||||||||
+NRM�xuuwuyutxxvxvxwtyvxwxxxvvtwwxvytwxwrwvxxyxuyxyuysx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xuuwuyutxxvxvxwtyvxwxxxvvtwwxvytwxwrwvxxyxuyxyuysx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||

data/spec/dummy/solr/data/test/index/{_uz.fnm → _14b.fnm}

@@ -1,8 +1,8 @@
-����2idtype
+����4idtype
 class_nametitle_smconnect_title_sconnect_creator_sconnect_publisher_sisbn_smcarrier_type_s
 library_sm
 language_sitem_identifier_smshelf_smcreated_at_dupdated_at_dcreator_ids_imcontributor_ids_impublisher_ids_imitem_ids_imrequired_role_id_istart_page_i
 end_page_inumber_of_pages_irepository_content_b
 creator_smsort_title_speriodical_bseries_master_bresource_master_b
-title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
original_manifestation_ids_im
+title_text
creator_text
contributor_text
publisher_text
item_identifier_text
aulast_text
aufirst_text
au_text
btitle_text
	isbn_text
issn_smoriginal_manifestation_ids_im
 pub_year_i

data/spec/dummy/solr/data/test/index/{_uz.nrm → _14b.nrm}

@@ -1 +1 @@
-NRM�vruwvvuur|xttutttwwuuuuuuxx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xtt|uuutt||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||vruwvvuur|xttutttwwuuuuuuxx|||||y|||��|||||||���������|||||||||||||||||||||||||||
+NRM�vruwvvuur|xttutttwwuuuuuuxx||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||xtt|uuutt||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||vruwvvuur|x||u|ttwwuuuuuuxx|||||y|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||tt|t|||||||||||||||||||||||tt|t||||||||||||

data/spec/fixtures/identifier_types.yml

@@ -0,0 +1,29 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  name: isbn
+  display_name: ISBN
+  note: 
+  position: 1
+  id: 1
+
+two:
+  name: issn
+  display_name: ISSN
+  note: 
+  position: 2
+  id: 2
+
+# == Schema Information
+#
+# Table name: identifier_types
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+

data/spec/fixtures/identifiers.yml

@@ -0,0 +1,113 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  body: 12345678
+  manifestation_id: 1
+  identifier_type_id: 1
+  primary: false
+
+two:
+  body: 99999999
+  manifestation_id: 2
+  identifier_type_id: 2
+  primary: false
+
+identifier_00001:
+  manifestation_id: 1
+  identifier_type_id: 1
+  body: "4798002062"
+
+identifier_00002:
+  manifestation_id: 2
+  identifier_type_id: 1
+  body: "4915724824"
+
+identifier_00003:
+  manifestation_id: 3
+  identifier_type_id: 1
+  body: "4897063590"
+
+identifier_00004:
+  manifestation_id: 4
+  identifier_type_id: 1
+  body: 0471412791
+
+identifier_00005:
+  manifestation_id: 7
+  identifier_type_id: 1
+  body: 0470844701
+
+identifier_00006:
+  manifestation_id: 8
+  identifier_type_id: 1
+  body: "4798101028"
+
+identifier_00007:
+  manifestation_id: 9
+  identifier_type_id: 1
+  body: "4641143331"
+
+identifier_00008:
+  manifestation_id: 10
+  identifier_type_id: 1
+  body: "9784774127804"
+
+identifier_00009:
+  manifestation_id: 21
+  identifier_type_id: 1
+  body: "4822281167"
+
+identifier_00114:
+  manifestation_id: 114
+  identifier_type_id: 1
+  body: "9784756137470"
+
+identifier_00116:
+  manifestation_id: 116
+  identifier_type_id: 1
+  body: "9784756100917"
+
+identifier_00120:
+  manifestation_id: 120
+  identifier_type_id: 1
+  body: "9784274063855"
+
+identifier_00192:
+  manifestation_id: 192
+  identifier_type_id: 1
+  body: "9784873113241"
+
+identifier_00193_1:
+  manifestation_id: 193
+  identifier_type_id: 1
+  body: "9784797340044"
+
+identifier_00193_2:
+  manifestation_id: 193
+  identifier_type_id: 1
+  body: "4797340045"
+
+identifier_00196:
+  manifestation_id: 196
+  identifier_type_id: 1
+  body: "9784797336610"
+
+identifier_00201:
+  manifestation_id: 201
+  identifier_type_id: 2
+  body: "09130000"
+
+# == Schema Information
+#
+# Table name: identifiers
+#
+#  id                 :integer          not null, primary key
+#  body               :string(255)      not null
+#  identifier_type_id :integer          not null
+#  manifestation_id   :integer
+#  primary            :boolean
+#  position           :integer
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#
+