mongoid-enum_attribute 0.1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e0c939d3c2c2a5677c00e67b188c2f1121a74b514481a26850ae44132d8b58b
-  data.tar.gz: 7a81b66ee67d78377af402636a31be30594f3558103fc9b4868b5373f6aba3ee
+  metadata.gz: c85c88df691e9234b725d9426676a137c4b7feff5fba0fe40a34b8c6d06298a2
+  data.tar.gz: 2547e88eb4f8e120bf9fd183dbb1beb6154f588d98d6227c1e070e67133acd10
 SHA512:
-  metadata.gz: eb7c9892acf4df44ea84e40019a7db574fe5ce5638707d621e527ca456655d4dede81f56c9c56d8ea6bad1aebf675bf34bd89d2891512fff3759a9f2ab3033cc
-  data.tar.gz: b799c8b3c833c15751ae2e5f8f792232717ebea7a895d63bfbb9b9ff23cce1c478d4ffe415f83d02ce516e970fb087608419b7098dde82962906c70559717fda
+  metadata.gz: 8115f38cd0ef33ec05157f05691f6dd8988dc392bf84b5cd1d074125f41e0d60e3b20ee6c07501505180f591a596cd77bb56cacc3069bd9f6747e140b83d7060
+  data.tar.gz: e6f1ab33617bc6fbe8ea1a187af56c64d66a8392a9a29d4fee0c90d5a734b238be029d4df6143a28eb0f4de06a314db524b96ae1e68d7d5890264744840187ff

data/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Tests
+on: [push, pull_request]
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: ["7", "8"]
+        ruby: ["2.7", "3.0", "3.1", "3.2"]
+        include:
+          - gemfile: "6"
+            ruby: "2.7"
+    runs-on: ubuntu-latest
+    services:
+      mongodb:
+        image: mongo
+        ports: ["27017:27017"]
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - run: bundle exec rake

data/.gitignore

@@ -8,3 +8,4 @@
 /tmp/
 
 Gemfile.lock
+/gemfiles/*.gemfile.lock

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "6" do
+  gem "mongoid", "~> 6.0"
+end
+
+appraise "7" do
+  gem "mongoid", "~> 7.0"
+end
+
+appraise "8" do
+  gem "mongoid", "~> 8.0"
+end

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.0.1
+
+* Mongoid 8 compatibility
+
+## 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/gemfiles/6.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 6.0"
+
+gemspec path: "../"

data/gemfiles/7.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 7.0"
+
+gemspec path: "../"

data/gemfiles/8.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 8.0"
+
+gemspec path: "../"

data/lib/mongoid/enum_attribute/version.rb

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

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/mongoid-enum_attribute.gemspec

@@ -19,10 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'mongoid', '>= 5', '< 8'
+  spec.add_dependency "mongoid", ">= 5"
 
-  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"
+  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "database_cleaner-mongoid"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "rake"
 end

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.1
 platform: ruby
 authors:
 - Tomáš Celizna
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2023-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,53 +24,64 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
-    - - "<"
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8'
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: database_cleaner-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,21 +94,25 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - tomas.celizna@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/6.gemfile
+- gemfiles/7.gemfile
+- gemfiles/8.gemfile
 - lib/mongoid/enum_attribute.rb
 - lib/mongoid/enum_attribute/configuration.rb
 - lib/mongoid/enum_attribute/validators/multiple_validator.rb
@@ -109,7 +121,7 @@ files:
 homepage: https://github.com/tomasc/mongoid-enum_attribute
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +136,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.3.14
+signing_key:
 specification_version: 4
 summary: Take on ActiveRecord::Enum in Mongoid
 test_files: []

data/.travis.yml

@@ -1,23 +0,0 @@
-language: ruby
-cache: bundler
-script: 'bundle exec rake'
-rvm:
-  - 2.5.0
-services:
-  - mongodb
-
-notifications:
-  email:
-    recipients:
-      - tomas.celizna@gmail.com
-    on_failure: change
-    on_success: never
-
-matrix:
-  include:
-    - rvm: 2.3.3
-      env: MONGOID_VERSION=5
-    - rvm: 2.3.3
-      env: MONGOID_VERSION=6
-    - rvm: 2.5.0
-      env: MONGOID_VERSION=7