enju_ndl 0.2.0.beta.2 → 0.2.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d81c15120a0294c901c2efc355d7010fe8f6049
-  data.tar.gz: 3376ff1f9371bc282cf58e57e76fd00232e7b2ac
+  metadata.gz: 1b12b8528ac406f72cefc769982ea23a5ce09cc5
+  data.tar.gz: 89feb9d27d4aa822e250467d9906b13e1dbb6cf7
 SHA512:
-  metadata.gz: 66f196e337dfc0855b70ce6b0a08ded49293a264f8baad3afb9de6c459e257f26d66c6a905be65cc00d5101eb74a5ce20d9782d5e440de9994f8cd447c92d106
-  data.tar.gz: 2962768c8c8f9455e21cc91cbe8f1617a28671b45201bf7019b9d83baed8869a1c1ab0f9502115e02a08268441e6c6da68246641a7de71a76410c6fb3c2f2d2a
+  metadata.gz: e1050c4f1c7aa273a92d5dd61e210273f180935caf7b2347c202f8598deab9e6c8df2e1b9ef5b901a1428576e31753b403065a6da4b067641cf6b9dba22b54a6
+  data.tar.gz: fb0f5428fa79d6b767b5770a1d623e742ab7d43a747745b57883ed5ae929f3f0091650b855e2740cdfd2e599715cdca5ca1f883fc40d70fe516ce345970559df

data/lib/enju_ndl/ndl_search.rb

@@ -132,6 +132,8 @@ module EnjuNdl
             :start_page => extent[:start_page],
             :end_page => extent[:end_page],
             :height => extent[:height],
+            :extent => extent[:extent],
+            :dimensions => extent[:dimensions],
             :publication_place => publication_place,
             :edition_string => edition_string,
           )
@@ -213,8 +215,11 @@ module EnjuNdl
             end
             if classification_urls
               classification_urls.each do |url|
-                ndc_url = URI.parse(URI.escape(url))
-                if ndc_url.path.split('/').reverse[1] == "ndc9"
+                begin
+                  ndc_url = URI.parse(URI.escape(url))
+                rescue URI::InvalidURIError
+                end
+                if ndc_url and ndc_url.path.split('/').reverse[1] == "ndc9"
                   ndc_type = "ndc9"
                   ndc = ndc_url.path.split('/').last
                   classification_type = ClassificationType.where(name: ndc_type).first || ClassificationType.create!(name: ndc_type)
@@ -346,11 +351,13 @@ module EnjuNdl
         if extent
           extent = extent.split(';')
           page = extent[0].try(:strip)
+          value[:extent] = page
           if page =~ /\d+p/
             value[:start_page] = 1
             value[:end_page] = page.to_i
           end
           height = extent[1].try(:strip)
+          value[:dimensions] = height
           if height =~ /\d+cm/
             value[:height] = height.to_i
           end

data/lib/enju_ndl/version.rb

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

data/spec/cassette_library/NdlBook/import/should_import_even_with_invalid_url.yml

