activerecord-grouping_enum 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e61c19aaa99aef3eb517943283a64d18ee081e4a
-  data.tar.gz: d5825cb43d374b8f9231126c5072f403d2b5e039
+  metadata.gz: 99b15a6aca80d09d560d3f356b2229bad160276d
+  data.tar.gz: c926ddf0ecc4ece6474f1adf7184b3a6c9885daa
 SHA512:
-  metadata.gz: 64fc5c631ce2af68e63d5fcc0d32ccfec64aa1c466fe2962e2df1136d4bc2f45c807e7ee7d9451177b4a1c40830a7a549770550de16c376ca86c9f2c03108abf
-  data.tar.gz: cf65c9b20cf6ab1093e1ec23e4d8d9d4531aaae98082c9387e5d7197c2d39125d28c795981fc680650280f0024a83e03c1201958b65c573d50b1b5248e09a931
+  metadata.gz: 390d935d1f174c4ac7820262d670fc5ca667fa43ac2515ae484ff2f7dd53bdae22dced102dc4769e6d8ad2ce2b56366b9781607130323be737e4a68886ac0828
+  data.tar.gz: cd5c48ba881b6b6216b5a94a854f891eedb9b04924bbd974d1416e38f6b9edec08d9760cb1d4b69ea85fb27d6d2ea377b8a51066cccbd181be8a8b62699c7c3e

data/README.md

@@ -1,6 +1,6 @@
 # ActiveRecord::GroupingEnum
 
-Allows you to group enum and can use enum's scope and boolean method.
+Grouping the enum of ActiveRecord
 
 ## Installation
 

data/activerecord-grouping_enum.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Tomohiro Suwa"]
   spec.email         = ["neoen.gsn@gmail.com"]
 
-  spec.summary       = %q{Allows you to group enum}
-  spec.description   = %q{Allows you to group enum and can use enum's scope and boolean methods.}
+  spec.summary       = %q{Grouping the enum of ActiveRecord}
+  spec.description   = %q{Grouping the enum of ActiveRecord}
   spec.homepage      = "https://github.com/tsuwatch/activerecord-grouping_enum"
   spec.license       = "MIT"
 
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activerecord', '>=4.1.0'
+  spec.add_runtime_dependency 'activerecord', '~> 5.0.0'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/active_record/grouping_enum.rb

@@ -7,21 +7,14 @@ module ActiveRecord
         values.each do |key, enums|
           _grouping_enum_methods_module.module_eval do
             klass.send(:detect_enum_conflict!, name, "#{key}?")
-            define_method("#{key}?") do
-              values = []
-              enums.each do |enum|
-                values << klass.defined_enums[name.to_s].fetch(enum.to_s)
-              end
-              values.include?(self[name])
-            end
+            define_method("#{key}?") { enums.map(&:to_s).include?(self[name]) }
 
-            klass.send(:detect_enum_conflict!, name, "#{key}", true)
-            klass.scope "#{key}", lambda {
-              query = "#{name} == #{klass.defined_enums[name.to_s][enums.shift.to_s]}"
-              enums.each do |enum|
-                query << " or #{name} == #{klass.defined_enums[name.to_s][enum.to_s]}"
+            klass.send(:detect_enum_conflict!, name, key.to_s, true)
+            klass.scope key.to_s, lambda {
+              clause = enums.each_with_object Hash.new { |h, k| h[k] = [] } do |enum, obj|
+                obj[name] << klass.public_send(name.to_s.pluralize.to_sym)[enum.to_s]
               end
-              klass.where(query)
+              klass.where(clause)
             }
           end
         end

data/lib/active_record/grouping_enum/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module GroupingEnum
-    VERSION = "0.1.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-grouping_enum
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Tomohiro Suwa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Allows you to group enum and can use enum's scope and boolean methods.
+description: Grouping the enum of ActiveRecord
 email:
 - neoen.gsn@gmail.com
 executables: []
@@ -164,5 +164,5 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: Allows you to group enum
+summary: Grouping the enum of ActiveRecord
 test_files: []