enju_biblio 0.2.0.beta.1 → 0.2.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f22c619e2e023ba90b4d76131e0c4f42a740bb76
-  data.tar.gz: 1b27cdc13c2cd26379b8db84fde261ffdc6757cf
+  metadata.gz: 50d129df29fd20bd177861de5f04438006af46a9
+  data.tar.gz: fd340579d9a396a70bada80b8005113911ea68df
 SHA512:
-  metadata.gz: e3bba80e90836041a24d98b327bb5208d61ea6fdcf81e364263cbe885e809064b56dd9b4849498f38fdaa15b429e322c92cf14abd6f1be7924213506f79d0fd7
-  data.tar.gz: 4bb20c415894012ba00e271d6db98b251d9465a6a66fe1b1d7b8b685aedbf79d941277c55b13bd19835e24cebf0eec1acb8e64a1e28300c586b0d661880680d7
+  metadata.gz: 1c73cfc96f9b2eccf7d852065d4913398b96382dc097d221e12a38222e38f454b1cb8e04f2fc5dfb9a59267bffb06f3c5043b68696ece4cc7168d6c4149e7c45
+  data.tar.gz: b096f74133b6efff51c95c3eaedde1a57e58ca7f99c1f403b1a6210d726ecbecb6d00411213bad7aaed95ed7563ab1549ed20559ec05dada23d22007433b3c16

data/app/helpers/picture_files_helper.rb

@@ -2,14 +2,14 @@ module PictureFilesHelper
   def show_image(picture_file, options = {size: :medium})
     case options[:size]
     when :medium
-      if picture_file.picture.width.to_i >= 600
-        return image_tag picture_file_path(picture_file, format: :download, size: :medium), alt: "*", width: picture_file.picture.width(:medium), height: picture_file.picture.height(:medium)
+      if picture_file.picture_width.to_i >= 600
+        return image_tag picture_file_path(picture_file, format: :download, size: :medium), alt: "*", width: 600
       end
     when :thumb
-      if picture_file.picture.width.to_i >= 100
-        return image_tag picture_file_path(picture_file, format: :download, size: :thumb), alt: "*", width: picture_file.picture.width(:thumb), height: picture_file.picture.height(:thumb)
+      if picture_file.picture_width.to_i >= 100
+        return image_tag picture_file_path(picture_file, format: :download, size: :thumb), alt: "*", width: 100
       end
     end
-    image_tag picture_file_path(picture_file, format: :download, size: :original), alt: "*", width: picture_file.picture.width, height: picture_file.picture.height
+    image_tag picture_file_path(picture_file, format: :download, size: :original), alt: "*", width: picture_file.picture_width, height: picture_file.picture_height
   end
 end

data/app/models/picture_file.rb

@@ -1,6 +1,7 @@
 class PictureFile < ActiveRecord::Base
   scope :attached, -> { where('picture_attachable_id IS NOT NULL') }
   belongs_to :picture_attachable, polymorphic: true, validate: true
+  before_save :extract_dimensions
 
   if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :picture, storage: :s3, styles: { medium: "600x600>", thumb: "100x100>" },
@@ -16,7 +17,7 @@ class PictureFile < ActiveRecord::Base
       path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
   validates_attachment_presence :picture
-  validates_attachment_content_type :picture, content_type: ["image/jpeg", "image/pjpeg", "image/png", "image/gif", "image/svg+xml"], on: :create
+  validates_attachment_content_type :picture, content_type: /\Aimage\/.*\Z/
 
   validates :picture_attachable_type, presence: true, inclusion: { in: ['Event', 'Manifestation', 'Agent', 'Shelf'] }
   validates_associated :picture_attachable
@@ -26,6 +27,14 @@ class PictureFile < ActiveRecord::Base
   strip_attributes only: :picture_attachable_type
 
   paginates_per 10
+
+  private
+  def extract_dimensions
+    return nil unless picture.queued_for_write[:original]
+    geometry = Paperclip::Geometry.from_file(picture.queued_for_write[:original])
+    self.picture_width = geometry.width.to_i
+    self.picture_height = geometry.height.to_i
+  end
 end
 
 # == Schema Information

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

@@ -42,7 +42,7 @@
       <ul>
         <%- if user_signed_in? -%>
           <%- if current_user.email.present? -%>
-            <li><%= link_to t('manifestation.send_email'), manifestation_path(mode: 'send_email'), data: {confirm: t('page.are_you_sure')} -%></li>
+            <li><%= link_to t('manifestation.send_email'), manifestation_path(@manifestation, mode: 'send_email'), data: {confirm: t('page.are_you_sure')} -%></li>
           <%- end -%>
           <% if defined?(EnjuBookmark) %>
             <li><%= link_to_bookmark(@manifestation) %></li>

data/app/views/picture_files/show.html+phone.erb

@@ -27,12 +27,12 @@
 
 <p>
   <strong><%= t('activerecord.attributes.picture_file.width') -%>:</strong>
-  <%= @picture_file.picture.width -%>
+  <%= @picture_file.picture_width -%>
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.picture_file.height') -%>:</strong>
-  <%= @picture_file.picture.height -%>
+  <%= @picture_file.picture_height -%>
 </p>
 
 <p>

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

@@ -26,12 +26,12 @@
 
 <p>
   <strong><%= t('activerecord.attributes.picture_file.width') -%>:</strong>
-  <%= @picture_file.picture.width -%>
+  <%= @picture_file.picture_width -%>
 </p>
 
 <p>
   <strong><%= t('activerecord.attributes.picture_file.height') -%>:</strong>
-  <%= @picture_file.picture.height -%>
+  <%= @picture_file.picture_height -%>
 </p>
 
 <p>

data/db/migrate/20091012101112_add_dcndl_schema.rb

@@ -8,7 +8,7 @@ class AddDcndlSchema < ActiveRecord::Migration
     add_column :manifestations, :valid_until, :timestamp
     add_column :manifestations, :date_submitted, :timestamp
     add_column :manifestations, :date_accepted, :timestamp
-    add_column :manifestations, :date_caputured, :timestamp
+    add_column :manifestations, :date_captured, :timestamp
     rename_column :manifestations, :copyright_date, :date_copyrighted
   end
 
@@ -21,7 +21,7 @@ class AddDcndlSchema < ActiveRecord::Migration
     remove_column :manifestations, :valid_until
     remove_column :manifestations, :date_submitted
     remove_column :manifestations, :date_accepted
-    remove_column :manifestations, :date_caputured
+    remove_column :manifestations, :date_captured
     rename_column :manifestations, :date_copyrighted, :copyright_date
   end
 end

data/db/migrate/20160811102604_add_picture_width_to_picture_file.rb

@@ -0,0 +1,6 @@
+class AddPictureWidthToPictureFile < ActiveRecord::Migration
+  def change
+    add_column :picture_files, :picture_width, :integer
+    add_column :picture_files, :picture_height, :integer
+  end
+end

data/lib/enju_biblio/engine.rb

@@ -1,6 +1,4 @@
-require 'paper_trail'
-require 'paperclip'
-require 'paperclip-meta'
+require 'enju_library'
 require 'validates_timeliness'
 require 'dynamic_form'
 require 'simple_form'

data/lib/enju_biblio/version.rb

@@ -1,3 +1,3 @@
 module EnjuBiblio
-  VERSION = "0.2.0.beta.1"
+  VERSION = "0.2.0.beta.2"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,9 +1,8 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  include EnjuLeaf::Controller
-  include EnjuBiblio::Controller
   include EnjuLibrary::Controller
+  include EnjuBiblio::Controller
   include EnjuEvent::Controller
   include EnjuSubject::Controller
   include EnjuInventory::Controller

data/spec/dummy/config/application.rb

@@ -3,11 +3,12 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require 'enju_biblio'
 require 'enju_leaf'
+require 'enju_biblio'
+require 'enju_manifestation_viewer'
 require 'enju_inventory'
 require 'enju_subject'
-#require 'enju_circulation'
+require 'enju_circulation'
 require 'enju_ndl'
 require 'enju_bookmark'
 require 'resque/server'

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151213072705) do
+ActiveRecord::Schema.define(version: 20160811102604) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -895,7 +895,7 @@ ActiveRecord::Schema.define(version: 20151213072705) do
     t.datetime "valid_until"
     t.datetime "date_submitted"
     t.datetime "date_accepted"
-    t.datetime "date_caputured"
+    t.datetime "date_captured"
     t.string   "pub_date"
     t.string   "edition_string"
     t.integer  "volume_number"
@@ -1031,6 +1031,8 @@ ActiveRecord::Schema.define(version: 20151213072705) do
     t.datetime "picture_updated_at"
     t.text     "picture_meta"
     t.string   "picture_fingerprint"
