mongoid-enum_attribute 0.1.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e0c939d3c2c2a5677c00e67b188c2f1121a74b514481a26850ae44132d8b58b
-  data.tar.gz: 7a81b66ee67d78377af402636a31be30594f3558103fc9b4868b5373f6aba3ee
+  metadata.gz: 672283b84f349e0f148fe27f108986935c5b56919a571c306ed604c34ba05131
+  data.tar.gz: 2e0bc5be5274b6effb9975b802dea9abe6f1bdc95296da8e31877499dd57c5ce
 SHA512:
-  metadata.gz: eb7c9892acf4df44ea84e40019a7db574fe5ce5638707d621e527ca456655d4dede81f56c9c56d8ea6bad1aebf675bf34bd89d2891512fff3759a9f2ab3033cc
-  data.tar.gz: b799c8b3c833c15751ae2e5f8f792232717ebea7a895d63bfbb9b9ff23cce1c478d4ffe415f83d02ce516e970fb087608419b7098dde82962906c70559717fda
+  metadata.gz: 5dbe677cfbd240bbe3523c6c3ce401f19a488214303d7e32712445b9772c2c2d522001762cb41768da8d7cc23b4665daae966a492a9209b82ed3acd832ae836c
+  data.tar.gz: 34c01c435fed78d549d1140bcfae91fb9c70237e1c886fdc5d22a22cf7e21f93314308534835788dcb350b6b8ebe0e66aad8e8d2b7f36936923f1b3fbe35a45b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.0.0
+
+* switch from deprecated Symbol type to string, [PR #1](https://github.com/tomasc/mongoid-enum_attribute/pull/1), thanks [@romansavrulin](https://github.com/romansavrulin)
+
 ## 0.1.0
 
 * first release

data/README.md

@@ -25,7 +25,7 @@ Or install it yourself as:
 ```ruby
 class Payment
   include Mongoid::Document
-  include Mongoid::Enum
+  include Mongoid::EnumAttribute
 
   enum :status, [:pending, :approved, :declined]
 end
@@ -101,4 +101,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/mongoid-enum_attribute.
+Bug reports and pull requests are welcome on GitHub at https://github.com/tomasc/mongoid-enum_attribute.

data/lib/mongoid/enum_attribute.rb

@@ -8,11 +8,10 @@ module Mongoid
 
     module ClassMethods
       def enum(name, values, options = {})
-        field_name = "#{Mongoid::EnumAttribute.configuration.field_name_prefix}#{name}"
         options = default_options(values).merge(options)
 
         set_values_constant(name, values)
-        create_field(field_name, options)
+        field_name = create_field(name, options)
 
         create_validations(field_name, values, options)
         define_value_scopes_and_accessors(name, field_name, values, options)
@@ -27,7 +26,9 @@ module Mongoid
           required: true,
           validate: true,
           prefix: Mongoid::EnumAttribute.configuration.prefix,
-          suffix: Mongoid::EnumAttribute.configuration.suffix
+          suffix: Mongoid::EnumAttribute.configuration.suffix,
+          field_name_prefix: Mongoid::EnumAttribute.configuration.field_name_prefix,
+          field_name: nil
         }
       end
 
@@ -36,9 +37,12 @@ module Mongoid
         const_set(const_name, values)
       end
 
-      def create_field(field_name, options)
-        type = options[:multiple] && Array || Symbol
+      def create_field(name, options)
+        type = options[:multiple] && Array || String
+        field_name = (options[:field_name] || "#{options[:field_name_prefix]}#{name}").to_s
+        raise "enum name #{name} and field_name option cannot be equal!" if name.to_s == field_name.to_s
         field field_name, type: type, default: options[:default]
+        field_name
       end
 
       def create_validations(field_name, values, options)
@@ -53,7 +57,7 @@ module Mongoid
         elsif options[:validate]
           validates(
             field_name,
-            inclusion: { in: values.map(&:to_sym) },
+            inclusion: { in: values.map(&:to_s) },
             allow_nil: !options[:required]
           )
         end
@@ -100,7 +104,7 @@ module Mongoid
 
       def define_string_field_accessor(name, field_name)
         class_eval "def #{name}=(val) self.write_attribute(:#{field_name}, val && val.to_sym || nil) end"
-        class_eval "def #{name}() self.send(:#{field_name}) end"
+        class_eval "def #{name}() self.send(:#{field_name}).to_sym end"
       end
 
       def define_array_accessor(accessor_name, field_name, value)
@@ -109,7 +113,7 @@ module Mongoid
       end
 
       def define_string_accessor(accessor_name, field_name, value)
-        class_eval "def #{accessor_name}?() self.#{field_name} == :#{value} end"
+        class_eval "def #{accessor_name}?() self.#{field_name}.to_sym == :#{value} end"
         class_eval "def #{accessor_name}!() update_attributes! :#{field_name} => :#{value} end"
       end
     end

data/lib/mongoid/enum_attribute/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module EnumAttribute
-    VERSION = "0.1.0"
+    VERSION = "1.0.0"
   end
 end

data/mongoid-enum_attribute.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'mongoid', '>= 5', '< 8'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler", ">= 1.16"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "database_cleaner"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-enum_attribute
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Tomáš Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -34,14 +34,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -124,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Take on ActiveRecord::Enum in Mongoid