enumerize 0.11.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e3454dcf7faa010477afaa0c7de0b49e3e7e7e
-  data.tar.gz: fe8517318865f32bfe0421493e2431f90ca568dc
+  metadata.gz: 4a571fc9e3b62621d40cfddd9ba755389dda8115
+  data.tar.gz: e6a8a7e2043a36b8072a2f28cc547efab248770a
 SHA512:
-  metadata.gz: 9e54b9a844cf53b5570f82b4da4fbf509e4f62ef0b947ee16776b0608d2dfdde6b49d56c401abc7a16ed242bf57c64bf51450279513e70c7b577a2cbf67a4c87
-  data.tar.gz: 0a607cef37922a25e47df3fa99b03ae4e86e06ced6b58d77c4faa91cce771ac373bdbad30244da1d052488bac2c7bfb6ab497669581430fa2253ac16e821e470
+  metadata.gz: bda0563e282a121e0b5e0a26144a81efc8bde072ebf1a56a357da909421f272cc02b5c7dd85dac6cf7780b42a88e302f7aef020434255682dc9a7d7840e21e9a
+  data.tar.gz: 5c0d858c82b33958edd3a3c8e2b347822641966e6765ad87c7fae7158b1fee0ddaac08ecbc5b88849e392b928c474435e372ceeb2beec7a9c0b3052f937073a3

data/.gitignore

@@ -2,6 +2,7 @@
 *.rbc
 .bundle
 .config
+.ruby-version
 .yardoc
 .idea/
 enumerize.iml

data/.travis.yml

@@ -5,7 +5,6 @@ before_install:
   - gem install bundler
 gemfile:
   - Gemfile
-  - Gemfile.rails32
 rvm:
   - 1.9.3
   - 2.0.0
@@ -13,9 +12,6 @@ rvm:
   - 2.2
   - jruby-19mode
 matrix:
-  exclude:
-    - rvm: 2.2
-      gemfile: Gemfile.rails32
   include:
     - rvm: 2.2
       gemfile: Gemfile.rails40

data/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ### bug fix
 
