active_merge 1.1.0 → 1.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.rdoc +22 -0
- data/lib/active_merge/service.rb +1 -1
- data/lib/active_merge/simple_service.rb +38 -45
- data/lib/active_merge/version.rb +1 -1
- data/spec/active_merge/service_spec.rb +12 -12
- data/spec/active_merge/simple_service_spec.rb +17 -0
- data/spec/dummy/db/development.sqlite3 +0 -0
- data/spec/dummy/db/test.sqlite3 +0 -0
- data/spec/dummy/log/development.log +236 -0
- data/spec/dummy/log/test.log +22830 -0
- metadata +4 -2
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: active_merge
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.2.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Andrew Kozin
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-05-24 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|
|
@@ -131,6 +131,7 @@ files:
|
|
|
131
131
|
- spec/dummy/config/initializers/wrap_parameters.rb
|
|
132
132
|
- spec/dummy/config/locales/ru.yml
|
|
133
133
|
- spec/dummy/config/routes.rb
|
|
134
|
+
- spec/dummy/db/development.sqlite3
|
|
134
135
|
- spec/dummy/db/migrate/20140416183029_create_lords.rb
|
|
135
136
|
- spec/dummy/db/migrate/20140416183043_create_men.rb
|
|
136
137
|
- spec/dummy/db/migrate/20140416183059_create_domains.rb
|
|
@@ -193,6 +194,7 @@ test_files:
|
|
|
193
194
|
- spec/dummy/log/test.log
|
|
194
195
|
- spec/dummy/log/development.log
|
|
195
196
|
- spec/dummy/db/test.sqlite3
|
|
197
|
+
- spec/dummy/db/development.sqlite3
|
|
196
198
|
- spec/dummy/db/migrate/20140416183059_create_domains.rb
|
|
197
199
|
- spec/dummy/db/migrate/20140416183043_create_men.rb
|
|
198
200
|
- spec/dummy/db/migrate/20140416183029_create_lords.rb
|