oldie_rails_models 0.1.3 → 0.2.0

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: 468a29273f0e7eb9133ff5853c6b491ec77a1700
4
- data.tar.gz: e0d22801d779145ad863d166b90cc79083c3dfe5
3
+ metadata.gz: d11e3ce20fa4c95d0fc9d773df0578adca4ad0d5
4
+ data.tar.gz: f4ff450eb38698ad3ac7b8a50852eac1b0ea87ff
5
5
  SHA512:
6
- metadata.gz: 22f06d003021ef26e4fe50e892cc7058edc539b50e8247556a9cdb1d88fda5dffe5b5f60638141f8b7a19c58771aa8313187ab6957f57e2b5c7aac3201995f5c
7
- data.tar.gz: f1ecbed5b96a258acd76af68d0721fa4f8dd7054fd24109b47e3cd692c05dcbf0f476ac51d5b905eae6ce71493c3f4949caef7b639ab6abf3f84e838077917f1
6
+ metadata.gz: 4017113eed064499f583d8a14d14dd30d4ee382f433e4f62717d9697f1e539294d843fad3bed6b4839c4b74192fea61216557b38154d7090a79c82fc5e48c947
7
+ data.tar.gz: e0381563c44370b9a98924f2bdc917faf005988505999f687bbb4a572751c277ed53f252bb654e93079080e051b85b4395c5dd424090cfce7f299b5adf8c5cda
@@ -2,7 +2,28 @@ module OldieRailsModels
2
2
  module Model
3
3
 
4
4
  def named_scope(*args)
5
- scope *args
5
+ name, opts, block = args
6
+
7
+ scope name, ->(*p) {
8
+
9
+ h = case opts
10
+ when Hash
11
+ opts
12
+ when Proc
13
+ opts.call(*p)
14
+ end
15
+
16
+ h.inject(self) do |s, (key, value)|
17
+ case key
18
+ when :conditions
19
+ s.where(value)
20
+ when :order
21
+ s.order(value)
22
+ when :joins
23
+ s.joins(value)
24
+ end
25
+ end
26
+ }
6
27
  end
7
28
 
8
29
  def validate_on_create(*args)
@@ -14,7 +35,6 @@ module OldieRailsModels
14
35
  end
15
36
 
16
37
  def before_validation_on_create(*args)
17
- args.last.merge(on: :create) if args.last.is_a?(Hash)
18
38
  before_validation *add_parameter(args, { on: :create })
19
39
  end
20
40
 
@@ -22,6 +42,22 @@ module OldieRailsModels
22
42
  before_validation *add_parameter(args, { on: :update })
23
43
  end
24
44
 
45
+ # def before_destroy
46
+
47
+ # end
48
+
49
+ # validates_acceptance_of (<= v2.3.8)
50
+ # validates_associated (<= v2.3.8)
51
+ # validates_confirmation_of (<= v2.3.8)
52
+ # validates_exclusion_of (<= v2.3.8)
53
+ # validates_format_of (<= v2.3.8)
54
+ # validates_inclusion_of (<= v2.3.8)
55
+ # validates_length_of (<= v2.3.8)
56
+ # validates_numericality_of (<= v2.3.8)
57
+ # validates_presence_of (<= v2.3.8)
58
+ # validates_size_of (<= v2.3.8)
59
+ # validates_uniqueness_of (<= v2.3.8)
60
+
25
61
  def set_primary_key(*args)
26
62
  # self.primary_key = *args
27
63
  end
@@ -1,3 +1,3 @@
1
1
  module OldieRailsModels
2
- VERSION = "0.1.3"
2
+ VERSION = "0.2.0"
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.3
4
+ version: 0.2.0
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-20 00:00:00.000000000 Z
11
+ date: 2014-03-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -31,9 +31,9 @@ executables: []
31
31
  extensions: []
32
32
  extra_rdoc_files: []
33
33
  files:
34
- - lib/oldie_rails_models/mailer.rb
35
- - lib/oldie_rails_models/model.rb
36
34
  - lib/oldie_rails_models/version.rb
35
+ - lib/oldie_rails_models/model.rb
36
+ - lib/oldie_rails_models/mailer.rb
37
37
  - lib/oldie_rails_models.rb
38
38
  - MIT-LICENSE
39
39
  - Rakefile