enumerate_it 1.3.0 → 1.3.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eeb5e0de6df61f17293c7d0c7b5d833c5d3738b3
-  data.tar.gz: 31978fd7c1d78bbcf499ecf4c6d66f3101add5a1
+  metadata.gz: fa84a89fcca8d6194d41aaf25a1b08ae33f0f61d
+  data.tar.gz: 3fa95bf16fe87f5fb99b21667747a21d8d48c9fc
 SHA512:
-  metadata.gz: 910befeeabdbd3647ca2b1c7c9115cee8e8bd927fd938dac4704a03a6b0cf077524e17a604edf2fb31d5493b6d4aec6819cfbec0e46b51d16a633b0974903af2
-  data.tar.gz: cf9b34ec103040023ac449a9fecffad45a3bca529f3ae041683838fbd25f23f48cce1dda40c5aeae9ccddc7388aa3a9058353b1e985d533a339b09a12105854e
+  metadata.gz: 78fdd11e5fbaf213ae694925d9014127c24037b77771a66e997a61907a7d207ae9ac0b72170fe904087747f10c8498aaf013d86c34fff16fc5884e676c1cb3e0
+  data.tar.gz: 2ad8706ed2aee354ee17e3cadb24b5c74e6ac5bf429c858da80e075c7b06f01672ea3cf706683e6efdb093eb86900e217a748886d204b9ac38bebc2cda945e53

data/.rubocop.yml

@@ -0,0 +1,40 @@
+require: rubocop-rspec
+
+AllCops:
+  DisplayCopNames: true
+
+  Include:
+    - '**/Appraisals'
+    - '**/Gemfile'
+    - '**/Rakefile'
+  Exclude:
+    - 'lib/generators/enumerate_it/enum/templates/**/*'
+    - 'gemfiles/vendor/**/*'
+
+Lint/EndAlignment:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 100
+
+Style/AlignHash:
+  EnforcedLastArgumentHashStyle: ignore_implicit
+
+Style/Documentation:
+  Enabled: false
+
+Style/ElseAlignment:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/IndentationWidth:
+  Enabled: false
+
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/PredicateName:
+  Exclude:
+    - 'lib/enumerate_it/class_methods.rb'

data/.travis.yml

@@ -4,17 +4,32 @@ sudo: false
 
 cache: bundler
 
+script:
+- "ruby -e \"RUBY_VERSION == '2.3.1' ? system('bundle exec rubocop') : exit(0)\""
+- bundle exec rake spec
+
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.5
-  - 2.2.1
+  - 2.1.10
+  - 2.2.5
   - 2.3.1
 
 gemfile:
-  - gemfiles/activesupport_3_0.gemfile
-  - gemfiles/activesupport_3_1.gemfile
-  - gemfiles/activesupport_3_2.gemfile
-  - gemfiles/activesupport_4_0.gemfile
-  - gemfiles/activesupport_4_1.gemfile
-  - gemfiles/activesupport_4_2.gemfile
+  - gemfiles/rails_3.0.gemfile
+  - gemfiles/rails_3.1.gemfile
+  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+
+matrix:
+  # Rails 5 requires Ruby version 2.2+
+  exclude:
+  - rvm: 1.9.3
+    gemfile: gemfiles/rails_5.0.gemfile
+  - rvm: 2.0.0
+    gemfile: gemfiles/rails_5.0.gemfile
+  - rvm: 2.1.10
+    gemfile: gemfiles/rails_5.0.gemfile

data/Appraisals

@@ -1,6 +1,13 @@
-%w(3_0 3_1 3_2 4_0 4_1 4_2).each do |version|
-  appraise "activesupport_#{version}" do
-    gem 'activesupport', "~> #{version.gsub(/_/, '.')}.0"
-    gem 'activerecord',  "~> #{version.gsub(/_/, '.')}.0"
+require 'json'
+
+rails_versions = JSON.parse(Net::HTTP.get(URI('https://rubygems.org/api/v1/versions/rails.json')))
+  .group_by { |version| version['number'] }.keys.select { |key| key !~ /rc|racecar|beta|pre/ }
+
+%w(3.0 3.1 3.2 4.0 4.1 4.2 5.0).each do |version|
+  appraise "rails_#{version}" do
+    current_version = rails_versions.select { |key| key.match(/\A#{version}/) }.max
+
+    gem 'activesupport', "~> #{current_version}"
+    gem 'activerecord',  "~> #{current_version}"
   end
 end

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 # Specify your gem's dependencies in enumerate_it.gemspec
 gemspec

data/Gemfile.lock

@@ -1,64 +1,65 @@
 PATH
   remote: .
   specs:
-    enumerate_it (1.3.0)
+    enumerate_it (1.3.1.rc1)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (5.0.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     appraisal (2.1.0)
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.2.0)
-    coderay (1.0.9)
+    ast (2.3.0)
+    coderay (1.1.1)
+    concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     i18n (0.7.0)
-    json (1.8.3)
-    method_source (0.8.1)
-    minitest (5.8.4)
-    parser (2.3.0.7)
+    method_source (0.8.2)
+    minitest (5.9.0)
+    parser (2.3.1.2)
       ast (~> 2.2)
     powerpack (0.1.1)
-    pry (0.9.12)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
     rainbow (2.1.0)
-    rake (11.1.1)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.38.0)
-      parser (>= 2.3.0.6, < 3.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.42.0)
+      parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
-    slop (3.4.4)
+    rubocop-rspec (1.6.0)
+      rubocop (>= 0.42.0)
+    ruby-progressbar (1.8.1)
+    slop (3.6.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.0.2)
+    unicode-display_width (1.1.0)
 
 PLATFORMS
   ruby
@@ -70,6 +71,7 @@ DEPENDENCIES
   rake
   rspec
   rubocop
+  rubocop-rspec
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/README.md

@@ -51,9 +51,7 @@ Changes are maintained under [Releases](https://github.com/lucascaton/enumerate_
 
 ## Creating enumerations
 
-Enumerations are created as models, but you can put them anywhere in your
-application. In Rails applications, you should put them inside
-`app/enumerations` folder.
+Enumerations are created as classes and you should put them inside `app/enumerations` folder.
 
 ```ruby
 class RelationshipStatus < EnumerateIt::Base
@@ -187,13 +185,10 @@ end
 
 The `sort_by` methods accept one of the following values:
 
-*   `:translation`: The default behavior, will sort the returned values based
-    on translations.
-*   `:value`: Will sort the returned values based on values.
-*   `:name`: Will sort the returned values based on the name of each
-    enumeration option.
-*   `:none`: Will return values in order that was passed to associate_values
-    call.
+* `:translation`: The default behavior, will sort the returned values based on translations.
+* `:value`: Will sort the returned values based on values.
+* `:name`: Will sort the returned values based on the name of each enumeration option.
+* `:none`: Will return values in order that was passed to associate_values call.
 
 ## Using enumerations
 
@@ -494,7 +489,7 @@ their locale files. Take a look at how to use it running:
 rails generate enumerate_it:enum --help
 ```
 
-## Supported Ruby and Rails (ActiveSupport) versions
+## Supported Ruby and Rails versions
 
 Check [travis config file](https://github.com/lucascaton/enumerate_it/blob/master/.travis.yml).
 
@@ -516,7 +511,7 @@ codes. I had both situations in my legacy database.
 *   Make your feature addition or bug fix.
 *   Add tests for it. This is important so I don't break it in a future
     version unintentionally.
-*   Run the tests agaist all supported versions: `$ appraisal rake`.
+*   Run the tests agaist all supported versions: `$ rake`.
 *   Commit, do not mess with Rakefile, version, or history. (if you want to
     have your own version, that is fine but bump version in a commit by itself
     I can ignore when I pull)

data/Rakefile

@@ -1,12 +1,16 @@
 # encoding: utf-8
 
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
+if ENV['APPRAISAL_INITIALIZED'] || ENV['TRAVIS'] || RUBY_VERSION < '2.0.0'
+  require 'rspec/core/rake_task'
+
+  Bundler::GemHelper.install_tasks
+  RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+  task default: :spec
+else
+  require 'appraisal'
+
+  task default: :appraisal
+end

data/enumerate_it.gemspec

@@ -2,8 +2,8 @@ require File.expand_path('../lib/enumerate_it/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ['Cássio Marques', 'Lucas Caton']
-  gem.description   = 'Enumerations for Ruby with some magic powers!'
   gem.summary       = 'Ruby Enumerations'
+  gem.description   = 'Enumerations for Ruby with some magic powers!'
   gem.homepage      = 'https://github.com/lucascaton/enumerate_it'
 
   gem.files         = `git ls-files`.split("\n")
@@ -18,5 +18,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rubocop'
+
+  if RUBY_VERSION >= '2.2.0'
+    gem.add_development_dependency 'rubocop'
+    gem.add_development_dependency 'rubocop-rspec'
+  end
 end

data/gemfiles/{activesupport_4_0.gemfile → rails_3.0.gemfile}

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "activesupport", "~> 4.0.0"
-gem "activerecord", "~> 4.0.0"
+gem "activesupport", "~> 3.0.9"
+gem "activerecord", "~> 3.0.9"
 
 gemspec :path => "../"

data/gemfiles/{activesupport_3_0.gemfile → rails_3.1.gemfile}

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "activesupport", "~> 3.0.0"
-gem "activerecord", "~> 3.0.0"
+gem "activesupport", "~> 3.1.9"
+gem "activerecord", "~> 3.1.9"
 
 gemspec :path => "../"

data/gemfiles/{activesupport_3_1.gemfile → rails_3.2.gemfile}

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "activesupport", "~> 3.1.0"
-gem "activerecord", "~> 3.1.0"
+gem "activesupport", "~> 3.2.9"
+gem "activerecord", "~> 3.2.9"
 
 gemspec :path => "../"

data/gemfiles/{activesupport_3_2.gemfile → rails_4.0.gemfile}

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "activesupport", "~> 3.2.0"
-gem "activerecord", "~> 3.2.0"
+gem "activesupport", "~> 4.0.9"
+gem "activerecord", "~> 4.0.9"
 
 gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activesupport", "~> 4.1.9"
+gem "activerecord", "~> 4.1.9"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activesupport", "~> 4.2.7.1"
+gem "activerecord", "~> 4.2.7.1"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "activesupport", "~> 5.0.0.1"
+gem "activerecord", "~> 5.0.0.1"
+
+gemspec :path => "../"

data/lib/enumerate_it/base.rb

@@ -1,122 +1,134 @@
 # encoding: utf-8
+
 module EnumerateIt
   class Base
-    @@registered_enumerations = {}
-
     class << self
       attr_reader :sort_mode
-    end
 
-    def self.associate_values(*args)
-      values_hash = args.first.is_a?(Hash) ? args.first : args.inject({}) { |h, v| h[v] = v.to_s; h }
+      def associate_values(*args)
+        values = values_hash(args)
 
-      register_enumeration normalize_enumeration(values_hash)
-      values_hash.each_pair { |value_name, attributes| define_enumeration_constant value_name, attributes[0] }
-    end
+        register_enumeration(normalize_enumeration(values))
 
-    def self.sort_by(sort_mode)
-      @sort_mode = sort_mode
-    end
+        values.each_pair do |value_name, attributes|
+          define_enumeration_constant value_name, attributes[0]
+        end
+      end
 
-    def self.list
-      sorted_map.map { |_k, v| v.first }
-    end
+      def sort_by(sort_mode)
+        @sort_mode = sort_mode
+      end
 
-    def self.enumeration
-      @@registered_enumerations[self]
-    end
+      def list
+        sorted_map.map { |_k, v| v.first }
+      end
 
-    def self.to_a
-      sorted_map.map { |_k, v| [translate(v[1]), v[0]] }
-    end
+      def enumeration
+        @registered_enumerations[self]
+      end
 
-    def self.length
-      list.length
-    end
+      def to_a
+        sorted_map.map { |_k, v| [translate(v[1]), v[0]] }
+      end
 
-    def self.each_translation
-      each_value { |value| yield t(value) }
-    end
+      def length
+        list.length
+      end
 
-    def self.translations
-      list.map { |value| t(value) }
-    end
+      def each_translation
+        each_value { |value| yield t(value) }
+      end
 
-    def self.each_value
-      list.each { |value| yield value }
-    end
+      def translations
+        list.map { |value| t(value) }
+      end
 
-    def self.to_json
-      sorted_map.map { |_k, v| { value: v[0], label: translate(v[1]) } }.to_json
-    end
+      def each_value
+        list.each { |value| yield value }
+      end
 
-    def self.t(value)
-      target = to_a.detect { |item| item[1] == value }
-      target ? target[0] : value
-    end
+      def to_json
+        sorted_map.map { |_k, v| { value: v[0], label: translate(v[1]) } }.to_json
+      end
 
-    def self.values_for(values)
-      values.map { |v| self.value_for v.to_sym }
-    end
+      def t(value)
+        target = to_a.detect { |item| item[1] == value }
+        target ? target[0] : value
+      end
 
-    def self.value_for(value)
-      self.const_get(value.to_sym)
-    rescue NameError
-      nil
-    end
+      def values_for(values)
+        values.map { |v| value_for v.to_sym }
+      end
 
-    def self.value_from_key(key)
-      return if key.nil?
-      (enumeration[key.to_sym] || []).first
-    end
+      def value_for(value)
+        const_get(value.to_sym)
+      rescue NameError
+        nil
+      end
 
-    def self.keys
-      enumeration.keys
-    end
+      def value_from_key(key)
+        return if key.nil?
+        (enumeration[key.to_sym] || []).first
+      end
 
-    def self.key_for(value)
-      enumeration.map { |e| e[0] if e[1][0] == value }.compact.first
-    end
+      def keys
+        enumeration.keys
+      end
 
-    def self.to_range
-      (list.min..list.max)
-    end
+      def key_for(value)
+        enumeration.map { |e| e[0] if e[1][0] == value }.compact.first
+      end
 
-    private
+      def to_range
+        (list.min..list.max)
+      end
 
-    def self.sorted_map
-      return enumeration if sort_mode == :none
+      def translate(value)
+        return value unless value.is_a? Symbol
 
-      enumeration.sort_by { |k, v| sort_lambda.call(k, v) }
-    end
+        default = value.to_s.tr('_', ' ').split.map(&:capitalize).join(' ')
+        I18n.t("enumerations.#{name.underscore}.#{value.to_s.underscore}", default: default)
+      end
 
-    def self.sort_lambda
-      {
-        value:       lambda { |_k, v| v[0] },
-        name:        lambda { |k, _v| k },
-        translation: lambda { |_k, v| translate(v[1]) }
-      }[sort_mode || :translation]
-    end
+      private
 
-    def self.translate(value)
-      return value unless value.is_a? Symbol
+      def sorted_map
+        return enumeration if sort_mode == :none
 
-      default = value.to_s.gsub(/_/, ' ').split.map(&:capitalize).join(' ')
-      I18n.t("enumerations.#{self.name.underscore}.#{value.to_s.underscore}", default: default)
-    end
+        enumeration.sort_by { |k, v| sort_lambda.call(k, v) }
+      end
 
-    def self.normalize_enumeration(values_hash)
-      values_hash.each_pair do |key, value|
-        values_hash[key] = [value, key] unless value.is_a? Array
+      def sort_lambda
+        {
+          value:       ->(_k, v) { v[0] },
+          name:        ->(k, _v) { k },
+          translation: ->(_k, v) { translate(v[1]) }
+        }[sort_mode || :translation]
       end
-    end
 
-    def self.register_enumeration(values_hash)
-      @@registered_enumerations[self] = values_hash
-    end
+      def normalize_enumeration(values_hash)
+        values_hash.each_pair do |key, value|
+          values_hash[key] = [value, key] unless value.is_a? Array
+        end
+      end
 
-    def self.define_enumeration_constant(name, value)
-      const_set name.to_s.gsub(/-/, '_').upcase, value
+      def register_enumeration(values_hash)
+        @registered_enumerations ||= {}
+        @registered_enumerations[self] = values_hash
+      end
+
+      def define_enumeration_constant(name, value)
+        const_set name.to_s.tr('-', '_').upcase, value
+      end
+
+      def values_hash(args)
+        return args.first if args.first.is_a?(Hash)
+
+        args.each_with_object({}) do |value, hash|
+          hash[value] = value.to_s
+          hash
+        end
+      end
     end
   end
 end