enju_resource_merge 0.1.0.pre2 → 0.1.0.pre3

data/lib/enju_resource_merge/version.rb

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

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

data/spec/views/series_statement_merges/index.html.erb_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe "series_statement_merges/index" do
+  fixtures :all
+
   before(:each) do
     assign(:series_statement_merges, Kaminari::paginate_array([
       stub_model(SeriesStatementMerge,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_resource_merge
 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-08-07 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre3
+        version: 0.1.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre3
+        version: 0.1.0.pre6
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -144,17 +144,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
 description: Merge resource records for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -214,6 +214,7 @@ files:
 - spec/dummy/app/helpers/application_helper.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_has_role.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -224,6 +225,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
@@ -401,6 +403,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.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_has_role.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -411,6 +414,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