enumerate 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db9d3a63909d2f1e942fc7c9d72ee6df9129de4
-  data.tar.gz: bac591dc7038aa835d7244bde5573f1e328fdcbd
+  metadata.gz: 7d919858d8c1c54b7566bafe2fa92f2277fe4509
+  data.tar.gz: b73bac61dd57eb7c67bd178672af1be33dda7949
 SHA512:
-  metadata.gz: 781cedc5ede92afbdb33ba49cc4b659f7d61d0627c15ac76bf46e8c3bb2f0d26b27b3b955506b1ce540fca604d1d191c0f2d2abc4fd94fd85ef8857918b308ff
-  data.tar.gz: cdb2002e9c61cc372c8093e7c00b9de5fdc2f77787c8bb150218232404c5aa99399631213e190de45bd089036fca5a31da80cd667bb6c06fb17f7eb97acb3ff9
+  metadata.gz: bbc00303f7ee43b06ce9756c4b3e44209afdde7279139130c524c471f389309451abec299e3a174f5c1367281b6eaa94e9e3ec300f568e422c9f031701b817fa
+  data.tar.gz: dc1efa39fb468eea0aefa6694604157fe4d571caf3c692707f73ba6d64d844d7fe765d36ec261374b0daf4fb58f3ea2fd9ae0f5606406cb49eb6b9ee976ea434

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+vendor

data/README.md

@@ -1,5 +1,4 @@
-# Enumerate [![Build Status](https://secure.travis-ci.org/TwilightCoders/enumerate.png)](http://travis-ci.org/TwilightCoders/enumerate)
-# Enumerate [![Gem Version](https://badge.fury.io/rb/enumerate.png)](http://badge.fury.io/rb/enumerate)
+# Enumerate [![Build Status](https://secure.travis-ci.org/TwilightCoders/enumerate.png)](http://travis-ci.org/TwilightCoders/enumerate) [![Gem Version](https://badge.fury.io/rb/enumerate.png)](http://badge.fury.io/rb/enumerate) [![Code Climate](https://codeclimate.com/github/TwilightCoders/enumerate.png)](https://codeclimate.com/github/TwilightCoders/enumerate)
 
 Enumerate adds an enum command to all ActiveRecord models which enables you to work with integer and string attributes as if they were enums
 

data/enumerate.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "activerecord", '>= 3.0'
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency 'appraisal', '>= 0.3.8'
+  s.add_development_dependency "rake", '~> 0.9', '>= 0.9.3'
+  s.add_development_dependency 'rspec', '~> 2.3', '>= 2.3.0'
+  s.add_development_dependency 'activerecord', '~> 3.0', '>= 3.0.6'
+  s.add_development_dependency "sqlite3", '~> 1.3', '>= 1.3.3'
+  s.add_development_dependency 'appraisal', '~> 0.3', '>= 0.3.8'
 end

data/lib/enumerate/model.rb

@@ -4,8 +4,13 @@ module Enumerate
 
       validates_inclusion_of attribute, :in => vals, :allow_nil => !!opts[:allow_nil]
       
+      
       # Get the column type of the attribute. We support int and string
-      col_type = self.columns_hash[attribute.to_s].type
+	  if self.columns_hash[attribute.to_s].nil?
+        raise "Column '#{attribute}' does not exist in #{self.class.name}"
+      else
+        col_type = self.columns_hash[attribute.to_s].type
+	  end
       
       const_hash_name = attribute.to_s.pluralize.upcase
     
@@ -44,31 +49,41 @@ module Enumerate
         unless methods.include?("#{attribute.to_s}=")
           self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{attribute.to_s}=(s)
