enumbler 0.6.2 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d8b5d35cb1f59fe24b30b944e5a834ce43c26f17e951b7cc164106cd0b9c7e
-  data.tar.gz: cb4f46ece4d9bd70f7c6f1e06bb515c1fbbc8601bdb6785458a838f242a5f5c6
+  metadata.gz: b325cf47a0a64b573f1347bffbbea7338cc57b7422dfdf3f0da39d412274d8cb
+  data.tar.gz: 10affa6956ef071ec34ad4195379d632b86945745e8d0eb7718fc8735427fe9e
 SHA512:
-  metadata.gz: a1c7cd257da559c741b9932dd160e757a83e080c26f7d0fc88df0e2996b155222ad5c517c675a7ad1694a09433fca864c34328f63f1c5c41b99ebc7df27eec03
-  data.tar.gz: 361d082e5872d0fc5c8a03a1d5002ba622ef963ac9ce0add18a1238ea15241cc7e509d8e9f4bbac8644eb11fc741ad9cf6fd649d3103028b336f91928763333d
+  metadata.gz: a38a602c49f7a0bf3f69781b4a54d555bc92a23bd61788a27bbf858d75aa554599638a77af3afd8d2088b8e94fcc69768c63d3e2268b7ea0384fc4f74a955dfa
+  data.tar.gz: 98fae8e4a32aa7207f55fe07128ca7e4730c50701cfac378756ff32c27e8b745ab471afb88401cf8096e75b42deffe7ec031d9d9e1d3d0ba97bdddc37774058c

data/Gemfile.lock

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

data/README.md

@@ -61,6 +61,9 @@ Color.black.black?         # => true
 Color.black.is_black       # => true
 Color.white.not_black?     # => true
 
+Color.all.any_black?                         # => true
+Color.where.not(id: Color::BLACK).any_black? # => false
+
 # Get attributes without hitting the database
 Color.black(:id)           # => 1
 Color.black(:enum)         # => :black
@@ -73,6 +76,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 +92,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
@@ -311,6 +326,21 @@ module Enumbler
         rescue NoMethodError
           raise Enumbler::Error, "The attribute #{attr} is not supported on this Enumble."
         end
+
+        define_singleton_method("any_#{enumble.enum}?") do
+          where(id: enumble.id).exists?
+        rescue NoMethodError
+          raise Enumbler::Error, "The attribute #{attr} is not supported on this Enumble."
+        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)

data/lib/enumbler/version.rb

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

metadata

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