lib/rails/crud/tools/crud_data.rb in rails-crud-tools-0.6.9 vs lib/rails/crud/tools/crud_data.rb in rails-crud-tools-0.6.10

@@ -20,11 +20,11 @@
           @crud_cols = {}
           @last_loaded_time = nil
         end
 
         def load_crud_data
-          config = CrudConfig.instance
+          config = CrudConfig.instance.config
           return unless config.enabled
 
           unless File.exist?(config.crud_file_path)
             CrudLogger.logger.warn "CRUD file not found: #{config.crud_file_path}"
             return false
@@ -62,11 +62,11 @@
           end
         end
 
         # CRUDデータが更新された場合に再読み込みする
         def reload_if_needed
-          config = CrudConfig.instance
+          config = CrudConfig.instance.config
           return unless config.enabled
 
           return unless @last_loaded_time.nil? || File.mtime(config.crud_file_path) > @last_loaded_time
 
           last_modified_by = get_last_modified_by(config.crud_file_path)
@@ -83,21 +83,21 @@
 
           Zip::File.open(file_path) do |zipfile|
             doc_props = zipfile.find_entry("docProps/core.xml")
             if doc_props
               content = doc_props.get_input_stream.read
-              last_modified_by = content[%r{<cp:lastModifiedBy>(.*?)<\\\\/cp:lastModifiedBy>}, 1]
+              last_modified_by = content[%r{<cp:lastModifiedBy>(.*?)</cp:lastModifiedBy>}, 1]
             else
               CrudLogger.logger.warn "docProps/core.xml が見つかりませんでした。"
             end
           end
 
           last_modified_by
         end
 
         # CRUDシートを取得する
         def crud_sheet
-          sheet_name = CrudConfig.instance.sheet_name
+          sheet_name = CrudConfig.instance.config.crud_file.sheet_name
           sheet = @workbook[sheet_name]
           raise "CRUD sheet '#{sheet_name}' not found" if sheet.nil?
 
           sheet
         end