enumify 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b5e524f240a067b06540a32326291865c420b85
-  data.tar.gz: ee00750660d876fce2e8f5e916cd9549c7e3153d
+  metadata.gz: a8afbb3738f0c1aba03e6447384e9fe19c628905
+  data.tar.gz: 7a3e37ec4b0e53194e13005d8c46ffcd5c9ff4b6
 SHA512:
-  metadata.gz: 2ffc622bd738b6049023cc6b4f0b91ab63b2cfe193b48aed43aa379fd8dd1fa50aacca01969e011f66dd1c572c616995e85285ff30f50d511af59607cb727e0d
-  data.tar.gz: 8af5a86231191e753b9436289801dc26c175757d21f28ac79757fb2e0535c6dc51f471f5f82581864eaf3fa8a1e3508b915a56b420c4ca0211383691d0232ecf
+  metadata.gz: cee67d6734399da89000f4a503acd71098842395bd5ef6d6fdd1e7d08bbed1fe7cc8debcff7b20dfcc3cc5a2533845f4b8ab38fce479519b210b31fd14cc9850
+  data.tar.gz: ccb3e32f9d9dd9c7fa8457097d3a23cd5899585a3edbce0a3491a1f268a80f4180b72e2d12b7e507e9895b1c3da44f10709a5fbd65d195a87b142a63ac001583

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+gemfile:
+  - gemfiles/rails30.gemfile
+  - gemfiles/rails31.gemfile
+  - gemfiles/rails32.gemfile
+  - gemfiles/rails40.gemfile
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails40.gemfile

data/Appraisals

@@ -0,0 +1,15 @@
+appraise "rails30" do
+  gem "activerecord", "~> 3.0.11"
+end
+
+appraise "rails31" do
+  gem "activerecord", "~> 3.1.12"
+end
+
+appraise "rails32" do
+  gem "activerecord", "~> 3.2.14"
+end
+
+appraise "rails40" do
+  gem "activerecord", "~> 4.0.0"
+end

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v0.0.5
+* Added 'allow_nil' as an option.
+
 ## v0.0.3
 * Fixed bug in not_ scopes
 

data/Rakefile

@@ -1,5 +1,6 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
+require 'appraisal'
 
 RSpec::Core::RakeTask.new(:spec)
 task :default => :spec

data/Readme.md

@@ -39,6 +39,20 @@ event.canceled!             # changes the enum's value to canceled
 Event::STATUSES             # returns all available status of the enum
 ```
 
+## Options
+#### :allow_nil
+By default the enum field does not support a nil value. In order to allow nil values add the `allow_nil` option (similar to the Rails validation option).
+
+```ruby
+class Event < ActiveRecord::Base
+    enum :status, [:available, :canceled, :completed], :allow_nil => true
+end
+
+Event.create! # Is valid and does not throw an exception.
+```
+
+
+
 ## Callbacks
 Another cool feature of enumify is the option to add a callback function that will be called each time the value of the field changes
 This is cool to do stuff like log stuff or create behaviour on state changes

data/enumify.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  s.add_development_dependency "activerecord"
+  s.add_development_dependency "activerecord", '>= 3.0'
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency 'appraisal', '>= 0.3.8'
 end

data/gemfiles/rails30.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 3.0.11"
+
+gemspec :path=>"../"

data/gemfiles/rails31.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 3.1.12"
+
+gemspec :path=>"../"

data/gemfiles/rails32.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 3.2.14"
+
+gemspec :path=>"../"

data/gemfiles/rails40.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activerecord", "~> 4.0.0"
+
+gemspec :path=>"../"

data/lib/enumify/model.rb

@@ -1,10 +1,10 @@
 module Enumify
   module Model
-    def enum(parameter, opts=[])
+    def enum(parameter, vals=[], opts={})
 
-      validates_inclusion_of parameter, :in => opts
+      validates_inclusion_of parameter, :in => vals, :allow_nil => !!opts[:allow_nil]
 
-      const_set("#{parameter.to_s.pluralize.upcase}", opts)
+      const_set("#{parameter.to_s.pluralize.upcase}", vals)
 
       define_method "#{parameter.to_s}" do
         attr = read_attribute(parameter)
@@ -31,28 +31,28 @@ module Enumify
 
       end
 
-      opts.each do |opt|
-        raise "Collision in enum values method #{opt}" if respond_to?("#{opt.to_s}?") or respond_to?("#{opt.to_s}!") or respond_to?("#{opt.to_s}")
+      vals.each do |val|
+        raise "Collision in enum values method #{val}" if respond_to?("#{val.to_s}?") or respond_to?("#{val.to_s}!") or respond_to?("#{val.to_s}")
 
-        define_method "#{opt.to_s}?" do
-            send("#{parameter.to_s}") == opt
+        define_method "#{val.to_s}?" do
+            send("#{parameter.to_s}") == val
         end
 
-        define_method "#{opt.to_s}!" do
-            send("_set_#{parameter.to_s}", opt, true)
+        define_method "#{val.to_s}!" do
+            send("_set_#{parameter.to_s}", val, true)
         end
 
-        scope opt.to_sym, lambda { where(parameter.to_sym => opt.to_s) }
+        scope val.to_sym, lambda { where(parameter.to_sym => val.to_s) }
       end
 
       # We want to first define all the "positive" scopes and only then define
       # the "negation scopes", to make sure they don't override previous scopes
-      opts.each do |opt|
+      vals.each do |val|
         # We need to prefix the field with the table name since if this scope will
         # be used in a joined query with other models that have the same enum field then
         # it will fail on ambiguous column name.
-        unless respond_to?("not_#{opt}")
-          scope "not_#{opt}", lambda { where("#{self.table_name}.#{parameter} != ?", opt.to_s) }
+        unless respond_to?("not_#{val}")
+          scope "not_#{val}", lambda { where("#{self.table_name}.#{parameter} != ?", val.to_s) }
         end
       end
 

data/lib/enumify/version.rb

@@ -1,3 +1,3 @@
 module Enumify
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/enumify/enum_spec.rb

@@ -14,6 +14,17 @@ class OtherModel < ActiveRecord::Base
   enum :status, [:active, :expired, :not_expired]
 end
 
+class ModelAllowingNil < ActiveRecord::Base
+  self.table_name = 'models'
+
+  extend Enumify::Model
+
+  belongs_to :model
+
+  enum :status, [:active, :expired, :not_expired], :allow_nil => true
+end
+
+
 describe :Enumify do
 
   before(:each) do
@@ -29,6 +40,28 @@ describe :Enumify do
     @not_expired_obj = OtherModel.create!(:status => :not_expired, :model => @canceled_obj)
   end
 
+  describe "allow nil" do
+
+    before(:each) do
+      @obj_not_allowing_nil = Model.create
+      @obj_allowing_nil = ModelAllowingNil.create
+    end
+
+    describe "model allowing enum value to be nil" do
+      it "should be valid" do
+        @obj_allowing_nil.should be_valid
+      end
+
+    end
+
+    describe "model not allowing enum value to be nil" do
+      it "should be invalid" do
+        @obj_not_allowing_nil.should be_invalid
+      end
+    end
+
+  end
+
   describe "short hand methods" do
     describe "question mark (?)" do
       it "should return true if value of enum equals a value" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumify
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - yon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.8
 description: |2
       Enumify lets you add an enum command to ActiveRecord models
 
@@ -82,12 +96,18 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - LICENSE
 - Rakefile
 - Readme.md
 - enumify.gemspec
+- gemfiles/rails30.gemfile
+- gemfiles/rails31.gemfile
+- gemfiles/rails32.gemfile
+- gemfiles/rails40.gemfile
 - lib/enumify.rb
 - lib/enumify/model.rb
 - lib/enumify/railtie.rb