enum_ish 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c81de716639aaef492be612f2f9d412889513785e61163a2d0e409dad03f883e
-  data.tar.gz: 8163a1339902881f9300cf582b852ca8e505c0cbe27b031b0e9e680cef5a1547
+  metadata.gz: 52aa581f25b17fc1890f71cba2669c5cd12c1507f7282ab8f1c1dbb2c1680d7e
+  data.tar.gz: 7993d724365d6a906874c8cf0786ab25a3b551b1ec9790971585d37b71a90845
 SHA512:
-  metadata.gz: 689437f57eb521fe7b5458fde6ea43d2bfa86fba8b7cca2873c18e7d5ece8cbc5da72ea300ed8ac6ed373c113bc1e3e1ff48e1ecb8abc04e0712e7b7e4b28a88
-  data.tar.gz: 8269c8f1268008af6bedb3bec2eff776254430d440d9c71bd68243d1661f137392bfbfbe74d1ec5aaef78ce293637a080a3c713e2bcaaafcb4d0eff72887e213
+  metadata.gz: a6d1ac67ef5a55663ddd0c784225b3c3c0f4f5322ad71d066ed2260c305997ae1a384254ace06dea5d0bd076440d315733520ac4afc070e3c2bd19f7debc1f86
+  data.tar.gz: da632eb455b2915e5c7116544fd3c94033c2eabf6b866c938bb2c869090f026c27d8f564964fe0ae2b279203a69f0419b6083ca0b026e40da3d4fcc3ad5fc19a

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.2.1
+
+* Fix internal module name.
+
 ## 1.2.0
 
 * Register enum definitions in the class.

data/lib/enum_ish/active_record_definer.rb

@@ -0,0 +1,41 @@
+require_relative 'active_record_enum_type'
+
+module EnumIsh
+  class ActiveRecordDefiner < EnumIsh::Definer
+    def define_default(enum)
+      method = "_enum_ish_init_#{enum.name}".to_sym
+
+      @klass.class_eval do
+        after_initialize method
+        define_method method do
+          if respond_to?(enum.name) && public_send(enum.name).nil?
+            default = enum.setting[:default]
+            default = instance_exec(&default) if default.kind_of?(Proc)
+            public_send("#{enum.name}=", default)
+          end
+        end
+      end
+    end
+
+    def define_accessor(enum)
+      @klass.class_eval do
+        define_method "#{Config.raw_prefix}#{enum.name}#{Config.raw_suffix}" do
+          value = read_attribute(enum.name)
+          enum.mapping.fetch(value, value)
+        end
+
+        decorate_attribute_type(enum.name, :enum) do |subtype|
+          EnumIsh::ActiveRecordEnumType.new(enum.name, enum.mapping, subtype)
+        end
+      end
+    end
+
+    def define_scope(enum)
+      @klass.class_eval do
+        scope "#{Config.scope_prefix}#{enum.name}#{Config.scope_suffix}", ->(value) {
+          where(enum.name => enum.mapping.fetch(value, value))
+        }
+      end
+    end
+  end
+end

data/lib/enum_ish/active_record_enum_type.rb

@@ -0,0 +1,27 @@
+module EnumIsh
+  class ActiveRecordEnumType < ActiveRecord::Type::Value
+    def initialize(name, mapping, subtype)
+      @name = name
+      @mapping = mapping
+      @subtype = subtype
+    end
+
+    def cast(value)
+      if @mapping.has_key?(value)
+        value
+      elsif @mapping.has_value?(value)
+        @mapping.key(value)
+      else
+        value
+      end
+    end
+
+    def deserialize(value)
+      @mapping.key(@subtype.deserialize(value))
+    end
+
+    def serialize(value)
+      @mapping.fetch(value, value)
+    end
+  end
+end

data/lib/enum_ish/version.rb

@@ -1,3 +1,3 @@
 module EnumIsh
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/enum_ish.rb

@@ -5,7 +5,7 @@ require 'enum_ish/config'
 require 'enum_ish/enum'
 require 'enum_ish/dictionary'
 require 'enum_ish/definer'
-require 'enum_ish/active_record/definer' if defined?(::ActiveRecord::Base)
+require 'enum_ish/active_record_definer' if defined?(ActiveRecord::Base)
 
 module EnumIsh
   def enum_ish(name, map, config = {})
@@ -15,8 +15,8 @@ module EnumIsh
     self._enum_ish_enums ||= []
     self._enum_ish_enums << enum
 
-    if defined?(::ActiveRecord::Base) && self.ancestors.include?(::ActiveRecord::Base)
-      ActiveRecord::Definer.new(self).define(enum)
+    if defined?(ActiveRecord::Base) && self.ancestors.include?(ActiveRecord::Base)
+      ActiveRecordDefiner.new(self).define(enum)
     else
       Definer.new(self).define(enum)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enum_ish
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Yoshikazu Kaneta
@@ -115,8 +115,8 @@ files:
 - gemfiles/rails52.gemfile
 - gemfiles/rails60.gemfile
 - lib/enum_ish.rb
-- lib/enum_ish/active_record/definer.rb
-- lib/enum_ish/active_record/enum_type.rb
+- lib/enum_ish/active_record_definer.rb
+- lib/enum_ish/active_record_enum_type.rb
 - lib/enum_ish/config.rb
 - lib/enum_ish/definer.rb
 - lib/enum_ish/dictionary.rb

data/lib/enum_ish/active_record/definer.rb

@@ -1,43 +0,0 @@
-require_relative 'enum_type'
-
-module EnumIsh
-  module ActiveRecord
-    class Definer < EnumIsh::Definer
-      def define_default(enum)
-        method = "_enum_ish_init_#{enum.name}".to_sym
-
-        @klass.class_eval do
-          after_initialize method
-          define_method method do
-            if respond_to?(enum.name) && public_send(enum.name).nil?
-              default = enum.setting[:default]
-              default = instance_exec(&default) if default.kind_of?(Proc)
-              public_send("#{enum.name}=", default)
-            end
-          end
-        end
-      end
-
-      def define_accessor(enum)
-        @klass.class_eval do
-          define_method "#{Config.raw_prefix}#{enum.name}#{Config.raw_suffix}" do
-            value = read_attribute(enum.name)
-            enum.mapping.fetch(value, value)
-          end
-
-          decorate_attribute_type(enum.name, :enum) do |subtype|
-            EnumIsh::ActiveRecord::EnumType.new(enum.name, enum.mapping, subtype)
-          end
-        end
-      end
-
-      def define_scope(enum)
-        @klass.class_eval do
-          scope "#{Config.scope_prefix}#{enum.name}#{Config.scope_suffix}", ->(value) {
-            where(enum.name => enum.mapping.fetch(value, value))
-          }
-        end
-      end
-    end
-  end
-end

data/lib/enum_ish/active_record/enum_type.rb

@@ -1,29 +0,0 @@
-module EnumIsh
-  module ActiveRecord
-    class EnumType < ::ActiveRecord::Type::Value
-      def initialize(name, mapping, subtype)
-        @name = name
-        @mapping = mapping
-        @subtype = subtype
-      end
-
-      def cast(value)
-        if @mapping.has_key?(value)
-          value
-        elsif @mapping.has_value?(value)
-          @mapping.key(value)
-        else
-          value
-        end
-      end
-
-      def deserialize(value)
-        @mapping.key(@subtype.deserialize(value))
-      end
-
-      def serialize(value)
-        @mapping.fetch(value, value)
-      end
-    end
-  end
-end