active_enum 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0463e9528b9a2ec019caf593cfc2becaa1767a116d4657d93de5462c8fb5475
-  data.tar.gz: 2cd9be66544fa2bd00cf2ace406c4c5010411f02d53f1c926d0f197609e89993
+  metadata.gz: 8d2ff570eda0a94b326f65a6a97b5b6bb68cd3f953fba95cdc14e34e184f8afc
+  data.tar.gz: fb5e45a1e55ee514408b1e1a71c0559b52bacb74f2d632dea63680a495bcf523
 SHA512:
-  metadata.gz: efd7a02386a9e3a6a45812b35e8c509ac60d47249238bee485b00fc8d0a1598ed8a0ae5319e02d76f59ca06ccce5e22dfd25ad0b217ee29f7471510a8deeb15c
-  data.tar.gz: d69b2b354382981ba79af48b3d0306839a1f218d7e7bf01136a2021fdc7026a4b0eedfc40e00e5d63c24deaf2eccf00b5727083a8a2023947a29a00ed579a5ec
+  metadata.gz: dae56bad88d50dbef7355c37243b5c76dea0cd4a741ee6389f94824453f3e5d05bae64966102a304ce643fc675f3a37584637ac4e6bf9d0219d96911e0effbd2
+  data.tar.gz: 6aec92d08a5afad8eb137cd319346d41784ec19648a8c261408dc2896fcb853a4e8ba345bd50d98b67ddf5e49d82747c3fdd32035a9011184a1c7783a1f69b63

data/Rakefile

@@ -24,8 +24,3 @@ end
 
 desc 'Default: run specs.'
 task :default => :spec
-
-task :all do
-  sh "export FORMTASTIC=2.0 && bundle install && bundle exec rake"
-  sh "export FORMTASTIC=1.2 && bundle install && bundle exec rake"
-end

data/lib/active_enum/acts_as_enum.rb

@@ -42,6 +42,8 @@ module ActiveEnum
 
       # Enables use as a delimiter in inclusion validation
       def include?(value)
+        return super if value.is_a?(Module)
+
         !self[value].nil?
       end
 

data/lib/active_enum/base.rb

@@ -54,7 +54,14 @@ module ActiveEnum
 
       # Return enum values in an array suitable to pass to a Rails form select helper.
       def to_select
-        store.values.map { |v| [v[1], v[0]] }
+        store.values.map { |v| [v[1].html_safe, v[0]] }
+      end
+
+      # Return enum values in a nested array suitable to pass to a Rails form grouped select helper.
+      def to_grouped_select(group_by)
+        store.values.group_by { |(_id, _name, meta)| meta.fetch(group_by) }.map { |group, collection|
+          [ group, collection.map { |(id, name, _meta)| [ name.html_safe, id ] } ]
+        }
       end
 
       # Access id or name value. Pass an id number to retrieve the name or

data/lib/active_enum/extensions.rb