-              write_attribute(:#{attribute}, #{const_hash_name}[s.to_sym])
+			  if (s.kind_of?(Fixnum))
+                write_attribute(:#{attribute}, s)
+              elsif (s.kind_of?(Symbol) or s.kind_of?(String))
+			  # 	puts "changing to \#{s}"
+			    write_attribute(:#{attribute}, #{const_hash_name}[s.to_sym])
+				#	puts "is now \#{#{attribute}}"
+              end
             end
           RUBY
         end
       end
 
       def setup_predicates(vals, attribute)
-          vals.each do |key, val|
-              raise "Collision in enumeration predicate method(s) #{key}" if respond_to?("#{key.to_s}?") or respond_to?("#{key.to_s}!") or respond_to?("#{key.to_s}")
+		vals.each do |key, val|
+		  raise "Collision in enumeration predicate method(s) #{key}" if respond_to?("#{key.to_s}?") or respond_to?("#{key.to_s}!") or respond_to?("not_#{key.to_s}?") or respond_to?("#{attribute.to_s}")
               
-              define_method "#{key.to_s}?" do
-                send("#{attribute.to_s}") == key
-              end
+		  define_method "#{key.to_s}?" do
+			send("#{attribute.to_s}") == key
+		  end
+			  
+		  define_method "not_#{key.to_s}?" do
+			send("#{attribute.to_s}") != key
+		  end
               
-              define_method "#{key.to_s}!" do
-                send("#{attribute.to_s}=", key)
-              end
+		  define_method "#{key.to_s}!" do
+		    send("#{attribute.to_s}=", key)
+		  end
               
-              # Define helper scopes
-              self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-                scope :#{key}, lambda { where(:#{attribute} => #{val}) }
-              RUBY
-          end
+		  # Define helper scopes
+		  self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+			scope :#{key}, lambda { where(:#{attribute} => #{val}) }
+			scope :not_#{key}, lambda { where("#{attribute} != #{val}") }
+		  RUBY
+		end
       end
-
   end
 
 end

data/lib/enumerate/railtie.rb

@@ -1,4 +1,4 @@
-module UrlFormatter
+module Enumerate
   class Railtie < Rails::Railtie
     initializer 'enumerate.model' do
       ActiveSupport.on_load :active_record do

data/lib/enumerate/version.rb

@@ -1,3 +1,3 @@
 module Enumerate
-  VERSION = '0.0.4'
+  VERSION = '0.0.7'
 end

data/spec/enumerate/enum_spec.rb

@@ -11,7 +11,7 @@ class OtherModel < ActiveRecord::Base
 
   belongs_to :model
 
-  enumerate :status, [:active, :expired, :not_expired]
+  enumerate :status, [:active, :expired]
 end
 
 class ModelAllowingNil < ActiveRecord::Base
@@ -21,7 +21,7 @@ class ModelAllowingNil < ActiveRecord::Base
 
   belongs_to :model
 
-  enumerate :status, [:active, :expired, :not_expired], :allow_nil => true
+  enumerate :status, [:active, :expired], :allow_nil => true
 end
 
 
@@ -37,7 +37,6 @@ describe :Enumerate do
 
     @active_obj = OtherModel.create!(:status => :active, :model => @obj)
     @expired_obj = OtherModel.create!(:status => :expired, :model => @canceled_obj)
-    @not_expired_obj = OtherModel.create!(:status => :not_expired, :model => @canceled_obj)
   end
 
   describe "allow nil" do
@@ -65,11 +64,13 @@ describe :Enumerate do
   describe "short hand methods" do
     describe "question mark (?)" do
       it "should return true if value of enum equals a value" do
-        @obj.available?.should be_true
+		@obj.available?.should be_true
+		@obj.not_canceled?.should be_true
       end
-
+	  
       it "should return false if value of enum is different " do
-        @obj.canceled?.should be_false
+		@obj.canceled?.should be_false
+		@obj.not_available?.should be_false
       end
 
     end
@@ -81,9 +82,10 @@ describe :Enumerate do
       end
     end
 
-    it "should have two shorthand methods for each possible value" do
-      Model::STATUSES.each do |key, val|
-        @obj.respond_to?("#{key}?").should be_true
+    it "should have three shorthand methods for each possible value" do
+	  Model::STATUSES.each do |key, val|
+		@obj.respond_to?("#{key}?").should be_true
+		@obj.respond_to?("not_#{key}?").should be_true
         @obj.respond_to?("#{key}!").should be_true
       end
     end
@@ -91,9 +93,9 @@ describe :Enumerate do
 
   describe "getting value" do
     it "should always return the enums value as a symbol" do
-      @obj.status.should == :available
+      @obj.status.kind_of?(Symbol).should be_true
       @obj.status = "canceled"
-      @obj.status.should == :canceled
+      @obj.status.kind_of?(Symbol).should be_true
     end
 
   end

metadata

@@ -1,83 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: enumerate
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Dale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - ">="
       - !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'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
 description: |2
@@ -93,8 +123,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -120,17 +150,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Enumerate adds an `enumerate` command to all ActiveRecord models, enabling