enumbler 0.6.1 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b196f7e09065d7f461c8f0c4ae87e25d849600dfa38840b2aba5b9f2d75c2d7b
-  data.tar.gz: f187980e2ba0a7b79dc9657c1469e205aa1e3efb7439190d2d5592d5df0851b9
+  metadata.gz: c7090cf447bc470848993d1b219762453e4188c8aea3c11bf3bb4daf3d5ed771
+  data.tar.gz: 2fc9f318859ab4c8f6dc493f00d565b3c68ca41d0d804beeb8ac3f251262423e
 SHA512:
-  metadata.gz: 43c6e81c18303961b9e1ea530282f70fff80d76b57bf57eeef347f014a3bc6918d525748a0e0ea216bd4aed31579b9c133d43dd085a0cca42dbab4c19ab5f839
-  data.tar.gz: 96635852aa098120cc7a93e30d8e51c865e0be220ae73b93f06cca1af783feaa9776cb2295d02f5a3cfbc4abff6c2d1495c0b4951c9b06755f444a2db3cc931d
+  metadata.gz: 59b4721f1cdbdb5174692d1c13b784cd9eae230a67a99d34f87e4696602d75bd91f005a140ea5ff8f0ec4731102e10f9eb193f2deaaf8537465720c569c10faf
+  data.tar.gz: 704eca26b618018b976e165146182bda016440a9d4ff652ccb7351e70dfacc587c8d9fb1bf96647185adbe439f7a6b59d2f4798a3cbe4d6c4d45d58224daae51

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enumbler (0.6.1)
+    enumbler (0.6.6)
       activerecord (>= 5.2.3, < 6.1)
       activesupport (>= 5.2.3, < 6.1)
 

data/README.md

@@ -73,6 +73,9 @@ Color.find_enumbles(:black, 'does-not-exist') # => [Enumbler::Enumble<:black>, n
 
 Color.find_enumble(:black) # => Enumbler::Enumble<:black>
 
+# Is pretty flexible with findidng things from strings
+Color.find_enumble('Dark_Brown') # => Enumbler::Enumble<:dark-brown>
+
 # raises errors if none found
 Color.find_enumbles!!(:black, 'does-no-exist') # => raises Enumbler::Error
 Color.find_enumble!(:does_not_exist) # => raises Enumbler::Error
@@ -86,10 +89,14 @@ Color.ids_from_enumbler!(:black, 'does-no-exist') # => raises Enumbler::Error
 Color.id_from_enumbler!(:does_not_exist) # => raises Enumbler::Error
 
 # Get enumble object by id
-
 house = House.create!(color: Color.black)
-house.black?
-house.not_black?
+
+# These are all db-free lookups
+house.color_label        # => 'black'
+house.color_enum         # => :black
+house.color_graphql_enum # => 'BLACK'
+house.black?             # => true
+house.not_black?         # => false
 
 house2 = House.create!(color: Color.white)
 House.color(:black, :white)      # => ActiveRecord::Relation<house, house2>

data/lib/enumbler.rb

@@ -65,6 +65,7 @@ module Enumbler
 
       belongs_to(name, scope, **options)
 
+      define_helper_attributes(name)
       define_dynamic_methods_for_enumbled_to_models(enumbled_model, prefix: prefix, scope_prefix: scope_prefix)
     rescue NameError
       raise Error, "The model #{class_name} cannot be found.  Uninitialized constant."
@@ -97,5 +98,16 @@ module Enumbler
         define_method(not_method_name) { self[column_name] != enumble.id }
       end
     end
+
+    # Add the attirbutes:
+    #
+    #   house.color_label #=> 'black'
+    #   house.color_enum  #=> :black
+    #   house.color_graphql_enum #=> 'BLACK'
+    def define_helper_attributes(name)
+      %i[label enum graphql_enum].each do |sym|
+        define_method("#{name}_#{sym}") { send(name).enumble.send(sym) }
+      end
+    end
   end
 end

data/lib/enumbler/enabler.rb

@@ -10,13 +10,22 @@ module Enumbler
     # The Enumble definition that this record defined.
     # @return [Enumbler::Enumble]
     def enumble
-      @enumble = self.class.enumbles.find { |enumble| enumble.id == id }
+      @enumble = self.class.find_enumble(id)
 
       raise Error, 'An enumble is not defined for this record!' if @enumble.nil?
 
       @enumble
     end
 
+    # The enumble label if it exists.
+    # @return [String]
+    def to_s
+      enumble = self.class.find_enumble(id)
+      return enumble.label if enumble.present?
+
+      super
+    end
+
     # These ClassMethods can be included in any model that you wish to
     # _Enumble_!
     #
@@ -58,12 +67,14 @@ module Enumbler
       # @param **attributes [Hash] optional: additional attributes and values that
       #   will be saved to the database for this enumble record
       def enumble(enum, id, label: nil, **attributes)
+        raise_error_if_model_does_not_support_attributes(attributes)
+
+        id = validate_id_is_numeric(enum, id)
+
         @enumbles ||= Enumbler::Collection.new
         @enumbled_model = self
         @enumbler_label_column_name ||= :label
 
-        raise_error_if_model_does_not_support_attributes(attributes)
-
         enumble = Enumble.new(enum, id, label: label, label_column_name: @enumbler_label_column_name, **attributes)
 
         if @enumbles.include?(enumble)
@@ -157,7 +168,11 @@ module Enumbler
                 @enumbled_model.enumbles.find { |e| e.enum == arg }
               elsif arg.is_a?(String)
                 @enumbled_model.enumbles.find do |e|
-                  case_sensitive ? e.label == arg : arg.casecmp?(e.label)
+                  if case_sensitive
+                    [e.label, e.enum.to_s].include?(arg)
+                  else
+                    arg.casecmp?(e.label) || arg.casecmp?(e.enum.to_s)
+                  end
                 end
               elsif arg.instance_of?(@enumbled_model)
                 arg.enumble
@@ -313,6 +328,15 @@ module Enumbler
         end
       end
 
+      # I accidentally forgot to provide an id one time and it was confusing as
+      # the last argument became the hash of options.  This should help.
+      def validate_id_is_numeric(enum, id)
+        Integer(id)
+      rescue ArgumentError, TypeError
+        raise Enumbler::Error,
+          "You must provide a numeric primary key, like: `enumble :#{enum}, 1 `"
+      end
+
       def raise_error_if_model_does_not_support_attributes(attributes)
         return if attributes.blank?
 
@@ -322,6 +346,9 @@ module Enumbler
 
         raise Enumbler::Error,
           "The model #{self} does not support the attribute(s): #{unsupported_attrs.keys.map(&:to_s).to_sentence}"
+      rescue ActiveRecord::StatementInvalid
+        warn "[Enumbler Warning] => Unable to find a table for #{self}."\
+          'This is to be expected if there is a pending migration; however, if there is not then something is amiss.'
       end
     end
   end

data/lib/enumbler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Enumbler
-  VERSION = '0.6.1'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumbler
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.6
 platform: ruby
 authors:
 - Damon Timm
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord