enju_event 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bfde966909ddbdc3638bf4dfc7341c4b19227ec
-  data.tar.gz: c6a7699d6e39f5dda7e46fb38e1d0168bb9e45d0
+  metadata.gz: 4d99877025e7784515792d2b90083641c8ed0734
+  data.tar.gz: a9e75b8518656abb4123f3a12d080561b0d27ed8
 SHA512:
-  metadata.gz: 45082771285e021a875d1cdcbb55edc7ff759138d23e4a6ad35f0fb7350efa097e68e32884a1616fb3825c243680e1238011205a2daa23c512f24b018f4c140b
-  data.tar.gz: c64ed3911db46b3a4515cb1cb78454ba083e926ebec1b30d5df366a56805928c6dc3c03765ec6363453079df36182d86e0e5361c3572a74bba63cbec470a47cd
+  metadata.gz: 72473dec7be540b1eea074363a779b241df9a5eee314cc0a110ed593cb45d2e8f84340461fac52e86aaf30affd6bdd79e4190ca38cf041345b6c9bdbed81c3df
+  data.tar.gz: 4f173ff7046e4351f0ada781acbbc3748fd38533fa7b621b08bfcf99462952cf5addab78decc537098965f9092cbea92b37f430aec0846a2c0d1cfa6965473d8

data/app/controllers/events_controller.rb

@@ -16,6 +16,7 @@ class EventsController < ApplicationController
     query = query.gsub('　', ' ')
     tag = params[:tag].to_s if params[:tag].present?
     date = params[:date].to_s if params[:date].present?
+    per_page = ( params[:format] == "json" ) ? 500 : Event.default_per_page
     mode = params[:mode]
 
     search = Sunspot.new_search(Event)
@@ -28,6 +29,10 @@ class EventsController < ApplicationController
         with(:start_at).less_than_or_equal_to Time.zone.parse(date)
         with(:end_at).greater_than Time.zone.parse(date)
       end
+      if params[:start].present? and params[:end].present?
+        with(:start_at).greater_than_or_equal_to Time.zone.parse(params[:start])
+        with(:end_at).less_than_or_equal_to Time.zone.parse(params[:end]).end_of_day
+      end
       case mode
       when 'upcoming'
         with(:start_at).greater_than Time.zone.now.beginning_of_day
@@ -38,14 +43,14 @@ class EventsController < ApplicationController
     end
 
     page = params[:page] || 1
-    search.query.paginate(page.to_i, Event.default_per_page)
+    search.query.paginate(page.to_i, per_page)
     @events = search.execute!.results
     @count[:query_result] = @events.total_entries
 
     respond_to do |format|
       format.html # index.html.erb
       format.html.phone
-      format.json
+      format.json { render json: @events.to_json }
       format.rss  { render layout: false }
       format.txt
       format.atom

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/generators/enju_event/update/update_generator.rb

@@ -0,0 +1,9 @@
+class EnjuEvent::UpdateGenerator < Rails::Generators::Base
+  source_root File.expand_path('../templates', __FILE__)
+  desc "Create files for updating Next-L Enju"
+
+  def copy_migration_files
+    generate('statesman:add_constraints_to_most_recent', 'EventImportFile', 'EventImportFileTransition')
+    generate('statesman:add_constraints_to_most_recent', 'EventExportFile', 'EventExportFileTransition')
+  end
+end

data/spec/controllers/event_categories_controller_spec.rb

@@ -6,12 +6,12 @@ describe EventCategoriesController do
   disconnect_sunspot
 
   def valid_attributes
-    FactoryGirl.attributes_for(:event_category)
+    FactoryBot.attributes_for(:event_category)
   end
 
   describe "GET index" do
     before(:each) do
-      FactoryGirl.create(:event_category)
+      FactoryBot.create(:event_category)
     end
 
     describe "When logged in as Administrator" do
@@ -54,7 +54,7 @@ describe EventCategoriesController do
       login_fixture_admin
 
       it "assigns the requested event_category as @event_category" do
-        event_category = FactoryGirl.create(:event_category)
+        event_category = FactoryBot.create(:event_category)
         get :show, id: event_category.id
         assigns(:event_category).should eq(event_category)
       end
@@ -64,7 +64,7 @@ describe EventCategoriesController do
       login_fixture_librarian
 
       it "assigns the requested event_category as @event_category" do
-        event_category = FactoryGirl.create(:event_category)
+        event_category = FactoryBot.create(:event_category)
         get :show, id: event_category.id
         assigns(:event_category).should eq(event_category)
       end
@@ -74,7 +74,7 @@ describe EventCategoriesController do
       login_fixture_user
 
       it "assigns the requested event_category as @event_category" do
-        event_category = FactoryGirl.create(:event_category)
+        event_category = FactoryBot.create(:event_category)
         get :show, id: event_category.id
         assigns(:event_category).should eq(event_category)
       end
@@ -82,7 +82,7 @@ describe EventCategoriesController do
 
     describe "When not logged in" do
       it "assigns the requested event_category as @event_category" do
-        event_category = FactoryGirl.create(:event_category)
+        event_category = FactoryBot.create(:event_category)
         get :show, id: event_category.id
         assigns(:event_category).should eq(event_category)
       end
@@ -134,7 +134,7 @@ describe EventCategoriesController do
       login_fixture_admin
 
       it "assigns the requested event_category as @event_category" do
-        event_category = FactoryGirl.create(:event_category)
+        event_category = FactoryBot.create(:event_category)
         get :edit, id: event_category.id
         assigns(:event_category).should eq(event_category)
       end
@@ -144,7 +144,7 @@ describe EventCategoriesController do
       login_fixture_librarian
 
       it "assigns the requested event_category as @event_category" do
-        event_category = FactoryGirl.create(:event_category)
+        event_category = FactoryBot.create(:event_category)
         get :edit, id: event_category.id
         response.should be_forbidden
       end
@@ -154,7 +154,7 @@ describe EventCategoriesController do
       login_fixture_user
 
       it "assigns the requested event_category as @event_category" do
-        event_category = FactoryGirl.create(:event_category)
+        event_category = FactoryBot.create(:event_category)
         get :edit, id: event_category.id
         response.should be_forbidden
       end
@@ -162,7 +162,7 @@ describe EventCategoriesController do
 
     describe "When not logged in" do
       it "should not assign the requested event_category as @event_category" do
-        event_category = FactoryGirl.create(:event_category)
+        event_category = FactoryBot.create(:event_category)
         get :edit, id: event_category.id
         response.should redirect_to(new_user_session_url)
       end
@@ -288,7 +288,7 @@ describe EventCategoriesController do
 
   describe "PUT update" do
     before(:each) do
-      @event_category = FactoryGirl.create(:event_category)
+      @event_category = FactoryBot.create(:event_category)
       @attrs = valid_attributes
       @invalid_attrs = {:name => ''}
     end
@@ -389,7 +389,7 @@ describe EventCategoriesController do
 
   describe "DELETE destroy" do
     before(:each) do
-      @event_category = FactoryGirl.create(:event_category)
+      @event_category = FactoryBot.create(:event_category)
     end
 
     describe "When logged in as Administrator" do

data/spec/controllers/events_controller_spec.rb

@@ -9,7 +9,7 @@ describe EventsController do
     end
 
     before(:each) do
-      FactoryGirl.create(:event)
+      FactoryBot.create(:event)
     end
 
     describe "When logged in as Administrator" do
@@ -78,6 +78,21 @@ describe EventsController do
         response.should be_success
         assigns(:events).should_not be_nil
       end
+
+      describe "with json data (calendar feed)" do
+        it "should get all events data" do
+          20.times do |c|
+            FactoryBot.create(:event)
+          end
+          Event.reindex
+          today = Date.today
+          get :index, { format: "json", start: today.beginning_of_month.to_s, end: today.end_of_month.to_s }
+          expect(response).to be_success
+          events = assigns(:events)
+          expect(events).not_to be_nil
+          expect(events.size).to be >= 20
+        end
+      end
     end
   end
 
@@ -86,7 +101,7 @@ describe EventsController do
       login_fixture_admin
 
       it "assigns the requested event as @event" do
-        event = FactoryGirl.create(:event)
+        event = FactoryBot.create(:event)
         get :show, :id => event.id
         assigns(:event).should eq(event)
       end
@@ -96,7 +111,7 @@ describe EventsController do
       login_fixture_librarian
 
       it "assigns the requested event as @event" do
