active_enum 1.0.0.rc3 → 1.0.0.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2ff570eda0a94b326f65a6a97b5b6bb68cd3f953fba95cdc14e34e184f8afc
-  data.tar.gz: fb5e45a1e55ee514408b1e1a71c0559b52bacb74f2d632dea63680a495bcf523
+  metadata.gz: 906926ead31439e2c3457cf32e453bf6c6a342245a6e8f0ce1d1debd6fd7b539
+  data.tar.gz: 13dd1539bded32f57ba862d4e0d068d6d3d0e7aae22bb8fe1078d6e9c823d261
 SHA512:
-  metadata.gz: dae56bad88d50dbef7355c37243b5c76dea0cd4a741ee6389f94824453f3e5d05bae64966102a304ce643fc675f3a37584637ac4e6bf9d0219d96911e0effbd2
-  data.tar.gz: 6aec92d08a5afad8eb137cd319346d41784ec19648a8c261408dc2896fcb853a4e8ba345bd50d98b67ddf5e49d82747c3fdd32035a9011184a1c7783a1f69b63
+  metadata.gz: 46d4c12f04dd2affd956488081f0735a9b19767ae4b370a912cf0ef31779a01d3c398da082bd1bb03e22156ccd647ace3eb54ed95a9628e81847299fdf8e0fc0
+  data.tar.gz: 3b362e15afb2b1cb5f2215577605027eacc3b3d15252bdca4e664baf8259c2caa72b50bac9314662323eb60869731b2a7385c84290dd239e838f5f1f5ac70182

data/.travis.yml

@@ -1,8 +1,8 @@
-env:
-  - "RAILS_VERSION=3.1.0"
-  - "RAILS_VERSION=3.2.0"
-  - "RAILS_VERSION=4.0.0"
-  - "RAILS_VERSION=master"
+gemfile:
+  - gemfiles/rails_4_2.gemfile
+  - gemfiles/rails_5_0.gemfile
+  - gemfiles/rails_5_1.gemfile
+  - gemfiles/rails_5_2.gemfile
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.5.8
+  - 2.6.6

data/README.rdoc

@@ -15,7 +15,7 @@ From gem version 1.0 onwards this plugin will only have Rails 4+ support. If you
 
 Put this in your Gemfile
 
-  gem 'active_enum', '~> 1.0.0.pre'
+  gem 'active_enum', '~> 1.0.0.rc4'
 
 Then generate the config initializer file
 

data/gemfiles/rails_4_2.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.2.11"
+
+gem 'sqlite3', '~> 1.3.0'
+
+gem 'rake'
+gem 'simple_form', '~> 3.0'
+gem 'byebug'
+gem 'rspec', '~> 3.4'
+gem 'rspec-rails', '~> 3.4'
+gem 'capybara'
+
+gemspec path: "../"

data/gemfiles/rails_5_0.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+
+gem 'sqlite3', '~> 1.3.0'
+
+gem 'rake'
+gem 'simple_form', '~> 5.0'
+gem 'byebug'
+gem 'rspec', '~> 3.4'
+gem 'rspec-rails', '~> 3.4'
+gem 'capybara'
+
+gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+
+gem 'sqlite3', '~> 1.3.0'
+
+gem 'rake'
+gem 'simple_form', '~> 5.0'
+gem 'byebug'
+gem 'rspec', '~> 3.4'
+gem 'rspec-rails', '~> 3.4'
+gem 'capybara'
+
+gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -0,0 +1,16 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+
+gem 'sqlite3', '~> 1.3.0'
+
+gem 'rake'
+gem 'simple_form', '~> 5.0'
+gem 'byebug'
+gem 'rspec', '~> 3.4'
+gem 'rspec-rails', '~> 3.4'
+gem 'capybara'
+
+gemspec path: "../"

data/lib/active_enum/acts_as_enum.rb

@@ -7,15 +7,19 @@ module ActiveEnum
         extend ClassMethods
         class_attribute :active_enum_options
         self.active_enum_options = options.reverse_merge(:name_column => 'name')
-        scope :enum_values, proc { select("#{primary_key}, #{active_enum_options[:name_column]}").
+        scope :enum_values, proc { select(Arel.sql("#{primary_key}, #{active_enum_options[:name_column]}")).
                                    where(active_enum_options[:conditions]).
-                                   order("#{primary_key} #{active_enum_options[:order]}") }
+                                   order(Arel.sql("#{primary_key} #{active_enum_options[:order]}")) }
       end
 
     end
 
     module ClassMethods
 
