attribute_enums 0.1.5 → 0.1.6

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.
Files changed (6) hide show
  1. data/CHANGELOG +4 -0
  2. data/README.markdown +6 -4
  3. data/lib/attribute_enums/active_record_extension.rb +21 -13
  4. data/lib/attribute_enums/version.rb +1 -1
  5. data/spec/models/active_record/user_spec.rb +10 -3
  6. metadata +27 -27
data/CHANGELOG CHANGED
@@ -1,3 +1,7 @@
1
+ == 0.1.6
2
+
3
+ * fix boolean validate inclusion bug
4
+
1
5
  == 0.1.5
2
6
 
3
7
  * fix boolean default bug
data/README.markdown CHANGED
@@ -92,14 +92,14 @@ default `true`
92
92
  User.enable => User.where(:enable => true)
93
93
  User.not_enable => User.where(:enable => false)
94
94
 
95
- ###allow_blank
96
-
97
- default `false`
98
-
99
95
  ###validate
100
96
 
101
97
  default `true`
102
98
 
99
+ ###allow_blank
100
+
101
+ default `false`, is valid with validate == true
102
+
103
103
  ###methods and use example
104
104
 
105
105
  default `true`
@@ -120,6 +120,8 @@ default `true`
120
120
 
121
121
  if your defined `default`, it set attribute `default` value before validate.
122
122
 
123
+ Note: if your migration defined field default, this is invalidation.
124
+
123
125
 
124
126
  ##Run test for development
125
127
 
data/lib/attribute_enums/active_record_extension.rb CHANGED
@@ -15,15 +15,18 @@ module AttributeEnums
15
15
  methods = options.delete(:methods) || true
16
16
  i18n = options.delete(:i18n) || true
17
17
  booleans = options.delete(:booleans) || false
18
- default_value = options.delete(:default)
19
- default_value = true if default_value.nil? and booleans
20
- raise "if booleans, default must be in true/false" if booleans and ![true, false].index(default_value)
21
- default = default_value.nil? ? false : true
18
+
19
+ default_field_value = options.delete(:default)
20
+ default_field_value = true if default_field_value.nil? and booleans
21
+ raise "if booleans, default must be in true/false" if booleans and ![true, false].index(default_field_value)
22
+
23
+ default = (default_field_value.nil? ? false : true)
22
24
 
23
25
  return if !self.table_exists? or !self.respond_to?(:column_names)
24
26
  raise "attribute #{ attribute_name } does not exist." unless column_names.index(attribute_name)
25
- raise "in/within and booleans has one and only one exist." if (!within.blank? and !booleans.blank?) or
26
- (within.blank? and booleans.blank?)
27
+ raise "in/within and booleans has one and only one exist." if (!within.blank? and !booleans.blank?) or (within.blank? and booleans.blank?)
28
+
29
+
27
30
  if booleans
28
31
  within = [true, false]
29
32
  else
@@ -45,13 +48,18 @@ module AttributeEnums
45
48
  end
46
49
  end
47
50
 
48
- unless allow_blank
49
- validates attribute_name, :presence => true
50
- end
51
-
51
+
52
52
  if use_validate
53
- validates attribute_name, :inclusion => { :in => booleans ? [true, false] : (within + within.collect{|x| x.to_sym}) },
53
+ if allow_blank
54
+ validates attribute_name, :presence => true
55
+ else
56
+ if booleans
57
+ validates attribute_name, :inclusion => { :in => [true, false] }
58
+ else
59
+ validates attribute_name, :inclusion => { :in => within + within.collect{|x| x.to_sym} },
54
60
  :if => eval(%Q`Proc.new { |record| record.#{ attribute_name }? }`)
61
+ end
62
+ end
55
63
  end
56
64
 
57
65
  if methods
@@ -68,9 +76,9 @@ module AttributeEnums
68
76
 
69
77
  if default
70
78
  if booleans
71
- class_eval(%Q`def set_default_for_attr_#{ attribute_name }; v = read_attribute("#{ attribute_name }"); self.#{ attribute_name } = (v.nil? ? #{ !default_value.blank? } : v) ; end`)
79
+ class_eval(%Q`def set_default_for_attr_#{ attribute_name }; self.#{ attribute_name } = #{ default_field_value } if read_attribute("#{ attribute_name }").nil? ; end`)
72
80
  else
