mongoid-enum-i18n 0.2.5 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 052aa901fd5927b0b43d7a2af5238bd93aaa8a43
-  data.tar.gz: 4156cf8e480c110bb3e1bb576cfeb4671b660613
+  metadata.gz: cc39e71840d462cac737d0756eea80a8f831089e
+  data.tar.gz: c388c3055bd4af60a7549d71645511a40a242443
 SHA512:
-  metadata.gz: a4b9fa2e8ec1f61645aa1dead56571585e284b602a8627609c535440d2a160b17e275637a9ecf4b24297f775a865d74d7732d7f01eecad3a3d40b369333967c3
-  data.tar.gz: dfd098909d946ce1e625aae35006b9a49bbb1264f4384cc697824633d4df8585285efdf93e9e18b2730969220ad914408c7febe2199c9f787bdc27ae309c29a9
+  metadata.gz: 6ff488c1098984135d6d1a70da51395c909b2865a22e9ff1538e76b894e0fc29d78dc3da4f6428fef5ea0c8fabaeddd5b3396e003298bfc84faad69e0677aa0c
+  data.tar.gz: 6702eb2c30f6872a6df327cb0a8c2d56e68987d2180c42fcfdca31a6391b0188e7490ac609e84b5d18ea4d9a4ccc4edeb96b4d03cd10b0b3d7e841106a01f84f

data/.travis.yml

@@ -12,3 +12,5 @@ rvm:
 
 services:
   - mongodb
+
+sudo: false

data/Gemfile

@@ -1,4 +1,16 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in mongoid-enum.gemspec
+gem 'mongoid', '>= 5.0.0.beta'
+
 gemspec
+
+group :test do
+  gem 'guard'
+  gem 'rubocop'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+  gem 'rspec', '>= 3.2.0'
+  gem 'codeclimate-test-reporter', require: nil
+  gem 'mongoid-rspec', git: 'https://github.com/nofxx/mongoid-rspec'
+end

data/Guardfile

@@ -0,0 +1,22 @@
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+
+# guard :rubocop do
+guard :rubocop, all_on_start: false, keep_failed: false, cli: ['-D'] do
+  watch(%r{.+\.rb$})
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+end
+
+guard :rspec, cmd: 'bundle exec rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch(/^generators\/(.+)\.rb$/) { |_m| 'spec/schemaless/worker_spec' }
+
+  watch('spec/spec_helper.rb')  { 'spec' }
+end

data/README.md

@@ -1,8 +1,5 @@
 # Mongoid::Enum (::I18n alternative gem)
 
