enumerize_with_groups 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59506b929f4cfd75b0fe4093318008574ea6b193
-  data.tar.gz: 9f4883d1eee279a916cef4d1a3ed90dcbb47ebb7
+  metadata.gz: a1e47572df2503a8ac70272068198c74ccc78b93
+  data.tar.gz: 060e60fce6412427d8ee7d7f300115b8d683aa9f
 SHA512:
-  metadata.gz: 1997524375a224fabbe66cf33e7a0bafd79574cf7b9ce39243b6cf0c747977bec0c3a9fdeb98a788289c27e51194ec3694efa2dcaa1d4e12d488813e967cbaec
-  data.tar.gz: ef1b50fee050c299b4ae61dcc534cc1ed7afa53d27d185cf027a10e4c059636212d861c971eda2f8e4d1da4737381110535aed9ca8dad6ebd0e2a6ac84427974
+  metadata.gz: 721b13b6dc9418e74d743afc16a4525674c4fde013c70411bbe89e86e66634e34fc4562196415832347adde246c03be8239b937693cbe63addfaf9c4661dea1d
+  data.tar.gz: 109fc82b607685bb67e4fe76dbc45d77245be6596e7d99b512047a56d660ec3ef36bfba7b2ff91f6b876c29f887b245bff213060ba2832d8bb42dc03fb66eea6

data/lib/enumerize_with_groups.rb

@@ -10,38 +10,51 @@ module EnumerizeWithGroups
     end
 
     mod.module_eval do
-      def self.enumerize(name, options = {})
-        super
+      def self.define_active_record_scope(name, key, items)
+        return unless self.ancestors.include?(ActiveRecord::Base)
 
-        self.define_singleton_method("#{name}_groups") do
-          options[:groups]
+        scope_name = "enumerize_with_groups_#{name}_#{key}_group"
+        scope scope_name, -> { where(name => items) }
+
+        self.define_singleton_method("#{name}_#{key}_scope") do
+          self.send(scope_name)
         end
+      end
 
-        if options[:groups]
-          options[:groups].each do |key, items|
-            scope_name = "enumerize_with_groups_#{name}_#{key}_group"
+      def self.define_group_check_methods(name, key, items)
+        define_method("in_#{name}_#{key}?") do
+          fail "You have to define #{key} as group" unless items.is_a?(Array)
 
-            self.define_singleton_method("#{name}_#{key}") do
-              items
-            end
+          items.map(&:to_s).include?(self.public_send(name))
+        end
+      end
 
-            define_method("in_#{name}_#{key}?") do
-              values = options[:groups][key]
-              fail "You have to define #{key} as group" unless values.is_a?(Array)
+      def self.define_methods_of_groups(name, groups)
+        self.define_singleton_method("#{name}_groups") do
+          groups
+        end
 
-              values.map(&:to_s).include?(self.public_send(name))
-            end
+        return unless groups.present?
+        groups = groups.freeze
 
-            if self.ancestors.include?(ActiveRecord::Base)
-              scope scope_name, ->{ where(name => items) }
+        groups.each do |key, items|
+          next unless items.present?
+          items = items.freeze
 
-              self.define_singleton_method("#{name}_#{key}_scope") do
-                self.send(scope_name)
-              end
-            end
+          self.define_singleton_method("#{name}_#{key}") do
+            items
           end
+
+          define_group_check_methods(name, key, items)
+          define_active_record_scope(name, key, items)
         end
       end
+
+      def self.enumerize(name, options = {})
+        super
+
+        define_methods_of_groups(name, options[:groups])
+      end
     end
   end
 end

data/lib/enumerize_with_groups/version.rb

@@ -1,3 +1,3 @@
 module EnumerizeWithGroups
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize_with_groups
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - lcp
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler