active_merge 1.0.3 → 1.0.4

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 437f70552da85cee916f4d060341ae5406ed014a
4
- data.tar.gz: 3af69755e31ad9f4c250d05a20357b1d8e2e7a7e
3
+ metadata.gz: 94958ab074d4d742ad174a71fa0681622073ac3c
4
+ data.tar.gz: b8ab11b01746280d598ffc584622d17131384b6a
5
5
  SHA512:
6
- metadata.gz: 3a771d299a8979fe1630f15a8703c8bb1978ee9d2ecd626d00a857a071d21c984f670292be97b05f0dd5811a54af58ede02aaca10d3ea6caa0ab416119c77119
7
- data.tar.gz: db75d398efd205d0a4eb1042502c76bfafe59c5f26a54b40daf337870f4c30b45a744cb8f40cbb18aa8fa31385480d861a964be872be32c832fa6403d57d6ca7
6
+ metadata.gz: 95b4c45ac956d9dec90090f4d51b44ec34b35321ce510c8d85e1d60f787558e7c5dd6ff22ed00b7582561480eba0e4c5c8c96d9e931712253c36cd33f3a7420b
7
+ data.tar.gz: 966ecb1a67d54ff45bb23a46cef7d5369394851fb9b4707758d9341b48e5769a6098ae7ff1955a41984a91c9cb99cbd5115fa00ef86feff94cbd2b7517d33b0b
data/README.rdoc CHANGED
@@ -1,4 +1,9 @@
1
1
  = ActiveMerge
2
+ {<img src="https://badge.fury.io/rb/active_merge.png" alt="Gem Version" />}[http://badge.fury.io/rb/active_merge]
3
+ {<img src="https://travis-ci.org/nepalez/active_merge.svg" alt="Build Status" />}[https://travis-ci.org/nepalez/active_merge]
4
+ {<img src="https://codeclimate.com/github/nepalez/active_merge.png" />}[https://codeclimate.com/github/nepalez/active_merge]
5
+ {<img src="https://gemnasium.com/nepalez/active_merge.svg" alt="Dependency Status" />}[https://gemnasium.com/nepalez/active_merge]
6
+ {<img src="https://coveralls.io/repos/nepalez/active_merge/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/nepalez/active_merge]
2
7
 
3
8
  Declares the <tt>ActiveMerge</tt> module for extending ActiveRecord models.
4
9
 
data/Rakefile CHANGED
@@ -4,7 +4,13 @@ rescue LoadError
4
4
  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
5
5
  end
6
6
 
7
- require 'rdoc/task'
7
+ begin
8
+ require 'rdoc/task'
9
+ rescue LoadError
10
+ require 'rdoc/rdoc'
11
+ require 'rake/rdoctask'
12
+ RDoc::Task = Rake::RDocTask
13
+ end
8
14
 
9
15
  RDoc::Task.new(:rdoc) do |rdoc|
10
16
  rdoc.rdoc_dir = 'rdoc'
@@ -15,3 +21,9 @@ RDoc::Task.new(:rdoc) do |rdoc|
15
21
  end
16
22
 
17
23
  Bundler::GemHelper.install_tasks
24
+
25
+ require "bundler/gem_tasks"
26
+ require 'rspec/core/rake_task'
27
+
28
+ RSpec::Core::RakeTask.new(:spec)
29
+ task default: :spec
@@ -1,4 +1,4 @@
1
1
  module ActiveMerge
2
2
  # Текущая версия плагина
3
- VERSION = "1.0.3"
3
+ VERSION = "1.0.4"
4
4
  end
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.0.3
4
+ version: 1.0.4
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-03-18 00:00:00.000000000 Z
11
+ date: 2014-04-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 4.0.3
19
+ version: '4'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 4.0.3
26
+ version: '4'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: sqlite3
29
29
  requirement: !ruby/object:Gem::Requirement