-        event = FactoryGirl.create(:event)
+        event = FactoryBot.create(:event)
         get :show, :id => event.id
         assigns(:event).should eq(event)
       end
@@ -106,7 +121,7 @@ describe EventsController do
       login_fixture_user
 
       it "assigns the requested event as @event" do
-        event = FactoryGirl.create(:event)
+        event = FactoryBot.create(:event)
         get :show, :id => event.id
         assigns(:event).should eq(event)
       end
@@ -114,7 +129,7 @@ describe EventsController do
 
     describe "When not logged in" do
       it "assigns the requested event as @event" do
-        event = FactoryGirl.create(:event)
+        event = FactoryBot.create(:event)
         get :show, :id => event.id
         assigns(:event).should eq(event)
       end
@@ -164,7 +179,7 @@ describe EventsController do
       login_fixture_admin
 
       it "assigns the requested event as @event" do
-        event = FactoryGirl.create(:event)
+        event = FactoryBot.create(:event)
         get :edit, :id => event.id
         assigns(:event).should eq(event)
       end
@@ -174,7 +189,7 @@ describe EventsController do
       login_fixture_librarian
 
       it "assigns the requested event as @event" do
-        event = FactoryGirl.create(:event)
+        event = FactoryBot.create(:event)
         get :edit, :id => event.id
       end
     end
@@ -183,7 +198,7 @@ describe EventsController do
       login_fixture_user
 
       it "assigns the requested event as @event" do
-        event = FactoryGirl.create(:event)
+        event = FactoryBot.create(:event)
         get :edit, :id => event.id
         response.should be_forbidden
       end
@@ -191,7 +206,7 @@ describe EventsController do
 
     describe "When not logged in" do
       it "should not assign the requested event as @event" do
-        event = FactoryGirl.create(:event)
+        event = FactoryBot.create(:event)
         get :edit, :id => event.id
         response.should redirect_to(new_user_session_url)
       end
@@ -200,7 +215,7 @@ describe EventsController do
 
   describe "POST create" do
     before(:each) do
-      @attrs = FactoryGirl.attributes_for(:event)
+      @attrs = FactoryBot.attributes_for(:event)
       @invalid_attrs = {:name => ''}
     end
 
@@ -317,8 +332,8 @@ describe EventsController do
 
   describe "PUT update" do
     before(:each) do
-      @event = FactoryGirl.create(:event)
-      @attrs = FactoryGirl.attributes_for(:event)
+      @event = FactoryBot.create(:event)
+      @attrs = FactoryBot.attributes_for(:event)
       @invalid_attrs = {:name => ''}
     end
 
@@ -412,7 +427,7 @@ describe EventsController do
 
   describe "DELETE destroy" do
     before(:each) do
-      @event = FactoryGirl.create(:event)
+      @event = FactoryBot.create(:event)
     end
 
     describe "When logged in as Administrator" do

data/spec/controllers/participates_controller_spec.rb

@@ -6,7 +6,7 @@ describe ParticipatesController do
   disconnect_sunspot
 
   def valid_attributes
-    FactoryGirl.attributes_for(:participate)
+    FactoryBot.attributes_for(:participate)
   end
 
   describe "GET index" do
@@ -50,7 +50,7 @@ describe ParticipatesController do
       login_fixture_admin
 
       it "assigns the requested participate as @participate" do
-        participate = FactoryGirl.create(:participate)
+        participate = FactoryBot.create(:participate)
         get :show, id: participate.id
         assigns(:participate).should eq(participate)
       end
@@ -60,7 +60,7 @@ describe ParticipatesController do
       login_fixture_librarian
 
       it "assigns the requested participate as @participate" do
-        participate = FactoryGirl.create(:participate)
+        participate = FactoryBot.create(:participate)
         get :show, id: participate.id
         assigns(:participate).should eq(participate)
       end
@@ -70,7 +70,7 @@ describe ParticipatesController do
       login_fixture_user
 
       it "assigns the requested participate as @participate" do
-        participate = FactoryGirl.create(:participate)
+        participate = FactoryBot.create(:participate)
         get :show, id: participate.id
         assigns(:participate).should eq(participate)
       end
