mongoid-enum 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe0e5157d30b2aac72047e14db8cca549db38f29
-  data.tar.gz: ff1af2e59142bd12feaa332998d0dbbffa89e10a
+  metadata.gz: afeb11021cb69d6768757b3d64497ed210ea1385
+  data.tar.gz: d0ecaf60fdae16d33c695ad249fb9296fa455664
 SHA512:
-  metadata.gz: 6794021fe88958a5746395f4a87ce1f26cf5ef01977578ab6212c877f9e9184086beed7de31f0465a389fd0f74512f08d7488dad8aa9790d28c52d4168a737e3
-  data.tar.gz: 0f83fdf80128ed57c9c5229c31fbd4bd2e7803e809e6652ee35d1fb74b237ed38c4aa22b6521b9ae0ebf9593ee0f2b367686962979b19771daa86c845ae45476
+  metadata.gz: 207868209b262b7fc9ab7420c276d46ff3b43d12b845ae811a0f3ae64934c82e4a61688920ad237f78a8bc0bab81d7477ae684da4b3dbfb962e054128a897ba7
+  data.tar.gz: 3e8224bf9a36c00f39d1b1a3123b25a8d241b79127dd9c94d20906e069d6dae0b695a238a80c202a0a9416bb16fe8bfdc073883e5825682641bf5ec6b5ecaf1c

data/Guardfile

@@ -0,0 +1,8 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec, cmd: "bundle exec rspec" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/lib/mongoid/enum.rb

@@ -14,10 +14,10 @@ module Mongoid
         set_values_constant name, values
 
         create_field field_name, options
-        alias_attribute name, field_name
 
         create_validations field_name, values, options
         define_value_scopes_and_accessors field_name, values, options
+        define_field_accessor name, field_name, options
       end
 
       private
@@ -42,9 +42,10 @@ module Mongoid
 
       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] }
+          validates field_name, :'mongoid/enum/validators/multiple' => { :in => values.map(&:to_sym), :allow_nil => !options[:required] }
+        #FIXME: Shouldn't this be `elsif options[:validate]` ???
         elsif validate
-          validates field_name, :inclusion => {:in => values}, :allow_nil => !options[:required]
+          validates field_name, :inclusion => {:in => values.map(&:to_sym)}, :allow_nil => !options[:required]
         end
       end
 
@@ -60,6 +61,24 @@ module Mongoid
         end
       end
 
+      def define_field_accessor(name, field_name, options)
+        if options[:multiple]
+          define_array_field_accessor name, field_name
+        else
+          define_string_field_accessor name, field_name
+        end
+      end
+
+      def define_array_field_accessor(name, field_name)
+        class_eval "def #{name}=(vals) self.write_attribute(:#{field_name}, Array(vals).compact.map(&:to_sym)) end"
+        class_eval "def #{name}() self.read_attribute(:#{field_name}) end"
+      end
+
+      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.read_attribute(:#{field_name}) end"
+      end
+
       def define_array_accessor(field_name, value)
         class_eval "def #{value}?() self.#{field_name}.include?(:#{value}) end"
         class_eval "def #{value}!() update_attributes! :#{field_name} => (self.#{field_name} || []) + [:#{value}] end"

data/lib/mongoid/enum/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Enum
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/mongoid-enum.gemspec

@@ -18,12 +18,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "mongoid", "~> 4.0"
+  spec.add_runtime_dependency "mongoid", "~> 5.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.14"
-  spec.add_development_dependency "guard-rspec", "~> 4.0.3"
-  spec.add_development_dependency "database_cleaner", "~> 1.2.0"
-  spec.add_development_dependency "mongoid-rspec", "~> 1.5.1"
+  spec.add_development_dependency "rspec", "~> 3.1"
+  spec.add_development_dependency "guard-rspec", "~> 4.6.2"
+  spec.add_development_dependency "mongoid-rspec", "~> 3.0"
 end

data/spec/mongoid/enum_spec.rb

@@ -42,7 +42,7 @@ describe Mongoid::Enum do
     it "is aliased" do
       expect(instance).to respond_to alias_name
       expect(instance).to respond_to :"#{alias_name}="
-      expect(instance).to respond_to :"#{alias_name}?"
+      expect(instance).to respond_to :"#{alias_name}"
     end
 
     describe "type" do
@@ -68,6 +68,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
@@ -76,6 +92,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
@@ -103,6 +131,33 @@ 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 = ['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

data/spec/spec_helper.rb

@@ -1,22 +1,18 @@
 $: << File.expand_path("../../lib", __FILE__)
 
-require 'database_cleaner'
 require 'mongoid'
-require 'mongoid-rspec'
+require "mongoid/rspec"
 require 'mongoid/enum'
 
 ENV['MONGOID_ENV'] = "test"
 
 RSpec.configure do |config|
   config.include Mongoid::Matchers
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :truncation
-  end
 
-  config.after(:each) do
-    DatabaseCleaner.clean
+  config.before(:each) do
     Mongoid.purge!
   end
 end
 
 Mongoid.load!(File.expand_path("../support/mongoid.yml", __FILE__), :test)
+Mongo::Logger.logger.level = ::Logger::INFO

data/spec/support/mongoid.yml

@@ -1,5 +1,5 @@
 test:
-  sessions:
+  clients:
     default:
       database: mongoid-enum_test
       hosts:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-enum
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nicholas Bruning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,56 +58,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.3
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 4.6.2
 - !ruby/object:Gem::Dependency
   name: mongoid-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '3.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.
@@ -122,6 +108,7 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -155,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Sweet enum sugar for your Mongoid documents