enum_ext 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 364abab1ad0b759be15eb2353fbbca5d483d13ea65e4d9d9c407cdb0a9a7265d
-  data.tar.gz: 3653c710a34c0d02d1568e961ce667e6b0c005285b04f56a1debe2737944cdbe
+  metadata.gz: 74e124aa3c4dcc444a79313a06d79aa55862a58c065a00b399797413e11ca13a
+  data.tar.gz: ba28311cd931ba1233585407f8532c5026a7dee51b3a695c3c36a8fd675ec27e
 SHA512:
-  metadata.gz: d6960e5b712f3f48a84d5e746fa49c3354a78c433547750c9b2dd324da8a7b021d09eb8bdcfdc73d67e38aca67e4771b6fe8c1f6a57958b93db4b14b03e0780e
-  data.tar.gz: 7aa13f57d737196c809f05a8cb4cd1ee193a6ac06ff3516fa022af9210f789f461fd35c636fb524dcf777926643af53e231c9eb17ad9daad558866a699d9da6c
+  metadata.gz: 103d98798be494d1fc9b8354dc84b4bad405d282c3aa83be42cee4800775bc20b848294d913cf682be5e7e25db03bb34fb402bd296e9376d461e1cd29a369b3f
+  data.tar.gz: '081f7581316c5904826f0daf2aa023a8a959900c0cbe4ea3d16a64831602d17ff5b267260d8ff97da62e4c83676a07ae28996b767fd7dd120c73dce7484d09f5'

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.4.3
+* ext_enum_sets now can go without options just to define with and without scopes
+
 # 0.4.2
 * bugfix for localize_enum multiple call
 * test added for 0.4.1 ver funcitonality ( multiple times humanize_enum calls ) 

data/lib/enum_ext.rb

@@ -69,26 +69,25 @@ module EnumExt
   #  ext_enum_sets :status, {
   #                  outside_wharehouse: ( delivery_set_statuses - in_warehouse_statuses )... any other array operations like &, + and so can be used
   #                }
-  def ext_enum_sets( enum_name, options )
+  def ext_enum_sets( enum_name, options = {} )
     enum_plural = enum_name.to_s.pluralize
 
     self.instance_eval do
+      # with_enums scope
+      scope "with_#{enum_plural}", -> (sets_arr) {
+        where( enum_name => self.send( enum_plural ).slice(
+          *sets_arr.map{|set_name| self.try( "#{set_name}_#{enum_plural}" ) || set_name }.flatten.uniq.map(&:to_s) ).values )
+      } unless respond_to?("with_#{enum_plural}")
+
+      # without_enums scope
+      scope "without_#{enum_plural}", -> (sets_arr) {
+        where.not( id: self.send("with_#{enum_plural}", sets_arr) )
+      } unless respond_to?("without_#{enum_plural}")
+
       options.each do |set_name, enum_vals|
         # set_name scope
         scope set_name, -> { where( enum_name => self.send( enum_plural ).slice( *enum_vals.map(&:to_s) ).values ) }
 
-        # with_enums scope
-        scope "with_#{enum_plural}", -> (sets_arr) {
-          where( enum_name => self.send( enum_plural ).slice(
-                     *sets_arr.map{|set_name| self.try( "#{set_name}_#{enum_plural}" ) || set_name }.flatten.uniq.map(&:to_s) ).values )
-        } unless respond_to?("with_#{enum_plural}")
-
-        # without_enums scope
-        scope "without_#{enum_plural}", -> (sets_arr) {
-          where.not( id: self.send("with_#{enum_plural}", sets_arr) )
-        } unless respond_to?("without_#{enum_plural}")
-
-
         # class.enum_set_values
         define_singleton_method( "#{set_name}_#{enum_plural}" ) do
           enum_vals

data/lib/enum_ext/version.rb

@@ -1,3 +1,3 @@
 module EnumExt
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enum_ext
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - alekseyl
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord