oldie_rails_models 0.3.8 → 0.3.9

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: f3dc34f895b5e9d7ebfb8fe5cddc672ab3b89601
4
- data.tar.gz: 039d2056d7e07692f79f222d996bc4a117a6a226
3
+ metadata.gz: 7f27871005caba3cd3cab92b7b6e5b3dbcb8f232
4
+ data.tar.gz: cc54ebe40de89debb8f1e3735947bb68302ba1f5
5
5
  SHA512:
6
- metadata.gz: 8119972886002feaad67d0fb345634d1e4b5c04023ecb909418e3ad5fa89cd829635b55efc2cdb3209e8ba36d02f96c013ee9ae3118e424f3abdadfd721276a0
7
- data.tar.gz: 9ddf897c59e455c1592e482175b2eaf3b550e527a5c3ae8f216247d646809f49344392c54d8356ef72291f1b7c860e86909adac04f0541722be33d1e33da5330
6
+ metadata.gz: 93adb42a127f0e78f6b7bcfc4fbb90b037bd2660cfa295ce8bb6ab1fd20aae4a2f6b9e3e5f6b91bb69292936d1cc67aaa6e4690d04f5f8d815ec65fcdafc8ab9
7
+ data.tar.gz: 89b672bb2f63feb8fe50b51b93290aeddfe00e89384f5c3beddef1cb48375eaf4df0b34b0239f83636f120770914629726091d55b4648d5a03b5e29919f16da2
@@ -39,33 +39,6 @@ module OldieRailsModels
39
39
  parent_scoped(h, self)
40
40
  end
41
41
 
42
- def parent_scoped(h, parent)
43
- h.inject(parent) do |s, (key, value)|
44
- case key
45
- when :conditions
46
- s.where(value)
47
- when :select
48
- s.select(value)
49
- when :order
50
- s.order(value)
51
- when :joins
52
- s.joins(value)
53
- when :limit
54
- s.limit(value)
55
- when :includes
56
- s.includes(value)
57
- when :offset
58
- s.offset(value)
59
- when :group
60
- s.group(value)
61
- when :having
62
- s.having(value)
63
- when :finder_sql
64
- s.find_by_sql(value)
65
- end
66
- end
67
- end
68
-
69
42
  def validate_on_create(*args)
70
43
  validate *add_parameter(args, { on: :create })
71
44
  end
@@ -98,7 +71,17 @@ module OldieRailsModels
98
71
  case opts
99
72
  when Hash
100
73
  finders = {}
101
- [:conditions, :order, :joins, :limit, :include, :offset, :group, :having, :finder_sql].each do |k|
74
+ [
75
+ :conditions,
76
+ :order,
77
+ :joins,
78
+ :limit,
79
+ :include,
80
+ :offset,
81
+ :group,
82
+ :having,
83
+ :finder_sql
84
+ ].each do |k|
102
85
  if opts[k]
103
86
  finders[k] = opts[k]
104
87
  opts.delete(k)
@@ -120,6 +103,36 @@ module OldieRailsModels
120
103
  end
121
104
  end
122
105
 
106
+
107
+ def parent_scoped(h, parent)
108
+ h.inject(parent) do |s, (key, value)|
109
+ case key
110
+ when :conditions
111
+ s.where(value)
112
+ when :select
113
+ s.select(value)
114
+ when :order
115
+ s.order(value)
116
+ when :joins
117
+ s.joins(value)
118
+ when :limit
119
+ s.limit(value)
120
+ when :includes
121
+ s.includes(value)
122
+ when :offset
123
+ s.offset(value)
124
+ when :group
125
+ s.group(value)
126
+ when :having
127
+ s.having(value)
128
+ when :finder_sql
129
+ s.find_by_sql(value)
130
+ when :count
131
+ s.where(value).count
132
+ end
133
+ end
134
+ end
135
+
123
136
  end
124
137
  end
125
138
 
@@ -1,3 +1,3 @@
1
1
  module OldieRailsModels
2
- VERSION = "0.3.8"
2
+ VERSION = "0.3.9"
3
3
  end
metadata CHANGED
@@ -1,27 +1,27 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oldie_rails_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.8
4
+ version: 0.3.9
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-08-14 00:00:00.000000000 Z
11
+ date: 2014-11-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
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
26
  version: '0'
27
27
  description: Basic support of Rails 2 models in Rails 4.
@@ -31,13 +31,13 @@ executables: []
31
31
  extensions: []
32
32
  extra_rdoc_files: []
33
33
  files:
34
- - lib/oldie_rails_models/version.rb
35
- - lib/oldie_rails_models/model.rb
36
- - lib/oldie_rails_models/mailer.rb
37
- - lib/oldie_rails_models.rb
38
34
  - MIT-LICENSE
39
- - Rakefile
40
35
  - README.rdoc
36
+ - Rakefile
37
+ - lib/oldie_rails_models.rb
38
+ - lib/oldie_rails_models/mailer.rb
39
+ - lib/oldie_rails_models/model.rb
40
+ - lib/oldie_rails_models/version.rb
41
41
  homepage: https://github.com/dubadub/oldie_rails_models
42
42
  licenses: []
43
43
  metadata: {}
@@ -47,19 +47,18 @@ require_paths:
47
47
  - lib
48
48
  required_ruby_version: !ruby/object:Gem::Requirement
49
49
  requirements:
50
- - - '>='
50
+ - - ">="
51
51
  - !ruby/object:Gem::Version
52
52
  version: '0'
53
53
  required_rubygems_version: !ruby/object:Gem::Requirement
54
54
  requirements:
55
- - - '>='
55
+ - - ">="
56
56
  - !ruby/object:Gem::Version
57
57
  version: '0'
58
58
  requirements: []
59
59
  rubyforge_project:
60
- rubygems_version: 2.0.14
60
+ rubygems_version: 2.2.2
61
61
  signing_key:
62
62
  specification_version: 4
63
63
  summary: Basic support of Rails 2 models in Rails 4.
64
64
  test_files: []
65
- has_rdoc: