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

Sign up to get free protection for your applications and to get access to all the features.
Files changed (282) hide show
  1. data/.gitignore +14 -8
  2. data/.travis.yml +40 -31
  3. data/.yardopts +4 -0
  4. data/Appraisals +2 -5
  5. data/CONTRIBUTING.md +46 -0
  6. data/Gemfile +21 -4
  7. data/Gemfile.lock +42 -17
  8. data/{History.txt → History.md} +142 -75
  9. data/README.md +102 -104
  10. data/RUNNING_TESTS.md +76 -0
  11. data/Rakefile.jdbc +20 -0
  12. data/activerecord-jdbc-adapter.gemspec +35 -18
  13. data/gemfiles/rails23.gemfile +4 -3
  14. data/gemfiles/rails23.gemfile.lock +9 -6
  15. data/gemfiles/rails30.gemfile +4 -3
  16. data/gemfiles/rails30.gemfile.lock +9 -6
  17. data/gemfiles/rails31.gemfile +4 -3
  18. data/gemfiles/rails31.gemfile.lock +9 -6
  19. data/gemfiles/rails32.gemfile +4 -3
  20. data/gemfiles/rails32.gemfile.lock +17 -14
  21. data/gemfiles/rails40.gemfile +5 -5
  22. data/gemfiles/rails40.gemfile.lock +17 -69
  23. data/lib/active_record/connection_adapters/firebird_adapter.rb +1 -0
  24. data/lib/active_record/connection_adapters/sqlserver_adapter.rb +1 -0
  25. data/lib/arel/visitors/compat.rb +22 -3
  26. data/lib/arel/visitors/db2.rb +8 -4
  27. data/lib/arel/visitors/derby.rb +14 -13
  28. data/lib/arel/visitors/firebird.rb +5 -4
  29. data/lib/arel/visitors/hsqldb.rb +11 -9
  30. data/lib/arel/visitors/sql_server.rb +89 -61
  31. data/lib/arjdbc.rb +1 -1
  32. data/lib/arjdbc/db2/adapter.rb +181 -212
  33. data/lib/arjdbc/db2/as400.rb +31 -18
  34. data/lib/arjdbc/db2/column.rb +167 -0
  35. data/lib/arjdbc/db2/connection_methods.rb +2 -0
  36. data/lib/arjdbc/derby/adapter.rb +206 -107
  37. data/lib/arjdbc/derby/connection_methods.rb +4 -9
  38. data/lib/arjdbc/firebird.rb +1 -0
  39. data/lib/arjdbc/firebird/adapter.rb +202 -64
  40. data/lib/arjdbc/firebird/connection_methods.rb +20 -0
  41. data/lib/arjdbc/h2/adapter.rb +56 -36
  42. data/lib/arjdbc/hsqldb/adapter.rb +99 -68
  43. data/lib/arjdbc/jdbc/adapter.rb +474 -265
  44. data/lib/arjdbc/jdbc/adapter_java.jar +0 -0
  45. data/lib/arjdbc/jdbc/adapter_require.rb +8 -7
  46. data/lib/arjdbc/jdbc/arel_support.rb +132 -0
  47. data/lib/arjdbc/jdbc/base_ext.rb +8 -7
  48. data/lib/arjdbc/jdbc/callbacks.rb +16 -10
  49. data/lib/arjdbc/jdbc/column.rb +25 -3
  50. data/lib/arjdbc/jdbc/connection.rb +28 -55
  51. data/lib/arjdbc/jdbc/extension.rb +14 -14
  52. data/lib/arjdbc/jdbc/java.rb +6 -3
  53. data/lib/arjdbc/jdbc/jdbc.rake +1 -1
  54. data/lib/arjdbc/jdbc/quoted_primary_key.rb +2 -2
  55. data/lib/arjdbc/jdbc/rake_tasks.rb +1 -1
  56. data/lib/arjdbc/jdbc/type_converter.rb +5 -2
  57. data/lib/arjdbc/mssql/adapter.rb +160 -280
  58. data/lib/arjdbc/mssql/column.rb +182 -0
  59. data/lib/arjdbc/mssql/connection_methods.rb +37 -4
  60. data/lib/arjdbc/mssql/explain_support.rb +13 -21
  61. data/lib/arjdbc/mssql/limit_helpers.rb +79 -42
  62. data/lib/arjdbc/mssql/lock_methods.rb +77 -0
  63. data/lib/arjdbc/mssql/utils.rb +11 -11
  64. data/lib/arjdbc/mysql/adapter.rb +165 -247
  65. data/lib/arjdbc/mysql/column.rb +123 -0
  66. data/lib/arjdbc/mysql/connection_methods.rb +3 -6
  67. data/lib/arjdbc/oracle/adapter.rb +282 -288
  68. data/lib/arjdbc/oracle/column.rb +122 -0
  69. data/lib/arjdbc/oracle/connection_methods.rb +3 -0
  70. data/lib/arjdbc/postgresql/adapter.rb +336 -574
  71. data/lib/arjdbc/postgresql/column.rb +458 -0
  72. data/lib/arjdbc/postgresql/connection_methods.rb +1 -2
  73. data/lib/arjdbc/postgresql/schema_creation.rb +38 -0
  74. data/lib/arjdbc/sqlite3/adapter.rb +189 -145
  75. data/lib/arjdbc/sqlite3/explain_support.rb +1 -1
  76. data/lib/arjdbc/tasks/oracle/enhanced_structure_dump.rb +8 -8
  77. data/lib/arjdbc/util/quoted_cache.rb +60 -0
  78. data/lib/arjdbc/util/table_copier.rb +110 -0
  79. data/lib/arjdbc/version.rb +6 -7
  80. data/pom.xml +56 -2
  81. data/rakelib/02-test.rake +72 -83
  82. data/rakelib/db.rake +29 -17
  83. data/src/java/arjdbc/ArJdbcModule.java +21 -18
  84. data/src/java/arjdbc/db2/DB2RubyJdbcConnection.java +84 -12
  85. data/src/java/arjdbc/derby/DerbyModule.java +140 -143
  86. data/src/java/arjdbc/derby/DerbyRubyJdbcConnection.java +58 -7
  87. data/src/java/arjdbc/h2/H2Module.java +43 -0
  88. data/src/java/arjdbc/informix/InformixRubyJdbcConnection.java +7 -6
  89. data/src/java/arjdbc/jdbc/RubyJdbcConnection.java +1223 -648
  90. data/src/java/arjdbc/mssql/MSSQLRubyJdbcConnection.java +24 -23
  91. data/src/java/arjdbc/mysql/MySQLModule.java +33 -32
  92. data/src/java/arjdbc/mysql/MySQLRubyJdbcConnection.java +147 -30
  93. data/src/java/arjdbc/oracle/OracleModule.java +13 -13
  94. data/src/java/arjdbc/oracle/OracleRubyJdbcConnection.java +114 -6
  95. data/src/java/arjdbc/postgresql/PostgreSQLRubyJdbcConnection.java +166 -36
  96. data/src/java/arjdbc/sqlite3/SQLite3RubyJdbcConnection.java +101 -19
  97. data/src/java/arjdbc/util/QuotingUtils.java +19 -19
  98. metadata +240 -394
  99. data/bench/bench_attributes.rb +0 -13
  100. data/bench/bench_attributes_new.rb +0 -14
  101. data/bench/bench_create.rb +0 -12
  102. data/bench/bench_find_all.rb +0 -12
  103. data/bench/bench_find_all_mt.rb +0 -25
  104. data/bench/bench_model.rb +0 -85
  105. data/bench/bench_new.rb +0 -12
  106. data/bench/bench_new_valid.rb +0 -12
  107. data/bench/bench_valid.rb +0 -13
  108. data/lib/arel/engines/sql/compilers/db2_compiler.rb +0 -9
  109. data/lib/arel/engines/sql/compilers/derby_compiler.rb +0 -6
  110. data/lib/arel/engines/sql/compilers/h2_compiler.rb +0 -6
  111. data/lib/arel/engines/sql/compilers/hsqldb_compiler.rb +0 -15
  112. data/lib/arel/engines/sql/compilers/jdbc_compiler.rb +0 -6
  113. data/lib/arel/engines/sql/compilers/mssql_compiler.rb +0 -46
  114. data/lib/arjdbc/jdbc/missing_functionality_helper.rb +0 -98
  115. data/lib/arjdbc/mssql/lock_helpers.rb +0 -76
  116. data/lib/arjdbc/mssql/tsql_methods.rb +0 -58
  117. data/lib/arjdbc/postgresql/column_cast.rb +0 -134
  118. data/test/activerecord/connections/native_jdbc_mysql/connection.rb +0 -25
  119. data/test/activerecord/jall.sh +0 -7
  120. data/test/activerecord/jtest.sh +0 -3
  121. data/test/assets/flowers.jpg +0 -0
  122. data/test/binary.rb +0 -67
  123. data/test/db/db2.rb +0 -43
  124. data/test/db/db2/binary_test.rb +0 -6
  125. data/test/db/db2/has_many_through_test.rb +0 -6
  126. data/test/db/db2/rake_test.rb +0 -82
  127. data/test/db/db2/rake_test_data.sql +0 -35
  128. data/test/db/db2/reset_column_information_test.rb +0 -5
  129. data/test/db/db2/serialize_test.rb +0 -6
  130. data/test/db/db2/simple_test.rb +0 -81
  131. data/test/db/db2/test_helper.rb +0 -6
  132. data/test/db/db2/unit_test.rb +0 -73
  133. data/test/db/derby.rb +0 -12
  134. data/test/db/derby/binary_test.rb +0 -6
  135. data/test/db/derby/migration_test.rb +0 -74
  136. data/test/db/derby/rake_test.rb +0 -96
  137. data/test/db/derby/reset_column_information_test.rb +0 -6
  138. data/test/db/derby/row_locking_test.rb +0 -20
  139. data/test/db/derby/schema_dump_test.rb +0 -5
  140. data/test/db/derby/serialize_test.rb +0 -6
  141. data/test/db/derby/simple_test.rb +0 -173
  142. data/test/db/derby/test_helper.rb +0 -6
  143. data/test/db/derby/unit_test.rb +0 -32
  144. data/test/db/derby/xml_column_test.rb +0 -17
  145. data/test/db/h2.rb +0 -11
  146. data/test/db/h2/binary_test.rb +0 -6
  147. data/test/db/h2/change_column_test.rb +0 -68
  148. data/test/db/h2/identity_column_test.rb +0 -35
  149. data/test/db/h2/offset_test.rb +0 -49
  150. data/test/db/h2/rake_test.rb +0 -98
  151. data/test/db/h2/schema_dump_test.rb +0 -29
  152. data/test/db/h2/serialize_test.rb +0 -6
  153. data/test/db/h2/simple_test.rb +0 -56
  154. data/test/db/hsqldb.rb +0 -11
  155. data/test/db/hsqldb/binary_test.rb +0 -6
  156. data/test/db/hsqldb/rake_test.rb +0 -101
  157. data/test/db/hsqldb/schema_dump_test.rb +0 -19
  158. data/test/db/hsqldb/serialize_test.rb +0 -6
  159. data/test/db/hsqldb/simple_test.rb +0 -17
  160. data/test/db/informix.rb +0 -13
  161. data/test/db/jdbc.rb +0 -16
  162. data/test/db/jdbc_derby.rb +0 -14
  163. data/test/db/jdbc_h2.rb +0 -17
  164. data/test/db/jdbc_mysql.rb +0 -13
  165. data/test/db/jdbc_postgres.rb +0 -23
  166. data/test/db/jndi_config.rb +0 -32
  167. data/test/db/jndi_pooled_config.rb +0 -32
  168. data/test/db/mssql.rb +0 -11
  169. data/test/db/mssql/binary_test.rb +0 -6
  170. data/test/db/mssql/exec_proc_test.rb +0 -46
  171. data/test/db/mssql/identity_insert_test.rb +0 -18
  172. data/test/db/mssql/ignore_system_views_test.rb +0 -40
  173. data/test/db/mssql/limit_offset_test.rb +0 -190
  174. data/test/db/mssql/multibyte_test.rb +0 -16
  175. data/test/db/mssql/multiple_connections_test.rb +0 -71
  176. data/test/db/mssql/rake_test.rb +0 -143
  177. data/test/db/mssql/reset_column_information_test.rb +0 -6
  178. data/test/db/mssql/row_locking_test.rb +0 -7
  179. data/test/db/mssql/serialize_test.rb +0 -6
  180. data/test/db/mssql/simple_test.rb +0 -140
  181. data/test/db/mssql/transaction_test.rb +0 -6
  182. data/test/db/mssql/types_test.rb +0 -205
  183. data/test/db/mssql/unit_test.rb +0 -249
  184. data/test/db/mysql.rb +0 -4
  185. data/test/db/mysql/_rails_test_mysql.32.out +0 -6585
  186. data/test/db/mysql/binary_test.rb +0 -6
  187. data/test/db/mysql/connection_test.rb +0 -51
  188. data/test/db/mysql/index_length_test.rb +0 -58
  189. data/test/db/mysql/multibyte_test.rb +0 -10
  190. data/test/db/mysql/nonstandard_primary_key_test.rb +0 -39
  191. data/test/db/mysql/rake_test.rb +0 -97
  192. data/test/db/mysql/reset_column_information_test.rb +0 -6
  193. data/test/db/mysql/schema_dump_test.rb +0 -228
  194. data/test/db/mysql/serialize_test.rb +0 -6
  195. data/test/db/mysql/simple_test.rb +0 -187
  196. data/test/db/mysql/statement_escaping_test.rb +0 -46
  197. data/test/db/mysql/transaction_test.rb +0 -6
  198. data/test/db/mysql/types_test.rb +0 -30
  199. data/test/db/mysql/unit_test.rb +0 -93
  200. data/test/db/mysql_config.rb +0 -7
  201. data/test/db/oracle.rb +0 -27
  202. data/test/db/oracle/binary_test.rb +0 -6
  203. data/test/db/oracle/limit_test.rb +0 -24
  204. data/test/db/oracle/multibyte_test.rb +0 -22
  205. data/test/db/oracle/rake_test.rb +0 -100
  206. data/test/db/oracle/reset_column_information_test.rb +0 -6
  207. data/test/db/oracle/serialize_test.rb +0 -6
  208. data/test/db/oracle/simple_test.rb +0 -140
  209. data/test/db/oracle/specific_test.rb +0 -180
  210. data/test/db/oracle/transaction_test.rb +0 -31
  211. data/test/db/oracle/unit_test.rb +0 -31
  212. data/test/db/postgres.rb +0 -11
  213. data/test/db/postgres/_rails_test_postgres.32.out +0 -6405
  214. data/test/db/postgres/a_custom_primary_key_test.rb +0 -50
  215. data/test/db/postgres/active_schema_unit_test.rb +0 -68
  216. data/test/db/postgres/array_type_test.rb +0 -101
  217. data/test/db/postgres/binary_test.rb +0 -6
  218. data/test/db/postgres/connection_test.rb +0 -63
  219. data/test/db/postgres/data_types_test.rb +0 -703
  220. data/test/db/postgres/hstore_test.rb +0 -200
  221. data/test/db/postgres/information_schema_leak_test.rb +0 -30
  222. data/test/db/postgres/json_test.rb +0 -86
  223. data/test/db/postgres/ltree_test.rb +0 -51
  224. data/test/db/postgres/mixed_case_test.rb +0 -29
  225. data/test/db/postgres/native_types_test.rb +0 -124
  226. data/test/db/postgres/rake_test.rb +0 -117
  227. data/test/db/postgres/reserved_test.rb +0 -22
  228. data/test/db/postgres/reset_column_information_test.rb +0 -6
  229. data/test/db/postgres/row_locking_test.rb +0 -21
  230. data/test/db/postgres/schema_dump_test.rb +0 -95
  231. data/test/db/postgres/schema_test.rb +0 -115
  232. data/test/db/postgres/simple_test.rb +0 -260
  233. data/test/db/postgres/table_alias_length_test.rb +0 -16
  234. data/test/db/postgres/transaction_test.rb +0 -6
  235. data/test/db/postgres/unit_test.rb +0 -31
  236. data/test/db/postgres_config.rb +0 -10
  237. data/test/db/sqlite3.rb +0 -6
  238. data/test/db/sqlite3/_rails_test_sqlite3.32.out +0 -6274
  239. data/test/db/sqlite3/has_many_though_test.rb +0 -6
  240. data/test/db/sqlite3/rake_test.rb +0 -71
  241. data/test/db/sqlite3/reset_column_information_test.rb +0 -6
  242. data/test/db/sqlite3/schema_dump_test.rb +0 -6
  243. data/test/db/sqlite3/serialize_test.rb +0 -6
  244. data/test/db/sqlite3/simple_test.rb +0 -268
  245. data/test/db/sqlite3/transaction_test.rb +0 -32
  246. data/test/db/sqlite3/type_conversion_test.rb +0 -104
  247. data/test/has_many_through.rb +0 -61
  248. data/test/informix_simple_test.rb +0 -48
  249. data/test/jdbc/db2.rb +0 -36
  250. data/test/jdbc/oracle.rb +0 -34
  251. data/test/jdbc_column_test.rb +0 -23
  252. data/test/jdbc_common.rb +0 -16
  253. data/test/jdbc_connection_test.rb +0 -196
  254. data/test/jndi_callbacks_test.rb +0 -33
  255. data/test/jndi_test.rb +0 -55
  256. data/test/manualTestDatabase.rb +0 -191
  257. data/test/models/add_not_null_column_to_table.rb +0 -9
  258. data/test/models/auto_id.rb +0 -15
  259. data/test/models/binary.rb +0 -18
  260. data/test/models/custom_pk_name.rb +0 -15
  261. data/test/models/data_types.rb +0 -40
  262. data/test/models/entry.rb +0 -41
  263. data/test/models/mixed_case.rb +0 -22
  264. data/test/models/reserved_word.rb +0 -15
  265. data/test/models/rights_and_roles.rb +0 -57
  266. data/test/models/string_id.rb +0 -17
  267. data/test/models/thing.rb +0 -17
  268. data/test/models/topic.rb +0 -32
  269. data/test/models/validates_uniqueness_of_string.rb +0 -19
  270. data/test/rails/mysql.rb +0 -13
  271. data/test/rails/sqlite3/version.rb +0 -6
  272. data/test/rails_stub.rb +0 -31
  273. data/test/rake_test_support.rb +0 -298
  274. data/test/row_locking.rb +0 -102
  275. data/test/schema_dump.rb +0 -182
  276. data/test/serialize.rb +0 -275
  277. data/test/shared_helper.rb +0 -35
  278. data/test/simple.rb +0 -1317
  279. data/test/sybase_jtds_simple_test.rb +0 -28
  280. data/test/sybase_reset_column_information_test.rb +0 -6
  281. data/test/test_helper.rb +0 -304
  282. data/test/transaction.rb +0 -109
@@ -2,23 +2,40 @@
2
2
  $:.push File.expand_path("../lib", __FILE__)
3
3
  require 'arjdbc/version'
4
4
 
5
- Gem::Specification.new do |s|
6
- s.name = "activerecord-jdbc-adapter"
7
- s.version = ArJdbc::VERSION
8
- s.platform = Gem::Platform::RUBY
9
- s.authors = ["Nick Sieger, Ola Bini and JRuby contributors"]
10
- s.email = %q{nick@nicksieger.com, ola.bini@gmail.com}
11
- s.homepage = %q{https://github.com/jruby/activerecord-jdbc-adapter}
12
- s.summary = %q{JDBC adapter for ActiveRecord, for use within JRuby on Rails.}
13
- s.description = %q{activerecord-jdbc-adapter is a database adapter for Rails\' ActiveRecord
14
- component that can be used with JRuby[http://www.jruby.org/]. It allows use of
15
- virtually any JDBC-compliant database with your JRuby on Rails application.}
16
- s.license = "BSD"
17
- s.files = `git ls-files`.split("\n").reject {|v| v =~ /^(activerecord-jdbc[^-]|jdbc-)/}
18
- s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
19
- s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
20
- s.require_paths = ["lib"]
21
- s.rdoc_options = ["--main", "README.md", "-SHN", "-f", "darkfish"]
22
- s.rubyforge_project = %q{jruby-extras}
5
+ Gem::Specification.new do |gem|
6
+ gem.name = 'activerecord-jdbc-adapter'
7
+ gem.version = ArJdbc::VERSION
8
+ gem.platform = Gem::Platform::RUBY
9
+ gem.authors = ['Nick Sieger, Ola Bini and JRuby contributors']
10
+ gem.email = ['nick@nicksieger.com', 'ola.bini@gmail.com']
11
+ gem.homepage = 'https://github.com/jruby/activerecord-jdbc-adapter'
12
+ gem.license = "BSD"
13
+ gem.summary = 'JDBC adapter for ActiveRecord, for use within JRuby on Rails.'
14
+ gem.description = "" <<
15
+ "AR-JDBC is a database adapter for Rails' ActiveRecord component designed " <<
16
+ "to be used with JRuby built upon Java's JDBC API for database access. " <<
17
+ "Provides (ActiveRecord) built-in adapters: MySQL, PostgreSQL and SQLite3 " <<
18
+ "as well as adapters for popular databases such as Oracle, SQLServer, " <<
19
+ "DB2, FireBird and even Java (embed) databases: Derby, HSQLDB and H2. " <<
20
+ "It allows to connect to virtually any JDBC-compliant database with your " <<
21
+ "JRuby on Rails application."
22
+
23
+ gem.require_paths = ["lib"]
24
+
25
+ gem.files = `git ls-files`.split("\n").
26
+ reject { |f| f =~ /^(activerecord-jdbc[^-]|jdbc-)/ }. # gem directories
27
+ reject { |f| f =~ /^(bench|test)/ } # not sure if including tests is useful
28
+ gem.executables = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
29
+ gem.test_files = gem.files.grep(%r{^test/})
30
+
31
+ # NOTE: 1.3.0 only supports >= 2.3 but users report it works with 2.2 :
32
+ gem.add_dependency 'activerecord', '>= 2.2'
33
+
34
+ #gem.add_development_dependency 'test-unit', '2.5.4'
35
+ #gem.add_development_dependency 'test-unit-context', '>= 0.3.0'
36
+ #gem.add_development_dependency 'mocha', '~> 0.13.1'
37
+
38
+ gem.rdoc_options = ["--main", "README.md", "-SHN", "-f", "darkfish"]
39
+ gem.rubyforge_project = %q{jruby-extras}
23
40
  end
24
41
 
@@ -2,12 +2,13 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
+ gem "thread_safe", :require=>nil
5
6
  gem "jruby-openssl", :platform=>:jruby
6
- gem "appraisal", :require=>nil
7
7
  gem "rake", :require=>nil
8
+ gem "appraisal", :require=>nil
8
9
  gem "test-unit", "2.5.4", :group=>:test
9
- gem "test-unit-context", :group=>:test
10
- gem "mocha", ">= 0.13.0", :require=>nil, :group=>:test
10
+ gem "test-unit-context", ">= 0.3.0", :group=>:test
11
+ gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
11
12
  gem "simplecov", :require=>nil, :group=>:test
12
13
  gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
13
14
  gem "activerecord", "~> 2.3.18"
@@ -14,15 +14,15 @@ GEM
14
14
  appraisal (0.5.2)
15
15
  bundler
16
16
  rake
17
- bcrypt-ruby (3.0.1)
17
+ atomic (1.1.10-java)
18
18
  bcrypt-ruby (3.0.1-java)
19
19
  bouncy-castle-java (1.5.0147)
20
- jruby-openssl (0.8.7)
20
+ jruby-openssl (0.8.8)
21
21
  bouncy-castle-java (>= 1.5.0147)
22
22
  metaclass (0.0.1)
23
23
  mocha (0.13.3)
24
24
  metaclass (~> 0.0.1)
25
- multi_json (1.7.2)
25
+ multi_json (1.7.7)
26
26
  rack (1.1.6)
27
27
  rails (2.3.18)
28
28
  actionmailer (= 2.3.18)
@@ -31,7 +31,7 @@ GEM
31
31
  activeresource (= 2.3.18)
32
32
  activesupport (= 2.3.18)
33
33
  rake (>= 0.8.3)
34
- rake (10.0.4)
34
+ rake (10.1.0)
35
35
  simplecov (0.7.1)
36
36
  multi_json (~> 1.0)
37
37
  simplecov-html (~> 0.7.1)
@@ -39,6 +39,8 @@ GEM
39
39
  test-unit (2.5.4)
40
40
  test-unit-context (0.3.1)
41
41
  test-unit (>= 2.4.0)
42
+ thread_safe (0.1.2-java)
43
+ atomic
42
44
 
43
45
  PLATFORMS
44
46
  java
@@ -48,9 +50,10 @@ DEPENDENCIES
48
50
  appraisal
49
51
  bcrypt-ruby (~> 3.0.0)
50
52
  jruby-openssl
51
- mocha (>= 0.13.0)
53
+ mocha (~> 0.13.1)
52
54
  rails (~> 2.3.18)
53
55
  rake
54
56
  simplecov
55
57
  test-unit (= 2.5.4)
56
- test-unit-context
58
+ test-unit-context (>= 0.3.0)
59
+ thread_safe
@@ -2,12 +2,13 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
+ gem "thread_safe", :require=>nil
5
6
  gem "jruby-openssl", :platform=>:jruby
6
- gem "appraisal", :require=>nil
7
7
  gem "rake", :require=>nil
8
+ gem "appraisal", :require=>nil
8
9
  gem "test-unit", "2.5.4", :group=>:test
9
- gem "test-unit-context", :group=>:test
10
- gem "mocha", ">= 0.13.0", :require=>nil, :group=>:test
10
+ gem "test-unit-context", ">= 0.3.0", :group=>:test
11
+ gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
11
12
  gem "simplecov", :require=>nil, :group=>:test
12
13
  gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
13
14
  gem "activerecord", "~> 3.0.20"
@@ -15,18 +15,18 @@ GEM
15
15
  bundler
16
16
  rake
17
17
  arel (2.0.10)
18
- bcrypt-ruby (3.0.1)
18
+ atomic (1.1.10-java)
19
19
  bcrypt-ruby (3.0.1-java)
20
20
  bouncy-castle-java (1.5.0147)
21
21
  builder (2.1.2)
22
22
  i18n (0.5.0)
23
- jruby-openssl (0.8.7)
23
+ jruby-openssl (0.8.8)
24
24
  bouncy-castle-java (>= 1.5.0147)
25
25
  metaclass (0.0.1)
26
26
  mocha (0.13.3)
27
27
  metaclass (~> 0.0.1)
28
- multi_json (1.7.2)
29
- rake (10.0.4)
28
+ multi_json (1.7.7)
29
+ rake (10.1.0)
30
30
  simplecov (0.7.1)
31
31
  multi_json (~> 1.0)
32
32
  simplecov-html (~> 0.7.1)
@@ -34,6 +34,8 @@ GEM
34
34
  test-unit (2.5.4)
35
35
  test-unit-context (0.3.1)
36
36
  test-unit (>= 2.4.0)
37
+ thread_safe (0.1.2-java)
38
+ atomic
37
39
  tzinfo (0.3.37)
38
40
 
39
41
  PLATFORMS
@@ -44,8 +46,9 @@ DEPENDENCIES
44
46
  appraisal
45
47
  bcrypt-ruby (~> 3.0.0)
46
48
  jruby-openssl
47
- mocha (>= 0.13.0)
49
+ mocha (~> 0.13.1)
48
50
  rake
49
51
  simplecov
50
52
  test-unit (= 2.5.4)
51
- test-unit-context
53
+ test-unit-context (>= 0.3.0)
54
+ thread_safe
@@ -2,12 +2,13 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
+ gem "thread_safe", :require=>nil
5
6
  gem "jruby-openssl", :platform=>:jruby
6
- gem "appraisal", :require=>nil
7
7
  gem "rake", :require=>nil
8
+ gem "appraisal", :require=>nil
8
9
  gem "test-unit", "2.5.4", :group=>:test
9
- gem "test-unit-context", :group=>:test
10
- gem "mocha", ">= 0.13.0", :require=>nil, :group=>:test
10
+ gem "test-unit-context", ">= 0.3.0", :group=>:test
11
+ gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
11
12
  gem "simplecov", :require=>nil, :group=>:test
12
13
  gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
13
14
  gem "activerecord", "~> 3.1.12"
@@ -16,18 +16,18 @@ GEM
16
16
  bundler
17
17
  rake
18
18
  arel (2.2.3)
19
- bcrypt-ruby (3.0.1)
19
+ atomic (1.1.10-java)
20
20
  bcrypt-ruby (3.0.1-java)
21
21
  bouncy-castle-java (1.5.0147)
22
22
  builder (3.0.4)
23
23
  i18n (0.6.4)
24
- jruby-openssl (0.8.7)
24
+ jruby-openssl (0.8.8)
25
25
  bouncy-castle-java (>= 1.5.0147)
26
26
  metaclass (0.0.1)
27
27
  mocha (0.13.3)
28
28
  metaclass (~> 0.0.1)
29
- multi_json (1.7.2)
30
- rake (10.0.4)
29
+ multi_json (1.7.7)
30
+ rake (10.1.0)
31
31
  simplecov (0.7.1)
32
32
  multi_json (~> 1.0)
33
33
  simplecov-html (~> 0.7.1)
@@ -35,6 +35,8 @@ GEM
35
35
  test-unit (2.5.4)
36
36
  test-unit-context (0.3.1)
37
37
  test-unit (>= 2.4.0)
38
+ thread_safe (0.1.2-java)
39
+ atomic
38
40
  tzinfo (0.3.37)
39
41
 
40
42
  PLATFORMS
@@ -45,8 +47,9 @@ DEPENDENCIES
45
47
  appraisal
46
48
  bcrypt-ruby (~> 3.0.0)
47
49
  jruby-openssl
48
- mocha (>= 0.13.0)
50
+ mocha (~> 0.13.1)
49
51
  rake
50
52
  simplecov
51
53
  test-unit (= 2.5.4)
52
- test-unit-context
54
+ test-unit-context (>= 0.3.0)
55
+ thread_safe
@@ -2,12 +2,13 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
+ gem "thread_safe", :require=>nil
5
6
  gem "jruby-openssl", :platform=>:jruby
6
- gem "appraisal", :require=>nil
7
7
  gem "rake", :require=>nil
8
+ gem "appraisal", :require=>nil
8
9
  gem "test-unit", "2.5.4", :group=>:test
9
- gem "test-unit-context", :group=>:test
10
- gem "mocha", ">= 0.13.0", :require=>nil, :group=>:test
10
+ gem "test-unit-context", ">= 0.3.0", :group=>:test
11
+ gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
11
12
  gem "simplecov", :require=>nil, :group=>:test
12
13
  gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
13
14
  gem "activerecord", "~> 3.2.13"
@@ -1,33 +1,33 @@
1
1
  GEM
2
2
  remote: https://rubygems.org/
3
3
  specs:
4
- activemodel (3.2.13)
5
- activesupport (= 3.2.13)
4
+ activemodel (3.2.14)
5
+ activesupport (= 3.2.14)
6
6
  builder (~> 3.0.0)
7
- activerecord (3.2.13)
8
- activemodel (= 3.2.13)
9
- activesupport (= 3.2.13)
7
+ activerecord (3.2.14)
8
+ activemodel (= 3.2.14)
9
+ activesupport (= 3.2.14)
10
10
  arel (~> 3.0.2)
11
11
  tzinfo (~> 0.3.29)
12
- activesupport (3.2.13)
13
- i18n (= 0.6.1)
12
+ activesupport (3.2.14)
13
+ i18n (~> 0.6, >= 0.6.4)
14
14
  multi_json (~> 1.0)
15
15
  appraisal (0.5.2)
16
16
  bundler
17
17
  rake
18
18
  arel (3.0.2)
19
- bcrypt-ruby (3.0.1)
19
+ atomic (1.1.10-java)
20
20
  bcrypt-ruby (3.0.1-java)
21
21
  bouncy-castle-java (1.5.0147)
22
22
  builder (3.0.4)
23
- i18n (0.6.1)
24
- jruby-openssl (0.8.7)
23
+ i18n (0.6.4)
24
+ jruby-openssl (0.8.8)
25
25
  bouncy-castle-java (>= 1.5.0147)
26
26
  metaclass (0.0.1)
27
27
  mocha (0.13.3)
28
28
  metaclass (~> 0.0.1)
29
- multi_json (1.7.2)
30
- rake (10.0.4)
29
+ multi_json (1.7.7)
30
+ rake (10.1.0)
31
31
  simplecov (0.7.1)
32
32
  multi_json (~> 1.0)
33
33
  simplecov-html (~> 0.7.1)
@@ -35,6 +35,8 @@ GEM
35
35
  test-unit (2.5.4)
36
36
  test-unit-context (0.3.1)
37
37
  test-unit (>= 2.4.0)
38
+ thread_safe (0.1.2-java)
39
+ atomic
38
40
  tzinfo (0.3.37)
39
41
 
40
42
  PLATFORMS
@@ -45,8 +47,9 @@ DEPENDENCIES
45
47
  appraisal
46
48
  bcrypt-ruby (~> 3.0.0)
47
49
  jruby-openssl
48
- mocha (>= 0.13.0)
50
+ mocha (~> 0.13.1)
49
51
  rake
50
52
  simplecov
51
53
  test-unit (= 2.5.4)
52
- test-unit-context
54
+ test-unit-context (>= 0.3.0)
55
+ thread_safe
@@ -2,14 +2,14 @@
2
2
 
3
3
  source "https://rubygems.org"
4
4
 
5
- gem "activerecord"
5
+ gem "thread_safe", :require=>nil
6
6
  gem "jruby-openssl", :platform=>:jruby
7
- gem "appraisal", :require=>nil
8
7
  gem "rake", :require=>nil
8
+ gem "appraisal", :require=>nil
9
9
  gem "test-unit", "2.5.4", :group=>:test
10
- gem "test-unit-context", :group=>:test
11
- gem "mocha", ">= 0.13.0", :require=>nil, :group=>:test
10
+ gem "test-unit-context", ">= 0.3.0", :group=>:test
11
+ gem "mocha", "~> 0.13.1", :require=>nil, :group=>:test
12
12
  gem "simplecov", :require=>nil, :group=>:test
13
13
  gem "bcrypt-ruby", "~> 3.0.0", :require=>nil, :group=>:test
14
- gem "rails", :github=>"rails/rails", :branch=>"4-0-stable"
14
+ gem "activerecord", "~> 4.0.0"
15
15
 
@@ -1,112 +1,60 @@
1
- GIT
2
- remote: git://github.com/rails/rails.git
3
- revision: b83a7203b85df83026af2b1d8a9135c4d068d807
4
- branch: 4-0-stable
1
+ GEM
2
+ remote: https://rubygems.org/
5
3
  specs:
6
- actionmailer (4.0.0.rc1)
7
- actionpack (= 4.0.0.rc1)
8
- mail (~> 2.5.4)
9
- actionpack (4.0.0.rc1)
10
- activesupport (= 4.0.0.rc1)
4
+ activemodel (4.0.0)
5
+ activesupport (= 4.0.0)
11
6
  builder (~> 3.1.0)
12
- erubis (~> 2.7.0)
13
- rack (~> 1.5.2)
14
- rack-test (~> 0.6.2)
15
- activemodel (4.0.0.rc1)
16
- activesupport (= 4.0.0.rc1)
17
- builder (~> 3.1.0)
18
- activerecord (4.0.0.rc1)
19
- activemodel (= 4.0.0.rc1)
7
+ activerecord (4.0.0)
8
+ activemodel (= 4.0.0)
20
9
  activerecord-deprecated_finders (~> 1.0.2)
21
- activesupport (= 4.0.0.rc1)
10
+ activesupport (= 4.0.0)
22
11
  arel (~> 4.0.0)
23
- activesupport (4.0.0.rc1)
12
+ activerecord-deprecated_finders (1.0.3)
13
+ activesupport (4.0.0)
24
14
  i18n (~> 0.6, >= 0.6.4)
25
15
  minitest (~> 4.2)
26
16
  multi_json (~> 1.3)
27
17
  thread_safe (~> 0.1)
28
18
  tzinfo (~> 0.3.37)
29
- rails (4.0.0.rc1)
30
- actionmailer (= 4.0.0.rc1)
31
- actionpack (= 4.0.0.rc1)
32
- activerecord (= 4.0.0.rc1)
33
- activesupport (= 4.0.0.rc1)
34
- bundler (>= 1.3.0, < 2.0)
35
- railties (= 4.0.0.rc1)
36
- sprockets-rails (~> 2.0.0.rc4)
37
- railties (4.0.0.rc1)
38
- actionpack (= 4.0.0.rc1)
39
- activesupport (= 4.0.0.rc1)
40
- rake (>= 0.8.7)
41
- thor (>= 0.18.1, < 2.0)
42
-
43
- GEM
44
- remote: https://rubygems.org/
45
- specs:
46
- activerecord-deprecated_finders (1.0.2)
47
19
  appraisal (0.5.2)
48
20
  bundler
49
21
  rake
50
22
  arel (4.0.0)
51
- atomic (1.1.9-java)
23
+ atomic (1.1.10-java)
52
24
  bcrypt-ruby (3.0.1-java)
53
25
  bouncy-castle-java (1.5.0147)
54
26
  builder (3.1.4)
55
- erubis (2.7.0)
56
- hike (1.2.2)
57
27
  i18n (0.6.4)
58
28
  jruby-openssl (0.8.8)
59
29
  bouncy-castle-java (>= 1.5.0147)
60
- mail (2.5.4)
61
- mime-types (~> 1.16)
62
- treetop (~> 1.4.8)
63
30
  metaclass (0.0.1)
64
- mime-types (1.23)
65
- minitest (4.7.4)
31
+ minitest (4.7.5)
66
32
  mocha (0.13.3)
67
33
  metaclass (~> 0.0.1)
68
- multi_json (1.7.3)
69
- polyglot (0.3.3)
70
- rack (1.5.2)
71
- rack-test (0.6.2)
72
- rack (>= 1.0)
73
- rake (10.0.4)
34
+ multi_json (1.7.7)
35
+ rake (10.1.0)
74
36
  simplecov (0.7.1)
75
37
  multi_json (~> 1.0)
76
38
  simplecov-html (~> 0.7.1)
77
39
  simplecov-html (0.7.1)
78
- sprockets (2.9.3)
79
- hike (~> 1.2)
80
- multi_json (~> 1.0)
81
- rack (~> 1.0)
82
- tilt (~> 1.1, != 1.3.0)
83
- sprockets-rails (2.0.0.rc4)
84
- actionpack (>= 3.0)
85
- activesupport (>= 3.0)
86
- sprockets (~> 2.8)
87
40
  test-unit (2.5.4)
88
41
  test-unit-context (0.3.1)
89
42
  test-unit (>= 2.4.0)
90
- thor (0.18.1)
91
43
  thread_safe (0.1.0)
92
44
  atomic
93
- tilt (1.4.1)
94
- treetop (1.4.12)
95
- polyglot
96
- polyglot (>= 0.3.1)
97
45
  tzinfo (0.3.37)
98
46
 
99
47
  PLATFORMS
100
48
  java
101
49
 
102
50
  DEPENDENCIES
103
- activerecord
51
+ activerecord (~> 4.0.0)
104
52
  appraisal
105
53
  bcrypt-ruby (~> 3.0.0)
106
54
  jruby-openssl
107
- mocha (>= 0.13.0)
108
- rails!
55
+ mocha (~> 0.13.1)
109
56
  rake
110
57
  simplecov
111
58
  test-unit (= 2.5.4)
112
- test-unit-context
59
+ test-unit-context (>= 0.3.0)
60
+ thread_safe