@@ -0,0 +1,174 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://iss.ndl.go.jp/api/sru?maximumRecords=1&onlyBib=true&operation=searchRetrieve&query=(itemno=R100000002-I000003523406-00%20)&recordSchema=dcndl
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.9.2
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Sat, 01 Oct 2016 05:52:30 GMT
+      X-Runtime:
+      - '0.812651'
+      Etag:
+      - '"7f8f995bc73030df2f38518df1d3d78d"'
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Ua-Compatible:
+      - IE=Edge,chrome=1
+      Status:
+      - '200'
+      Content-Type:
+      - application/xml; charset=utf-8
+      Set-Cookie:
+      - ROUTEID=.ps24; path=/
+      - TS01cb7804=011338590adebfcf3a27f8a0c948c25a74a2ed1ebe620714fb6dbff40466a4293f7632d7422f5681e6392d32f4177f8b08480e6667;
+        path=/; domain=.iss.ndl.go.jp
+      - TS01f3cfdf=011338590a42b713a5f726e6347fcc5453de8c6190b6695fd2442af9cae8c189c20e58322a37caadb6c0dcd3935c884390a80ca6ef647e9aa620a23794c830aca80e4b5550ab6aafc734a182f936f5b32396b483ee;
+        Path=/
+      - _front_session_id=21796c47b769a32b216c43843b600c33; domain=.iss.ndl.go.jp;
+        path=/; expires=Sat, 01-Oct-2016 06:52:31 GMT; HttpOnly
+      - ndl.go.jp=rd2o00000000000000000000ffff0a024f6co80; path=/
+      - serverid=1101; path=/
+      Vary:
+      - Accept-Encoding,User-Agent
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - SAMEORIGIN
+      Content-Length:
+      - '1457'
+      Connection:
+      - close
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHNlYXJj
+        aFJldHJpZXZlUmVzcG9uc2UgeG1sbnM9Imh0dHA6Ly93d3cubG9jLmdvdi96
+        aW5nL3Nydy8iPgogIDx2ZXJzaW9uPjEuMjwvdmVyc2lvbj4KICA8bnVtYmVy
+        T2ZSZWNvcmRzPjE8L251bWJlck9mUmVjb3Jkcz4KICA8bmV4dFJlY29yZFBv
+        c2l0aW9uPjA8L25leHRSZWNvcmRQb3NpdGlvbj4KICA8ZXh0cmFSZXNwb25z
+        ZURhdGE+CiZsdDtmYWNldHMmZ3Q7CiAgJmx0O2xzdCBuYW1lPSZxdW90O1JF
+        UE9TSVRPUllfTk8mcXVvdDsmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q7
+        UjEwMDAwMDAwMiZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgICAmbHQ7aW50
+        IG5hbWU9JnF1b3Q7UjEwMDAwMDAwNCZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7
+        CiAgJmx0Oy9sc3QmZ3Q7CiAgJmx0O2xzdCBuYW1lPSZxdW90O05EQyZxdW90
+        OyZndDsKICAmbHQ7L2xzdCZndDsKICAmbHQ7bHN0IG5hbWU9JnF1b3Q7SVNT
+        VUVEX0RBVEUmcXVvdDsmZ3Q7CiAgICAmbHQ7aW50IG5hbWU9JnF1b3Q7MTk5
+        NSZxdW90OyZndDsxJmx0Oy9pbnQmZ3Q7CiAgJmx0Oy9sc3QmZ3Q7CiAgJmx0
+        O2xzdCBuYW1lPSZxdW90O0xJQlJBUlkmcXVvdDsmZ3Q7CiAgICAmbHQ7aW50
+        IG5hbWU9JnF1b3Q75Zu956uL5Zu95Lya5Zuz5pu46aSoJnF1b3Q7Jmd0OzEm
+        bHQ7L2ludCZndDsKICAgICZsdDtpbnQgbmFtZT0mcXVvdDvmnbHkuqzpg73n
+        q4vlpJrmkanlm7Pmm7jppKgmcXVvdDsmZ3Q7MSZsdDsvaW50Jmd0OwogICZs
+        dDsvbHN0Jmd0OwombHQ7L2ZhY2V0cyZndDsKICA8L2V4dHJhUmVzcG9uc2VE
+        YXRhPgogIDxyZWNvcmRzPgogICAgPHJlY29yZD4KICAgICAgPHJlY29yZFNj
+        aGVtYT5pbmZvOnNydy9zY2hlbWEvMS9kYy12MS4xPC9yZWNvcmRTY2hlbWE+
+        CiAgICAgIDxyZWNvcmRQYWNraW5nPnN0cmluZzwvcmVjb3JkUGFja2luZz4K
+        ICAgICAgPHJlY29yZERhdGE+CiZsdDtyZGY6UkRGIHhtbG5zOnJkZj0mcXVv
+        dDtodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMj
+        JnF1b3Q7IHhtbG5zOnJkZnM9JnF1b3Q7aHR0cDovL3d3dy53My5vcmcvMjAw
+        MC8wMS9yZGYtc2NoZW1hIyZxdW90OyB4bWxuczpkY3Rlcm1zPSZxdW90O2h0
+        dHA6Ly9wdXJsLm9yZy9kYy90ZXJtcy8mcXVvdDsgeG1sbnM6ZGNuZGw9JnF1
+        b3Q7aHR0cDovL25kbC5nby5qcC9kY25kbC90ZXJtcy8mcXVvdDsgeG1sbnM6
+        Zm9hZj0mcXVvdDtodHRwOi8veG1sbnMuY29tL2ZvYWYvMC4xLyZxdW90OyB4
+        bWxuczpvd2w9JnF1b3Q7aHR0cDovL3d3dy53My5vcmcvMjAwMi8wNy9vd2wj
+        JnF1b3Q7IHhtbG5zOmRjPSZxdW90O2h0dHA6Ly9wdXJsLm9yZy9kYy9lbGVt
+        ZW50cy8xLjEvJnF1b3Q7Jmd0OwogICZsdDtkY25kbDpCaWJBZG1pblJlc291
+        cmNlIHJkZjphYm91dD0mcXVvdDtodHRwOi8vaXNzLm5kbC5nby5qcC9ib29r
+        cy9SMTAwMDAwMDAyLUkwMDAwMDM1MjM0MDYtMDAmcXVvdDsmZ3Q7CiAgICAm
+        bHQ7ZGNuZGw6Y2F0YWxvZ2luZ1N0YXR1cyZndDtDNyZsdDsvZGNuZGw6Y2F0
+        YWxvZ2luZ1N0YXR1cyZndDsKICAgICZsdDtkY25kbDpiaWJSZWNvcmRDYXRl
+        Z29yeSZndDtSMTAwMDAwMDAyJmx0Oy9kY25kbDpiaWJSZWNvcmRDYXRlZ29y
+        eSZndDsKICAgICZsdDtkY25kbDpyZWNvcmQgcmRmOnJlc291cmNlPSZxdW90
+        O2h0dHA6Ly9pc3MubmRsLmdvLmpwL2Jvb2tzL1IxMDAwMDAwMDItSTAwMDAw
+        MzUyMzQwNi0wMCNtYXRlcmlhbCZxdW90Oy8mZ3Q7CiAgJmx0Oy9kY25kbDpC
+        aWJBZG1pblJlc291cmNlJmd0OwogICZsdDtkY25kbDpCaWJSZXNvdXJjZSBy
+        ZGY6YWJvdXQ9JnF1b3Q7aHR0cDovL2lzcy5uZGwuZ28uanAvYm9va3MvUjEw
+        MDAwMDAwMi1JMDAwMDAzNTIzNDA2LTAwI21hdGVyaWFsJnF1b3Q7Jmd0Owog
+        ICAgJmx0O2RjdGVybXM6aWRlbnRpZmllciByZGY6ZGF0YXR5cGU9JnF1b3Q7
+        aHR0cDovL25kbC5nby5qcC9kY25kbC90ZXJtcy9JU0JOJnF1b3Q7Jmd0OzA3
+        NDQ1MjE4MTUmbHQ7L2RjdGVybXM6aWRlbnRpZmllciZndDsKICAgICZsdDty
+        ZGZzOnNlZUFsc28gcmRmOnJlc291cmNlPSZxdW90O2h0dHA6Ly9pc3MubmRs
+        LmdvLmpwL2lzYm4vMDc0NDUyMTgxNSZxdW90Oy8mZ3Q7CiAgICAmbHQ7cmRm
+        czpzZWVBbHNvIHJkZjpyZXNvdXJjZT0mcXVvdDtodHRwOi8vbGNjbi5sb2Mu
+        Z292Lzk0MDQxNzg5JnF1b3Q7LyZndDsKICAgICZsdDtkY3Rlcm1zOnRpdGxl
+        Jmd0O1RoZSBsaXR0bGUgYm9hdCAvIHdyaXR0ZW4gYnkgS2F0aHkgSGVuZGVy
+        c29uIDsgaWxsdXN0cmF0ZWQgYnkgUGF0cmljayBCZW5zb24mbHQ7L2RjdGVy
+        bXM6dGl0bGUmZ3Q7CiAgICAmbHQ7ZGM6dGl0bGUmZ3Q7CiAgICAgICZsdDty
+        ZGY6RGVzY3JpcHRpb24mZ3Q7CiAgICAgICAgJmx0O3JkZjp2YWx1ZSZndDtU
+        aGUgbGl0dGxlIGJvYXQgLyB3cml0dGVuIGJ5IEthdGh5IEhlbmRlcnNvbiA7
+        IGlsbHVzdHJhdGVkIGJ5IFBhdHJpY2sgQmVuc29uJmx0Oy9yZGY6dmFsdWUm
+        Z3Q7CiAgICAgICZsdDsvcmRmOkRlc2NyaXB0aW9uJmd0OwogICAgJmx0Oy9k
+        Yzp0aXRsZSZndDsKICAgICZsdDtkY3Rlcm1zOmNyZWF0b3ImZ3Q7CiAgICAg
+        ICZsdDtmb2FmOkFnZW50IHJkZjphYm91dD0mcXVvdDtodHRwOi8vaWQubmRs
+        LmdvLmpwL2F1dGgvZW50aXR5LzAwNDYzMTE0JnF1b3Q7Jmd0OwogICAgICAg
+        ICZsdDtmb2FmOm5hbWUmZ3Q7QmVuc29uLCBQYXRyaWNrLCAxOTU2LSZsdDsv
+        Zm9hZjpuYW1lJmd0OwogICAgICAmbHQ7L2ZvYWY6QWdlbnQmZ3Q7CiAgICAm
+        bHQ7L2RjdGVybXM6Y3JlYXRvciZndDsKICAgICZsdDtkY3Rlcm1zOmNyZWF0
+        b3ImZ3Q7CiAgICAgICZsdDtmb2FmOkFnZW50Jmd0OwogICAgICAgICZsdDtm
+        b2FmOm5hbWUmZ3Q7SGVuZGVyc29uLCBLYXRoeSwgMTk0OS0mbHQ7L2ZvYWY6
+        bmFtZSZndDsKICAgICAgJmx0Oy9mb2FmOkFnZW50Jmd0OwogICAgJmx0Oy9k
+        Y3Rlcm1zOmNyZWF0b3ImZ3Q7CiAgICAmbHQ7ZGN0ZXJtczpwdWJsaXNoZXIm
+        Z3Q7CiAgICAgICZsdDtmb2FmOkFnZW50Jmd0OwogICAgICAgICZsdDtmb2Fm
+        Om5hbWUmZ3Q7V2Fsa2VyIEJvb2tzJmx0Oy9mb2FmOm5hbWUmZ3Q7CiAgICAg
+        ICAgJmx0O2RjbmRsOmxvY2F0aW9uJmd0O0xvbmRvbiZsdDsvZGNuZGw6bG9j
+        YXRpb24mZ3Q7CiAgICAgICZsdDsvZm9hZjpBZ2VudCZndDsKICAgICZsdDsv
+        ZGN0ZXJtczpwdWJsaXNoZXImZ3Q7CiAgICAmbHQ7ZGNuZGw6cHVibGljYXRp
+        b25QbGFjZSByZGY6ZGF0YXR5cGU9JnF1b3Q7aHR0cDovL3B1cmwub3JnL2Rj
+        L3Rlcm1zL0lTTzMxNjYmcXVvdDsmZ3Q7R0ImbHQ7L2RjbmRsOnB1YmxpY2F0
+        aW9uUGxhY2UmZ3Q7CiAgICAmbHQ7ZGN0ZXJtczpkYXRlJmd0OzE5OTUmbHQ7
+        L2RjdGVybXM6ZGF0ZSZndDsKICAgICZsdDtkY3Rlcm1zOmlzc3VlZCByZGY6
+        ZGF0YXR5cGU9JnF1b3Q7aHR0cDovL3B1cmwub3JnL2RjL3Rlcm1zL1czQ0RU
+        RiZxdW90OyZndDsxOTk1Jmx0Oy9kY3Rlcm1zOmlzc3VlZCZndDsKICAgICZs
+        dDtkY3Rlcm1zOnN1YmplY3QmZ3Q7CiAgICAgICZsdDtyZGY6RGVzY3JpcHRp
+        b24mZ3Q7CiAgICAgICAgJmx0O3JkZjp2YWx1ZSZndDtTYWlsYm9hdHMgLS0g
+        RmljdGlvbiZsdDsvcmRmOnZhbHVlJmd0OwogICAgICAmbHQ7L3JkZjpEZXNj
+        cmlwdGlvbiZndDsKICAgICZsdDsvZGN0ZXJtczpzdWJqZWN0Jmd0OwogICAg
+        Jmx0O2RjdGVybXM6c3ViamVjdCZndDsKICAgICAgJmx0O3JkZjpEZXNjcmlw
+        dGlvbiZndDsKICAgICAgICAmbHQ7cmRmOnZhbHVlJmd0O1NlYXNob3JlIC0t
+        IEZpY3Rpb24mbHQ7L3JkZjp2YWx1ZSZndDsKICAgICAgJmx0Oy9yZGY6RGVz
+        Y3JpcHRpb24mZ3Q7CiAgICAmbHQ7L2RjdGVybXM6c3ViamVjdCZndDsKICAg
+        ICZsdDtkY3Rlcm1zOnN1YmplY3QmZ3Q7CiAgICAgICZsdDtyZGY6RGVzY3Jp
+        cHRpb24mZ3Q7CiAgICAgICAgJmx0O3JkZjp2YWx1ZSZndDtPY2VhbiAtLSBG
+        aWN0aW9uJmx0Oy9yZGY6dmFsdWUmZ3Q7CiAgICAgICZsdDsvcmRmOkRlc2Ny
+        aXB0aW9uJmd0OwogICAgJmx0Oy9kY3Rlcm1zOnN1YmplY3QmZ3Q7CiAgICAm
+        bHQ7ZGN0ZXJtczpzdWJqZWN0IHJkZjpyZXNvdXJjZT0mcXVvdDtodHRwOi8v
+        aWQubmRsLmdvLmpwL2NsYXNzL25kbGMvWTE3JnF1b3Q7LyZndDsKICAgICZs
+        dDtkY3Rlcm1zOnN1YmplY3QgcmRmOnJlc291cmNlPSZxdW90O2h0dHA6Ly9k
+        ZXdleS5pbmZvL2NsYXNzL1tFXS9hYm91dCZxdW90Oy8mZ3Q7CiAgICAmbHQ7
+        ZGM6c3ViamVjdCByZGY6ZGF0YXR5cGU9JnF1b3Q7aHR0cDovL3B1cmwub3Jn
+        L2RjL3Rlcm1zL0xDQyZxdW90OyZndDtQWjcuSDgzMDUmbHQ7L2RjOnN1Ympl
+        Y3QmZ3Q7CiAgICAmbHQ7ZGN0ZXJtczpsYW5ndWFnZSByZGY6ZGF0YXR5cGU9
+        JnF1b3Q7aHR0cDovL3B1cmwub3JnL2RjL3Rlcm1zL0lTTzYzOS0yJnF1b3Q7
+        Jmd0O2VuZyZsdDsvZGN0ZXJtczpsYW5ndWFnZSZndDsKICAgICZsdDtkY3Rl
+        cm1zOmFic3RyYWN0Jmd0O0EgbGl0dGxlIGJveSBwbGF5aW5nIGF0IHRoZSBz
+        ZWFzaG9yZSBtYWtlcyBhIHRveSBzYWlsYm9hdCB0aGF0IGlzIHN3ZXB0IG91
+        dCB0byBzZWEsIGFuZCwgYWZ0ZXIgYnJhdmluZyBzdG9ybXMsIGh1bmdyeSBm
+        aXNoLCBhbmQgYmlnZ2VyIGJvYXRzLCBpcyBmaW5hbGx5IGZvdW5kIGJ5IGEg
+        bGl0dGxlIGdpcmwgYXQgdGhlIG9wcG9zaXRlIHNob3JlJmx0Oy9kY3Rlcm1z
+        OmFic3RyYWN0Jmd0OwogICAgJmx0O2RjdGVybXM6ZXh0ZW50Jmd0OzEgdi4g
+        KHVucGFnZWQpIDogY29sLiBpbGwuIDsgMjUgeCAyOSBjbSZsdDsvZGN0ZXJt
+        czpleHRlbnQmZ3Q7CiAgICAmbHQ7ZGNuZGw6bWF0ZXJpYWxUeXBlIHJkZnM6
+        bGFiZWw9JnF1b3Q75Zuz5pu4JnF1b3Q7IHJkZjpyZXNvdXJjZT0mcXVvdDto
+        dHRwOi8vbmRsLmdvLmpwL25kbHR5cGUvQm9vayZxdW90Oy8mZ3Q7CiAgICAm
+        bHQ7ZGN0ZXJtczphY2Nlc3NSaWdodHMmZ3Q7UzAxUDk5VTk5Jmx0Oy9kY3Rl
+        cm1zOmFjY2Vzc1JpZ2h0cyZndDsKICAmbHQ7L2RjbmRsOkJpYlJlc291cmNl
+        Jmd0OwombHQ7L3JkZjpSREYmZ3Q7CiAgICAgIDwvcmVjb3JkRGF0YT4KICAg
+        ICAgPHJlY29yZFBvc2l0aW9uPjE8L3JlY29yZFBvc2l0aW9uPgogICAgPC9y
+        ZWNvcmQ+CiAgPC9yZWNvcmRzPgo8L3NlYXJjaFJldHJpZXZlUmVzcG9uc2U+
+        Cg==
+    http_version: 
+  recorded_at: Sat, 01 Oct 2016 05:52:31 GMT
+recorded_with: VCR 3.0.3

