mongoid_enum_mapper 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26b3b43fed1a77165990d18dff6678c7646228bb66ec14c1c8dc18dea6faf120
-  data.tar.gz: '06683302772ad3c1ea70ad16cd0e59eb33bdc0bd7146940c7e0b5f6e208f5d9b'
+  metadata.gz: 5d0a0051e60354703c9c5043588cf66eef8f026947d6f4a967ae478fa8e1bb14
+  data.tar.gz: e20189a9446da51c696ba9aff909b655d91d33904643b945606467fba84d899f
 SHA512:
-  metadata.gz: 1be85951a46d41c97b9bf4c4bfdba4373f2838f4d0b070b454eb39348e1a03f09b8cf690a816e380cd69dd8dbfd7d8a7ac675d637842a8acbf445c6c2cc1c0a9
-  data.tar.gz: d4d75bf8d5513629704768e5916097ec69c9b76d0c77ae511a5a716f5536f4d8bd6f8f6944be5026e5f88c07deb2a2315eb8f35ab477ab45e4334ca82994ea92
+  metadata.gz: 0a41c6b7649a65bc235a9fbfb37b2499ef66813854680f8356a4f7347a37ae7c58a91ede1924310099459349aef7a0789bdf0e6964e3530d15039d92b1a15485
+  data.tar.gz: 1e958ee4564771a0e064fe9a195de18cd438eb590aafc235b2dc72f387c0aec5bc0f9f7034529da2b24ffa740f0fbe906ff0d8e70be32b1edc30788e7acfb99a

data/.travis.yml

@@ -7,6 +7,36 @@ rvm:
   - 2.2
   - 2.3
   - 2.4
+  - 2.5
+gemfile:
+  - gemfiles/mongoid_61.gemfile
+  - gemfiles/mongoid_60.gemfile
+  - gemfiles/mongoid_51.gemfile
+  - gemfiles/mongoid_50.gemfile
+  - gemfiles/mongoid_40.gemfile
+matrix:
+  exclude:
+    - rvm: 2.5
+      gemfile: gemfiles/mongoid_51.gemfile
+    - rvm: 2.5
+      gemfile: gemfiles/mongoid_50.gemfile
+    - rvm: 2.5
+      gemfile: gemfiles/mongoid_40.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/mongoid_51.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/mongoid_50.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/mongoid_40.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/mongoid_61.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/mongoid_61.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/mongoid_60.gemfile
+cache: bundler
+services:
+  - mongodb
 before_install:
   - gem install bundler
   - gem update --system

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/mongoid_enum_mapper.svg)](https://badge.fury.io/rb/mongoid_enum_mapper)
 [![Maintainability](https://api.codeclimate.com/v1/badges/919d0459a7ffdfa9a221/maintainability)](https://codeclimate.com/github/berniechiu/mongoid_enum_mapper/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/919d0459a7ffdfa9a221/test_coverage)](https://codeclimate.com/github/berniechiu/mongoid_enum_mapper/test_coverage)
 [![Build Status](https://travis-ci.org/berniechiu/mongoid_enum_mapper.svg?branch=master)](https://travis-ci.org/berniechiu/mongoid_enum_mapper)

data/gemfiles/mongoid_40.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem 'mongoid', '~> 4.0.0'
+
+gemspec path: '../'
+
+group :test do
+  gem 'simplecov', '~> 0.15.1'
+end

data/gemfiles/mongoid_50.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem 'mongoid', '~> 5.0.0'
+
+gemspec path: '../'
+
+group :test do
+  gem 'simplecov', '~> 0.15.1'
+end

data/gemfiles/mongoid_51.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem 'mongoid', '~> 5.1.0'
+
+gemspec path: '../'
+
+group :test do
+  gem 'simplecov', '~> 0.15.1'
+end

data/gemfiles/mongoid_60.gemfile

@@ -0,0 +1,12 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem 'mongoid', '~> 6.0.0'
+
+gemspec path: '../'
+
+group :test do
+  gem 'simplecov', '~> 0.15.1'
+end
+

data/gemfiles/mongoid_61.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+
+gem 'mongoid', '~> 6.1.0'
+
+gemspec path: '../'
+
+group :test do
+  gem 'simplecov', '~> 0.15.1'
+end

data/lib/mongoid/enum_mapper/define_enum.rb

@@ -2,35 +2,38 @@ module Mongoid
   module EnumMapper
     extend ActiveSupport::Concern
 
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    def reload
-      super
-      reset_enum_mapping_cache
-      self
-    end
+    included do
+      def reload
+        super
+        reset_enum_mapping_cache
+        self
+      end
 
-    def reset_enum_mapping_cache(enum_field: nil, key: nil)
-      if enum_field
-        # Reset certain enum field
-        enum_mapper = self.class.const_get(enum_field.to_s.upcase)
-        key ||= enum_mapper.key(self[:"#{enum_field}"])  # If key not found, grep from current db value
-        return self[enum_field] unless enum_mapper[key]
-        instance_variable_set(:"@#{enum_field}", nil)
-        self[enum_field] = enum_mapper[key]
-      else
-        # Reset all enum field
-        self.class.instance_variable_get(:'@current_enums').each do |field|
-          reset_enum_mapping_cache(enum_field: field) 
+      def reset_enum_mapping_cache(enum_field: nil, key: nil)
+        if enum_field
+          # Reset certain enum field
+          enum_mapper = self.class.const_get(enum_field.to_s.upcase)
+          key ||= enum_mapper.key(self[:"#{enum_field}"])  # If key not found, grep from current db value
+          enum_status = enum_mapper[key]
+          reset_enum_instance_cache(enum_field, status: enum_status)
+          enum_status ? (self[enum_field] = enum_status) : self[enum_field]
+        else
+          # Reset all enum field
+          self.class.current_enums.each { |field| reset_enum_mapping_cache(enum_field: field) }
         end
       end
+
+      def reset_enum_instance_cache(field, status: nil)
+        instance_variable_set(:"@#{field}", nil) if self.status != status
+      end
     end
 
     module ClassMethods
+      attr_reader :current_enums
+
       def define_enum(enum_field, enum_mapping = {})
         field :"#{enum_field}", type: Integer, default: 0
+
         set_enum_mapping_constant(enum_field, enum_mapping)
         set_current_enum_fields(enum_field)
 

data/lib/mongoid/enum_mapper/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module EnumMapper
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/mongoid_enum_mapper.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "pry-byebug", "~> 3.5", ">= 3.5.1"
 
-  spec.add_dependency "mongoid", "<= 5.2.1"
+  spec.add_dependency "mongoid", "<= 6.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_enum_mapper
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Bernie Chiu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-14 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<="
       - !ruby/object:Gem::Version
-        version: 5.2.1
+        version: 6.2.1
 description: Enum mapper for Mongoid field
 email:
 - bernie_chiu@hotmail.com
@@ -101,6 +101,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/mongoid_40.gemfile
+- gemfiles/mongoid_50.gemfile
+- gemfiles/mongoid_51.gemfile
+- gemfiles/mongoid_60.gemfile
+- gemfiles/mongoid_61.gemfile
 - lib/enum_mapper.rb
 - lib/mongoid/enum_mapper/define_enum.rb
 - lib/mongoid/enum_mapper/version.rb