activerecord-jdbc-adapter 1.3.0.beta1 → 1.3.0.beta2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (161) hide show
  1. data/.gitignore +12 -11
  2. data/.travis.yml +36 -7
  3. data/Appraisals +3 -3
  4. data/Gemfile +1 -1
  5. data/Gemfile.lock +13 -6
  6. data/History.txt +64 -0
  7. data/README.md +8 -1
  8. data/Rakefile +3 -1
  9. data/gemfiles/rails23.gemfile +1 -1
  10. data/gemfiles/rails23.gemfile.lock +6 -5
  11. data/gemfiles/rails30.gemfile +1 -1
  12. data/gemfiles/rails30.gemfile.lock +7 -6
  13. data/gemfiles/rails31.gemfile +1 -1
  14. data/gemfiles/rails31.gemfile.lock +6 -5
  15. data/gemfiles/rails32.gemfile +1 -1
  16. data/gemfiles/rails32.gemfile.lock +6 -5
  17. data/gemfiles/rails40.gemfile +2 -4
  18. data/gemfiles/rails40.gemfile.lock +37 -51
  19. data/lib/active_record/connection_adapters/as400_adapter.rb +2 -0
  20. data/lib/active_record/connection_adapters/db2_adapter.rb +1 -1
  21. data/lib/arel/visitors/db2.rb +5 -1
  22. data/lib/arel/visitors/hsqldb.rb +1 -0
  23. data/lib/arel/visitors/sql_server.rb +55 -13
  24. data/lib/arjdbc/db2/adapter.rb +197 -227
  25. data/lib/arjdbc/db2/as400.rb +124 -0
  26. data/lib/arjdbc/db2/connection_methods.rb +20 -1
  27. data/lib/arjdbc/derby/adapter.rb +17 -85
  28. data/lib/arjdbc/derby/connection_methods.rb +2 -1
  29. data/lib/arjdbc/discover.rb +55 -47
  30. data/lib/arjdbc/h2/adapter.rb +52 -18
  31. data/lib/arjdbc/h2/connection_methods.rb +10 -2
  32. data/lib/arjdbc/hsqldb/adapter.rb +33 -9
  33. data/lib/arjdbc/hsqldb/connection_methods.rb +10 -2
  34. data/lib/arjdbc/informix.rb +2 -1
  35. data/lib/arjdbc/jdbc.rb +5 -1
  36. data/lib/arjdbc/jdbc/adapter.rb +167 -89
  37. data/lib/arjdbc/jdbc/adapter_java.jar +0 -0
  38. data/lib/arjdbc/jdbc/adapter_require.rb +46 -0
  39. data/lib/arjdbc/jdbc/base_ext.rb +25 -3
  40. data/lib/arjdbc/jdbc/callbacks.rb +9 -8
  41. data/lib/arjdbc/jdbc/column.rb +8 -20
  42. data/lib/arjdbc/jdbc/connection.rb +69 -80
  43. data/lib/arjdbc/jdbc/extension.rb +6 -8
  44. data/lib/arjdbc/jdbc/jdbc.rake +3 -141
  45. data/lib/arjdbc/jdbc/rake_tasks.rb +3 -10
  46. data/lib/arjdbc/mssql/adapter.rb +108 -34
  47. data/lib/arjdbc/mssql/connection_methods.rb +3 -1
  48. data/lib/arjdbc/mssql/limit_helpers.rb +3 -2
  49. data/lib/arjdbc/mssql/lock_helpers.rb +5 -1
  50. data/lib/arjdbc/mysql/adapter.rb +127 -70
  51. data/lib/arjdbc/mysql/connection_methods.rb +5 -2
  52. data/lib/arjdbc/oracle/adapter.rb +124 -94
  53. data/lib/arjdbc/oracle/connection_methods.rb +2 -1
  54. data/lib/arjdbc/postgresql/adapter.rb +99 -67
  55. data/lib/arjdbc/postgresql/column_cast.rb +3 -5
  56. data/lib/arjdbc/postgresql/connection_methods.rb +6 -6
  57. data/lib/arjdbc/railtie.rb +3 -1
  58. data/lib/arjdbc/sqlite3/adapter.rb +60 -43
  59. data/lib/arjdbc/sqlite3/connection_methods.rb +9 -9
  60. data/lib/arjdbc/sybase.rb +1 -1
  61. data/lib/arjdbc/tasks.rb +13 -0
  62. data/lib/arjdbc/tasks/database_tasks.rb +50 -0
  63. data/lib/arjdbc/tasks/databases.rake +89 -0
  64. data/lib/arjdbc/tasks/databases3.rake +203 -0
  65. data/lib/arjdbc/tasks/databases4.rake +39 -0
  66. data/lib/arjdbc/tasks/db2_database_tasks.rb +104 -0
  67. data/lib/arjdbc/tasks/derby_database_tasks.rb +95 -0
  68. data/lib/arjdbc/tasks/h2_database_tasks.rb +29 -0
  69. data/lib/arjdbc/tasks/hsqldb_database_tasks.rb +70 -0
  70. data/lib/arjdbc/tasks/jdbc_database_tasks.rb +122 -0
  71. data/lib/arjdbc/tasks/mssql_database_tasks.rb +36 -0
  72. data/lib/arjdbc/tasks/oracle/enhanced_structure_dump.rb +297 -0
  73. data/lib/arjdbc/tasks/oracle_database_tasks.rb +62 -0
  74. data/lib/arjdbc/version.rb +1 -1
  75. data/pom.xml +11 -12
  76. data/rails_generators/jdbc_generator.rb +1 -1
  77. data/rails_generators/templates/config/initializers/jdbc.rb +8 -5
  78. data/rails_generators/templates/lib/tasks/jdbc.rake +7 -4
  79. data/rakelib/02-test.rake +42 -15
  80. data/rakelib/compile.rake +29 -2
  81. data/rakelib/db.rake +2 -1
  82. data/rakelib/rails.rake +23 -6
  83. data/src/java/arjdbc/ArJdbcModule.java +175 -0
  84. data/src/java/arjdbc/db2/DB2Module.java +2 -1
  85. data/src/java/arjdbc/derby/DerbyModule.java +5 -24
  86. data/src/java/arjdbc/hsqldb/HSQLDBModule.java +3 -2
  87. data/src/java/arjdbc/jdbc/AdapterJavaService.java +3 -46
  88. data/src/java/arjdbc/jdbc/RubyJdbcConnection.java +1001 -259
  89. data/src/java/arjdbc/mssql/MSSQLModule.java +2 -1
  90. data/src/java/arjdbc/mysql/MySQLModule.java +4 -3
  91. data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java +12 -7
  92. data/src/java/arjdbc/oracle/OracleModule.java +2 -1
  93. data/src/java/arjdbc/sqlite3/SQLite3Module.java +2 -1
  94. data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java +12 -0
  95. data/test/db/db2.rb +14 -7
  96. data/test/db/db2/rake_test.rb +82 -0
  97. data/test/db/db2/rake_test_data.sql +35 -0
  98. data/test/db/db2/simple_test.rb +20 -0
  99. data/test/db/db2/unit_test.rb +3 -1
  100. data/test/db/derby.rb +7 -5
  101. data/test/db/derby/rake_test.rb +96 -0
  102. data/test/db/derby/simple_test.rb +10 -2
  103. data/test/db/h2.rb +6 -8
  104. data/test/db/h2/identity_column_test.rb +35 -0
  105. data/test/db/h2/offset_test.rb +49 -0
  106. data/test/db/h2/rake_test.rb +98 -0
  107. data/test/db/h2/schema_dump_test.rb +5 -1
  108. data/test/db/hsqldb.rb +6 -10
  109. data/test/db/hsqldb/rake_test.rb +101 -0
  110. data/test/db/hsqldb/schema_dump_test.rb +5 -1
  111. data/test/db/hsqldb/simple_test.rb +8 -0
  112. data/test/db/jndi_config.rb +1 -3
  113. data/test/db/jndi_pooled_config.rb +1 -3
  114. data/test/db/mssql/limit_offset_test.rb +23 -14
  115. data/test/db/mssql/rake_test.rb +143 -0
  116. data/test/db/mysql/_rails_test_mysql.32.out +1069 -1252
  117. data/test/db/mysql/nonstandard_primary_key_test.rb +21 -24
  118. data/test/db/mysql/rake_test.rb +97 -0
  119. data/test/db/mysql/schema_dump_test.rb +11 -11
  120. data/test/db/mysql/simple_test.rb +52 -3
  121. data/test/db/mysql/statement_escaping_test.rb +46 -0
  122. data/test/db/oracle/rake_test.rb +100 -0
  123. data/test/db/oracle/simple_test.rb +48 -0
  124. data/test/db/postgres/_rails_test_postgres.32.out +998 -1370
  125. data/test/db/postgres/active_schema_unit_test.rb +68 -0
  126. data/test/db/postgres/connection_test.rb +10 -2
  127. data/test/db/postgres/data_types_test.rb +2 -2
  128. data/test/db/postgres/ltree_test.rb +6 -5
  129. data/test/db/postgres/native_types_test.rb +1 -5
  130. data/test/db/postgres/rake_test.rb +117 -0
  131. data/test/db/postgres/schema_dump_test.rb +9 -2
  132. data/test/db/postgres/schema_test.rb +4 -2
  133. data/test/db/postgres/simple_test.rb +57 -16
  134. data/test/db/sqlite3.rb +3 -10
  135. data/test/db/sqlite3/_rails_test_sqlite3.32.out +1070 -1298
  136. data/test/db/sqlite3/rake_test.rb +71 -0
  137. data/test/db/sqlite3/simple_test.rb +9 -9
  138. data/test/has_many_through.rb +4 -1
  139. data/test/jdbc/db2.rb +14 -1
  140. data/test/jdbc_column_test.rb +23 -0
  141. data/test/{generic_jdbc_connection_test.rb → jdbc_connection_test.rb} +22 -17
  142. data/test/jndi_callbacks_test.rb +26 -28
  143. data/test/jndi_test.rb +7 -16
  144. data/test/models/data_types.rb +2 -1
  145. data/test/models/thing.rb +1 -0
  146. data/test/rails/mysql.rb +13 -0
  147. data/test/rails/sqlite3/version.rb +6 -0
  148. data/test/rails_stub.rb +31 -0
  149. data/test/rake_test_support.rb +298 -0
  150. data/test/serialize.rb +2 -4
  151. data/test/{helper.rb → shared_helper.rb} +0 -0
  152. data/test/simple.rb +167 -93
  153. data/test/test_helper.rb +52 -16
  154. metadata +388 -354
  155. data/lib/pg.rb +0 -26
  156. data/test/abstract_db_create.rb +0 -139
  157. data/test/activerecord/connection_adapters/type_conversion_test.rb +0 -36
  158. data/test/db/mssql/db_create_test.rb +0 -29
  159. data/test/db/mysql/db_create_test.rb +0 -33
  160. data/test/db/postgres/db_create_test.rb +0 -44
  161. data/test/db/postgres/db_drop_test.rb +0 -17
data/.gitignore CHANGED
@@ -1,22 +1,23 @@
1
- pkg
2
1
  *.gem
3
2
  *.tgz
4
3
  derby-testdb*
5
4
  derby.log
6
5
  test.*
7
- doc
8
- build.xml
9
- nbproject
10
- TAGS
11
6
  *~
12
7
  *.log
13
8
  patches*
14
9
  *#
15
- .stgit-edit.txt
16
- /.classpath
17
- /.project
18
- /bin
19
- /jndi_test/jdbc/.bindings
10
+ TAGS
11
+ build.xml
12
+ nbproject
13
+ .classpath
14
+ .project
15
+ MANIFEST.MF
16
+ bin
17
+ pkg
18
+ doc
20
19
  target
21
- test/jars
22
20
  coverage
21
+ test_*.out
22
+ test/jars/*.jar
23
+ jndi_test/jdbc/.bindings
data/.travis.yml CHANGED
@@ -3,21 +3,21 @@ script: bundle exec rake test_$DB
3
3
  rvm:
4
4
  - jruby-18mode
5
5
  - jruby-19mode
6
+ gemfile:
7
+ - gemfiles/rails23.gemfile
8
+ - gemfiles/rails30.gemfile
9
+ - gemfiles/rails31.gemfile
10
+ - gemfiles/rails32.gemfile
11
+ - gemfiles/rails40.gemfile
6
12
  env:
7
13
  - DB=mysql
8
14
  - DB=postgresql
9
15
  - DB=sqlite3
10
- # derby - tested with test_jndi
11
- #- DB=derby
16
+ - DB=derby
12
17
  - DB=h2
13
18
  - DB=hsqldb
14
19
  - DB=jndi
15
20
  - DB=jdbc
16
- gemfile:
17
- - gemfiles/rails23.gemfile
18
- - gemfiles/rails30.gemfile
19
- - gemfiles/rails31.gemfile
20
- - gemfiles/rails32.gemfile
21
21
  branches:
22
22
  only:
23
23
  - master
@@ -26,5 +26,34 @@ matrix:
26
26
  allow_failures:
27
27
  # probably fine to allow in 1.3.x :
28
28
  #- gemfile: gemfiles/rails23.gemfile
29
+ # NOTE: temporary until it gets stable :
30
+ - gemfile: gemfiles/rails40.gemfile
29
31
  # NOTE: not sure why it can't connect :
30
32
  - env: DB=jdbc
33
+ # Rails 4 prefers to run on Ruby 2.0 :
34
+ exclude:
35
+ - rvm: jruby-18mode
36
+ gemfile: gemfiles/rails40.gemfile
37
+ env: DB=mysql
38
+ - rvm: jruby-18mode
39
+ gemfile: gemfiles/rails40.gemfile
40
+ env: DB=postgresql
41
+ - rvm: jruby-18mode
42
+ gemfile: gemfiles/rails40.gemfile
43
+ env: DB=sqlite3
44
+ - rvm: jruby-18mode
45
+ gemfile: gemfiles/rails40.gemfile
46
+ env: DB=derby
47
+ - rvm: jruby-18mode
48
+ gemfile: gemfiles/rails40.gemfile
49
+ env: DB=h2
50
+ - rvm: jruby-18mode
51
+ gemfile: gemfiles/rails40.gemfile
52
+ env: DB=hsqldb
53
+ - rvm: jruby-18mode
54
+ gemfile: gemfiles/rails40.gemfile
55
+ env: DB=jdbc
56
+ - rvm: jruby-18mode
57
+ gemfile: gemfiles/rails40.gemfile
58
+ env: DB=jndi
59
+
data/Appraisals CHANGED
@@ -18,7 +18,7 @@ end
18
18
  appraise "rails40" do # NOTE: make sure you're using --1.9 with AR-4.0
19
19
  #gem "activerecord", "~> 4.0.0"
20
20
  # until there's an actual 4.0 release :
21
- gem 'rails', :github => 'rails/rails'
22
- gem 'journey', :github => 'rails/journey'
23
- gem 'activerecord-deprecated_finders', :github => 'rails/activerecord-deprecated_finders', :require => nil
21
+ gem 'rails', :github => 'rails/rails', :branch => '4-0-stable'
22
+ #gem 'journey', :github => 'rails/journey'
23
+ #gem 'activerecord-deprecated_finders', :github => 'rails/activerecord-deprecated_finders', :require => nil
24
24
  end
data/Gemfile CHANGED
@@ -7,7 +7,7 @@ group :development do
7
7
  gem 'ruby-debug', :require => nil
8
8
  end
9
9
 
10
- gem 'appraisal'
10
+ gem 'appraisal', :require => nil
11
11
  gem 'rake', :require => nil
12
12
  # appraisal ignores group block declarations :
13
13
  gem 'test-unit', '2.5.4', :group => :test
data/Gemfile.lock CHANGED
@@ -22,20 +22,23 @@ GEM
22
22
  activesupport (3.2.13)
23
23
  i18n (= 0.6.1)
24
24
  multi_json (~> 1.0)
25
- appraisal (0.5.1)
25
+ appraisal (0.5.2)
26
26
  bundler
27
27
  rake
28
28
  arel (3.0.2)
29
+ bcrypt-ruby (3.0.1)
29
30
  bcrypt-ruby (3.0.1-java)
30
- bouncy-castle-java (1.5.0146.1)
31
+ bouncy-castle-java (1.5.0147)
31
32
  builder (3.0.4)
32
33
  columnize (0.3.6)
33
34
  erubis (2.7.0)
34
35
  hike (1.2.1)
35
36
  i18n (0.6.1)
36
37
  journey (1.0.4)
37
- jruby-openssl (0.8.2)
38
- bouncy-castle-java (>= 1.5.0146.1)
38
+ jruby-openssl (0.8.8)
39
+ bouncy-castle-java (>= 1.5.0147)
40
+ linecache (0.46)
41
+ rbx-require-relative (> 0.0.4)
39
42
  metaclass (0.0.1)
40
43
  mocha (0.13.3)
41
44
  metaclass (~> 0.0.1)
@@ -45,10 +48,13 @@ GEM
45
48
  rack (>= 0.4)
46
49
  rack-test (0.6.2)
47
50
  rack (>= 1.0)
48
- rake (10.0.3)
51
+ rake (10.0.4)
52
+ rbx-require-relative (0.0.9)
49
53
  ruby-debug (0.10.4)
50
54
  columnize (>= 0.1)
51
55
  ruby-debug-base (~> 0.10.4.0)
56
+ ruby-debug-base (0.10.4)
57
+ linecache (>= 0.3)
52
58
  ruby-debug-base (0.10.4-java)
53
59
  simplecov (0.7.1)
54
60
  multi_json (~> 1.0)
@@ -60,13 +66,14 @@ GEM
60
66
  rack (~> 1.0)
61
67
  tilt (~> 1.1, != 1.3.0)
62
68
  test-unit (2.5.4)
63
- test-unit-context (0.3.0)
69
+ test-unit-context (0.3.1)
64
70
  test-unit (>= 2.4.0)
65
71
  tilt (1.3.6)
66
72
  tzinfo (0.3.37)
67
73
 
68
74
  PLATFORMS
69
75
  java
76
+ ruby
70
77
 
71
78
  DEPENDENCIES
72
79
  actionpack
data/History.txt CHANGED
@@ -1,3 +1,67 @@
1
+ == 1.3.0.beta2 (05/30/13)
2
+
3
+ - only load rake tasks if AR is being used - AR::Railtie is loaded (#234)
4
+ - override #structure_dump so it won't silently return while doing nothing
5
+ - [h2] support empty insert statement (actually used by AR 4.0)
6
+ - [postgres] support 4.0 options for #indexes + dumping partial indexes
7
+ - [oracle] "better" rake tasks (kindly borrowed from the enhanced-adapter)
8
+ - [db2] some database tasks - with a tested (and fixed) structure_dump
9
+ - [db2] should set schema on configure_connection
10
+ - [mssql] Fix SQL server version matching on SQL Azure
11
+ - [mssql] collation and database_exists? helpers for SQLServer
12
+ - [h2] rake db: tasks support (db:structure: dump/load as well as db:drop)
13
+ - [hsqldb] structure:dump structure:load and fixed drop database support
14
+ - [hsqldb] handle config[:database] with db specific prefix
15
+ - [as400] error support for execure_and_auto_confirm
16
+ - [db2] remove unused explain method
17
+ - AR-4.0 inspired rake task impl (usable and shared with Rails 3.x/2.3 tasks)
18
+ - jdbc connection updates to better follow AR semantics
19
+ * #active? should check whether connection is valid
20
+ * #reconnect! should #configure_connection if available
21
+ * use JDBC 4 isValid as alive check fallback (no need for connection_alive_sql)
22
+ - [sqlite3] missing adapter.encoding method
23
+ - [as400] auto discover support (+ current_schema) for AS/400 with jndi
24
+ - use (module) spec.initiialize! convention to perform (lazy) AR initialization
25
+ - allow for (potential) adapter_spec overides by user on connection method
26
+ - [oracle] column/table name (+ raw) quoting - inspired by enhanced adapter
27
+ - [db2] support for `ArJdbc::DB2.emulate_booleans = false`
28
+ - [oracle] support for `ArJdbc::Oracle.emulate_booleans = false` (#225)
29
+ - [mysql] AR::ConnectionAdapters::MysqlAdapter.emulate_booleans support
30
+ - [mysql] #indexes compatible with 4.0 as well as #pk_and_sequence_for
31
+ - add config parameter to disable (JDBC) statement escaping and
32
+ disable statement escape processing by default for all (#243)
33
+ - [as400] add db2_schema to table_exists? + add support for nil schema
34
+ - [mssql] SQLServer visitor compat with next AREL
35
+ - [mssql] quote_table_name_for_assignment for MS-SQL
36
+ - quote_table_name_for_assignment should only be added on AR >= 4.0
37
+ - disable extension auto-discovery for installed gems (unless specified)
38
+ - [as400] fix as400 system schema + re-add jndi schema support
39
+ - [db2] separate AS400 code into a module + stadalone connection method
40
+ - [postgres] quoting that uses column.type (thus works with defs as well)
41
+ only use #sql_type when necessary
42
+ - better compatibility with native MySQL/SQLite3 adapter (constants)
43
+ - [postgres] restore PostgreSQLColumn.new < 4.0 compatibility
44
+ - [h2] allow H2 to set auto increment default value
45
+ - [postgres] make sure intifnite date/time values are handled correctly
46
+ - [postgres] use quote_table_name_for_assignment from AR-4.0
47
+ - [sqlite3] fix remove_column on AR-4.0
48
+ - do not load the AR built-in adapters eagerly - but on demand (#353)
49
+ - [postgres] ignore encoding option, print a warning about it (#376)
50
+ - [h2] check if offset is set, otherwise use the Arel::Node::Offset#expr
51
+ - [as400] adding ordering support when using both limit and offset
52
+ - [as400] force decimal field with 0 scale to be integers
53
+ - [sqlite3] let the JDBC API to figure out indexes (#377)
54
+ - support for loading only the necessary Java parts per adapter (#353)
55
+ - AREL visitors base impl revisited (to fix long broken query cache),
56
+ make sure a visitor is instantiated by the JDBC adapter (2.3 compatible)
57
+ - introduced ArJdbc.modules method that should return adapter modules
58
+ - move mysql gem API faking into (rails loadable) test code
59
+ - there should be no more need to fake out *pg.rb* (due native 'pg' gem)
60
+ - do not fake out SQLite3::Version ... gets only loaded while running tests now
61
+
62
+ Code Contributors (in no particular order): Jason Franklin, Alexey Noskov,
63
+ Brian Kulyk, Pierrick Rouxel, Mike Poltyn and Steve Lorek
64
+
1
65
  == 1.3.0.beta1 (04/11/13)
2
66
 
3
67
  - [db2] map datetime / timestamp / time types + correct time handling on AS400
data/README.md CHANGED
@@ -13,7 +13,7 @@ strives to provide ActiveRecord 2.3, 3.x as well as 4.0 (master) compatibility.
13
13
  Our master already contains a lot of fixes but since we diverged significantly
14
14
  from the 1.2 line (we no longer back-port fixes) and still require to perform a
15
15
  few refactorings we advise users to point their *Gemfiles* to our master or use
16
- pre-release versions of our gem(s) e.g. **1.3.0.beta1**.
16
+ pre-release versions of our gem(s) e.g. **1.3.0.beta2**.
17
17
 
18
18
  **NOTE:** activerecord-jdbc-adapter gem **1.2.6** contains a SQL injection
19
19
  [security vulnerability](http://cl.ly/code/0n381E353414) and has been yanked,
@@ -144,6 +144,13 @@ development:
144
144
  password: lion
145
145
  ```
146
146
 
147
+ If your SGBD isn't automatically discovered you can force dialect :
148
+ ```yml
149
+ development:
150
+ [...]
151
+ dialect: as400 # For example
152
+ ```
153
+
147
154
  ### Standalone (with ActiveRecord)
148
155
 
149
156
  1. Install the gem with JRuby:
data/Rakefile CHANGED
@@ -1,6 +1,8 @@
1
1
  require 'rake/testtask'
2
+
2
3
  require 'rake/clean'
3
- CLEAN.include 'derby*', 'test.db.*','test/reports', 'test.sqlite3','lib/**/*.jar','manifest.mf', '*.log', 'target/*'
4
+ CLEAN.include 'derby*', 'test.db.*', '*test.sqlite3', 'test/reports'
5
+ CLEAN.include 'lib/**/*.jar', 'MANIFEST.MF', '*.log', 'target/*'
4
6
 
5
7
  require 'bundler/gem_helper'
6
8
  Bundler::GemHelper.install_tasks
data/gemfiles/rails23.gemfile CHANGED
@@ -3,7 +3,7 @@
3
3
  source "https://rubygems.org"
4
4
 
5
5
  gem "jruby-openssl", :platform=>:jruby
6
- gem "appraisal"
6
+ gem "appraisal", :require=>nil
7
7
  gem "rake", :require=>nil
8
8
  gem "test-unit", "2.5.4", :group=>:test
9
9
  gem "test-unit-context", :group=>:test
data/gemfiles/rails23.gemfile.lock CHANGED
@@ -11,17 +11,18 @@ GEM
11
11
  activeresource (2.3.18)
12
12
  activesupport (= 2.3.18)
13
13
  activesupport (2.3.18)
14
- appraisal (0.5.1)
14
+ appraisal (0.5.2)
15
15
  bundler
16
16
  rake
17
+ bcrypt-ruby (3.0.1)
17
18
  bcrypt-ruby (3.0.1-java)
18
19
  bouncy-castle-java (1.5.0147)
19
- jruby-openssl (0.8.4)
20
+ jruby-openssl (0.8.7)
20
21
  bouncy-castle-java (>= 1.5.0147)
21
22
  metaclass (0.0.1)
22
23
  mocha (0.13.3)
23
24
  metaclass (~> 0.0.1)
24
- multi_json (1.5.0)
25
+ multi_json (1.7.2)
25
26
  rack (1.1.6)
26
27
  rails (2.3.18)
27
28
  actionmailer (= 2.3.18)
@@ -30,13 +31,13 @@ GEM
30
31
  activeresource (= 2.3.18)
31
32
  activesupport (= 2.3.18)
32
33
  rake (>= 0.8.3)
33
- rake (10.0.3)
34
+ rake (10.0.4)
34
35
  simplecov (0.7.1)
35
36
  multi_json (~> 1.0)
36
37
  simplecov-html (~> 0.7.1)
37
38
  simplecov-html (0.7.1)
38
39
  test-unit (2.5.4)
39
- test-unit-context (0.3.0)
40
+ test-unit-context (0.3.1)
40
41
  test-unit (>= 2.4.0)
41
42
 
42
43
  PLATFORMS
data/gemfiles/rails30.gemfile CHANGED
@@ -3,7 +3,7 @@
3
3
  source "https://rubygems.org"
4
4
 
5
5
  gem "jruby-openssl", :platform=>:jruby
6
- gem "appraisal"
6
+ gem "appraisal", :require=>nil
7
7
  gem "rake", :require=>nil
8
8
  gem "test-unit", "2.5.4", :group=>:test
9
9
  gem "test-unit-context", :group=>:test
data/gemfiles/rails30.gemfile.lock CHANGED
@@ -11,29 +11,30 @@ GEM
11
11
  arel (~> 2.0.10)
12
12
  tzinfo (~> 0.3.23)
13
13
  activesupport (3.0.20)
14
- appraisal (0.5.1)
14
+ appraisal (0.5.2)
15
15
  bundler
16
16
  rake
17
17
  arel (2.0.10)
18
+ bcrypt-ruby (3.0.1)
18
19
  bcrypt-ruby (3.0.1-java)
19
20
  bouncy-castle-java (1.5.0147)
20
21
  builder (2.1.2)
21
22
  i18n (0.5.0)
22
- jruby-openssl (0.8.4)
23
+ jruby-openssl (0.8.7)
23
24
  bouncy-castle-java (>= 1.5.0147)
24
25
  metaclass (0.0.1)
25
26
  mocha (0.13.3)
26
27
  metaclass (~> 0.0.1)
27
- multi_json (1.5.0)
28
- rake (10.0.3)
28
+ multi_json (1.7.2)
29
+ rake (10.0.4)
29
30
  simplecov (0.7.1)
30
31
  multi_json (~> 1.0)
31
32
  simplecov-html (~> 0.7.1)
32
33
  simplecov-html (0.7.1)
33
34
  test-unit (2.5.4)
34
- test-unit-context (0.3.0)
35
+ test-unit-context (0.3.1)
35
36
  test-unit (>= 2.4.0)
36
- tzinfo (0.3.35)
37
+ tzinfo (0.3.37)
37
38
 
38
39
  PLATFORMS
39
40
  java
data/gemfiles/rails31.gemfile CHANGED
@@ -3,7 +3,7 @@
3
3
  source "https://rubygems.org"
4
4
 
5
5
  gem "jruby-openssl", :platform=>:jruby
6
- gem "appraisal"
6
+ gem "appraisal", :require=>nil
7
7
  gem "rake", :require=>nil
8
8
  gem "test-unit", "2.5.4", :group=>:test
9
9
  gem "test-unit-context", :group=>:test
data/gemfiles/rails31.gemfile.lock CHANGED
@@ -12,27 +12,28 @@ GEM
12
12
  tzinfo (~> 0.3.29)
13
13
  activesupport (3.1.12)
14
14
  multi_json (~> 1.0)
15
- appraisal (0.5.1)
15
+ appraisal (0.5.2)
16
16
  bundler
17
17
  rake
18
18
  arel (2.2.3)
19
+ bcrypt-ruby (3.0.1)
19
20
  bcrypt-ruby (3.0.1-java)
20
21
  bouncy-castle-java (1.5.0147)
21
22
  builder (3.0.4)
22
23
  i18n (0.6.4)
23
- jruby-openssl (0.8.4)
24
+ jruby-openssl (0.8.7)
24
25
  bouncy-castle-java (>= 1.5.0147)
25
26
  metaclass (0.0.1)
26
27
  mocha (0.13.3)
27
28
  metaclass (~> 0.0.1)
28
- multi_json (1.2.0)
29
- rake (10.0.3)
29
+ multi_json (1.7.2)
30
+ rake (10.0.4)
30
31
  simplecov (0.7.1)
31
32
  multi_json (~> 1.0)
32
33
  simplecov-html (~> 0.7.1)
33
34
  simplecov-html (0.7.1)
34
35
  test-unit (2.5.4)
35
- test-unit-context (0.3.0)
36
+ test-unit-context (0.3.1)
36
37
  test-unit (>= 2.4.0)
37
38
  tzinfo (0.3.37)
38
39
 
data/gemfiles/rails32.gemfile CHANGED
@@ -3,7 +3,7 @@
3
3
  source "https://rubygems.org"
4
4
 
5
5
  gem "jruby-openssl", :platform=>:jruby
6
- gem "appraisal"
6
+ gem "appraisal", :require=>nil
7
7
  gem "rake", :require=>nil
8
8
  gem "test-unit", "2.5.4", :group=>:test
9
9
  gem "test-unit-context", :group=>:test
data/gemfiles/rails32.gemfile.lock CHANGED
@@ -12,27 +12,28 @@ GEM
12
12
  activesupport (3.2.13)
13
13
  i18n (= 0.6.1)
14
14
  multi_json (~> 1.0)
15
- appraisal (0.5.1)
15
+ appraisal (0.5.2)
16
16
  bundler
17
17
  rake
18
18
  arel (3.0.2)
19
+ bcrypt-ruby (3.0.1)
19
20
  bcrypt-ruby (3.0.1-java)
20
21
  bouncy-castle-java (1.5.0147)
21
22
  builder (3.0.4)
22
23
  i18n (0.6.1)
23
- jruby-openssl (0.8.4)
24
+ jruby-openssl (0.8.7)
24
25
  bouncy-castle-java (>= 1.5.0147)
25
26
  metaclass (0.0.1)
26
27
  mocha (0.13.3)
27
28
  metaclass (~> 0.0.1)
28
- multi_json (1.5.0)
29
- rake (10.0.3)
29
+ multi_json (1.7.2)
30
+ rake (10.0.4)
30
31
  simplecov (0.7.1)
31
32
  multi_json (~> 1.0)
32
33
  simplecov-html (~> 0.7.1)
33
34
  simplecov-html (0.7.1)
34
35
  test-unit (2.5.4)
35
- test-unit-context (0.3.0)
36
+ test-unit-context (0.3.1)
36
37
  test-unit (>= 2.4.0)
37
38
  tzinfo (0.3.37)
38
39