+      def values
+        enum_values.map { |v| [ v.id, v.send(active_enum_options[:name_column]) ] }
+      end
+
       def ids
         enum_values.map { |v| v.id }
       end
@@ -59,7 +63,7 @@ module ActiveEnum
         if index.is_a?(Integer)
           enum_values.where(id: index)
         else
-          enum_values.where("#{active_enum_options[:name_column]} like lower(?)", index.to_s)
+          enum_values.where("lower(#{active_enum_options[:name_column]}) = lower(?)", Arel.sql(index.to_s))
         end
       end
     end

data/lib/active_enum/base.rb

@@ -34,9 +34,11 @@ module ActiveEnum
         @order = order
       end
 
-      def all
+      # Array of arrays of stored values defined id, name, meta values hash
+      def values
         store.values
       end
+      alias_method :all, :values
 
       def each(&block)
         all.each(&block)
@@ -59,7 +61,7 @@ module ActiveEnum
 
       # Return enum values in a nested array suitable to pass to a Rails form grouped select helper.
       def to_grouped_select(group_by)
-        store.values.group_by { |(_id, _name, meta)| meta.fetch(group_by) }.map { |group, collection|
+        store.values.group_by { |(_id, _name, meta)| (meta || {})[group_by] }.map { |group, collection|
           [ group, collection.map { |(id, name, _meta)| [ name.html_safe, id ] } ]
         }
       end
@@ -74,7 +76,7 @@ module ActiveEnum
       alias_method :[], :get
 
       def include?(value)
-        !get(value).nil?
+        !get_value(value, false).nil?
       end
 
       # Access any meta data defined for a given id or name. Returns a hash.
@@ -86,12 +88,12 @@ module ActiveEnum
       private
 
       # Access value row array for a given id or name value.
-      def get_value(index)
+      def get_value(index, raise_on_not_found = ActiveEnum.raise_on_not_found)
         if index.is_a?(Integer)
           store.get_by_id(index)
         else
           store.get_by_name(index)
-        end || (ActiveEnum.raise_on_not_found ? raise(ActiveEnum::NotFound, "#{self} value for '#{index}' was not found") : nil)
+        end || (raise_on_not_found ? raise(ActiveEnum::NotFound, "#{self} value for '#{index}' was not found") : nil)
       end
 
       def id_and_name_and_meta(hash)

data/lib/active_enum/extensions.rb

@@ -110,7 +110,7 @@ module ActiveEnum
         class_eval <<-DEF
           def #{attribute}=(arg)
             if arg.is_a?(Symbol)
-              super self.class.active_enum_for(:#{attribute})[arg]
+              super(self.class.active_enum_for(:#{attribute})[arg])
             else
               super
             end
@@ -127,7 +127,7 @@ module ActiveEnum
         class_eval <<-DEF
           def #{attribute}?(arg=nil)
             if arg
-              self.#{attribute}(:id) == self.class.active_enum_for(:#{attribute})[arg]
+              self.#{attribute}(:id).present? && self.#{attribute}(:id) == self.class.active_enum_for(:#{attribute})[arg]
             else
               super()
             end

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '1.0.0.rc3'
+  VERSION = '1.0.0.rc8'
 end

data/spec/active_enum/acts_as_enum_spec.rb

@@ -45,6 +45,12 @@ describe ActiveEnum::ActsAsEnum do
     end
   end
 
+  context '#values' do
+    it "should return array of arrays containing id and name column values" do
+      expect(Person.values).to eq([[1, 'Dave'], [2, 'John']])
+    end
+  end
+
   context '#to_select' do
     it "should return array for select helpers" do
       expect(Person.to_select).to eq([['Dave', 1], ['John', 2]])

data/spec/active_enum/base_spec.rb

@@ -24,9 +24,9 @@ describe ActiveEnum::Base do
     end
   end
 
-  describe ".all" do
+  describe ".values" do
     it 'should return an empty array when no values defined' do
-      expect(define_enum.all).to eq([])
+      expect(define_enum.values).to eq([])
     end
 
     it 'should return an array of arrays with all values defined as [id, name]' do
@@ -34,7 +34,7 @@ describe ActiveEnum::Base do
         value :name => 'Name 1'
         value :name => 'Name 2'
       end
-      expect(enum.all).to eq([[1,'Name 1'], [2, 'Name 2']])
+      expect(enum.values).to eq([[1,'Name 1'], [2, 'Name 2']])
     end
   end
 
@@ -43,28 +43,28 @@ describe ActiveEnum::Base do
       enum = define_enum do
         value :id => 1, :name => 'Name'
       end
-      expect(enum.all).to eq([[1,'Name']])
+      expect(enum.values).to eq([[1,'Name']])
     end
 
     it 'should allow me to define a value with a name only' do
       enum = define_enum do
         value :name => 'Name'
       end
-      expect(enum.all).to eq([[1,'Name']])
+      expect(enum.values).to eq([[1,'Name']])
     end
 
     it 'should allow me to define a value as hash with id as key and name as value' do
       enum = define_enum do
         value 1 => 'Name'
       end
-      expect(enum.all).to eq([[1,'Name']])
+      expect(enum.values).to eq([[1,'Name']])
     end
 
     it 'should allow to define meta data value with extra key value pairs' do
       enum = define_enum do
         value :id => 1, :name => 'Name', :description => 'extra'
       end
-      expect(enum.all).to eq([[1,'Name',{:description => 'extra'}]])
+      expect(enum.values).to eq([[1,'Name',{:description => 'extra'}]])
     end
 
     it 'should increment value ids when defined without ids' do
@@ -72,7 +72,7 @@ describe ActiveEnum::Base do
         value :name => 'Name 1'
         value :name => 'Name 2'
       end
-      expect(enum.all).to eq([[1,'Name 1'], [2, 'Name 2']])
+      expect(enum.values).to eq([[1,'Name 1'], [2, 'Name 2']])
     end
 
     it 'should raise error if the id is a duplicate' do
@@ -117,7 +117,7 @@ describe ActiveEnum::Base do
         value :id => 2, :name => 'Name 2'
         value :id => 1, :name => 'Name 1'
       end
-      expect(enum.all).to eq([[1,'Name 1'], [2, 'Name 2']])
+      expect(enum.values).to eq([[1,'Name 1'], [2, 'Name 2']])
     end
 
     it 'should return sorted values by id using order setting' do
@@ -126,7 +126,7 @@ describe ActiveEnum::Base do
         value :id => 1, :name => 'Name 1'
         value :id => 2, :name => 'Name 2'
       end
-      expect(enum.all).to eq([[2, 'Name 2'], [1,'Name 1']])
+      expect(enum.values).to eq([[2, 'Name 2'], [1,'Name 1']])
     end
 
     it 'should return sorted values by id using order setting' do
@@ -136,7 +136,7 @@ describe ActiveEnum::Base do
         value :id => 1, :name => 'Name 1'
         value :id => 2, :name => 'Name 2'
       end
-      expect(enum.all).to eq([[3,'Name 3'], [1,'Name 1'], [2, 'Name 2']])
+      expect(enum.values).to eq([[3,'Name 3'], [1,'Name 1'], [2, 'Name 2']])
     end
   end
 
@@ -260,6 +260,18 @@ describe ActiveEnum::Base do
         [ 'Bar', [ ['Name 2',2] ] ]
       ])
     end
+
+    it 'should group any value missing the group_by key by nil' do
+      enum = define_enum do
+        value :id => 1, :name => 'Name 1', :category => 'Foo'
+        value :id => 2, :name => 'Name 2'
+      end
+
+      expect(enum.to_grouped_select(:category)).to eq([
+        [ 'Foo', [ ['Name 1',1] ] ],
+        [ nil, [ ['Name 2',2] ] ]
+      ])
+    end
   end
 
   def define_enum(&block)

data/spec/active_enum/extensions_spec.rb

@@ -176,6 +176,11 @@ describe ActiveEnum::Extensions do
         expect(person.sex?(:female)).to be_falsey
         expect(person.sex?(:Female)).to be_falsey
       end
+
+      it 'should return false if attribute is nil regardless of enum value' do
+        person.sex = nil
+        expect(person.sex?(:nonexistent)).to be_falsey
+      end
     end
 
     context "with value as enum name symbol" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_enum
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc8
 platform: ruby
 authors:
 - Adam Meehan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,6 +39,10 @@ files:
 - README.rdoc
 - Rakefile
 - active_enum.gemspec
+- gemfiles/rails_4_2.gemfile
+- gemfiles/rails_5_0.gemfile
+- gemfiles/rails_5_1.gemfile
+- gemfiles/rails_5_2.gemfile
 - init.rb
 - lib/active_enum.rb
 - lib/active_enum/acts_as_enum.rb
@@ -68,7 +72,7 @@ files:
 homepage: http://github.com/adzap/active_enum
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -83,8 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Define enum classes in Rails and use them to enumerate ActiveRecord attributes
 test_files: