active_enum 0.9.12 → 1.0.0.pre

data/spec/active_enum/storage/i18n_store_spec.rb

@@ -27,33 +27,33 @@ describe ActiveEnum::Storage::I18nStore do
   describe '#set' do
     it 'should store value of id and name' do
       store.set 1, 'test name'
-      store.send(:_values).should == [[1, 'test name']]
+      expect(store.send(:_values)).to eq([[1, 'test name']])
     end
 
     it 'should store value of id, name and meta hash' do
       store.set 1, 'test name', :description => 'meta'
-      store.send(:_values).should == [[1, 'test name', {:description => 'meta'}]]
+      expect(store.send(:_values)).to eq([[1, 'test name', {:description => 'meta'}]])
     end
 
     it 'should raise error if duplicate id' do
       expect {
         store.set 1, 'Name 1'
         store.set 1, 'Other Name'
-      }.should raise_error(ActiveEnum::DuplicateValue)
+      }.to raise_error(ActiveEnum::DuplicateValue)
     end
 
     it 'should raise error if duplicate name' do
       expect {
         store.set 1, 'Name 1'
         store.set 2, 'Name 1'
-      }.should raise_error(ActiveEnum::DuplicateValue)
+      }.to raise_error(ActiveEnum::DuplicateValue)
     end
 
     it 'should not raise error if duplicate name with alternate case matches' do
       expect {
         store.set 1, 'Name 1'
         store.set 2, 'name 1'
-      }.should_not raise_error(ActiveEnum::DuplicateValue)
+      }.not_to raise_error()
     end
   end
 
@@ -67,10 +67,10 @@ describe ActiveEnum::Storage::I18nStore do
       store.set 1, 'thanks'
 
       I18n.locale = :en
-      store.values.should == [ [1, 'Thanks'] ]
+      expect(store.values).to eq([ [1, 'Thanks'] ])
 
       I18n.locale = :fr
-      store.values.should == [ [1, 'Merce'] ]
+      expect(store.values).to eq([ [1, 'Merce'] ])
     end
 
   end
@@ -83,22 +83,22 @@ describe ActiveEnum::Storage::I18nStore do
 
     it 'should return the value for a given id' do
       store.set 1, 'test'
-      store.get_by_id(1).should == [1, 'Testing']
+      expect(store.get_by_id(1)).to eq([1, 'Testing'])
     end
 
     it 'should return the value with meta for a given id' do
       store.set 1, 'test', :description => 'meta'
-      store.get_by_id(1).should == [1, 'Testing', { :description => 'meta' }]
+      expect(store.get_by_id(1)).to eq([1, 'Testing', { :description => 'meta' }])
     end
 
     it 'should return nil when id not found' do
-      store.get_by_id(1).should be_nil
+      expect(store.get_by_id(1)).to be_nil
     end
 
     it 'should return key when translation missing' do
       I18n.locale = :ja
       store.set 1, 'test'
-      store.get_by_id(1).should == [1, 'test']
+      expect(store.get_by_id(1)).to eq([1, 'test'])
     end
   end
 
@@ -110,16 +110,16 @@ describe ActiveEnum::Storage::I18nStore do
 
     it 'should return the value for a given name' do
       store.set 1, 'test'
-      store.get_by_name('test').should == [1, 'Testing']
+      expect(store.get_by_name('test')).to eq([1, 'Testing'])
     end
 
     it 'should return the value with meta for a given name' do
       store.set 1, 'test', :description => 'meta'
-      store.get_by_name('test').should == [1, 'Testing', { :description => 'meta' }]
+      expect(store.get_by_name('test')).to eq([1, 'Testing', { :description => 'meta' }])
     end
 
     it 'should return nil when name not found' do
-      store.get_by_name('test').should be_nil
+      expect(store.get_by_name('test')).to be_nil
     end
   end
 
@@ -137,7 +137,7 @@ describe ActiveEnum::Storage::I18nStore do
 
       store.set 2, 'name2'
       store.set 1, 'name1'
-      store.values.should == [[1,'Name 1'], [2, 'Name 2']]
+      expect(store.values).to eq([[1,'Name 1'], [2, 'Name 2']])
     end
 
     it 'should sort values descending when passed :desc' do
@@ -145,7 +145,7 @@ describe ActiveEnum::Storage::I18nStore do
 
       store.set 1, 'name1'
       store.set 2, 'name2'
-      store.values.should == [[2, 'Name 2'], [1,'Name 1']]
+      expect(store.values).to eq([[2, 'Name 2'], [1,'Name 1']])
     end
 
     it 'should not sort values when passed :natural' do
@@ -154,7 +154,7 @@ describe ActiveEnum::Storage::I18nStore do
       store.set 1, 'name1'
       store.set 3, 'name3'
       store.set 2, 'name2'
-      store.values.should == [[1,'Name 1'], [3,'Name 3'], [2, 'Name 2']]
+      expect(store.values).to eq([[1,'Name 1'], [3,'Name 3'], [2, 'Name 2']])
     end
   end
 
@@ -171,12 +171,12 @@ describe ActiveEnum::Storage::I18nStore do
 
       it 'should return array values from yaml' do
         store.set 1, 'things'
-        store.get_by_name('things').should eq [1, 'Generic things']
+        expect(store.get_by_name('things')).to eq [1, 'Generic things']
       end
 
       it 'should not load locale entry unless defined in enum' do
         store.set 1, 'things'
-        store.get_by_name('not_found').should be_nil
+        expect(store.get_by_name('not_found')).to be_nil
       end
     end
 
@@ -186,12 +186,12 @@ describe ActiveEnum::Storage::I18nStore do
 
       it 'should return array values from yaml' do
         store.set 1, 'things'
-        store.get_by_name('things').should eq [1, 'Model things']
+        expect(store.get_by_name('things')).to eq [1, 'Model things']
       end
 
       it 'should not load locale entry unless defined in enum' do
         store.set 1, 'things'
-        store.get_by_name('not_found').should be_nil
+        expect(store.get_by_name('not_found')).to be_nil
       end
     end
 

data/spec/active_enum/storage/memory_store_spec.rb

@@ -9,73 +9,73 @@ describe ActiveEnum::Storage::MemoryStore do
   describe '#set' do
     it 'should store value of id and name' do
       store.set 1, 'test name'
-      store.values.should == [[1, 'test name']]
+      expect(store.values).to eq([[1, 'test name']])
     end
 
     it 'should store value of id, name and meta hash' do
       store.set 1, 'test name', :description => 'meta'
-      store.values.should == [[1, 'test name', {:description => 'meta'}]]
+      expect(store.values).to eq([[1, 'test name', {:description => 'meta'}]])
     end
 
     it 'should raise error if duplicate id' do
       expect {
         store.set 1, 'Name 1'
         store.set 1, 'Other Name'
-      }.should raise_error(ActiveEnum::DuplicateValue)
+      }.to raise_error(ActiveEnum::DuplicateValue)
     end
 
     it 'should raise error if duplicate name' do
       expect {
         store.set 1, 'Name 1'
         store.set 2, 'Name 1'
-      }.should raise_error(ActiveEnum::DuplicateValue)
+      }.to raise_error(ActiveEnum::DuplicateValue)
     end
 
     it 'should raise error if duplicate name matches title-case name' do
       expect {
         store.set 1, 'Name 1'
         store.set 2, 'name 1'
-      }.should raise_error(ActiveEnum::DuplicateValue)
+      }.to raise_error(ActiveEnum::DuplicateValue)
     end
   end
 
   describe "#values" do
     it 'should return array of stored values' do
       store.set 1, 'Name 1'
-      store.values.should == [[1, 'Name 1']]
+      expect(store.values).to eq([[1, 'Name 1']])
     end
 
     it 'should return values for set enum only' do
       alt_store.set 1, 'Other Name 1'
       store.set 1, 'Name 1'
-      store.values.should == [[1, 'Name 1']]
+      expect(store.values).to eq([[1, 'Name 1']])
     end
   end
 
   describe "#get_by_id" do
     it 'should return the value for a given id' do
       store.set 1, 'test name', :description => 'meta'
-      store.get_by_id(1).should == [1, 'test name', {:description => "meta"}]
+      expect(store.get_by_id(1)).to eq([1, 'test name', {:description => "meta"}])
     end
 
     it 'should return nil when id not found' do
-      store.get_by_id(1).should be_nil
+      expect(store.get_by_id(1)).to be_nil
     end
   end
 
   describe "#get_by_name" do
     it 'should return the value for a given name' do
       store.set 1, 'test name'
-      store.get_by_name('test name').should == [1, 'test name']
+      expect(store.get_by_name('test name')).to eq([1, 'test name'])
     end
 
     it 'should return the value with title-cased name for a given lowercase name' do
       store.set 1, 'Test Name'
-      store.get_by_name('test name').should == [1, 'Test Name']
+      expect(store.get_by_name('test name')).to eq([1, 'Test Name'])
     end
 
     it 'should return nil when name not found' do
-      store.get_by_name('test name').should be_nil
+      expect(store.get_by_name('test name')).to be_nil
     end
   end
 
@@ -84,14 +84,14 @@ describe ActiveEnum::Storage::MemoryStore do
       @order = :asc
       store.set 2, 'Name 2'
       store.set 1, 'Name 1'
-      store.values.should == [[1,'Name 1'], [2, 'Name 2']]
+      expect(store.values).to eq([[1,'Name 1'], [2, 'Name 2']])
     end
 
     it 'should sort values descending when passed :desc' do
       @order = :desc
       store.set 1, 'Name 1'
       store.set 2, 'Name 2'
-      store.values.should == [[2, 'Name 2'], [1,'Name 1']]
+      expect(store.values).to eq([[2, 'Name 2'], [1,'Name 1']])
     end
 
     it 'should not sort values when passed :natural' do
@@ -99,7 +99,7 @@ describe ActiveEnum::Storage::MemoryStore do
       store.set 1, 'Name 1'
       store.set 3, 'Name 3'
       store.set 2, 'Name 2'
-      store.values.should == [[1,'Name 1'], [3,'Name 3'], [2, 'Name 2']]
+      expect(store.values).to eq([[1,'Name 1'], [3,'Name 3'], [2, 'Name 2']])
     end
   end
 

data/spec/active_enum_spec.rb

@@ -13,8 +13,8 @@ describe ActiveEnum do
           value :id => 1, :name => 'Bar 1'
         end
       end
-      Foo.all.should == [[1,'Foo 1']]
-      Bar.all.should == [[1,'Bar 1']]
+      expect(Foo.all).to eq([[1,'Foo 1']])
+      expect(Bar.all).to eq([[1,'Bar 1']])
     end
   end
 
@@ -24,9 +24,9 @@ describe ActiveEnum do
     end
 
     it 'should pass module into block as configuration object' do
-      ActiveEnum.use_name_as_value.should be_false
+      expect(ActiveEnum.use_name_as_value).to be_falsey
       ActiveEnum.setup {|config| config.use_name_as_value = true }
-      ActiveEnum.use_name_as_value.should be_true
+      expect(ActiveEnum.use_name_as_value).to be_truthy
     end
     
     after :all do
@@ -38,16 +38,16 @@ describe ActiveEnum do
     it 'should add enumerate extensions to given classes' do
       ActiveEnum.extend_classes = [NotActiveRecord]
 
-      NotActiveRecord.should_not respond_to(:enumerate)
+      expect(NotActiveRecord).not_to respond_to(:enumerate)
 
       ActiveEnum.extend_classes!
 
-      NotActiveRecord.should respond_to(:enumerate)
+      expect(NotActiveRecord).to respond_to(:enumerate)
     end
   end
 
   it 'should use the memory store by default' do
-    ActiveEnum.storage.should == :memory
+    expect(ActiveEnum.storage).to eq(:memory)
   end
 
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-require 'rspec'
+ENV["RAILS_ENV"] ||= 'test'
+require 'spec_helper'
 
 require 'rails'
 require 'active_record'
@@ -8,6 +9,8 @@ require 'action_mailer'
 
 require 'active_enum'
 require 'active_enum/acts_as_enum'
+require 'securerandom'
+require 'byebug'
 
 module ActiveEnum 
   class Application < Rails::Application
@@ -16,20 +19,26 @@ module ActiveEnum
       g.test_framework  :rspec, :fixture => false
     end
     config.active_support.deprecation = :notify
+    config.eager_load = false if Rails.version >= "4.0"
+    config.secret_key_base = SecureRandom.hex(10) if Rails.version >= "4.0"
   end
 end
 ActiveEnum::Application.initialize!
 
-require 'rspec/rails'
+I18n.enforce_available_locales = false
+I18n.available_locales = ['en', 'ja']
 
 ActiveRecord::Migration.verbose = false
-ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
+ActiveRecord::Base.establish_connection({:adapter => "sqlite3", :database => ':memory:'})
 
+require 'rspec/rails'
 require 'support/schema'
 
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
+
 class Person < ActiveRecord::Base; end
 class NoEnumPerson < ActiveRecord::Base
-  set_table_name 'people'
+  self.table_name = 'people'
 end
 
 class NotActiveRecord
