enju_event 0.2.3 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bece4e0a86efb314fecfd3d18d96cdea9c934b8
-  data.tar.gz: 848acc1f94a15a5ebb6a54ca63daea3052ddd4c8
+  metadata.gz: 879cfcd417df261925334bada42ce70a9505b6c2
+  data.tar.gz: 14d17874ea376d73dc4883db641a71b3fe3248b6
 SHA512:
-  metadata.gz: 016aed2e25ca6490c533f087180ebead3ac9051c81424a0694bc133b8728cd41386c62b002d2f4232c46da70b96b2f5152e2220b45413d544b839dad57407cca
-  data.tar.gz: 57811159dc062065ec69dd5fb12028432f7951bf3b71a4fd4260dcaf84e5700c464eff1b5bd8161febbd3fbcfc460fc523831f61cbeefd4f30960dba902759de
+  metadata.gz: cc9bee98428747c76857d06bced3724551a48bb085b5cf89a49cc232042bee4c9901ace68de80266aa4f30d8838b4db3d419c2e2bafa98620786e211491c29fc
+  data.tar.gz: e6d2de7b23cd59129e645b39451bf4efcdf176d2010728f0f1d1780c543493c7e9bdc0d748f675602bf373c1a54763fd73825f631d67dcb55af3e08c01a4731e

data/README.rdoc

@@ -1,10 +1,10 @@
 = EnjuEvent