73
- class_eval(%Q`def set_default_for_attr_#{ attribute_name }; self.#{ attribute_name } ||= "#{ default_value.to_s }"; end`)
81
+ class_eval(%Q`def set_default_for_attr_#{ attribute_name }; self.#{ attribute_name } ||= "#{ default_field_value.to_s }"; end`)
74
82
  end
75
83
  eval(%Q`before_validation :set_default_for_attr_#{ attribute_name }`)
76
84
  end
data/lib/attribute_enums/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module AttributeEnums
2
- VERSION = "0.1.5"
2
+ VERSION = "0.1.6"
3
3
  end
4
4
 
data/spec/models/active_record/user_spec.rb CHANGED
@@ -26,7 +26,6 @@ describe User do
26
26
  let(:user) { User.create() }
27
27
  it { user.gender.should_not be_nil }
28
28
  it { user.gender.should == "female" }
29
- it { user.gender_text.should == "Girl" }
30
29
  end
31
30
 
32
31
 
@@ -47,14 +46,22 @@ describe User do
47
46
  it { User.create.enable.should be_true }
48
47
  end
49
48
 
50
- context "test :booleans and :default" do
49
+ context "test :booleans and :default => false" do
51
50
  before {
52
51
  User.attribute_enums :enable, :booleans => true, :default => false
53
52
  }
54
53
  let(:user) { User.create() }
55
54
  it { user.enable.should be_false }
56
55
  it { user.enable.should_not be_nil }
57
- it { user.enable_text.should == "No" }
56
+ end
57
+
58
+ context "test :booleans and :default => true" do
59
+ before {
60
+ User.attribute_enums :enable, :booleans => true, :default => true
61
+ }
62
+ let(:user) { User.create() }
63
+ it { user.enable.should be_true }
64
+ it { user.enable.should_not be_nil }
58
65
  end
59
66
  end
60
67
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: attribute_enums
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.5
4
+ version: 0.1.6
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-01-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
16
- requirement: &17268800 !ruby/object:Gem::Requirement
16
+ requirement: &13934340 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *17268800
24
+ version_requirements: *13934340
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rake
27
- requirement: &17268380 !ruby/object:Gem::Requirement
27
+ requirement: &13933920 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *17268380
35
+ version_requirements: *13933920
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rspec
38
- requirement: &17267960 !ruby/object:Gem::Requirement
38
+ requirement: &13933500 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *17267960
46
+ version_requirements: *13933500
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: guard-rspec
49
- requirement: &17267540 !ruby/object:Gem::Requirement
49
+ requirement: &13933080 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *17267540
57
+ version_requirements: *13933080
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rails
60
- requirement: &17267040 !ruby/object:Gem::Requirement
60
+ requirement: &13932580 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '3.0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *17267040
68
+ version_requirements: *13932580
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: sqlite3-ruby
71
- requirement: &17266620 !ruby/object:Gem::Requirement
71
+ requirement: &13932160 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *17266620
79
+ version_requirements: *13932160
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: rspec-rails
82
- requirement: &17266080 !ruby/object:Gem::Requirement
82
+ requirement: &13931620 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 2.7.0
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *17266080
90
+ version_requirements: *13931620
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: capybara
93
- requirement: &17265660 !ruby/object:Gem::Requirement
93
+ requirement: &13931200 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *17265660
101
+ version_requirements: *13931200
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: timecop
104
- requirement: &17265200 !ruby/object:Gem::Requirement
104
+ requirement: &13930740 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *17265200
112
+ version_requirements: *13930740
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: pry
115
- requirement: &17264780 !ruby/object:Gem::Requirement
115
+ requirement: &13930320 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *17264780
123
+ version_requirements: *13930320
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: pry-padrino
126
- requirement: &17264360 !ruby/object:Gem::Requirement
126
+ requirement: &13929900 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *17264360
134
+ version_requirements: *13929900
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: activerecord
137
- requirement: &17263860 !ruby/object:Gem::Requirement
137
+ requirement: &13929400 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ~>
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '3.0'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *17263860
145
+ version_requirements: *13929400
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: activesupport
148
- requirement: &17263360 !ruby/object:Gem::Requirement
148
+ requirement: &13928900 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,7 +153,7 @@ dependencies:
153
153
  version: '3.0'
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *17263360
156
+ version_requirements: *13928900
157
157
  description: A model attribute enums plugin for Rails3. like 'symbolize' gem.
158
158
  email:
159
159
  - vkill.net@gmail.com