@@ -53,4 +62,16 @@ end
 
 RSpec.configure do |config|
   config.include SpecHelper
+  config.include ConfigHelper
+
+  # rspec-rails 3 will no longer automatically infer an example group's spec type
+  # from the file location. You can explicitly opt-in to the feature using this
+  # config option.
+  # To explicitly tag specs without using automatic inference, set the `:type`
+  # metadata manually:
+  #
+  #     describe ThingsController, :type => :controller do
+  #       # Equivalent to being in spec/controllers
+  #     end
+  config.infer_spec_type_from_file_location!
 end

data/spec/support/config_helper.rb

@@ -0,0 +1,26 @@
+module ConfigHelper
+  extend ActiveSupport::Concern
+
+  def with_config(preference_name, temporary_value)
+    original_config_value = ActiveEnum.config.send(preference_name)
+    
+    ActiveEnum.config.send(:"#{preference_name}=", temporary_value)
+    yield
+  ensure
+    ActiveEnum.config.send(:"#{preference_name}=", original_config_value)
+  end
+
+  module ClassMethods
+    def with_config(preference_name, temporary_value)
+      original_config_value = ActiveEnum.config.send(preference_name)
+
+      before(:all) do
+        ActiveEnum.config.send(:"#{preference_name}=", temporary_value)
+      end
+
+      after(:all) do
+        ActiveEnum.config.send(:"#{preference_name}=", original_config_value)
+      end
+    end
+  end
+end

data/spec/support/schema.rb

@@ -7,6 +7,14 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer  :staying
   end
 
+  create_table :sorted_people, :force => true do |t|
+    t.string   :first_name
+    t.string   :last_name
+    t.integer  :sex
+    t.integer  :attending
+    t.integer  :staying
+  end
+
   create_table :sexes, :force => true do |t|
     t.string :name
   end

metadata

@@ -1,49 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_enum
-version: !ruby/object:Gem::Version 
-  hash: 35
-  prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 12
-  version: 0.9.12
+version: !ruby/object:Gem::Version
+  version: 1.0.0.pre
 platform: ruby
-authors: 
+authors:
 - Adam Meehan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-11 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-10-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Define enum classes in Rails and use them to enumerate ActiveRecord attributes
 email: adam.meehan@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 - MIT-LICENSE
-files: 
+files:
+- ".travis.yml"
 - CHANGELOG
 - MIT-LICENSE
 - README.rdoc
@@ -54,8 +44,6 @@ files:
 - lib/active_enum/acts_as_enum.rb
 - lib/active_enum/base.rb
 - lib/active_enum/extensions.rb
-- lib/active_enum/form_helpers/formtastic.rb
-- lib/active_enum/form_helpers/formtastic2.rb
 - lib/active_enum/form_helpers/simple_form.rb
 - lib/active_enum/railtie.rb
 - lib/active_enum/storage/abstract_store.rb
@@ -69,59 +57,46 @@ files:
 - spec/active_enum/acts_as_enum_spec.rb
 - spec/active_enum/base_spec.rb
 - spec/active_enum/extensions_spec.rb
-- spec/active_enum/form_helpers/formtastic2_spec.rb
-- spec/active_enum/form_helpers/formtastic_spec.rb
 - spec/active_enum/form_helpers/simple_form_spec.rb
 - spec/active_enum/storage/i18n_store_spec.rb
 - spec/active_enum/storage/memory_store_spec.rb
 - spec/active_enum_spec.rb
 - spec/spec_helper.rb
+- spec/support/config_helper.rb
 - spec/support/i18n.yml
 - spec/support/schema.rb
-has_rdoc: true
 homepage: http://github.com/adzap/active_enum
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">"
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Define enum classes in Rails and use them to enumerate ActiveRecord attributes
-test_files: 
+test_files:
 - spec/active_enum/acts_as_enum_spec.rb
 - spec/active_enum/base_spec.rb
 - spec/active_enum/extensions_spec.rb
-- spec/active_enum/form_helpers/formtastic2_spec.rb
-- spec/active_enum/form_helpers/formtastic_spec.rb
 - spec/active_enum/form_helpers/simple_form_spec.rb
 - spec/active_enum/storage/i18n_store_spec.rb
 - spec/active_enum/storage/memory_store_spec.rb
 - spec/active_enum_spec.rb
 - spec/spec_helper.rb
+- spec/support/config_helper.rb
 - spec/support/i18n.yml
 - spec/support/schema.rb