-{<img src="https://travis-ci.org/next-l/enju_event.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_event]
-{<img src="https://coveralls.io/repos/next-l/enju_event/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_event?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_event/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_event/1.2]
+{<img src="https://travis-ci.org/next-l/enju_event.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_event]
+{<img src="https://coveralls.io/repos/next-l/enju_event/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_event?branch=1.3]
+{<img src="https://hakiri.io/github/next-l/enju_event/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_event/1.3]
 
 This project rocks and uses MIT-LICENSE.
 
 == 製作者・貢献者 (Authors and contributors)
 * {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
-* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
+* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/app/controllers/concerns/enju_event/controller.rb

@@ -1,6 +1,6 @@
 module EnjuEvent
   module Controller
-    
+
     private
 
     def get_event

data/app/controllers/event_import_results_controller.rb

@@ -51,7 +51,7 @@ class EventImportResultsController < ApplicationController
 
   def event_import_result_params
     params.require(:event_import_result).permit(
-      :event_id, :event_import_file_id, :body #, as: :admin
+      :event_id, :event_import_file_id, :body # , as: :admin
     )
   end
 end

data/app/controllers/events_controller.rb

@@ -24,7 +24,7 @@ class EventsController < ApplicationController
     search.build do
       fulltext query if query.present?
       with(:library_id).equal_to library.id if library
-      #with(:tag).equal_to tag
+      # with(:tag).equal_to tag
       if date
         with(:start_at).less_than_or_equal_to Time.zone.parse(date)
         with(:end_at).greater_than Time.zone.parse(date)
@@ -50,7 +50,7 @@ class EventsController < ApplicationController
     respond_to do |format|
       format.html # index.html.erb
       format.html.phone
-      format.json { render json: @events.to_json }
+      format.json
       format.rss  { render layout: false }
       format.txt
       format.atom
@@ -74,23 +74,23 @@ class EventsController < ApplicationController
   # GET /events/new.json
   def new
      prepare_options
-    if params[:date]
-      begin
-        date = Time.zone.parse(params[:date])
-      rescue ArgumentError
-        date = Time.zone.now.beginning_of_day
-        flash[:notice] = t('page.invalid_date')
-      end
-    else
-      date = Time.zone.now.beginning_of_day
-    end
-    @event = Event.new(:start_at => date, :end_at => date)
-    @event.library = @library
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render json: @event }
-    end
+     if params[:date]
+       begin
+         date = Time.zone.parse(params[:date])
+       rescue ArgumentError
+         date = Time.zone.now.beginning_of_day
+         flash[:notice] = t('page.invalid_date')
+       end
+     else
+       date = Time.zone.now.beginning_of_day
+     end
+     @event = Event.new(start_at: date, end_at: date)
+     @event.library = @library
+
+     respond_to do |format|
+       format.html # new.html.erb
+       format.json { render json: @event }
+     end
   end
 
   # GET /events/1/edit

data/app/controllers/places_controller.rb

@@ -48,17 +48,17 @@ class PlacesController < ApplicationController
 
   private
     # Use callbacks to share common setup or constraints between actions.
-    def set_place
-      @place = Place.find(params[:id])
-      autorize @place
-    end
+  def set_place
+    @place = Place.find(params[:id])
+    autorize @place
+  end
 
-    def check_policy
-      authorize Place
-    end
+  def check_policy
+    authorize Place
+  end
 
     # Only allow a trusted parameter "white list" through.
-    def place_params
-      params.require(:place).permit(:term, :city, :country_id, :latitude, :longitude)
-    end
+  def place_params
+    params.require(:place).permit(:term, :city, :country_id, :latitude, :longitude)
+  end
 end

data/app/models/event.rb

@@ -3,11 +3,11 @@ class Event < ActiveRecord::Base
   scope :on, lambda {|datetime| where('start_at >= ? AND start_at < ?', datetime.beginning_of_day, datetime.tomorrow.beginning_of_day + 1)}
   scope :past, lambda {|datetime| where('end_at <= ?', Time.zone.parse(datetime).beginning_of_day)}
   scope :upcoming, lambda {|datetime| where('start_at >= ?', Time.zone.parse(datetime).beginning_of_day)}
-  scope :at, lambda {|library| where(:library_id => library.id)}
+  scope :at, lambda {|library| where(library_id: library.id)}
 
   belongs_to :event_category, validate: true
   belongs_to :library, validate: true
-  belongs_to :place
+  belongs_to :place, optional: true
   has_many :picture_files, as: :picture_attachable
   has_many :participates, dependent: :destroy
   has_many :agents, through: :participates
@@ -22,7 +22,7 @@ class Event < ActiveRecord::Base
     time :end_at
   end
 
-  validates_presence_of :name, :library, :event_category, :start_at, :end_at
+  validates :name, :library, :event_category, :start_at, :end_at, presence: true
   validates_associated :library, :event_category
   validate :check_date
   before_validation :set_date

data/app/models/event_export_file.rb

@@ -15,7 +15,7 @@ class EventExportFile < ActiveRecord::Base
     has_attached_file :event_export,
       path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
-  validates_attachment_content_type :event_export, :content_type => /\Atext\/plain\Z/
+  validates_attachment_content_type :event_export, content_type: /\Atext\/plain\Z/
   has_many :event_export_file_transitions, autosave: false
 
   def state_machine

data/app/models/event_export_file_transition.rb

@@ -1,9 +1,9 @@
 class EventExportFileTransition < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordTransition
 
-  
+
   belongs_to :event_export_file, inverse_of: :event_export_file_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
+  # attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/event_import_file.rb

@@ -27,8 +27,8 @@ class EventImportFile < ActiveRecord::Base
   ]
   validates_attachment_presence :event_import
   belongs_to :user, validate: true
-  belongs_to :default_library, class_name: 'Library'
-  belongs_to :default_event_category, class_name: 'EventCategory'
+  belongs_to :default_library, class_name: 'Library', optional: true
+  belongs_to :default_event_category, class_name: 'EventCategory', optional: true
   has_many :event_import_results
 
   has_many :event_import_file_transitions, autosave: false
@@ -75,7 +75,7 @@ class EventImportFile < ActiveRecord::Base
       event_category = default_event_category if event_category.blank?
       event.event_category = event_category
 
-      if event.save 
+      if event.save
         event_import_result.event = event
         num[:imported] += 1
         if row_num % 50 == 0

data/app/models/event_import_file_transition.rb

@@ -1,9 +1,9 @@
 class EventImportFileTransition < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordTransition
 
-  
+
   belongs_to :event_import_file, inverse_of: :event_import_file_transitions
-  #attr_accessible :to_state, :sort_key, :metadata
+  # attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/event_import_result.rb

@@ -4,9 +4,9 @@ class EventImportResult < ActiveRecord::Base
   scope :failed, -> { where(event_id: nil) }
 
   belongs_to :event_import_file
-  belongs_to :event
+  belongs_to :event, optional: true
 
-  validates_presence_of :event_import_file_id
+  validates :event_import_file_id, presence: true
 end
 
 # == Schema Information

data/app/models/participate.rb

@@ -2,8 +2,8 @@ class Participate < ActiveRecord::Base
   belongs_to :agent
   belongs_to :event
 
-  validates_presence_of :agent_id, :event_id
-  validates_uniqueness_of :agent_id, scope: :event_id
+  validates :agent_id, :event_id, presence: true
+  validates :agent_id, uniqueness: { scope: :event_id }
   acts_as_list scope: :event_id
 
   paginates_per 10

data/app/views/events/index.rss.builder

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rss('version' => "2.0",
   'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
@@ -10,12 +10,12 @@ xml.rss('version' => "2.0",
     xml.ttl "60"
     xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: :rss, only_path: true))}"
     xml.tag! "atom:link", rel: 'alternate', href: events_url
-    #xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
-    unless params[:query].blank?
+    # xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
+    if params[:query].present?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @events.offset + 1
       xml.tag! "opensearch:itemsPerPage", @events.per_page
-      #xml.tag! "opensearch:Query", :role => 'request', :searchTerms => params[:query], :startPage => (params[:page] || 1)
+      # xml.tag! "opensearch:Query", :role => 'request', :searchTerms => params[:query], :startPage => (params[:page] || 1)
     end
     @events.each do |event|
       xml.item do
@@ -24,10 +24,10 @@ xml.rss('version' => "2.0",
         # rfc822
         xml.pubDate event.created_at.rfc2822
         xml.link event_url(event)
-        xml.guid event_url(event), :isPermaLink => "true"
-        #event.tags.each do |tag|
+        xml.guid event_url(event), isPermaLink: "true"
+        # event.tags.each do |tag|
         #  xml.category tag.name
-        #end
+        # end
       end
     end
   }

data/config/routes.rb

@@ -6,6 +6,6 @@ Rails.application.routes.draw do
 
   resources :events
   resources :event_categories
-  resources :event_import_results, :only => [:index, :show, :destroy]
+  resources :event_import_results, only: [:index, :show, :destroy]
   resources :participates
 end

data/db/migrate/113_create_events.rb

@@ -1,4 +1,4 @@
-class CreateEvents < ActiveRecord::Migration
+class CreateEvents < ActiveRecord::Migration[4.2]
   def self.up
     create_table :events do |t|
       t.references :library, index: true, null: false

data/db/migrate/114_create_event_categories.rb

@@ -1,7 +1,7 @@
-class CreateEventCategories < ActiveRecord::Migration
+class CreateEventCategories < ActiveRecord::Migration[4.2]
   def self.up
     create_table :event_categories do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :display_name
       t.text :note
       t.integer :position

data/db/migrate/20081028093607_create_event_import_files.rb

@@ -1,4 +1,4 @@
-class CreateEventImportFiles < ActiveRecord::Migration
+class CreateEventImportFiles < ActiveRecord::Migration[4.2]
   def self.up
     create_table :event_import_files do |t|
       t.references :parent, index: true

data/db/migrate/20090519203307_create_participates.rb

@@ -1,4 +1,4 @@
-class CreateParticipates < ActiveRecord::Migration
+class CreateParticipates < ActiveRecord::Migration[4.2]
   def self.up
     create_table :participates do |t|
       t.references :agent, index: true, null: false

data/db/migrate/20100925074639_create_event_import_results.rb

@@ -1,4 +1,4 @@
-class CreateEventImportResults < ActiveRecord::Migration
+class CreateEventImportResults < ActiveRecord::Migration[4.2]
   def self.up
     create_table :event_import_results do |t|
       t.references :event_import_file

data/db/migrate/20120413051535_add_event_import_fingerprint_to_event_import_file.rb

@@ -1,4 +1,4 @@
-class AddEventImportFingerprintToEventImportFile < ActiveRecord::Migration
+class AddEventImportFingerprintToEventImportFile < ActiveRecord::Migration[4.2]
   def change
     add_column :event_import_files, :event_import_fingerprint, :string
   end

data/db/migrate/20120413170734_add_error_message_to_event_import_file.rb

@@ -1,4 +1,4 @@
-class AddErrorMessageToEventImportFile < ActiveRecord::Migration
+class AddErrorMessageToEventImportFile < ActiveRecord::Migration[4.2]
   def change
     add_column :event_import_files, :error_message, :text
   end

data/db/migrate/20120415060342_rename_event_import_file_imported_at_to_executed_at.rb

@@ -1,4 +1,4 @@
-class RenameEventImportFileImportedAtToExecutedAt < ActiveRecord::Migration
+class RenameEventImportFileImportedAtToExecutedAt < ActiveRecord::Migration[4.2]
   def up
     rename_column :event_import_files, :imported_at, :executed_at
   end

data/db/migrate/20140523171309_create_event_import_file_transitions.rb

@@ -1,4 +1,4 @@
-class CreateEventImportFileTransitions < ActiveRecord::Migration
+class CreateEventImportFileTransitions < ActiveRecord::Migration[4.2]
   def change
     create_table :event_import_file_transitions do |t|
       t.string :to_state

data/db/migrate/20140628071719_add_user_encoding_to_event_import_file.rb

@@ -1,4 +1,4 @@
-class AddUserEncodingToEventImportFile < ActiveRecord::Migration
+class AddUserEncodingToEventImportFile < ActiveRecord::Migration[4.2]
   def change
     add_column :event_import_files, :user_encoding, :string
   end

data/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb

@@ -1,4 +1,4 @@
-class AddDefaultLibraryIdToEventImportFile < ActiveRecord::Migration
+class AddDefaultLibraryIdToEventImportFile < ActiveRecord::Migration[4.2]
   def change
     add_reference :event_import_files, :default_library
   end

data/db/migrate/20140812152348_create_event_export_files.rb

@@ -1,4 +1,4 @@
-class CreateEventExportFiles < ActiveRecord::Migration
+class CreateEventExportFiles < ActiveRecord::Migration[4.2]
   def change
     create_table :event_export_files do |t|
       t.references :user, index: true

data/db/migrate/20140812153137_create_event_export_file_transitions.rb

@@ -1,4 +1,4 @@
-class CreateEventExportFileTransitions < ActiveRecord::Migration
+class CreateEventExportFileTransitions < ActiveRecord::Migration[4.2]
   def change
     create_table :event_export_file_transitions do |t|
       t.string :to_state

data/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb

@@ -1,4 +1,4 @@
-class AddDefaultEventCategoryIdToEventImportFile < ActiveRecord::Migration
+class AddDefaultEventCategoryIdToEventImportFile < ActiveRecord::Migration[4.2]
   def change
     add_reference :event_import_files, :default_event_category
   end

data/db/migrate/20151128142913_create_places.rb

@@ -1,4 +1,4 @@
-class CreatePlaces < ActiveRecord::Migration
+class CreatePlaces < ActiveRecord::Migration[4.2]
   def change
     create_table :places do |t|
       t.string :term

data/db/migrate/20151201163718_add_place_id_to_event.rb

@@ -1,4 +1,4 @@
-class AddPlaceIdToEvent < ActiveRecord::Migration
+class AddPlaceIdToEvent < ActiveRecord::Migration[4.2]
   def change
     add_reference :events, :place, index: true
   end

data/db/migrate/20160703184258_add_most_recent_to_event_import_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToEventImportFileTransitions < ActiveRecord::Migration
+class AddMostRecentToEventImportFileTransitions < ActiveRecord::Migration[4.2]
   def up
     add_column :event_import_file_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20160703184311_add_most_recent_to_event_export_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddMostRecentToEventExportFileTransitions < ActiveRecord::Migration
+class AddMostRecentToEventExportFileTransitions < ActiveRecord::Migration[4.2]
   def up
     add_column :event_export_file_transitions, :most_recent, :boolean, null: true
   end

data/db/migrate/20180107164558_add_constraints_to_most_recent_for_event_import_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForEventImportFileTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForEventImportFileTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up

data/db/migrate/20180107164617_add_constraints_to_most_recent_for_event_export_file_transitions.rb

@@ -1,4 +1,4 @@
-class AddConstraintsToMostRecentForEventExportFileTransitions < ActiveRecord::Migration
+class AddConstraintsToMostRecentForEventExportFileTransitions < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
 
   def up

data/lib/enju_event/engine.rb

@@ -2,6 +2,7 @@ require "enju_message"
 require "ri_cal"
 require "csv"
 require "nkf"
+require "jbuilder"
 begin
   require 'charlock_holmes/string'
 rescue LoadError

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.2.3"
+  VERSION = "0.3.0.beta.1"
 end

data/lib/generators/enju_event/setup/setup_generator.rb

@@ -5,10 +5,10 @@ class EnjuEvent::SetupGenerator < Rails::Generators::Base
     directory("db/fixtures", "db/fixtures/enju_event")
     rake("enju_event_engine:install:migrations")
     inject_into_file 'app/controllers/application_controller.rb',
-      "  enju_event\n", :after => "enju_library\n"
+      "  enju_event\n", after: "enju_library\n"
     inject_into_file 'app/assets/stylesheets/application.css',
-      " *= require enju_event/application\n", :after => " *= require enju_leaf\n"
+      " *= require enju_event/application\n", after: " *= require enju_leaf\n"
     inject_into_file 'app/assets/javascripts/application.js',
-      "//= require enju_event/application\n", :after => "//= require enju_leaf\n"
+      "//= require enju_event/application\n", after: "//= require enju_leaf\n"
   end
 end