data/spec/controllers/ndl_books_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe NdlBooksController do
   fixtures :all

data/spec/dummy/app/models/user.rb

@@ -5,3 +5,5 @@ class User < ActiveRecord::Base
 
   include EnjuSeed::EnjuUser
 end
+
+Manifestation.include(EnjuSubject::EnjuManifestation)

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,9 +1,9 @@
 class CreateLibraries < ActiveRecord::Migration
   def change
     create_table :libraries do |t|
-      t.string :name, :null => false
+      t.string :name, index: true, null: false
       t.text :display_name
-      t.string :short_display_name, :null => false
+      t.string :short_display_name, null: false
       t.string :zip_code
       t.text :street
       t.text :locality
@@ -12,17 +12,15 @@ class CreateLibraries < ActiveRecord::Migration
       t.string :telephone_number_2
       t.string :fax_number
       t.text :note
-      t.integer :call_number_rows, :default => 1, :null => false
-      t.string :call_number_delimiter, :default => "|", :null => false
-      t.integer :library_group_id, :default => 1, :null => false
-      t.integer :users_count, :default => 0, :null => false
+      t.integer :call_number_rows, default: 1, null: false
+      t.string :call_number_delimiter, default: "|", null: false
+      t.references :library_group, index: true, null: false
+      t.integer :users_count, default: 0, null: false
       t.integer :position
