enju_library 0.1.0.pre2 → 0.1.0.pre3

data/app/models/budget_type.rb

@@ -1,5 +1,5 @@
 class BudgetType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
+  attr_accessible :name, :display_name, :note, :position
   include MasterModel
   default_scope :order => 'budget_types.position'
   has_many :items

data/app/models/library.rb

@@ -3,7 +3,7 @@ class Library < ActiveRecord::Base
   attr_accessible :name, :display_name, :short_display_name, :zip_code, :street,
     :locality, :region, :telephone_number_1, :telephone_number_2, :fax_number,
     :note, :call_number_rows, :call_number_delimiter, :library_group_id,
-    :country_id, :opening_hour, :isil
+    :country_id, :opening_hour, :isil, :position
 
   include MasterModel
   default_scope :order => 'libraries.position'

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre2"
+  VERSION = "0.1.0.pre3"
 end

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

@@ -4,7 +4,7 @@ class PictureFile < ActiveRecord::Base
   scope :attached, where('picture_attachable_id > 0')
   belongs_to :picture_attachable, :polymorphic => true, :validate => true
 
-  if configatron.uploaded_file.storage == :s3
+  if Setting.uploaded_file.storage == :s3
     has_attached_file :picture, :storage => :s3, :styles => { :medium => "600x600>", :thumb => "100x100>" },
       :s3_credentials => "#{Rails.root.to_s}/config/s3.yml", :path => "picture_files/:id/:filename"
   else

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_library
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre2
+  version: 0.1.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 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
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.1.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -176,17 +176,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.pre2
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre
+        version: 0.1.0.pre5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre
+        version: 0.1.0.pre5
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +359,7 @@ files:
 - spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/picture_file.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
@@ -370,6 +371,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
@@ -563,6 +565,7 @@ test_files:
 - spec/dummy/app/models/ability.rb
 - spec/dummy/app/models/picture_file.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
@@ -574,6 +577,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