+## 1.0.0 (August 2, 2015)
+
+### enhancements
+ * Add `texts` method for getting an array of text values of the enumerized field with multiple type. (by [@huynhquancam](https://github.com/huynhquancam))
+ * Drop Rails 3.2 support. (by [@nashby](https://github.com/nashby))
+
+### bug fix
+
+ * Fix conflicts when Active Record and Mongoid are used at the same time. (by [@matsu911](https://github.com/matsu911))
+
 ## 0.11.0 (March 29, 2015) ##
 
 ### enhancements

data/lib/enumerize/base.rb

@@ -91,11 +91,9 @@ module Enumerize
 
     def _set_default_value_for_enumerized_attributes
       self.class.enumerized_attributes.each do |attr|
-        # remove after dropping support for Rails 3.x
-        # https://github.com/brainspec/enumerize/issues/101
-        begin
+        if respond_to?(attr.name)
           attr_value = public_send(attr.name)
-        rescue ActiveModel::MissingAttributeError
+        else
           next
         end
 

data/lib/enumerize/scope/activerecord.rb

@@ -7,7 +7,7 @@ module Enumerize
         _enumerize_module.dependent_eval do
           if self < ::ActiveRecord::Base
             if options[:scope]
-              _define_scope_methods!(name, options)
+              _define_activerecord_scope_methods!(name, options)
             end
           end
         end
@@ -15,7 +15,7 @@ module Enumerize
 
       private
 
-      def _define_scope_methods!(name, options)
+      def _define_activerecord_scope_methods!(name, options)
         scope_name = options[:scope] == true ? "with_#{name}" : options[:scope]
 
         define_singleton_method scope_name do |*values|

data/lib/enumerize/scope/mongoid.rb

@@ -7,7 +7,7 @@ module Enumerize
         _enumerize_module.dependent_eval do
           if self < ::Mongoid::Document
             if options[:scope]
-              _define_scope_methods!(name, options)
+              _define_mongoid_scope_methods!(name, options)
             end
           end
         end
@@ -15,7 +15,7 @@ module Enumerize
 
       private
 
-      def _define_scope_methods!(name, options)
+      def _define_mongoid_scope_methods!(name, options)
         scope_name = options[:scope] == true ? "with_#{name}" : options[:scope]
 
         define_singleton_method scope_name do |*values|

data/lib/enumerize/set.rb

@@ -36,6 +36,10 @@ module Enumerize
       @values.to_a
     end
 
+    def texts
+      @values.collect { |value| value.text }
+    end
+
     delegate :join, to: :to_ary
 
     def ==(other)

data/lib/enumerize/version.rb

@@ -1,3 +1,3 @@
 module Enumerize
-  VERSION = "0.11.0"
+  VERSION = "1.0.0"
 end

data/test/activerecord_test.rb

@@ -190,6 +190,13 @@ describe Enumerize::ActiveRecordSupport do
     interests.must_equal %w(music dancing)
   end
 
+  it 'stores multiple value passed passed to new' do
+    user = User.new(interests: [:music, :dancing])
+    user.save!
+    user.interests.must_equal %w(music dancing)
+    User.find(user.id).interests.must_equal %w(music dancing)
+  end
+
   it 'returns invalid multiple value for validation' do
     user = User.new
     user.interests << :music

data/test/set_test.rb

@@ -104,6 +104,12 @@ describe Enumerize::Set do
     end
   end
 
+  describe '#texts' do
+    it 'returns array of text values' do
+      set.texts.must_equal ['A']
+    end
+  end
+
   describe '#join' do
     it 'joins values' do
       set << :b

data/test/test_helper.rb

@@ -3,6 +3,10 @@ require 'minitest/spec'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_model'
 require 'rails'
+begin
+  require 'mongoid'
+rescue LoadError
+end
 
 module RailsAdmin
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enumerize
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sergey Nartimov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,12 +32,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.mongo_mapper
-- Gemfile.rails32
 - Gemfile.rails40
 - MIT-LICENSE
 - README.md
@@ -48,7 +46,6 @@ files:
 - lib/enumerize/attribute.rb
 - lib/enumerize/attribute_map.rb
 - lib/enumerize/base.rb
-- lib/enumerize/form_helper.rb
 - lib/enumerize/hooks/formtastic.rb
 - lib/enumerize/hooks/simple_form.rb
 - lib/enumerize/hooks/uniqueness.rb
@@ -103,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Enumerated attributes with I18n and ActiveRecord/Mongoid/MongoMapper support

data/.ruby-version

@@ -1 +0,0 @@
-2.1.5

data/Gemfile.rails32

@@ -1,23 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-gem 'rake'
-gem 'minitest', '~> 4.1'
-gem 'rspec', :require => false
-
-gem 'rails', '~> 3.2.0', :require => false
-gem 'sqlite3', :platform => [:ruby, :mswin, :mingw]
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'psych'
-  gem 'rubinius-developer_tools'
-  gem 'rubysl-test-unit'
-end
-
-gem 'mongoid'
-gem 'mongo_mapper'
-gem 'simple_form'
-gem 'formtastic'

data/lib/enumerize/form_helper.rb

@@ -1,25 +0,0 @@
-# backport of https://github.com/rails/rails/commit/3be9e8a0c2187744b6c9879ca2836cef5ebed693
-if defined?(ActionView::Helpers::InstanceTag)
-  ActionView::Helpers::InstanceTag.singleton_class.class_eval do
-    remove_method :check_box_checked?
-
-    def check_box_checked?(value, checked_value)
-      case value
-      when TrueClass, FalseClass
-        value
-      when NilClass
-        false
-      when Integer
-        value != 0
-      when String
-        value == checked_value
-      else
-        if value.respond_to?(:include?)
-          value.include?(checked_value)
-        else
-          value.to_i != 0
-        end
-      end
-    end
-  end
-end