enju_event 0.1.6 → 0.1.7

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011 YOURNAME
+Copyright 2012 YOURNAME
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -29,8 +29,18 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
+
 task :default => :spec

data/app/models/event.rb

@@ -1,5 +1,8 @@
 # -*- encoding: utf-8 -*-
 class Event < ActiveRecord::Base
+  attr_accessible :library_id, :event_category_id, :name, :note, :start_at,
+    :event_at, :all_day, :display_name
+
   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)}
   scope :past, lambda {|datetime| where('end_at <= ?', Time.zone.parse(datetime).beginning_of_day)}

data/app/models/event_category.rb

@@ -1,4 +1,5 @@
 class EventCategory < ActiveRecord::Base
+  attr_accessible :name, :display_name, :note
   include MasterModel
   default_scope :order => "position"
   has_many :events

data/app/models/event_import_file.rb

@@ -1,4 +1,5 @@
 class EventImportFile < ActiveRecord::Base
+  attr_accessible :event_import
   include ImportFile
   default_scope :order => 'id DESC'
   scope :not_imported, where(:state => 'pending')
@@ -62,7 +63,9 @@ class EventImportFile < ActiveRecord::Base
 
     rows.each do |row|
       next if row['dummy'].to_s.strip.present?
-      import_result = EventImportResult.create!(:event_import_file => self, :body => row.fields.join("\t"))
+      event_import_result = EventImportResult.new
+      event_import_result.assign_attributes({:event_import_file_id => self.id, :body => row.fields.join("\t")}, :as => :admin)
+      event_import_result.save!
 
       event = Event.new
       event.name = row['name'].to_s.strip
@@ -82,14 +85,14 @@ class EventImportFile < ActiveRecord::Base
       event.event_category = event_category
 
       if event.save!
-        import_result.event = event
+        event_import_result.event = event
         num[:imported] += 1
         if row_num % 50 == 0
           Sunspot.commit
           GC.start
         end
       end
-      import_result.save!
+      event_import_result.save!
       row_num += 1
     end
     Sunspot.commit
@@ -179,7 +182,9 @@ class EventImportFile < ActiveRecord::Base
     file = CSV.open(tempfile, :col_sep => "\t")
     header = file.first
     rows = CSV.open(tempfile, :headers => header, :col_sep => "\t")
-    EventImportResult.create!(:event_import_file => self, :body => header.join("\t"))
+    event_import_result = EventImportResult.new
+    event_import_result.assign_attributes({:event_import_file_id => self.id, :body => header.join("\t")}, :as => :admin)
+    event_import_result.save!
     tempfile.close(true)
     file.close
     rows

data/app/models/event_import_result.rb

@@ -1,4 +1,5 @@
 class EventImportResult < ActiveRecord::Base
+  attr_accessible :event_id, :event_import_file_id, :body, :as => :admin
   default_scope :order => 'event_import_results.id'
   scope :file_id, proc{|file_id| {:conditions => {:event_import_file_id => file_id}}}
   scope :failed, where(:event_id => nil)

data/app/models/participate.rb

@@ -1,4 +1,5 @@
 class Participate < ActiveRecord::Base
+  attr_accessible :patron_id, :event_id
   belongs_to :patron
   belongs_to :event
 

data/lib/enju_event/engine.rb

@@ -15,6 +15,6 @@ require "nkf"
 require "acts_as_list"
 
 module EnjuEvent
-  class Engine < Rails::Engine
+  class Engine < ::Rails::Engine
   end
 end

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv

@@ -0,0 +1,5 @@
+"name"	"category"	"library_shortname"	"start_at"	"end_at"	"dummy"
+"イベント名"	"カテゴリ。休館日の場合はclosed"	"図書館名"	"開始日"	"終了日"	"インポート省略"
+"hogehoge"	"おはなし会"	"kamata"	"2009-04-01"	"2009-04-03"	
+"hogehoge"		"hachioji"			
+"休館日"	"closed"	"kamata"	"2011-04-01"	"2011-04-03"	

data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv

@@ -0,0 +1,3 @@
+"name"	"library_shortname"	"start_at"	"end_at"
+"���{��̍Â���"	"kamata"	"2011-03-26"	"2011-03-27"
+"���{��̍Â���2"	"kamata"	"2011-03-26"	"2011-03-27"

data/spec/dummy/private/system/event_imports/4/original/event_destroy_file.tsv

@@ -0,0 +1,4 @@
+id	dummy
+1	
+2	
+3	この行は無視される

data/spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv

@@ -1,4 +1,4 @@
-"name"	"category"	"library_shortname"	"start_at"	"end_at"	"dummy"
+"name"	"category"	"library"	"start_at"	"end_at"	"dummy"
 "イベント名"	"カテゴリ。休館日の場合はclosed"	"図書館名"	"開始日"	"終了日"	"インポート省略"
 "hogehoge"	"おはなし会"	"kamata"	"2009-04-01"	"2009-04-03"	
 "hogehoge"		"hachioji"			

data/spec/dummy/private/system/event_imports/4/original/event_import_file_sample2.tsv

@@ -1,3 +1,3 @@
-"name"	"library_shortname"	"start_at"	"end_at"
+"name"	"library"	"start_at"	"end_at"
 "���{��̍Â���"	"kamata"	"2011-03-26"	"2011-03-27"
 "���{��̍Â���2"	"kamata"	"2011-03-26"	"2011-03-27"

data/spec/dummy/private/system/event_imports/4/original/event_update_file.tsv

@@ -0,0 +1,4 @@
+id	name	category	library	start_at	end_at	all_day	note	dummy
+1	変更後のイベント名		kamata	2012-04-01	2012-04-02			
+2			mita		2012-04-03	FALSE		
+3	変更後のイベント名							この行は無視される

data/spec/dummy/solr/data/test/index/_2s.fnm

@@ -0,0 +1,4 @@
+����idtype
+class_namecreated_at_dupdated_at_drequired_role_id_ipatron_type_id_i	name_text

+position_idisplay_name_text
address_text
library_id_i
+start_at_dend_at_d	note_text

data/spec/dummy/solr/data/test/index/_2s.nrm

@@ -0,0 +1 @@
+NRM�xxvx|u|||||||||||||||||||||||||�|ut�u��|||||

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -477,6 +477,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/059_create_libraries.rb
 - spec/dummy/db/migrate/069_create_shelves.rb
@@ -503,12 +504,16 @@ files:
 - spec/dummy/lib/enju_leaf/master_model.rb
 - spec/dummy/lib/enju_leaf/url_validator.rb
 - spec/dummy/lib/enju_leaf.rb
+- spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv
+- spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv
+- spec/dummy/private/system/event_imports/4/original/event_destroy_file.tsv
 - spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_imports/4/original/event_import_file_sample2.tsv
+- spec/dummy/private/system/event_imports/4/original/event_update_file.tsv
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -525,8 +530,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
+- spec/dummy/solr/data/test/index/_2s.fdt
+- spec/dummy/solr/data/test/index/_2s.fdx
+- spec/dummy/solr/data/test/index/_2s.fnm
+- spec/dummy/solr/data/test/index/_2s.frq
+- spec/dummy/solr/data/test/index/_2s.nrm
+- spec/dummy/solr/data/test/index/_2s.prx
+- spec/dummy/solr/data/test/index/_2s.tii
+- spec/dummy/solr/data/test/index/_2s.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1
+- spec/dummy/solr/data/test/index/segments_2k
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/country.rb
@@ -631,6 +644,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/059_create_libraries.rb
 - spec/dummy/db/migrate/069_create_shelves.rb
@@ -657,12 +671,16 @@ test_files:
 - spec/dummy/lib/enju_leaf/master_model.rb
 - spec/dummy/lib/enju_leaf/url_validator.rb
 - spec/dummy/lib/enju_leaf.rb
+- spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv
+- spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv
+- spec/dummy/private/system/event_imports/4/original/event_destroy_file.tsv
 - spec/dummy/private/system/event_imports/4/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_imports/4/original/event_import_file_sample2.tsv
+- spec/dummy/private/system/event_imports/4/original/event_update_file.tsv
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -679,8 +697,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
+- spec/dummy/solr/data/test/index/_2s.fdt
+- spec/dummy/solr/data/test/index/_2s.fdx
+- spec/dummy/solr/data/test/index/_2s.fnm
+- spec/dummy/solr/data/test/index/_2s.frq
+- spec/dummy/solr/data/test/index/_2s.nrm
+- spec/dummy/solr/data/test/index/_2s.prx
+- spec/dummy/solr/data/test/index/_2s.tii
+- spec/dummy/solr/data/test/index/_2s.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1
+- spec/dummy/solr/data/test/index/segments_2k
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/country.rb