-[![Build
-Status](https://travis-ci.org/thetron/mongoid-enum.png)](https://travis-ci.org/thetron/mongoid-enum)
-[![Code Climate](https://codeclimate.com/github/thetron/mongoid-enum.png)](https://codeclimate.com/github/thetron/mongoid-enum)
 
 Heavily inspired by [DHH's
 ActiveRecord::Enum](https://github.com/rails/rails/commit/db41eb8a6ea88b854bf5cd11070ea4245e1639c5), this little library is

data/lib/mongoid/enum.rb

@@ -18,26 +18,27 @@ module Mongoid
       # Main class method
       #
       def enum(field_name, values, options = {})
-        options = default_options(values).merge(options)
+        options = default_options.merge(options)
 
         set_values_constant field_name, values
 
-        create_field field_name, options
+        create_field field_name, options, values
         create_i18n_helper field_name, options
         create_values_helper field_name, options
 
         create_validations field_name, values, options
         define_value_scopes_and_accessors field_name, values, options
+        return unless options[:multiple]
+        define_array_field_writer field_name
       end
 
       private
 
-      def default_options(values)
+      def default_options
         {
-          :multiple => false,
-          :default  => values.first,
-          :required => true,
-          :validate => true
+          multiple: false,
+          required: true,
+          validate: true
         }
       end
 
@@ -46,21 +47,33 @@ module Mongoid
         const_set const_name, values
       end
 
-      def create_field(field_name, options)
+      def create_field(field_name, options, values)
         type = options[:multiple] && Array || Symbol
-        field field_name, :type => type, :default => options[:default]
+        default = \
+        if options.key?(:default)
+          options[:default]
+        else
+          options[:multiple] ? [] : values.first
+        end
+        field field_name, type: type, default: default
+      end
+
+      def define_array_field_writer(field_name)
+        define_method("#{field_name}=") do |vals|
+          write_attribute(field_name, Array(vals).compact.map(&:to_sym))
+        end
       end
 
       def create_validations(field_name, values, options)
         if options[:multiple] && options[:validate]
           validates field_name, :'mongoid/enum/validators/multiple' => {
-            :in => values,
-            :allow_nil => !options[:required]
+            in: values.map(&:to_sym),
+            allow_nil: !options[:required]
           }
         elsif validate
           validates field_name,
-                    :inclusion => { :in => values },
-                    :allow_nil => !options[:required]
+                    inclusion: { in: values },
+                    allow_nil: !options[:required]
         end
       end
 
@@ -74,7 +87,7 @@ module Mongoid
 
       def create_values_helper(field_name, options)
         return if options[:i18n].is_a?(FalseClass)
-        define_method("#{field_name}_values") do
+        define_singleton_method("#{field_name}_values") do
           I18n.translate("mongoid.enums.#{model_name.to_s.underscore}."\
                          "#{field_name}").map {  |k, v| [v, k] }
         end
@@ -101,7 +114,9 @@ module Mongoid
 
       def define_string_accessor(field_name, value)
         class_eval "def #{value}?() self.#{field_name} == :#{value} end"
-        class_eval "def #{value}!() update_attributes! :#{field_name} => :#{value} end"
+        define_method("#{value}!") do
+          update_attributes! :"#{field_name}" => :"#{value}"
+        end
       end
     end
   end

data/lib/mongoid/enum/validators/multiple_validator.rb

@@ -7,7 +7,7 @@ module Mongoid
       #
       class MultipleValidator < ActiveModel::EachValidator
         def validate_each(record, attribute, values)
-          values = Array(values)
+          values = Array(values).map(&:to_sym)
 
           if options[:allow_nil]
             unless all_included?(values, options[:in])

data/lib/mongoid/enum/version.rb

@@ -1,6 +1,6 @@
 module Mongoid
   # VERSION
   module Enum
-    VERSION = '0.2.5'
+    VERSION = '0.2.9'
   end
 end

data/mongoid-enum-i18n.gemspec

@@ -19,10 +19,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "mongoid", "> 4.0.0"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "mongoid-rspec"
 end

data/spec/mongoid/enum_spec.rb

@@ -5,7 +5,10 @@ class User
   include Mongoid::Enum
 
   enum :status, [:awaiting_approval, :approved, :banned]
-  enum :roles, [:author, :editor, :admin], multiple: true, default: [], required: false
+  enum :roles, [:author, :editor, :admin],
+       default: [],
+       multiple: true,
+       required: false
 end
 
 describe Mongoid::Enum do
@@ -52,6 +55,22 @@ describe Mongoid::Enum do
     end
   end
 
+  describe "'required' option" do
+    context 'when true' do
+      let(:instance) { User.new status: nil }
+      it 'is not valid with nil value' do
+        expect(instance).to_not be_valid
+      end
+    end
+
+    context 'when false' do
+      let(:instance) { User.new roles: nil }
+      it 'is valid with nil value' do
+        expect(instance).to be_valid
+      end
+    end
+  end
+
   describe 'constant' do
     it 'is set to the values' do
       expect(klass::STATUS).to eq values
@@ -60,6 +79,18 @@ describe Mongoid::Enum do
 
   describe 'accessors'do
     context 'when singular' do
+      describe 'setter' do
+        it 'accepts strings' do
+          instance.status = 'banned'
+          expect(instance.status).to eq :banned
+        end
+
+        it 'accepts symbols' do
+          instance.status = :banned
+          expect(instance.status).to eq :banned
+        end
+      end
+
       describe '{{value}}!' do
         it 'sets the value' do
           instance.save
@@ -87,6 +118,32 @@ describe Mongoid::Enum do
     end
 
     context 'when multiple' do
+      describe 'setter' do
+        it 'accepts strings' do
+          instance.roles = 'author'
+          expect(instance.roles).to eq [:author]
+        end
+
+        it 'accepts symbols' do
+          instance.roles << :author
+          expect(instance.roles).to eq [:author]
+        end
+
+        it 'accepts arrays of strings' do
+          instance.roles = %w( author editor )
+          instance.save
+          puts instance.errors.full_messages
+          instance.reload
+          expect(instance.roles).to include(:author)
+          expect(instance.roles).to include(:editor)
+        end
+
+        it 'accepts arrays of symbols'  do
+          instance.roles = [:author, :editor]
+          expect(instance.roles).to include(:author)
+          expect(instance.roles).to include(:editor)
+        end
+      end
       describe '{{value}}!' do
         context 'when field is nil' do
           it 'creates an array containing the value' do
@@ -183,7 +240,7 @@ describe Mongoid::Enum do
     end
 
     it 'should have a helper to translate the values' do
-      expect(instance.status_values)
+      expect(User.status_values)
         .to eq([['Awaiting Approval', :awaiting_approval]])
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 $LOAD_PATH << File.expand_path('../../lib', __FILE__)
 
-require 'database_cleaner'
 require 'mongoid'
 require 'mongoid-rspec'
 require 'mongoid/enum'
@@ -9,9 +8,9 @@ ENV['MONGOID_ENV'] = 'test'
 
 RSpec.configure do |config|
   config.include Mongoid::Matchers
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :truncation
-  end
+  # config.before(:suite) do
+  #   DatabaseCleaner.strategy = :truncation
+  # end
 
   config.after(:each) do
     Mongoid.purge!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-enum-i18n
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.9
 platform: ruby
 authors:
 - Nicholas Bruning
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-19 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -25,76 +25,6 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Heavily inspired by DDH's ActiveRecord::Enum, this little library is
   there to help you cut down the cruft in your models and make the world a happier
   place at the same time.
@@ -109,6 +39,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -142,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Sweet enum sugar for your Mongoid documents
@@ -153,3 +84,4 @@ test_files:
 - spec/support/app.en.yml
 - spec/support/mongoid.yml
 - spec/support/mongoid4.yml
+has_rdoc: