enju_event 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86085078847539c062412610f95d4c641547b0d50a79e647f890b184f1493295
-  data.tar.gz: bfb76bb84ae941ac9edd410def82a3f73da7e94df75ae693019d71b9f6e0c925
+  metadata.gz: 27b0c9dc4dc6da8c3186d98a1f4c6c99b9f95e4305f8c96b50297a5e692e3d86
+  data.tar.gz: c5298009340080f52bce7d1f9a698cf10b5772071b8ca4348b9129c348127a1b
 SHA512:
-  metadata.gz: 682305a24cc0e7a5b6a598c1b60a9698823ccf7ce6c84e0fd9e3652acaf1c3de0366d9f189ecc72d9f68f4db792441899caeb5c178977646ea307cb3f9c10415
-  data.tar.gz: 666a769639a846b11a92d295a7e8aefb7fe21239a8f17d6bcffb63d5ee6274a90a65a1b92cdf2e3de35167925bb36e77e22df805a32d27f3b4557eaede220c42
+  metadata.gz: 63640ab077e20f166c74c854980d1e7763d9c985a725a2d5e1cedf10030808e14d4ce7c36d19f34224cae9e4e84e556f06c89eedd8637ad5f812a2592dc4c00f
+  data.tar.gz: f171242671fd67136c9a5e1fe83fb36cfc0a03a40c8b704ad45f4de63145f5ea84e1406087b230c4799d86038f42879cd723e7cc5ddcc40d1980bf31e73620da

data/app/controllers/event_import_results_controller.rb

@@ -5,9 +5,9 @@ class EventImportResultsController < ApplicationController
   # GET /event_import_results
   # GET /event_import_results.json
   def index
-    @event_import_file = EventImportFile.where(id: params[:event_import_file_id]).first
+    @event_import_file = EventImportFile.find_by(id: params[:event_import_file_id])
     if @event_import_file
-      @event_import_results = @event_import_file.event_import_results.order(created_at: :desc).page(params[:page])
+      @event_import_results = @event_import_file.event_import_results.order(created_at: :asc).page(params[:page])
     else
       @event_import_results = EventImportResult.order(created_at: :desc).page(params[:page])
     end
@@ -15,7 +15,7 @@ class EventImportResultsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @event_import_results }
-      format.txt
+      format.text
     end
   end
 

data/app/controllers/events_controller.rb

@@ -52,7 +52,7 @@ class EventsController < ApplicationController
       format.html.phone
       format.json
       format.rss  { render layout: false }
-      format.txt
+      format.text
       format.atom
       format.ics
     end

data/app/controllers/places_controller.rb

@@ -50,7 +50,7 @@ class PlacesController < ApplicationController
     # Use callbacks to share common setup or constraints between actions.
   def set_place
     @place = Place.find(params[:id])
-    autorize @place
+    authorize @place
   end
 
   def check_policy

data/app/models/event_import_file.rb

@@ -51,9 +51,7 @@ class EventImportFile < ApplicationRecord
     rows.each do |row|
       row_num += 1
       next if row['dummy'].to_s.strip.present?
-      event_import_result = EventImportResult.new
-      event_import_result.assign_attributes({ event_import_file_id: id, body: row.fields.join("\t") })
-      event_import_result.save!
+      event_import_result = EventImportResult.new(event_import_file_id: id, body: row.fields.join("\t"))
 
       event = Event.new
       event.name = row['name'].to_s.strip
@@ -67,10 +65,10 @@ class EventImportFile < ApplicationRecord
       else
         event.all_day = false
       end
-      library = Library.where(name: row['library']).first
+      library = Library.find_by(name: row['library'])
       library = default_library || Library.web if library.blank?
       event.library = library
-      event_category = EventCategory.where(name: row['event_category']).first
+      event_category = EventCategory.find_by(name: row['event_category'])
       event_category = default_event_category if event_category.blank?
       event.event_category = event_category
 
@@ -113,7 +111,7 @@ class EventImportFile < ApplicationRecord
       event = Event.find(row['id'].to_s.strip)
       event_category = EventCategory.where(name: row['event_category'].to_s.strip).first
       event.event_category = event_category if event_category
-      library = Library.where(name: row['library'].to_s.strip).first
+      library = Library.find_by(name: row['library'].to_s.strip)
       event.library = library if library
       event.name = row['name'] if row['name'].to_s.strip.present?
       event.start_at = Time.zone.parse(row['start_at']) if row['start_at'].present?
@@ -183,9 +181,7 @@ class EventImportFile < ApplicationRecord
 
   def open_import_file(tempfile)
     file = CSV.open(tempfile, col_sep: "\t")
-    header_columns = %w(
-      id name display_name library event_category start_at end_at all_day note dummy
-    )
+    header_columns = EventImportResult.header
     header = file.first
     ignored_columns = header - header_columns
     unless ignored_columns.empty?

data/app/models/event_import_result.rb

@@ -6,6 +6,12 @@ class EventImportResult < ApplicationRecord
   belongs_to :event, optional: true
 
   validates :event_import_file_id, presence: true
+
+  def self.header
+    %w(
+      id name display_name library event_category start_at end_at all_day note dummy
+    )
+  end
 end
 
 # == Schema Information

data/app/views/event_categories/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/app/views/event_import_results/index.text.ruby

@@ -0,0 +1,5 @@
+CSV.generate(col_sep: "\t", row_sep: "\r\n") do |csv|
+  @event_import_results.each do |result|
+    csv << result.body.split("\t")
+  end
+end

data/config/brakeman.ignore

@@ -0,0 +1,66 @@
+{
+  "ignored_warnings": [
+    {
+      "warning_type": "File Access",
+      "warning_code": 16,
+      "fingerprint": "0cc99b4df61bb345104e86e3061a1d3e8f23a8385c02a3f65a31701d5dd6e6a6",
+      "check_name": "SendFile",
+      "message": "Model attribute used in file name",
+      "file": "app/controllers/event_import_files_controller.rb",
+      "line": 34,
+      "link": "https://brakemanscanner.org/docs/warning_types/file_access/",
+      "code": "send_file(EventImportFile.find(params[:id]).event_import.path, :filename => EventImportFile.find(params[:id]).event_import_file_name, :type => \"application/octet-stream\")",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "EventImportFilesController",
+        "method": "show"
+      },
+      "user_input": "EventImportFile.find(params[:id]).event_import.path",
+      "confidence": "Medium",
+      "note": ""
+    },
+    {
+      "warning_type": "File Access",
+      "warning_code": 16,
+      "fingerprint": "43e943cb9bc901967fc76b8120d84c754d5872e0a955b507ef00d8f613342c86",
+      "check_name": "SendFile",
+      "message": "Model attribute used in file name",
+      "file": "app/controllers/event_export_files_controller.rb",
+      "line": 33,
+      "link": "https://brakemanscanner.org/docs/warning_types/file_access/",
+      "code": "send_file(EventExportFile.find(params[:id]).event_export.path, :filename => EventExportFile.find(params[:id]).event_export_file_name, :type => \"application/octet-stream\")",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "EventExportFilesController",
+        "method": "show"
+      },
+      "user_input": "EventExportFile.find(params[:id]).event_export.path",
+      "confidence": "Medium",
+      "note": ""
+    },
+    {
+      "warning_type": "Redirect",
+      "warning_code": 18,
+      "fingerprint": "e304fcb4b88a6522a29c32c654cee5d0a59c5fcce2e0a9a8862768c237a8e72a",
+      "check_name": "Redirect",
+      "message": "Possible unprotected redirect",
+      "file": "app/controllers/event_import_files_controller.rb",
+      "line": 32,
+      "link": "https://brakemanscanner.org/docs/warning_types/redirect/",
+      "code": "redirect_to(EventImportFile.find(params[:id]).event_import.expiring_url(10))",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "EventImportFilesController",
+        "method": "show"
+      },
+      "user_input": "EventImportFile.find(params[:id]).event_import.expiring_url(10)",
+      "confidence": "High",
+      "note": ""
+    }
+  ],
+  "updated": "2020-04-29 03:31:48 +0900",
+  "brakeman_version": "4.8.1"
+}

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.3.4"
+  VERSION = "0.3.5".freeze
 end

data/spec/controllers/events_controller_spec.rb

@@ -55,8 +55,8 @@ describe EventsController do
         assigns(:events).should_not be_nil
       end
 
-      it "assigns all events as @events in txt format" do
-        get :index, format: 'txt'
+      it "assigns all events as @events in text format" do
+        get :index, format: :text
         assigns(:events).should_not be_nil
       end
 

data/spec/dummy/config/initializers/mime_types.rb

@@ -2,3 +2,4 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
+Mime::Type.register_alias "text/plain", :txt

data/spec/dummy/db/migrate/20200425072340_create_manifestation_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateManifestationCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :manifestation_custom_properties do |t|
+      t.string :name, null: false, comment: 'ラベル名', index: {unique: true}
+      t.text :display_name, null: false, comment: '表示名'
+      t.text :note, comment: '備考'
+      t.integer :position, default: 1, null: false
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20200425072349_create_item_custom_properties.rb

@@ -0,0 +1,12 @@
+class CreateItemCustomProperties < ActiveRecord::Migration[5.2]
+  def change
+    create_table :item_custom_properties do |t|
+      t.string :name, null: false, comment: 'ラベル名', index: {unique: true}
+      t.text :display_name, null: false, comment: '表示名'
+      t.text :note, comment: '備考'
+      t.integer :position, default: 1, null: false
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20200425074758_create_manifestation_custom_values.rb

@@ -0,0 +1,12 @@
+class CreateManifestationCustomValues < ActiveRecord::Migration[5.2]
+  def change
+    create_table :manifestation_custom_values do |t|
+      t.references :manifestation_custom_property, null: false, foreign_key: true, index: {name: 'index_manifestation_custom_values_on_custom_property_id'}
+      t.references :manifestation, null: false, foreign_key: true
+      t.text :value
+
+      t.timestamps
+    end
+    add_index :manifestation_custom_values, [:manifestation_custom_property_id, :manifestation_id], unique: true, name: 'index_manifestation_custom_values_on_property_manifestation'
+  end
+end

data/spec/dummy/db/migrate/20200425074822_create_item_custom_values.rb

@@ -0,0 +1,12 @@
+class CreateItemCustomValues < ActiveRecord::Migration[5.2]
+  def change
+    create_table :item_custom_values do |t|
+      t.references :item_custom_property, null: false, foreign_key: true, index: {name: 'index_item_custom_values_on_custom_property_id'}
+      t.references :item, null: false, foreign_key: true
+      t.text :value
+
+      t.timestamps
+    end
+    add_index :item_custom_values, [:item_custom_property_id, :item_id], unique: true, name: 'index_item_custom_values_on_custom_item_property_and_item_id'
+  end
+end