-      t.integer :country_id
+      t.references :country
 
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :libraries, :library_group_id
-    add_index :libraries, :name, :unique => true
   end
 end

data/spec/dummy/db/migrate/069_create_shelves.rb

@@ -1,15 +1,14 @@
 class CreateShelves < ActiveRecord::Migration
   def change
     create_table :shelves do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
-      t.integer :library_id, :default => 1, :null => false
-      t.integer :items_count, :default => 0, :null => false
+      t.references :library, index: true, null: false
+      t.integer :items_count, default: 0, null: false
       t.integer :position
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :shelves, :library_id
   end
 end

data/spec/dummy/db/migrate/080_create_library_groups.rb

@@ -1,9 +1,9 @@
 class CreateLibraryGroups < ActiveRecord::Migration
   def change
     create_table :library_groups do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
-      t.string :short_name, :null => false
+      t.string :short_name, index: true, null: false
       t.text :my_networks
       t.text :login_banner
       t.text :note
@@ -12,6 +12,5 @@ class CreateLibraryGroups < ActiveRecord::Migration
 
       t.timestamps
     end
-    add_index :library_groups, :short_name
   end
 end

data/spec/dummy/db/migrate/120_create_baskets.rb

@@ -1,12 +1,11 @@
 class CreateBaskets < ActiveRecord::Migration
   def change
     create_table :baskets do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.text :note
-      t.integer :lock_version, :default => 0, :null => false
+      t.integer :lock_version, default: 0, null: false
 
       t.timestamps
     end
-    add_index :baskets, :user_id
   end
 end

data/spec/dummy/db/migrate/20081006090811_create_subscriptions.rb

@@ -1,17 +1,14 @@
 class CreateSubscriptions < ActiveRecord::Migration
   def change
     create_table :subscriptions do |t|
-      t.text :title, :null => false
+      t.text :title, null: false
       t.text :note
-      #t.integer :subscription_list_id, :integer
-      t.integer :user_id
-      t.integer :order_list_id
+      t.references :user, index: true
+      t.references :order_list, index: true
       t.datetime :deleted_at
-      t.integer :subscribes_count, :default => 0, :null => false
+      t.integer :subscribes_count, default: 0, null: false
 
       t.timestamps
     end
-    add_index :subscriptions, :user_id
-    add_index :subscriptions, :order_list_id
   end
 end

data/spec/dummy/db/migrate/20081006093246_create_subscribes.rb

@@ -1,14 +1,13 @@
 class CreateSubscribes < ActiveRecord::Migration
   def change
     create_table :subscribes do |t|
-      t.integer :subscription_id, :null => false
-      t.integer :work_id, :null => false
-      t.datetime :start_at, :null => false
-      t.datetime :end_at, :null => false
+      t.references :subscription, index: true, null: false
+      t.integer :work_id, null: false
+      t.datetime :start_at, null: false
+      t.datetime :end_at, null: false
 
       t.timestamps
     end
-    add_index :subscribes, :subscription_id
     add_index :subscribes, :work_id
   end
 end

data/spec/dummy/db/migrate/20120319173203_create_accepts.rb

@@ -1,14 +1,11 @@
 class CreateAccepts < ActiveRecord::Migration
   def change
     create_table :accepts do |t|
-      t.integer :basket_id
-      t.integer :item_id
-      t.integer :librarian_id
+      t.references :basket, index: true
+      t.references :item, index: true
+      t.references :librarian, index: true
 
       t.timestamps
     end
-
-    add_index :accepts, :basket_id
-    add_index :accepts, :item_id
   end
 end

data/spec/dummy/db/migrate/20140110122216_create_user_import_files.rb

@@ -1,7 +1,7 @@
 class CreateUserImportFiles < ActiveRecord::Migration
   def change
     create_table :user_import_files do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.text :note
       t.datetime :executed_at
       t.string :user_import_file_name

data/spec/dummy/db/migrate/20140110131010_create_user_import_results.rb

@@ -1,8 +1,8 @@
 class CreateUserImportResults < ActiveRecord::Migration
   def change
     create_table :user_import_results do |t|
-      t.integer :user_import_file_id
-      t.integer :user_id
+      t.references :user_import_file, index: true
+      t.references :user, index: true
       t.text :body
 
       t.timestamps

data/spec/dummy/db/migrate/20140524074813_create_user_import_file_transitions.rb

@@ -8,11 +8,10 @@ class CreateUserImportFileTransitions < ActiveRecord::Migration
         t.text :metadata, default: "{}"
       end
       t.integer :sort_key
-      t.integer :user_import_file_id
+      t.references :user_import_file, index: true
       t.timestamps
     end
 
-    add_index :user_import_file_transitions, :user_import_file_id
     add_index :user_import_file_transitions, [:sort_key, :user_import_file_id], unique: true, name: "index_user_import_file_transitions_on_sort_key_and_file_id"
   end
 end

data/spec/dummy/db/migrate/20140709113413_create_user_export_files.rb

@@ -1,7 +1,7 @@
 class CreateUserExportFiles < ActiveRecord::Migration
   def change
     create_table :user_export_files do |t|
-      t.integer :user_id
+      t.references :user, index: true
       t.attachment :user_export
       t.datetime :executed_at
 

data/spec/dummy/db/migrate/20140709113905_create_user_export_file_transitions.rb

@@ -8,7 +8,7 @@ class CreateUserExportFileTransitions < ActiveRecord::Migration
         t.text :metadata, default: "{}"
       end
       t.integer :sort_key
-      t.integer :user_export_file_id
+      t.references :user_export_file, index: true
       t.timestamps
     end
 