@@ -112,7 +112,7 @@ module ActiveEnum
             if arg.is_a?(Symbol)
               super self.class.active_enum_for(:#{attribute})[arg]
             else
-              super arg
+              super
             end
           end
         DEF

data/lib/active_enum/form_helpers/simple_form.rb

@@ -23,9 +23,21 @@ class ActiveEnum::FormHelpers::SimpleForm::EnumInput < ::SimpleForm::Inputs::Col
   end
 end
 
+class ActiveEnum::FormHelpers::SimpleForm::GroupedEnumInput < ::SimpleForm::Inputs::GroupedCollectionSelectInput
+  def initialize(*args)
+    super
+    raise "Attribute '#{attribute_name}' has no enum class" unless enum = object.class.active_enum_for(attribute_name)
+
+    input_options[:collection] = enum.to_grouped_select(input_options[:group_by])
+    input_options[:group_method] = :last
+  end
+end
+
 SimpleForm::FormBuilder.class_eval do
   prepend ActiveEnum::FormHelpers::SimpleForm::BuilderExtension
 
-  map_type :enum, :to => ActiveEnum::FormHelpers::SimpleForm::EnumInput
+  map_type :enum, to: ActiveEnum::FormHelpers::SimpleForm::EnumInput
+  map_type :grouped_enum, to: ActiveEnum::FormHelpers::SimpleForm::GroupedEnumInput
+
   alias_method :collection_enum, :collection_select
 end

data/lib/active_enum/version.rb

@@ -1,3 +1,3 @@
 module ActiveEnum
-  VERSION = '1.0.0.rc2'
+  VERSION = '1.0.0.rc3'
 end

data/spec/active_enum/acts_as_enum_spec.rb

@@ -60,4 +60,22 @@ describe ActiveEnum::ActsAsEnum do
       expect(Person.meta(1)).to eq(Person.find(1).attributes.except('id', 'first_name'))
     end
   end
+
+  context '#include?' do
+    it "should return true if value is integer and model has id" do
+      expect(Person.exists?(id: 1)).to eq(true)
+      expect(Person.include?(1)).to eq(true)
+    end
+
+    it "should return false if value is integer and model does not have id" do
+      expect(Person.exists?(id: 100)).to eq(false)
+      expect(Person.include?(100)).to eq(false)
+    end
+
+    it "should return super if value is a module" do
+      expect(Person.include?(ActiveRecord::Attributes)).to eq(true)
+
+      expect(Person.include?(Module.new)).to eq(false)
+    end
+  end
 end

data/spec/active_enum/base_spec.rb

@@ -248,6 +248,20 @@ describe ActiveEnum::Base do
     end
   end
 
+  describe ".to_grouped_select" do
+    it 'should return array for grouped select helpers grouped by meta key value' do
+      enum = define_enum do
+        value :id => 1, :name => 'Name 1', :category => 'Foo'
+        value :id => 2, :name => 'Name 2', :category => 'Bar'
+      end
+
+      expect(enum.to_grouped_select(:category)).to eq([
+        [ 'Foo', [ ['Name 1',1] ] ],
+        [ 'Bar', [ ['Name 2',2] ] ]
+      ])
+    end
+  end
+
   def define_enum(&block)
     Class.new(ActiveEnum::Base, &block)
   end

data/spec/active_enum/form_helpers/simple_form_spec.rb

@@ -13,6 +13,16 @@ describe ActiveEnum::FormHelpers::SimpleForm, :type => :helper do
         value :id => 1, :name => 'Male'
         value :id => 2, :name => 'Female'
       end
+
+      enumerate :employment_status do
+        value :id => 1, :name => 'Full-time', group: 'Waged'
+        value :id => 3, :name => 'Part-time', group: 'Waged'
+        value :id => 4, :name => 'Casual', group: 'Waged'
+        value :id => 5, :name => 'Student', group: 'Un-waged'
+        value :id => 6, :name => 'Retired', group: 'Un-waged'
+        value :id => 7, :name => 'Unemployed', group: 'Un-waged'
+        value :id => 8, :name => 'Carer', group: 'Un-waged'
+      end
     end
   end
 
@@ -34,6 +44,15 @@ describe ActiveEnum::FormHelpers::SimpleForm, :type => :helper do
     expect(output).to have_xpath('//option[@value=2]', :text => 'Female')
   end
 
+  it "should use explicit :grouped_enum input type" do
+    output = simple_form_for(Person.new, :url => people_path) do |f|
+      concat f.input(:employment_status, :as => :grouped_enum, :group_by => :group)
+    end
+    expect(output).to have_selector('select#person_employment_status')
+    expect(output).to have_xpath('//optgroup[@label="Waged"]/option[@value=1]', :text => 'Full-time')
+    expect(output).to have_xpath('//optgroup[@label="Un-waged"]/option[@value=8]', :text => 'Carer')
+  end
+
   it "should not use enum input type if :as option indicates other type" do
     output = simple_form_for(Person.new, :url => people_path) do |f|
       concat f.input(:sex, :as => :string)

data/spec/support/schema.rb

@@ -5,6 +5,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer  :sex
     t.integer  :attending
     t.integer  :staying
+    t.integer  :employment_status
   end
 
   create_table :sorted_people, :force => true do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_enum
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Adam Meehan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -83,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Define enum classes in Rails and use them to enumerate ActiveRecord attributes