enum_ish 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 72e9f45d9096f7b3cb71b41f0eec2db69993d4b6
-  data.tar.gz: b642520f713d95c7730d9096af0b69a11a9007ac
+SHA256:
+  metadata.gz: 86b4cbe506b5b3a8cb444859dccda2f26dace53d2b3efbfa26d5aac1ab8313b8
+  data.tar.gz: 496e004c5d0992cde158973eaf48bbf22a361d0fe130c30632913aaada92ec9d
 SHA512:
-  metadata.gz: df6c0a64caa6dfc6551c82f759dbb3697024d58d77c10ad9b552e9cf766680151db386b4fd733033e9dbda4205e7dbe5ae2e71c66ff5d17fdd382968a887b48a
-  data.tar.gz: f7ef88a3ebd6b5f13be8fb9d6ee7505d69eded7a4358279bf07196cb76238c258fd9afe7f9f99fb399f065793e50970e2266dbb8005fbd4511c5ad74cc1daa7b
+  metadata.gz: 7bca545b6e8fb12143d801a16a9dbed2e0b3fc23deb07501ac74698681293b3c110a60c964be835e86fb1e26aacfcbddf72377e2df31e7dcf530385742d499cc
+  data.tar.gz: ba39d1e0fd59d0c4180f779c568d3bf00a9b2099072def2602397abbeb154a8f6ab1f395c23793e199b511f8bdf98e771741f9e44b7a740aac5eb83c0224fcaf

data/README.md

@@ -48,6 +48,8 @@ user = User.new
 user.status = 'enable'
 user.status_text     #=> "有効"
 User.status_options  #=> [["有効", "enable"], ["無効", "disable"]]
+User.status_options(only: 'enable')  #=> [["有効", "enable"]]
+User.status_options(except: 'enable')  #=> [["無効", "disable"]]
 ```
 
 ### Additional translations
@@ -88,6 +90,19 @@ user = User.new
 user.status  #=> "enable"
 ```
 
+Use default value with block:
+
+```ruby
+class User
+  extend EnumIsh
+  attr_accessor :status, :flag
+  enum_ish :status, ['enable', 'disable'], default: -> { flag ? 'enable' : 'disable' }
+end
+
+user = User.new
+user.status  #=> "disable"
+```
+
 ### Predicates
 
 Generate predicate methods:

data/enum_ish.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activesupport", ">= 5.0"
+  spec.add_dependency "i18n"
 
   spec.add_development_dependency "rails", ">= 5.0"
   spec.add_development_dependency "sqlite3"

data/gemfiles/rails52.gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem "rails", "~> 5.2.0.rc1"
+gem "rails", "~> 5.2.0"
 
 gemspec path: "../"

data/lib/enum_ish/builder/active_record.rb

@@ -9,7 +9,14 @@ module EnumIsh
         @klass.class_eval do
           after_initialize method
           define_method method do
-            public_send("#{attr}=", config[:default]) if respond_to?(attr) && public_send(attr).nil?
+            if respond_to?(attr) && public_send(attr).nil?
+              default = if config[:default].kind_of?(Proc)
+                          instance_exec(&config[:default])
+                        else
+                          config[:default]
+                        end
+              public_send("#{attr}=", default)
+            end
           end
         end
       end
@@ -35,7 +42,7 @@ module EnumIsh
 
         @klass.class_eval do
           scope method, ->(value) {
-            where(attr => value)
+            where(attr => (enum[value] || value))
           }
         end
       end

data/lib/enum_ish/builder.rb

@@ -64,7 +64,14 @@ module EnumIsh
       mod = Module.new
       mod.module_eval do
         define_method :initialize do |*args|
-          public_send("#{attr}=", config[:default]) if respond_to?(attr) && public_send(attr).nil?
+          if respond_to?(attr) && public_send(attr).nil?
+            default = if config[:default].kind_of?(Proc)
+                        instance_exec(&config[:default])
+                      else
+                        config[:default]
+                      end
+            public_send("#{attr}=", default)
+          end
           super(*args)
         end
       end
@@ -104,14 +111,25 @@ module EnumIsh
 
       translated = enum.map { |k, v| dict[k] ? [k, dict[k]] : [k, v.to_s] }.to_h
       translated = translated.map { |k, v| [enum[k], v] }.to_h unless config[:accessor]
+
+      if options[:except]
+        except = Array(options[:except])
+        translated.reject! { |k, v| except.include?(k) }
+      end
+      if options[:only]
+        only = Array(options[:only])
+        translated.select! { |k, v| only.include?(k) }
+      end
+
       translated
     end
 
     private
 
     def load_i18n(attr, enum, options)
-      attr_key = [attr, options.delete(:format)].compact.join('/')
-      i18n_options = options.merge(default: [:"enum_ish.defaults.#{attr_key}", enum.invert])
+      attr_key = [attr, options[:format]].compact.join('/')
+      i18n_options = (options[:i18n_options] || {}).merge(default: [:"enum_ish.defaults.#{attr_key}", enum.invert])
+
       dict = I18n.t("enum_ish.#{@klass.name.underscore}.#{attr_key}", i18n_options)
       dict.map { |k, v| [k.to_s.to_sym, v.to_s] }.to_h
     end

data/lib/enum_ish/version.rb

@@ -1,3 +1,3 @@
 module EnumIsh
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enum_ish
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Yoshikazu Kaneta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: A ruby and rails extension to generate enum-like methods