enju_oai 0.1.0.pre18 → 0.1.0.pre19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c43bc35ce6acfb814160534eb055d91f09f5b09c
-  data.tar.gz: f325d53d05dd7825b2a17a5aa2b6955c3ebee31c
+  metadata.gz: f6f952547e6fb1fd17016917dd03c4a2ccb18ca6
+  data.tar.gz: 6ff27008468b09fea1e0358866575f7980764ca7
 SHA512:
-  metadata.gz: cce3e6a8ef3c0fcb0b8d33c51660410447046f1a8663be57277e9a96c8828eace11135ea450feecebadb797d25d0ab8b39b4b15032b1a1118c41588a31561364
-  data.tar.gz: 2c9c053b5f2a8716da4dfa67723945f1210bf7a6e6875686ad72b3076c5c779ad169272f2417a2f0e2a80403aa9d912e42e626ca847b2533cd3f787cb9fd963f
+  metadata.gz: aa6f72a07db0b9e60668c673d875e26c23c396661bbcc4bbb269c1939ce7dda5f109d7dc8cfa2d6d4723792f9db65ee277593ab59ac4d1400dedac0b3f1ad6a2
+  data.tar.gz: b30081617dc9f6017d7ab4c91632200ef7f0e77b40021ca57f46ff590983c2d9226543c44ba91d521a508f9150b284c0b13ca955d7768fbd6dd5fb643ef7af7c

data/app/views/manifestations/list_identifiers.oai.builder

@@ -1,9 +1,9 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, :version => "1.0"
 xml.tag! "OAI-PMH", :xmlns => "http://www.openarchives.org/OAI/2.0/",
   "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
   "xsi:schemaLocation" => "http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd" do
   xml.responseDate Time.zone.now.utc.iso8601
-  xml.request manifestations_url(format: :oai), :verb => "ListIdentifiers", :metadataPrefix => "oai_dc"
+  xml.request manifestations_url(format: :oai), request_attr(@from_time, @until_time, @oai[:metadataPrefix])
   @oai[:errors].each do |error|
     xml.error :code => error
   end
@@ -20,9 +20,12 @@ xml.tag! "OAI-PMH", :xmlns => "http://www.openarchives.org/OAI/2.0/",
       end
     end
     if @resumption.present?
-      if @resumption[:cursor].to_i + @manifestations.limit_value < @manifestations.total_count
-        xml.resumptionToken @resumption[:token], completeListSize: @manifestations.total_count, cursor: @resumption[:cursor], expirationDate: @resumption[:expired_at]
+      if @resumption[:cursor].to_i + @manifestations.limit_value <= @count[:query_result]
+        token = @resumption[:token]
+      else
+        token = nil
       end
+      xml.resumptionToken token, completeListSize: @count[:query_result], cursor: @cursor.to_i
     end
   end
 end

data/app/views/manifestations/list_records.oai.builder

@@ -1,18 +1,9 @@
-def request_attr(prefix = 'oai_dc')
-  from_time = @from_time.utc.iso8601 if @from_time
-  until_time = @until_time.utc.iso8601 if @until_time
-  attribute = {:metadataPrefix => prefix, :verb => 'ListRecords'}
-  attribute.merge(:from => from_time) if from_time
-  attribute.merge(:until => until_time) if until_time
-  attribute
-end
-
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, :version => "1.0"
 xml.tag! "OAI-PMH", :xmlns => "http://www.openarchives.org/OAI/2.0/",
   "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
   "xsi:schemaLocation" => "http://www.openarchives.org/OAI/2.0/ http://www.openarchives.org/OAI/2.0/OAI-PMH.xsd" do
   xml.responseDate Time.zone.now.utc.iso8601
-  xml.request manifestations_url(format: :oai), request_attr(@oai[:metadataPrefix])
+  xml.request manifestations_url(format: :oai), request_attr(@from_time, @until_time, @oai[:metadataPrefix])
   @oai[:errors].each do |error|
     xml.error code: error
   end
@@ -36,9 +27,12 @@ xml.tag! "OAI-PMH", :xmlns => "http://www.openarchives.org/OAI/2.0/",
       end
     end
     if @resumption.present?
-      if @resumption[:cursor].to_i + @manifestations.limit_value < @manifestations.total_count
-        xml.resumptionToken @resumption[:token], completeListSize: @manifestations.total_count, cursor: @resumption[:cursor], expirationDate: @resumption[:expired_at]
+      if @resumption[:cursor].to_i + @manifestations.limit_value <= @count[:query_result]
+        token = @resumption[:token]
+      else
+        token = nil
       end
+      xml.resumptionToken token, completeListSize: @count[:query_result], cursor: @cursor.to_i
     end
   end
 end

data/lib/enju_oai/oai_controller.rb

@@ -1,43 +1,11 @@
 module EnjuOai
   module OaiController
     def self.included(base)
-      base.send :include, InstanceMethods
+      base.send :include, ClassMethods
+      base.helper_method :request_attr
     end
   
-    module InstanceMethods
-      def render_oai(oai, params)
-        if params[:format] == 'oai'
-          oai_search = true
-          from_and_until_times = set_from_and_until(Manifestation, params[:from], params[:until])
-          from_time = @from_time = from_and_until_times[:from]
-          until_time = @until_time = from_and_until_times[:until]
-          # OAI-PMHのデフォルトの件数
-          per_page = 200
-          if params[:resumptionToken]
-            current_token = get_resumption_token(params[:resumptionToken])
-            if current_token
-              page = (current_token[:cursor].to_i + per_page).div(per_page) + 1
-            else
-              @oai[:errors] << 'badResumptionToken'
-            end
-          end
-          page ||= 1
-
-          if params[:verb] == 'GetRecord' and params[:identifier]
-            begin
-              @manifestation = Manifestation.find_by_oai_identifier(params[:identifier])
-            rescue ActiveRecord::RecordNotFound
-              @oai[:errors] << "idDoesNotExist"
-              render :formats => :oai, :layout => false
-              return
-            end
-            render :template => 'manifestations/show', :formats => :oai, :layout => false
-            return
-          end
-        end
-      end
-
-      private
+    module ClassMethods
       def check_oai_params(params)
         oai = {}
         if params[:format] == 'oai'
@@ -86,57 +54,50 @@ module EnjuOai
           true
         end
       end
-    end
-  
-    def get_resumption_token(token)
-      if token.present?
-        resumption = Rails.cache.read(token)
+
+      def request_attr(from_time, until_time, prefix = 'oai_dc')
+        attribute = {metadataPrefix: prefix, verb: 'ListRecords'}
+        attribute.merge(from: from_time.utc.iso8601) if from_time
+        attribute.merge(:until => until_time.utc.iso8601) if until_time
+        attribute
       end
-    rescue
-      nil
-    end
-  
-    def set_resumption_token(token, from_time, until_time, per_page = 10)
-      return nil unless Rails.env.to_s == 'production'
-      if token.present?
-        latest_resumption = Rails.cache.read(token)
-        if latest_resumption
-          cursor = latest_resumption[:cursor] + per_page
+
+      def set_resumption_token(token, from_time, until_time, per_page = 200)
+        if token
+          cursor = token.split(',').reverse.first.to_i + per_page
+        else
+          cursor = per_page
         end
+        {
+          token: "f(#{from_time.utc.iso8601.to_s}),u(#{until_time.utc.iso8601.to_s}),#{cursor}",
+          cursor: cursor
+        }
       end
-      cursor ||= 0
-      resumption = {
-        :token => "f(#{from_time.utc.iso8601.to_s}).u(#{until_time.utc.iso8601.to_s}):#{cursor}",
-        :cursor => cursor,
-        # memcachedの使用が前提
-        :expired_at => ENV['ENJU_OAI_TTL'].to_i.seconds.from_now.utc.iso8601
-      }
-      Rails.cache.fetch(resumption[:token]){resumption}
-    end
-  
-    def set_from_and_until(klass, from_t, until_t)
-      if klass.first and klass.last
-        from_t ||= klass.last.updated_at.to_s
-        until_t ||= klass.first.updated_at.to_s
-      else
-        from_t ||= Time.zone.now.to_s
-        until_t ||= Time.zone.now.to_s
-      end
-  
-      times = {}
-      if /^[12]\d{3}-(0?[1-9]|1[0-2])-(0?[1-9]|[12]\d|3[01])$/ =~ from_t
-        times[:from] = Time.zone.parse(from_t).beginning_of_day
-      else
-        times[:from] = Time.zone.parse(from_t)
-      end
-      if /^[12]\d{3}-(0?[1-9]|1[0-2])-(0?[1-9]|[12]\d|3[01])$/ =~ until_t
-        times[:until] = Time.zone.parse(until_t).beginning_of_day
-      else
-        times[:until] = Time.zone.parse(until_t)
+
+      def set_from_and_until(klass, from_t, until_t)
+        if klass.first and klass.last
+          from_t ||= klass.order(:updated_at).first.updated_at.to_s
+          until_t ||= klass.order(:updated_at).last.updated_at.to_s
+        else
+          from_t ||= Time.zone.now.to_s
+          until_t ||= Time.zone.now.to_s
+        end
+
+        times = {}
+        if /^[12]\d{3}-(0?[1-9]|1[0-2])-(0?[1-9]|[12]\d|3[01])$/ =~ from_t
+          times[:from] = Time.zone.parse(from_t).beginning_of_day
+        else
+          times[:from] = Time.zone.parse(from_t)
+        end
+        if /^[12]\d{3}-(0?[1-9]|1[0-2])-(0?[1-9]|[12]\d|3[01])$/ =~ until_t
+          times[:until] = Time.zone.parse(until_t).beginning_of_day
+        else
+          times[:until] = Time.zone.parse(until_t)
+        end
+        times[:from] ||= Time.zone.parse(from_t)
+        times[:until] ||= Time.zone.parse(until_t)
+        times
       end
-      times[:from] ||= Time.zone.parse(from_t)
-      times[:until] ||= Time.zone.parse(until_t)
-      times
     end
   end
 end

data/lib/enju_oai/version.rb

@@ -1,3 +1,3 @@
 module EnjuOai
-  VERSION = "0.1.0.pre18"
+  VERSION = "0.1.0.pre19"
 end

data/lib/enju_oai.rb

@@ -4,3 +4,5 @@ require 'enju_oai/oai_controller'
 
 module EnjuOai
 end
+
+ActionController::Base.send :include, EnjuOai::OaiController

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_oai
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre18
+  version: 0.1.0.pre19
 platform: ruby
 authors:
 - Kosuke Tanabe
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre68
+        version: 0.1.0.pre69
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre68
+        version: 0.1.0.pre69
 - !ruby/object:Gem::Dependency
   name: enju_subject
   requirement: !ruby/object:Gem::Requirement