oldie_rails_models 0.1.2 → 0.1.3

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: d08a5316c6d7cfa748dac8e9fb7b945c6432c84e
4
- data.tar.gz: a59f55160c8388d27bc993b1c3c2395c53f081fe
3
+ metadata.gz: 468a29273f0e7eb9133ff5853c6b491ec77a1700
4
+ data.tar.gz: e0d22801d779145ad863d166b90cc79083c3dfe5
5
5
  SHA512:
6
- metadata.gz: 2290b724e3926a7639fc074f83eab9640ea302c4af27d36026562de0a8c9e9777abbc5400f0c89c0cd11a2edb96445f3f22170d41c214551107077cd9cea61df
7
- data.tar.gz: b281bd8917936a08f336f2025d4ef720155b8b42137587ca8dc6a293f25953c9a16186dca27a7869580758dc086e01ecf982d251dbfe47d786a2ac1ac6429644
6
+ metadata.gz: 22f06d003021ef26e4fe50e892cc7058edc539b50e8247556a9cdb1d88fda5dffe5b5f60638141f8b7a19c58771aa8313187ab6957f57e2b5c7aac3201995f5c
7
+ data.tar.gz: f1ecbed5b96a258acd76af68d0721fa4f8dd7054fd24109b47e3cd692c05dcbf0f476ac51d5b905eae6ce71493c3f4949caef7b639ab6abf3f84e838077917f1
@@ -6,23 +6,20 @@ module OldieRailsModels
6
6
  end
7
7
 
8
8
  def validate_on_create(*args)
9
- args.last.merge(on: :create) if args.last.is_a?(Hash)
10
- validate *args
9
+ validate *add_parameter(args, { on: :create })
11
10
  end
12
11
 
13
12
  def validate_on_update(*args)
14
- args.last.merge(on: :update) if args.last.is_a?(Hash)
15
- validate *args
13
+ validate *add_parameter(args, { on: :update })
16
14
  end
17
15
 
18
16
  def before_validation_on_create(*args)
19
17
  args.last.merge(on: :create) if args.last.is_a?(Hash)
20
- before_validation *args
18
+ before_validation *add_parameter(args, { on: :create })
21
19
  end
22
20
 
23
21
  def before_validation_on_update(*args)
24
- args.last.merge(on: :update) if args.last.is_a?(Hash)
25
- before_validation *args
22
+ before_validation *add_parameter(args, { on: :update })
26
23
  end
27
24
 
28
25
  def set_primary_key(*args)
@@ -43,5 +40,15 @@ module OldieRailsModels
43
40
 
44
41
  def attr_accessible(*args); end
45
42
 
43
+ private
44
+
45
+ def add_parameter(arr, h)
46
+ if arr.last.is_a?(Hash)
47
+ arr.last.merge(h) if arr.last.is_a?(Hash)
48
+ else
49
+ arr << h
50
+ end
51
+ end
52
+
46
53
  end
47
54
  end
@@ -1,3 +1,3 @@
1
1
  module OldieRailsModels
2
- VERSION = "0.1.2"
2
+ VERSION = "0.1.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oldie_rails_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alex Dubovskoy
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-17 00:00:00.000000000 Z
11
+ date: 2014-03-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -24,20 +24,6 @@ dependencies:
24
24
  - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: 4.0.2
27
- - !ruby/object:Gem::Dependency
28
- name: sqlite3
29
- requirement: !ruby/object:Gem::Requirement
30
- requirements:
31
- - - '>='
32
- - !ruby/object:Gem::Version
33
- version: '0'
34
- type: :development
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - '>='
39
- - !ruby/object:Gem::Version
40
- version: '0'
41
27
  description: Basic support of Rails 2 models in Rails 4.
42
28
  email:
43
29
  - dubovskoy.a@gmail.com