enju_event 0.1.16 → 0.1.17.pre

data/app/controllers/event_import_files_controller.rb

@@ -16,7 +16,7 @@ class EventImportFilesController < ApplicationController
   # GET /event_import_files/1.json
   def show
     if @event_import_file.event_import.path
-      unless configatron.uploaded_file.storage == :s3
+      unless Setting.uploaded_file.storage == :s3
         file = @event_import_file.event_import.path
       end
     end
@@ -25,7 +25,7 @@ class EventImportFilesController < ApplicationController
       format.html # show.html.erb
       format.json { render :json => @event_import_file }
       format.download {
-        if configatron.uploaded_file.storage == :s3
+        if Setting.uploaded_file.storage == :s3
           redirect_to @event_import_file.event_import.expiring_url(10)
         else
           send_file file, :filename => @event_import_file.event_import_file_name, :type => 'application/octet-stream'

data/app/models/event_import_file.rb

@@ -5,7 +5,7 @@ class EventImportFile < ActiveRecord::Base
   scope :not_imported, where(:state => 'pending')
   scope :stucked, where('created_at < ? AND state = ?', 1.hour.ago, 'pending')
 
-  if configatron.uploaded_file.storage == :s3
+  if Setting.uploaded_file.storage == :s3
     has_attached_file :event_import, :storage => :s3, :s3_credentials => "#{Rails.root.to_s}/config/s3.yml",
       :s3_permissions => :private
   else
@@ -167,7 +167,7 @@ class EventImportFile < ActiveRecord::Base
   private
   def open_import_file
     tempfile = Tempfile.new('event_import_file')
-    if configatron.uploaded_file.storage == :s3
+    if Setting.uploaded_file.storage == :s3
       uploaded_file_path = event_import.expiring_url(10)
     else
       uploaded_file_path = event_import.path

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.16"
+  VERSION = "0.1.17.pre"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -76,7 +76,7 @@ class ApplicationController < ActionController::Base
   def convert_charset
     case params[:format]
     when 'csv'
-      return unless configatron.csv_charset_conversion
+      return unless Setting.csv_charset_conversion
       # TODO: 他の言語
       if @locale.to_sym == :ja
         headers["Content-Type"] = "text/csv; charset=Shift_JIS"

data/spec/dummy/app/mailers/notifier.rb

@@ -2,10 +2,10 @@ class Notifier < ActionMailer::Base
   if LibraryGroup.site_config.try(:url)
     uri = Addressable::URI.parse(LibraryGroup.site_config.url)
     default_url_options[:host] = uri.host
-    default_url_options[:port] = uri.port if configatron.enju.web_port_number != 80
+    default_url_options[:port] = uri.port if Setting.enju.web_port_number != 80
   else
-    default_url_options[:host] = configatron.enju.web_hostname
-    default_url_options[:port] = configatron.enju.web_port_number if configatron.enju.web_port_number != 80
+    default_url_options[:host] = Setting.enju.web_hostname
+    default_url_options[:port] = Setting.enju.web_port_number if Setting.enju.web_port_number != 80
   end
 
   def message_notification(message)

data/spec/dummy/app/models/setting.rb

@@ -0,0 +1,4 @@
+class Setting < Settingslogic
+  source "#{Rails.root}/config/application.yml"
+  namespace Rails.env
+end

data/spec/dummy/config/application.yml

@@ -0,0 +1,38 @@
+defaults: &defaults
+  enju:
+    web_hostname: localhost
+    web_port_number: 3000
+
+  family_name_first: true
+  max_number_of_results: 500
+  write_search_log_to_file: true
+  csv_charset_conversion: true
+
+# Choose a locale from 'ca', 'de', 'fr', 'jp', 'uk', 'us'
+#AMAZON_AWS_HOSTNAME = 'ecs.amazonaws.com'
+  amazon:
+    aws_hostname: ecs.amazonaws.jp
+    hostname: www.amazon.co.jp
+    access_key: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
+    secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
+
+# :google, :amazon
+  book_jacket:
+    source: :google
+    unknown_resource:
+
+# :mozshot, :simpleapi, :heartrails, :thumbalizr
+  screenshot:
+    generator: :mozshot
+
+  uploaded_file:
+    storage: :local
+
+development:
+  <<: *defaults
+
+test:
+  <<: *defaults
+
+production:
+  <<: *defaults

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 version: !ruby/object:Gem::Version
-  version: 0.1.16
-  prerelease: 
+  version: 0.1.17.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -348,6 +348,7 @@ files:
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/role.rb
+- spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
@@ -359,6 +360,7 @@ files:
 - spec/dummy/app/views/page/404.mobile.erb
 - spec/dummy/app/views/page/404.xml.erb
 - spec/dummy/config/application.rb
+- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
@@ -557,9 +559,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -579,6 +581,7 @@ test_files:
 - spec/dummy/app/mailers/notifier.rb
 - spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/role.rb
+- spec/dummy/app/models/setting.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/models/user_group.rb
 - spec/dummy/app/models/user_has_role.rb
@@ -590,6 +593,7 @@ test_files:
 - spec/dummy/app/views/page/404.mobile.erb
 - spec/dummy/app/views/page/404.xml.erb
 - spec/dummy/config/application.rb
+- spec/dummy/config/application.yml
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb