enju_event 0.1.19 → 0.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06bb27ceb84bfa7db77a7c733455b7c1f075172a
-  data.tar.gz: 6188605aae86bc08d855df1842cc612346ab99c7
+  metadata.gz: 74666d6077a6991f5f0a7e436b07df60fc75186b
+  data.tar.gz: a7e12ff62c20667138919b5bfbe3b78f3cbe3edf
 SHA512:
-  metadata.gz: 0160b09125f5a0377ee930c7e69d021cb41afef6333a7dea3ad8d36d21e62c7f28e2b358ac62d035d91feae9df6c1e6e7d95b81ea77ff438a7bda987f5c561f9
-  data.tar.gz: caa4ad44b410940adbc60eb917c86f38d71b981996b2438b138d839557b07420af6065ae24645a21385bd8014f06a7ec508ee703c6eca8fad503501542a11cdf
+  metadata.gz: 62463138f2cac977d0472fba7460ddbaefdd643b3ce80d902fbbb72661135bb577ce139a44e2d067b8830e4cb477081053eb9aa531e563e59210dac04fde9124
+  data.tar.gz: 90ce3da43038e500f493c8d256f083db2d4fd955987959fc8b7ad6cef56161e801e51d8c51436f56f436173339dfa3ce76aaea25d4a539f87648e9097a9a5824

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuEvent
-{<img src="https://travis-ci.org/next-l/enju_event.svg?branch=1.1" 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.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_event?branch=1.1]
-{<img src="https://hakiri.io/github/next-l/enju_event/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_event/1.1]
+{<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]
 
 This project rocks and uses MIT-LICENSE.
 

data/Rakefile

@@ -1,16 +1,10 @@
-#!/usr/bin/env rake
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rdoc/rdoc'
-  require 'rake/rdoctask'
-  RDoc::Task = Rake::RDocTask
-end
+
+require 'rdoc/task'
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -24,10 +18,11 @@ APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
-Bundler::GemHelper.install_tasks
+load 'rails/tasks/statistics.rake'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+
+
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
@@ -38,9 +33,8 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
-end
 
+require "rspec/core/rake_task"
 
-task :default => :spec
+RSpec::Core::RakeTask.new("spec")
+task default: :spec

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

@@ -0,0 +1,13 @@
+module EnjuEvent
+  module Controller
+    
+    private
+
+    def get_event
+      if params[:event_id]
+        @event = Event.find(params[:event_id])
+        authorize @event, :show?
+      end
+    end
+  end
+end

data/app/controllers/event_categories_controller.rb

@@ -1,9 +1,11 @@
 class EventCategoriesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_event_category, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /event_categories
   # GET /event_categories.json
   def index
-    @event_categories = EventCategory.all
+    @event_categories = EventCategory.order(:position)
 
     respond_to do |format|
       format.html # index.html.erb
@@ -82,6 +84,15 @@ class EventCategoriesController < ApplicationController
   end
 
   private
+  def set_event_category
+    @event_category = EventCategory.find(params[:id])
+    authorize @event_category
+  end
+
+  def check_policy
+    authorize EventCategory
+  end
+
   def event_category_params
     params.require(:event_category).permit(:name, :display_name, :note)
   end

data/app/controllers/event_export_files_controller.rb

@@ -1,5 +1,6 @@
 class EventExportFilesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_event_export_file, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /event_export_files
   # GET /event_export_files.json
@@ -60,7 +61,7 @@ class EventExportFilesController < ApplicationController
     respond_to do |format|
       if @event_export_file.save
         if @event_export_file.mode == 'export'
-          Resque.enqueue(EventExportFileQueue, @event_export_file.id)
+          EventExportFileJob.perform_later(@event_export_file)
         end
         format.html { redirect_to @event_export_file, notice: t('export.successfully_created', model: t('activerecord.models.event_export_file')) }
         format.json { render json: @event_export_file, status: :created, location: @event_export_file }
@@ -77,7 +78,7 @@ class EventExportFilesController < ApplicationController
     respond_to do |format|
       if @event_export_file.update_attributes(event_export_file_params)
         if @event_export_file.mode == 'export'
-          EventExportFileQueue.perform(@event_export_file.id)
+          EventExportFileJob.perform_later(@event_export_file)
         end
         format.html { redirect_to @event_export_file, notice: t('controller.successfully_updated', model: t('activerecord.models.event_export_file')) }
         format.json { head :no_content }
@@ -100,6 +101,15 @@ class EventExportFilesController < ApplicationController
   end
 
   private
+  def set_event_export_file
+    @event_export_file = EventExportFile.find(params[:id])
+    authorize @event_export_file
+  end
+
+  def check_policy
+    authorize EventExportFile
+  end
+
   def event_export_file_params
     params.require(:event_export_file).permit(:mode)
   end

data/app/controllers/event_import_files_controller.rb

@@ -1,6 +1,7 @@
 class EventImportFilesController < ApplicationController
-  load_and_authorize_resource
-  before_filter :prepare_options, only: [:new, :edit]
+  before_action :set_event_import_file, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /event_import_files
   # GET /event_import_files.json
@@ -61,7 +62,7 @@ class EventImportFilesController < ApplicationController
     respond_to do |format|
       if @event_import_file.save
         if @event_import_file.mode == 'import'
-          Resque.enqueue(EventImportFileQueue, @event_import_file.id)
+          EventImportFileJob.perform_later(@event_import_file)
         end
         format.html { redirect_to @event_import_file, notice: t('import.successfully_created', model: t('activerecord.models.event_import_file')) }
         format.json { render json: @event_import_file, status: :created, location: @event_import_file }
@@ -79,7 +80,7 @@ class EventImportFilesController < ApplicationController
     respond_to do |format|
       if @event_import_file.update_attributes(event_import_file_params)
         if @event_import_file.mode == 'import'
-          Resque.enqueue(EventImportFileQueue, @event_import_file.id)
+          EventImportFileJob.perform_later(@event_import_file)
         end
         format.html { redirect_to @event_import_file, notice: t('controller.successfully_updated', model: t('activerecord.models.event_import_file')) }
         format.json { head :no_content }
@@ -103,6 +104,15 @@ class EventImportFilesController < ApplicationController
   end
 
   private
+  def set_event_import_file
+    @event_import_file = EventImportFile.find(params[:id])
+    authorize @event_import_file
+  end
+
+  def check_policy
+    authorize EventImportFile
+  end
+
   def event_import_file_params
     params.require(:event_import_file).permit(
       :event_import, :edit_mode, :user_encoding, :mode,

data/app/controllers/event_import_results_controller.rb

@@ -1,5 +1,7 @@
 class EventImportResultsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_event_import_result, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
   # GET /event_import_results
   # GET /event_import_results.json
   def index
@@ -38,6 +40,15 @@ class EventImportResultsController < ApplicationController
   end
 
   private
+  def set_event_import_result
+    @event_import_result = EventImportResult.find(params[:id])
+    authorize @event_import_result
+  end
+
+  def check_policy
+    authorize EventImportResult
+  end
+
   def event_import_result_params
     params.require(:event_import_result).permit(
       :event_id, :event_import_file_id, :body #, as: :admin

data/app/controllers/events_controller.rb

@@ -1,12 +1,11 @@
-# -*- encoding: utf-8 -*-
 class EventsController < ApplicationController
-  load_and_authorize_resource
-  before_filter :get_library, :get_agent
-  before_filter :get_libraries, except: :destroy
-  before_filter :prepare_options
-  before_filter :store_page, only: :index
-  after_filter :solr_commit, only: [:create, :update, :destroy]
-  after_filter :convert_charset, only: :index
+  before_action :store_page, only: :index
+  before_action :set_event, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :get_library, :get_agent
+  before_action :get_libraries, except: :destroy
+  before_action :prepare_options
+  after_action :convert_charset, only: :index
 
   # GET /events
   # GET /events.json
@@ -45,6 +44,7 @@ class EventsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
+      format.html.phone
       format.json
       format.rss  { render layout: false }
       format.txt
@@ -60,6 +60,7 @@ class EventsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
+      format.html.phone
       format.json { render json: @event }
     end
   end
@@ -144,6 +145,15 @@ class EventsController < ApplicationController
   end
 
   private
+  def set_event
+    @event = Event.find(params[:id])
+    authorize @event
+  end
+
+  def check_policy
+    authorize Event
+  end
+
   def event_params
     params.require(:event).permit(
       :library_id, :event_category_id, :name, :note, :start_at,

data/app/controllers/participates_controller.rb

@@ -1,5 +1,6 @@
 class ParticipatesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_participate, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /participates
   # GET /participates.json
@@ -80,6 +81,15 @@ class ParticipatesController < ApplicationController
   end
 
   private
+  def set_participate
+    @participate = Participate.find(params[:id])
+    authorize @participate
+  end
+
+  def check_policy
+    authorize Participate
+  end
+
   def participate_params
     params.require(:participate).permit(:agent_id, :event_id)
   end

data/app/controllers/places_controller.rb

@@ -0,0 +1,64 @@
+class PlacesController < ApplicationController
+  before_action :set_place, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
+  # GET /places
+  def index
+    @places = Place.all
+  end
+
+  # GET /places/1
+  def show
+  end
+
+  # GET /places/new
+  def new
+    @place = Place.new
+  end
+
+  # GET /places/1/edit
+  def edit
+  end
+
+  # POST /places
+  def create
+    @place = Place.new(place_params)
+
+    if @place.save
+      redirect_to @place, notice: 'Place was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /places/1
+  def update
+    if @place.update(place_params)
+      redirect_to @place, notice: 'Place was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /places/1
+  def destroy
+    @place.destroy
+    redirect_to places_url, notice: 'Place was successfully destroyed.'
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_place
+      @place = Place.find(params[:id])
+      autorize @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
+end

data/app/jobs/event_export_file_job.rb

@@ -0,0 +1,7 @@
+class EventExportFileJob < ActiveJob::Base
+  queue_as :enju_leaf
+
+  def perform(event_export_file)
+    event_export_file.export!
+  end
+end

data/app/jobs/event_import_file_job.rb

@@ -0,0 +1,7 @@
+class EventImportFileJob < ActiveJob::Base
+  queue_as :enju_leaf
+
+  def perform(event_import_file)
+    event_import_file.import_start
+  end
+end

data/app/models/event.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 class Event < ActiveRecord::Base
   scope :closing_days, -> { includes(:event_category).where('event_categories.name' => 'closed') }
   scope :on, lambda {|datetime| where('start_at >= ? AND start_at < ?', datetime.beginning_of_day, datetime.tomorrow.beginning_of_day + 1)}
@@ -8,6 +7,7 @@ class Event < ActiveRecord::Base
 
   belongs_to :event_category, validate: true
   belongs_to :library, validate: true
+  belongs_to :place
   has_many :picture_files, as: :picture_attachable
   has_many :participates, dependent: :destroy
   has_many :agents, through: :participates
@@ -66,7 +66,7 @@ class Event < ActiveRecord::Base
       all_day
     )
     lines = []
-    Event.all.map{|e|
+    Event.find_each.map{|e|
       line = []
       line << e.name
       line << e.event_category.name
@@ -91,13 +91,14 @@ end
 #  id                :integer          not null, primary key
 #  library_id        :integer          not null
 #  event_category_id :integer          not null
-#  name              :string(255)
+#  name              :string
 #  note              :text
 #  start_at          :datetime
 #  end_at            :datetime
 #  all_day           :boolean          default(FALSE), not null
 #  deleted_at        :datetime
 #  display_name      :text
-#  created_at        :datetime         not null
-#  updated_at        :datetime         not null
+#  created_at        :datetime
+#  updated_at        :datetime
+#  place_id          :integer
 #

data/app/models/event_category.rb

@@ -11,11 +11,10 @@ end
 # Table name: event_categories
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
+#  name         :string           not null
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/event_export_file.rb

@@ -1,7 +1,6 @@
 class EventExportFile < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordQueries
   include ExportFile
-  enju_export_file_model
 
   if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :event_export, storage: :s3,
@@ -58,11 +57,11 @@ end
 #
 #  id                        :integer          not null, primary key
 #  user_id                   :integer
-#  event_export_file_name    :string(255)
-#  event_export_content_type :string(255)
+#  event_export_file_name    :string
+#  event_export_content_type :string
 #  event_export_file_size    :integer
 #  event_export_updated_at   :datetime
 #  executed_at               :datetime
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
+#  created_at                :datetime
+#  updated_at                :datetime
 #