RubyGems - enju_event - Versions diffs - 0.3.5 → 0.4.0.beta.1 - Mend

enju_event 0.3.5 → 0.4.0.beta.1

Files changed (111) hide show

data/app/views/events/index.json.jbuilder CHANGED Viewed

@@ -1,6 +1,6 @@
 json.array!(@events) do |event|
   json.extract! event, :id
-  json.title event.display_name.localize
+  json.title event.display_name
   if event.all_day
     json.start event.start_at.iso8601
     json.end event.end_at.tomorrow.beginning_of_day.iso8601

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

@@ -3,7 +3,7 @@ xml.rss('version' => "2.0",
   'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
-    xml.title t('event.library_group_event', library_group_name: @library_group.display_name.localize)
+    xml.title t('event.library_group_event', library_group_name: @library_group.display_name)
     xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
@@ -19,7 +19,7 @@ xml.rss('version' => "2.0",
     end
     @events.each do |event|
       xml.item do
-        xml.title event.display_name.localize
+        xml.title event.display_name
         xml.description event.note
         # rfc822
         xml.pubDate event.created_at.rfc2822

data/app/views/events/index.txt.erb ADDED Viewed

@@ -0,0 +1,4 @@
+library	name	note	start_at	end_at
+<%- @events.each do |event| -%>
+"<%=h event.library.display_name.gsub(/"/, '""') -%>"	"<%=h event.display_name.gsub(/"/, '""') -%>"	"<%=h event.note.to_s.gsub(/"/, '""') -%>"	"<%=h event.start_at.to_s.gsub(/"/, '""') -%>"	"<%=h event.end_at.to_s.gsub(/"/, '""') %>
+<%- end -%>

data/app/views/events/show.html+phone.erb CHANGED Viewed

@@ -4,17 +4,17 @@
 <div data-role="content">
 <h2 class="resource_title">
-  <%= @event.display_name.localize -%>
+  <%= @event.display_name -%>
 </h2>
 <p>
   <strong><%= t('activerecord.models.event_category') -%>:</strong>
-  <%= @event.event_category.display_name.localize -%>
+  <%= @event.event_category.display_name -%>
 </p>
 <p>
   <strong><%= t('activerecord.models.library') -%>:</strong>
-  <%= link_to @event.library.display_name.localize, @event.library -%>
+  <%= link_to @event.library.display_name, @event.library -%>
 </p>
 <%- if @event.all_day -%>

data/app/views/events/show.html.erb CHANGED Viewed

@@ -4,7 +4,7 @@
 <p id="notice"><%= notice %></p>
 <h2 class="resource_title">
-  <%= @event.display_name.localize -%>
+  <%= @event.display_name -%>
 </h2>
 <p>
@@ -14,12 +14,12 @@
 <p>
   <strong><%= t('activerecord.models.event_category') -%>:</strong>
-  <%= @event.event_category.display_name.localize -%>
+  <%= @event.event_category.display_name -%>
 </p>
 <p>
   <strong><%= t('activerecord.models.library') -%>:</strong>
-  <%= link_to @event.library.display_name.localize, @event.library -%>
+  <%= link_to @event.library.display_name, @event.library -%>
 </p>
 <p>

data/app/views/layouts/calendar.html.erb CHANGED Viewed

@@ -3,14 +3,14 @@
 <head>
   <meta charset="UTF-8" />
   <%- if @library -%>
-    <title><%= t('calendar.library_calendar', library_name: @library.display_name.localize) -%> - <%= LibraryGroup.system_name(@locale) -%></title>
+    <title><%= t('calendar.library_calendar', library_name: @library.display_name) -%> - <%= LibraryGroup.system_name(@locale) -%></title>
   <%- else -%>
     <title><%= t('calendar.calendar') -%> - <%= LibraryGroup.system_name(@locale) -%></title>
   <%- end -%>
   <%= render 'page/include' -%>
-  <%= auto_discovery_link_tag(:rss, events_url(format: :rss), title: (t('event.library_group_event', library_group_name: @library_group.display_name.localize) + " (RSS)")) %>
-  <%= auto_discovery_link_tag(:atom, events_url(format: :atom), title: (t('event.library_group_event', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
-  <link rel="search" type="application/opensearchdescription+xml" href="<%= page_opensearch_url -%>" title="<%= @library_group.display_name.localize -%>" />
+  <%= auto_discovery_link_tag(:rss, events_url(format: :rss), title: (t('event.library_group_event', library_group_name: @library_group.display_name) + " (RSS)")) %>
+  <%= auto_discovery_link_tag(:atom, events_url(format: :atom), title: (t('event.library_group_event', library_group_name: @library_group.display_name) + " (Atom)")) %>
+  <link rel="search" type="application/opensearchdescription+xml" href="<%= page_opensearch_url -%>" title="<%= @library_group.display_name -%>" />
 </head>
 <body>

data/app/views/participates/index.html.erb CHANGED Viewed

@@ -11,7 +11,7 @@
 <%- @participates.each do |participate| %>
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to participate.agent.full_name, participate.agent %>
-    <td><%= link_to participate.event.display_name.localize, participate.event %>
+    <td><%= link_to participate.event.display_name, participate.event %>
     <td><%= link_to t('page.show'), participate %></td>
     <td><%= link_to t('page.edit'), edit_participate_path(participate) %></td>
     <td><%= link_to t('page.destroy'), participate, data: {confirm: t('page.are_you_sure')}, method: :delete %></td>

data/app/views/participates/show.html.erb CHANGED Viewed

@@ -10,7 +10,7 @@
 <p>
   <strong><%= t('activerecord.models.event') -%>:</strong>
-  <%= link_to @participate.event.display_name.localize, @participate.event %>
+  <%= link_to @participate.event.display_name, @participate.event %>
 </p>
 </div>

data/app/views/picture_files/_index_event.html.erb CHANGED Viewed

@@ -3,7 +3,7 @@
 <div id="content_list">
 <p id="notice"><%= notice %></p>
-<h2 class="resource_title"><%= link_to event.display_name.localize, event -%></h2>
+<h2 class="resource_title"><%= link_to event.display_name, event -%></h2>
 <table class="table table-striped index">
   <tr>

data/config/locales/translation_en.yml CHANGED Viewed

@@ -38,7 +38,6 @@ en:
         default_event_category_id: Default event category
       event_import_result:
         body: Body
-        lineno: Line
       event_export_file:
         event_export_file_name: Filename
         event_export_file_size: Size

data/config/locales/translation_ja.yml CHANGED Viewed

@@ -38,7 +38,6 @@ ja:
         default_event_category_id: 既定の催し物の種別
       event_import_result:
         body: 本文
-        lineno: 行数
       event_export_file:
         event_export_file_name: ファイル名
         event_export_file_size: ファイルサイズ

data/db/migrate/20190630153136_add_display_name_translations_to_event.rb ADDED Viewed

@@ -0,0 +1,6 @@
+class AddDisplayNameTranslationsToEvent < ActiveRecord::Migration[5.2]
+  def change
+    add_column :event_categories, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :events, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/lib/enju_event/engine.rb CHANGED Viewed

@@ -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 CHANGED Viewed

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

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

@@ -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',
-      "  include EnjuEvent::Controller\n", after: "include EnjuLibrary::Controller\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/application\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/application\n"
   end
 end

data/lib/generators/enju_event/setup/templates/db/fixtures/event_categories.yml CHANGED Viewed

@@ -1,15 +1,44 @@
 ---
 event_category_00001:
-  name: unknown
-  display_name: "en: unknown\r\n\
-    ja: 不明"
+  name: unknown
+  display_name_translations: {"en": "(not specified)", "ja": "未定"}
   id: 1
   note: ""
   position: 1
 event_category_00002:
-  name: closed
-  display_name: "en: closed\r\n\
-    ja: 休館日"
+  name: closed
+  display_name_translations: {"en": "closed", "ja": "休館日"}
   id: 2
   note: ""
   position: 2
+event_category_00003:
+  name: book_talk
+  display_name_translations: {"en": "talk event", "ja": "おはなし会"}
+  id: 3
+  note: ""
+  position: 3
+event_category_00004:
+  name: movie_theater
+  display_name_translations: {"en": "screening", "ja": "上映会"}
+  id: 4
+  note: ""
+  position: 4
+event_category_00005:
+  name: talk_event
+  display_name_translations: {"en": "seminar", "ja": "講演会"}
+  id: 5
+  note: ""
+  position: 5
+# == Schema Information
+#
+# Table name: event_categories
+#
+#  id                        :bigint           not null, primary key
+#  name                      :string           not null
+#  display_name_translations :jsonb            not null
+#  note                      :text
+#  position                  :integer          default(1), not null
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#

data/spec/controllers/event_import_results_controller_spec.rb CHANGED Viewed

@@ -9,7 +9,7 @@ describe EventImportResultsController do
       it "assigns all event_import_results as @event_import_results" do
         get :index
-        assigns(:event_import_results).should eq(EventImportResult.order(created_at: :desc).page(1))
+        assigns(:event_import_results).should eq(EventImportResult.page(1))
       end
     end
@@ -18,7 +18,7 @@ describe EventImportResultsController do
       it "assigns all event_import_results as @event_import_results" do
         get :index
-        assigns(:event_import_results).should eq(EventImportResult.order(created_at: :desc).page(1))
+        assigns(:event_import_results).should eq(EventImportResult.page(1))
       end
     end

data/spec/controllers/events_controller_spec.rb CHANGED Viewed

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

data/spec/dummy/bin/bundle CHANGED Viewed

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/setup CHANGED Viewed

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -21,7 +20,6 @@ chdir APP_ROOT do
   # Install JavaScript dependencies if using Yarn
   # system('bin/yarn')
   # puts "\n== Copying sample files =="
   # unless File.exist?('config/database.yml')
   #   cp 'config/database.yml.sample', 'config/database.yml'

data/spec/dummy/bin/update CHANGED Viewed

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'pathname'
 require 'fileutils'
 include FileUtils
 # path to your application root.
-APP_ROOT = Pathname.new File.expand_path('../../', __FILE__)
+APP_ROOT = File.expand_path('..', __dir__)
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -18,6 +17,9 @@ chdir APP_ROOT do
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
+  # Install JavaScript dependencies if using Yarn
+  # system('bin/yarn')
   puts "\n== Updating database =="
   system! 'bin/rails db:migrate'

data/spec/dummy/bin/yarn CHANGED Viewed

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
-VENDOR_PATH = File.expand_path('..', __dir__)
-Dir.chdir(VENDOR_PATH) do
+APP_ROOT = File.expand_path('..', __dir__)
+Dir.chdir(APP_ROOT) do
   begin
-    exec "yarnpkg #{ARGV.join(" ")}"
+    exec "yarnpkg", *ARGV
   rescue Errno::ENOENT
     $stderr.puts "Yarn executable was not detected in the system."
     $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"

data/spec/dummy/config/database.yml CHANGED Viewed

@@ -1,25 +1,86 @@
-# SQLite version 3.x
-#   gem install sqlite3
+# PostgreSQL. Versions 9.1 and up are supported.
 #
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
+# Install the pg driver:
+#   gem install pg
+# On OS X with Homebrew:
+#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
+# On OS X with MacPorts:
+#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
+# On Windows:
+#   gem install pg
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
 #
 default: &default
-  adapter: sqlite3
+  adapter: postgresql
+  encoding: unicode
+  # For details on connection pooling, see rails configuration guide
+  # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
-  timeout: 5000
+  username: postgres
 development:
   <<: *default
-  database: db/development.sqlite3
+  database: enju_event_dummy_development
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  #username: dummy
+  # The password associated with the postgres role (username).
+  #password:
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+  # The TCP port the server listens on. Defaults to 5432.
+  # If your server runs on a different port number, change accordingly.
+  #port: 5432
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # Defaults to warning.
+  #min_messages: notice
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: db/test.sqlite3
+  database: enju_event_dummy_test
+# As with config/secrets.yml, you never want to store sensitive information,
+# like your database password, in your source code. If your source code is
+# ever seen by anyone, they now have access to your database.
+#
+# Instead, provide the password as a unix environment variable when you boot
+# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
+# for a full rundown on how to provide these environment variables in a
+# production deployment.
+#
+# On Heroku and other platform providers, you may have a full connection URL
+# available as an environment variable. For example:
+#
+#   DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
+#
+# You can use this database configuration with:
+#
+#   production:
+#     url: <%= ENV['DATABASE_URL'] %>
+#
 production:
   <<: *default
-  database: db/production.sqlite3
+  database: enju_event_dummy_production
+  username: dummy
+  password: <%= ENV['DUMMY_DATABASE_PASSWORD'] %>

data/spec/dummy/config/initializers/assets.rb CHANGED Viewed

@@ -6,7 +6,7 @@ Rails.application.config.assets.version = '1.0'
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
 # Add Yarn node_modules folder to the asset load path.
-Rails.application.config.assets.paths << Rails.root.join('node_modules')
+Rails.application.config.assets.paths << Rails.root.join('../../', 'node_modules')
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets

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

@@ -2,4 +2,3 @@
 # 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/154_create_messages.rb CHANGED Viewed

@@ -2,19 +2,15 @@ class CreateMessages < ActiveRecord::Migration[4.2]
   def self.up
     create_table :messages, force: true do |t|
       t.datetime :read_at
-      t.integer  :receiver_id, :sender_id
+      t.references :sender, index: true
+      t.references :receiver, index: true
       t.string   :subject, null: false
       t.text     :body
-      t.integer :message_request_id
-      t.integer :parent_id
+      t.references :message_request, index: true
+      t.references :parent, index: true
       t.timestamps
     end
-    add_index :messages, :sender_id
-    add_index :messages, :receiver_id
-    add_index :messages, :message_request_id
-    add_index :messages, :parent_id
   end
   def self.down

data/spec/dummy/db/migrate/20080819181903_create_message_requests.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 class CreateMessageRequests < ActiveRecord::Migration[4.2]
   def self.up
     create_table :message_requests do |t|
-      t.integer :sender_id
-      t.integer :receiver_id
-      t.integer :message_template_id
+      t.references :sender
+      t.references :receiver
+      t.references :message_template
       t.datetime :sent_at
       t.datetime :deleted_at
       t.text :body

data/spec/dummy/db/migrate/20180107162659_add_constraints_to_most_recent_for_message_transitions.rb CHANGED Viewed

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

data/spec/dummy/db/migrate/20180107162711_add_constraints_to_most_recent_for_message_request_transitions.rb CHANGED Viewed

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

data/spec/dummy/db/migrate/20190630113817_add_display_name_translations_to_library_group.rb ADDED Viewed

@@ -0,0 +1,12 @@
+class AddDisplayNameTranslationsToLibraryGroup < ActiveRecord::Migration[5.2]
+  def change
+    add_column :budget_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :libraries, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :library_groups, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :request_status_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :request_types, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :search_engines, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :shelves, :display_name_translations, :jsonb, default: {}, null: false
+    add_column :user_groups, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/spec/dummy/db/migrate/{20181026064038_add_login_banner_to_library_group.rb → 20190630115523_add_login_banner_translations_to_library_group.rb} RENAMED Viewed

@@ -1,4 +1,4 @@
-class AddLoginBannerToLibraryGroup < ActiveRecord::Migration[5.2]
+class AddLoginBannerTranslationsToLibraryGroup < ActiveRecord::Migration[5.2]
   def change
     add_column :library_groups, :login_banner_translations, :jsonb, default: {}, null: false
     add_column :library_groups, :footer_banner_translations, :jsonb, default: {}, null: false

data/spec/dummy/db/migrate/20190630151446_add_display_name_translations_to_role.rb ADDED Viewed

@@ -0,0 +1,5 @@
+class AddDisplayNameTranslationsToRole < ActiveRecord::Migration[5.2]
+  def change
+    add_column :roles, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/spec/dummy/db/migrate/20190712163038_add_display_name_translations_to_carrier_type.rb ADDED Viewed

@@ -0,0 +1,21 @@
+class AddDisplayNameTranslationsToCarrierType < ActiveRecord::Migration[5.2]
+  def change
+    [
+      :agent_relationship_types,
+      :agent_types,
+      :carrier_types,
+      :content_types,
+      :create_types,
+      :form_of_works,
+      :frequencies,
+      :languages,
+      :licenses,
+      :manifestation_relationship_types,
+      :medium_of_performances,
+      :produce_types,
+      :realize_types
+    ].each do |table|
+      add_column table, :display_name_translations, :jsonb, default: {}, null: false
+    end
+  end
+end

data/spec/dummy/db/migrate/20190713114940_add_profile_id_to_user.rb ADDED Viewed

@@ -0,0 +1,5 @@
+class AddProfileIdToUser < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :users, :profile, foreign_key: true
+  end
+end

data/spec/dummy/db/migrate/20190713115451_add_full_name_translations_to_profile.rb ADDED Viewed

@@ -0,0 +1,5 @@
+class AddFullNameTranslationsToProfile < ActiveRecord::Migration[5.2]
+  def change
+    add_column :profiles, :full_name_translations, :jsonb, default: {}, null: false
+  end
+end