@@ -78,7 +78,7 @@ describe ParticipatesController do
 
     describe "When not logged in" do
       it "assigns the requested participate as @participate" do
-        participate = FactoryGirl.create(:participate)
+        participate = FactoryBot.create(:participate)
         get :show, id: participate.id
         assigns(:participate).should eq(participate)
       end
@@ -128,7 +128,7 @@ describe ParticipatesController do
       login_fixture_admin
 
       it "assigns the requested participate as @participate" do
-        participate = FactoryGirl.create(:participate)
+        participate = FactoryBot.create(:participate)
         get :edit, id: participate.id
         assigns(:participate).should eq(participate)
       end
@@ -138,7 +138,7 @@ describe ParticipatesController do
       login_fixture_librarian
 
       it "assigns the requested participate as @participate" do
-        participate = FactoryGirl.create(:participate)
+        participate = FactoryBot.create(:participate)
         get :edit, id: participate.id
         assigns(:participate).should eq(participate)
       end
@@ -148,7 +148,7 @@ describe ParticipatesController do
       login_fixture_user
 
       it "assigns the requested participate as @participate" do
-        participate = FactoryGirl.create(:participate)
+        participate = FactoryBot.create(:participate)
         get :edit, id: participate.id
         response.should be_forbidden
       end
@@ -156,7 +156,7 @@ describe ParticipatesController do
 
     describe "When not logged in" do
       it "should not assign the requested participate as @participate" do
-        participate = FactoryGirl.create(:participate)
+        participate = FactoryBot.create(:participate)
         get :edit, id: participate.id
         response.should redirect_to(new_user_session_url)
       end
@@ -282,7 +282,7 @@ describe ParticipatesController do
 
   describe "PUT update" do
     before(:each) do
-      @participate = FactoryGirl.create(:participate)
+      @participate = FactoryBot.create(:participate)
       @attrs = valid_attributes
       @invalid_attrs = {:event_id => ''}
     end
@@ -388,7 +388,7 @@ describe ParticipatesController do
 
   describe "DELETE destroy" do
     before(:each) do
-      @participate = FactoryGirl.create(:participate)
+      @participate = FactoryBot.create(:participate)
     end
 
     describe "When logged in as Administrator" do

data/spec/dummy/db/migrate/20171014084528_add_header_logo_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddHeaderLogoToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_attachment :library_groups, :header_logo
+  end
+end

data/spec/dummy/db/migrate/20171126133835_rename_login_banner_to_old_login_banner.rb

@@ -0,0 +1,5 @@
+class RenameLoginBannerToOldLoginBanner < ActiveRecord::Migration
+  def change
+    rename_column :library_groups, :login_banner, :old_login_banner
+  end
+end

data/spec/dummy/db/migrate/20171126135238_add_foreign_key_to_library_group_id_on_library.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyToLibraryGroupIdOnLibrary < ActiveRecord::Migration
+  def change
+    add_foreign_key :libraries, :library_groups, null: false
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160814165332) do
+ActiveRecord::Schema.define(version: 20171126135238) do
 
   create_table "accepts", force: :cascade do |t|
     t.integer  "basket_id"
@@ -671,7 +671,7 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.text     "display_name"
     t.string   "short_name",                                                       null: false
     t.text     "my_networks"
-    t.text     "login_banner"
+    t.text     "old_login_banner"
     t.text     "note"
     t.integer  "country_id"
     t.integer  "position"
@@ -685,6 +685,10 @@ ActiveRecord::Schema.define(version: 20160814165332) do
     t.boolean  "family_name_first",             default: true
     t.integer  "pub_year_facet_range_interval", default: 10
     t.integer  "user_id"
+    t.string   "header_logo_file_name"
+    t.string   "header_logo_content_type"
+    t.integer  "header_logo_file_size"
+    t.datetime "header_logo_updated_at"
   end
 
   add_index "library_groups", ["short_name"], name: "index_library_groups_on_short_name"

data/spec/factories/agent.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :agent do |f|
     f.sequence(:full_name){|n| "full_name_#{n}"}
     f.agent_type_id{AgentType.where(name: 'person').first.id}
@@ -7,7 +7,7 @@ FactoryGirl.define do
   end
 end
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :invalid_agent, :class => Agent do |f|
   end
 end