data/spec/dummy/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb

@@ -1,5 +1,5 @@
 class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration
   def change
-    add_column :user_import_files, :default_library_id, :integer
+    add_reference :user_import_files, :default_library
   end
 end

data/spec/dummy/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb

@@ -1,5 +1,5 @@
 class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration
   def change
-    add_column :user_import_files, :default_user_group_id, :integer
+    add_reference :user_import_files, :default_user_group
   end
 end

data/spec/dummy/db/migrate/20140821151023_create_colors.rb

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

data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb

@@ -1,13 +1,11 @@
 class CreateWithdraws < ActiveRecord::Migration
   def change
     create_table :withdraws do |t|
-      t.integer :basket_id
-      t.integer :item_id
-      t.integer :librarian_id
+      t.references :basket, index: true
+      t.references :item, index: true
+      t.references :librarian, index: true
 
       t.timestamps null: false
     end
-    add_index :withdraws, :basket_id
-    add_index :withdraws, :item_id
   end
 end

data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb

@@ -1,13 +1,26 @@
+# This migration comes from enju_library_engine (originally 20151213070943)
 class AddTranslationTableToLibraryGroup < ActiveRecord::Migration
   def up
-    LibraryGroup.create_translation_table!({
-      login_banner: :text
-    }, {
-      migrate_data: true
-    })
+    if defined?(Globalize)
+      LibraryGroup.create_translation_table!({
+        login_banner: :text
+      }, {
+        migrate_data: true
+      })
+    end
+
+    if defined?(AwesomeHstoreTranslate)
+      add_column :library_groups, :login_banner, :hstore
+    end
   end
 
   def down
-    LibraryGroup.drop_translation_table! migrate_data: true
+    if defined?(Globalize)
+      LibraryGroup.drop_translation_table! migrate_data: true
+    end
+
+    if defined?(AwesomeHstoreTranslate)
+      remove_column :library_groups, :login_banner
+    end
   end
 end

data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb

@@ -1,9 +1,22 @@
+# This migration comes from enju_library_engine (originally 20151213072705)
 class AddFooterBannerToLibraryGroup < ActiveRecord::Migration
   def up
-    LibraryGroup.add_translation_fields! footer_banner: :text
+    if defined?(Globalize)
+      LibraryGroup.add_translation_fields! footer_banner: :text
+    end
+
+    if defined?(AwesomeHstoreTranslate)
+      add_column :library_groups, :footer_banner, :hstore
+    end
   end
 
   def down
-    remove_column :library_group_translations, :footer_banner
+    if defined?(Globalize)
+      remove_column :library_group_translations, :footer_banner
+    end
+
+    if defined?(AwesomeHstoreTranslate)
+      remove_column :library_groups, :footer_banner
+    end
   end
 end

data/spec/dummy/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToMessageTransitions < ActiveRecord::Migration
+  def up
+    add_column :message_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :message_transitions, :most_recent
+  end
+end

data/spec/dummy/db/migrate/20160813191647_add_max_number_of_results_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddMaxNumberOfResultsToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :max_number_of_results, :integer, default: 500
+  end
+end

data/spec/dummy/db/migrate/20160813191733_add_family_name_first_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddFamilyNameFirstToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :family_name_first, :boolean, default: true
+  end
+end

data/spec/dummy/db/migrate/20160813192542_add_pub_year_facet_range_interval_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddPubYearFacetRangeIntervalToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :pub_year_facet_range_interval, :integer, default: 10
+  end
+end

data/spec/dummy/db/migrate/20160813203039_add_user_id_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddUserIdToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_reference :library_groups, :user, index: true, foreign_key: true
+  end
+end

data/spec/dummy/db/migrate/20160814165332_add_most_recent_to_message_request_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToMessageRequestTransitions < ActiveRecord::Migration
+  def up
+    add_column :message_request_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :message_request_transitions, :most_recent
+  end
+end