+    t.integer  "picture_width"
+    t.integer  "picture_height"
   end
 
   add_index "picture_files", ["picture_attachable_id", "picture_attachable_type"], name: "index_picture_files_on_picture_attachable_id_and_type"

data/spec/fixtures/library_groups.yml

@@ -12,11 +12,9 @@ one:
   login_banner: "*Next-L Enju*"
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
-  settings: <% if Rails::VERSION::MAJOR > 3 %>
+  settings: 
     "{\"max_number_of_results\":200,\"family_name_first\":true}"
-  <% else %>
-    "---\n:max_number_of_results: 200\n:family_name_first: true\n"
-  <% end %>
+
 # == Schema Information
 #
 # Table name: library_groups

data/spec/rails_helper.rb

@@ -62,7 +62,7 @@ RSpec.configure do |config|
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 
-  config.extend ControllerMacros, :type => :controller
+  config.extend ControllerMacros, type: :controller
 
   $original_sunspot_session = Sunspot.session
 

data/spec/routing/resource_import_files_routing_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe UserImportFilesController do
+  describe "routing" do
+
+    it "routes to #index" do
+      get("/user_import_files").should route_to("user_import_files#index")
+    end
+
+    it "routes to #new" do
+      get("/user_import_files/new").should route_to("user_import_files#new")
+    end
+
+    it "routes to #show" do
+      get("/user_import_files/1").should route_to("user_import_files#show", id: "1")
+    end
+
+    it "routes to #edit" do
+      get("/user_import_files/1/edit").should route_to("user_import_files#edit", id: "1")
+    end
+
+    it "routes to #create" do
+      post("/user_import_files").should route_to("user_import_files#create")
+    end
+
+    it "routes to #update" do
+      put("/user_import_files/1").should route_to("user_import_files#update", id: "1")
+    end
+
+    it "routes to #destroy" do
+      delete("/user_import_files/1").should route_to("user_import_files#destroy", id: "1")
+    end
+
+  end
+end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: enju_biblio
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta.1
+  version: 0.2.0.beta.2
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-31 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0.beta.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0.beta.2
 - !ruby/object:Gem::Dependency
-  name: paperclip-meta
+  name: marc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: validates_timeliness
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: marc
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,35 +67,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: paper_trail
+  name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: validates_timeliness
+  name: library_stdnums
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: lisbn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dynamic_form
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,75 +123,117 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: library_stdnums
+  name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.2.0.beta.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: lisbn
+  name: enju_subject
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.2.0.beta.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: statesman
+  name: enju_inventory
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
+        version: 0.2.0.beta.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: enju_bookmark
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.2.0.beta.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
-  name: cocoon
+  name: enju_event
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 0.2.0.beta.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_circulation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_ndl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+- !ruby/object:Gem::Dependency
+  name: enju_oai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -290,34 +332,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: enju_leaf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0.beta.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0.beta.1
-- !ruby/object:Gem::Dependency
-  name: enju_library
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0.beta.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0.beta.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -988,6 +1002,7 @@ files:
 - db/migrate/20140823095740_rename_manifestation_periodical_to_serial.rb
 - db/migrate/20150117111136_add_foreign_key_to_items_referencing_manifestations.rb
 - db/migrate/20151125004028_add_profile_id_to_agent.rb
+- db/migrate/20160811102604_add_picture_width_to_picture_file.rb
 - lib/enju_biblio.rb
 - lib/enju_biblio/biblio_helper.rb
 - lib/enju_biblio/engine.rb
@@ -1432,6 +1447,7 @@ files:
 - spec/routing/realize_types_routing_spec.rb
 - spec/routing/realizes_routing_spec.rb
 - spec/routing/resource_export_files_routing_spec.rb
+- spec/routing/resource_import_files_routing_spec.rb
 - spec/routing/series_statement_merge_lists_routing_spec.rb
 - spec/routing/series_statement_merges_routing_spec.rb
 - spec/spec_helper.rb
@@ -1933,6 +1949,7 @@ test_files:
 - spec/routing/realize_types_routing_spec.rb
 - spec/routing/realizes_routing_spec.rb
 - spec/routing/resource_export_files_routing_spec.rb
+- spec/routing/resource_import_files_routing_spec.rb
 - spec/routing/series_statement_merge_lists_routing_spec.rb
 - spec/routing/series_statement_merges_routing_spec.rb
 - spec/spec_helper.rb