active_enum 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: abc265242b6f277fd73cd50f675eb3e966407cda
-  data.tar.gz: 5b4c18dd92b26c6282afa3ba13e131d9ac916bd0
+SHA256:
+  metadata.gz: e0463e9528b9a2ec019caf593cfc2becaa1767a116d4657d93de5462c8fb5475
+  data.tar.gz: 2cd9be66544fa2bd00cf2ace406c4c5010411f02d53f1c926d0f197609e89993
 SHA512:
-  metadata.gz: c0a0d1e62906848e9a031e6bb8cd27071a3fa4b2b6919d4311eb7fbae2fcfb1676f9a6d292d94d462a167d2b084cccc795e37d58d65c0af25f6db5a9bf1f08f8
-  data.tar.gz: 5c9cb81a882a6ddaf6c2e3c6d864598e85d544e91f835ea711b9881a2c710b1b20b5812987481dc50975ee13ff60814cda8967fc36058f67dfed5a873b45947e
+  metadata.gz: efd7a02386a9e3a6a45812b35e8c509ac60d47249238bee485b00fc8d0a1598ed8a0ae5319e02d76f59ca06ccce5e22dfd25ad0b217ee29f7471510a8deeb15c
+  data.tar.gz: d69b2b354382981ba79af48b3d0306839a1f218d7e7bf01136a2021fdc7026a4b0eedfc40e00e5d63c24deaf2eccf00b5727083a8a2023947a29a00ed579a5ec

data/lib/active_enum/acts_as_enum.rb

@@ -17,37 +17,49 @@ module ActiveEnum
     module ClassMethods
 
       def ids
-        enum_values.map {|v| v.id }
+        enum_values.map { |v| v.id }
       end
 
       def names
-        enum_values.map {|v| v.send(active_enum_options[:name_column]) }
+        enum_values.map { |v| v.send(active_enum_options[:name_column]) }
       end
 
       def to_select
-        enum_values.map {|v| [v.send(active_enum_options[:name_column]), v.id] }
+        enum_values.map { |v| [v.send(active_enum_options[:name_column]), v.id] }
       end
 
       def [](index)
-        if index.is_a?(Integer)
-          v = lookup_by_id(index)
-          v.send(active_enum_options[:name_column]) unless v.blank?
-        else
-          v = lookup_by_name(index)
-          v.id unless v.blank?
-        end
+        row = get_value(index)
+        return if row.nil?
+        index.is_a?(Integer) ? row.send(active_enum_options[:name_column]) : row.id
       end
 
-      private
-
-      def lookup_by_id(index)
-        enum_values.find_by_id(index)
+      # Access any meta data defined for a given id or name. Returns a hash.
+      def meta(index)
+        row = lookup_relation(index).unscope(:select).first
+        row&.attributes.except(primary_key.to_s, active_enum_options[:name_column].to_s)
       end
 
-      def lookup_by_name(index)
-        enum_values.where("#{active_enum_options[:name_column]} like lower(?)", index.to_s).first
+      # Enables use as a delimiter in inclusion validation
+      def include?(value)
+        !self[value].nil?
       end
 
+      private
+
+      def get_value(index)
+        lookup_relation(index).first || begin
+          raise(ActiveEnum::NotFound, "#{self} value for '#{index}' was not found") if ActiveEnum.raise_on_not_found
+        end
+      end
+      
+      def lookup_relation(index)
+        if index.is_a?(Integer)
+          enum_values.where(id: index)
+        else
+          enum_values.where("#{active_enum_options[:name_column]} like lower(?)", index.to_s)
+        end
+      end
     end
 
   end

data/lib/active_enum/base.rb

@@ -20,7 +20,7 @@ module ActiveEnum
       #   value 1 => 'Foo'
       #
       def value(enum_value)
-        store.set *id_and_name_and_meta(enum_value)
+        store.set(*id_and_name_and_meta(enum_value))
       end
 
       # Specify order enum values are returned. 
@@ -44,17 +44,17 @@ module ActiveEnum
 
       # Array of all enum id values
       def ids
-        store.values.map {|v| v[0] }
+        store.values.map { |v| v[0] }
       end
 
       # Array of all enum name values
       def names
-        store.values.map {|v| v[1] }
+        store.values.map { |v| v[1] }
       end
 
       # Return enum values in an array suitable to pass to a Rails form select helper.
       def to_select
-        store.values.map {|v| [v[1], v[0]] }
+        store.values.map { |v| [v[1], v[0]] }
       end
 
       # Access id or name value. Pass an id number to retrieve the name or
@@ -66,15 +66,6 @@ module ActiveEnum
       end
       alias_method :[], :get
 
-      # Access value row array for a given id or name value.
-      def get_value(index)
-        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
-
       def include?(value)
         !get(value).nil?
       end
@@ -87,6 +78,15 @@ module ActiveEnum
 
       private
 
+      # Access value row array for a given id or name value.
+      def get_value(index)
+        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
+
       def id_and_name_and_meta(hash)
         if hash.has_key?(:name)
           id   = hash.delete(:id) || next_id

data/lib/active_enum/extensions.rb

@@ -64,7 +64,7 @@ module ActiveEnum
         enum_class_name = "#{name}::#{attribute.to_s.camelize}"
         eval("class #{enum_class_name} < ActiveEnum::Base; end")
         enum = enum_class_name.constantize
-        enum.class_eval &block
+        enum.class_eval(&block)
         enum
       end
 

data/lib/active_enum/storage/i18n_store.rb

@@ -14,7 +14,7 @@ module ActiveEnum
       end
 
       def values
-        _values.map { |(id, name)| get_by_id(id) }
+        _values.map { |(id, _)| get_by_id(id) }
       end
 
       def i18n_scope

data/lib/active_enum/storage/memory_store.rb

@@ -4,7 +4,7 @@ module ActiveEnum
 
       def set(id, name, meta=nil)
         check_duplicate id, name
-        _values << [id, name.to_s, meta].compact
+        _values << [ id, name.to_s, meta ].compact
         sort!
       end
 

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '1.0.0.rc1'
+  VERSION = '1.0.0.rc2'
 end

data/spec/active_enum/acts_as_enum_spec.rb

@@ -30,24 +30,34 @@ describe ActiveEnum::ActsAsEnum do
     expect(TestPerson.extended_modules).to include(ActiveEnum::ActsAsEnum::ClassMethods)
   end
 
-  it "should return name column value when passing id to [] method" do
-    expect(Person[1]).to eq('Dave')
-  end
+  context "#[]" do
+    it "should return name column value when passing id to [] method" do
+      expect(Person[1]).to eq('Dave')
+    end
 
-  it "should return id column value when passing string name to [] method" do
-    expect(Person['Dave']).to eq(1)
-    expect(Person['dave']).to eq(1)
-  end
+    it "should return id column value when passing string name to [] method" do
+      expect(Person['Dave']).to eq(1)
+      expect(Person['dave']).to eq(1)
+    end
 
-  it "should return id column value when passing symbol name to [] method" do
-    expect(Person[:dave]).to eq(1)
+    it "should return id column value when passing symbol name to [] method" do
+      expect(Person[:dave]).to eq(1)
+    end
   end
 
-  it "should return array for select helpers from to_select" do
-    expect(Person.to_select).to eq([['Dave', 1], ['John', 2]])
+  context '#to_select' do
+    it "should return array for select helpers" do
+      expect(Person.to_select).to eq([['Dave', 1], ['John', 2]])
+    end
+
+    it "should return sorted array from order value for select helpers when an order is specified" do
+      expect(SortedPerson.to_select).to eq([['John', 2], ['Dave', 1]])
+    end
   end
 
-  it "should return sorted array from order value for select helpers from to_select when an order is specified" do
-    expect(SortedPerson.to_select).to eq([['John', 2], ['Dave', 1]])
+  context '#meta' do
+    it "should return record attributes hash without id and name columns" do
+      expect(Person.meta(1)).to eq(Person.find(1).attributes.except('id', 'first_name'))
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_enum
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Adam Meehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2019-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Define enum classes in Rails and use them to enumerate ActiveRecord attributes