enum_from_file 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea76f67ea1318023b84e54b22e344e6efa214524bde46bc929dd8e02b5003783
-  data.tar.gz: b9640350d7207500b1634c0c172e5bf724b415298cf7dfe6744e012acf7ff3f3
+  metadata.gz: d0627a56758f812b87ea4fd6322f74b153b9c51f7d60e8a629a2eaddbafb8bfb
+  data.tar.gz: 55b2bdb4b59e98a03835a394c4cc21e2a70f1fdab67b9ba01f66ea775d45e922
 SHA512:
-  metadata.gz: 60b23f83a28e3d9acc095c49e8d55d9be4b4cecbf347f92e768e5dde36affbf6be70ea8319596a03eb5a56fb33ee77688e713aebc5968a59f9be745bdb321ff5
-  data.tar.gz: f3384394473e2647b373311eb695a2ebcb80cc4c5c7ad9c078674a4400cfa389f52534f005ec834ac15590c64d4d4a4ab1766ab68871deff9de4032683310331
+  metadata.gz: 7a1001bd834c85335d87be800c0ebd07c0489d71eb60f824279e3d7e791d2127706c41f641c790b3b334196dc459b4b94aa39cd9b3587af6849332d3d5ad30cd
+  data.tar.gz: a4a7024f4d05f2cfd6fa191549c8ae0ea5c34a5829b12732f9b4ce948225c10b0d7291047e5ea7ef3913d6532bed6fe8e87a48617c80c6d72bb49485d608dc6c

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://semaphoreci.com/api/v1/andrewr224/enum-from-file/branches/master/badge.svg)](https://semaphoreci.com/andrewr224/enum-from-file)
 
-If you've ever found yourself in a situation where you feel like you should use enum, but it has 50 potions so you don't know where to put it, the answer is here!
+If you've ever found yourself in a situation where you feel like you should use enum, but it has 50 positions so you don't know where to put it, the answer is here!
 
 Just store your enums in a .yml file!
 
@@ -10,12 +10,11 @@ This makes little sense when you have a small enum with just a couple of options
 
 ## Usage
 1. Create a folder `/config/enums` to store your enum files in .yml format.
-2. Add `include EnumFromFile` to the `ApplicationRecord` or your target model.
-3. Make sure your enum column has a type `string`.
+2. Make sure your enum column has a type `string`.
 
 Et voila!
 
-Given a file `/config/enums/eye_colors.yml` you add eye_color enum to a Cat model with the following line:
+Given a file `/config/enums/eye_colors.yml` you can add eye_color enum to a Cat model with the following line:
 ```ruby
 enum :eye_color, from_file: :eye_colors
 ```
@@ -25,7 +24,23 @@ You can continue using regular syntax for regular cases:
 enum status: { active: active, archived: archived }
 ```
 
-All the options will be passed to native enum implementation as expected.
+**All the options will be passed to native enum implementation as expected.**
+
+
+You can structure your .yml file either as a hash
+```
+blue:   blue
+copper: copper
+yellow: yellow
+```
+Or as a list
+```
+gold
+orange
+green
+red
+```
+The list will be converted automatically, so both structures yield the same result.
 
 ## Installation
 Add this line to your application's Gemfile:

data/lib/enum_from_file/core_ext.rb

@@ -18,7 +18,7 @@ module EnumFromFile
       private
 
       def enum_from_file(file:)
-        EnumFromFile::Storage.instance.send(file)
+        EnumFromFile::Storage.instance.values_from(file: file)
       end
     end
   end

data/lib/enum_from_file/storage.rb

@@ -8,6 +8,12 @@ module EnumFromFile
       enum_files.each(&method(:define_enum))
     end
 
+    def values_from(file:)
+      send(file)
+    rescue NoMethodError
+      raise StandardError, "Cannot read 'config/enums/#{method_name}.yml'"
+    end
+
     private
 
     def enum_files
@@ -24,12 +30,20 @@ module EnumFromFile
     def define_enum(file)
       define_singleton_method File.basename(file.path, ".yml") do
         instance_variable_get(instance_name(file)) ||
-          instance_variable_set(instance_name(file), YAML.safe_load(file))
+          instance_variable_set(instance_name(file), instance_value(file))
       end
     end
 
     def instance_name(file)
       "@#{File.basename(file.path, '.yml').to_sym}"
     end
+
+    def instance_value(file)
+      values = YAML.safe_load(file)
+
+      return values.to_h unless values.is_a?(String)
+
+      Hash[values.split.map { |val| [val.to_sym, val.to_sym] }]
+    end
   end
 end

data/lib/enum_from_file/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EnumFromFile
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/enum_from_file.rb

@@ -3,10 +3,6 @@
 require "enum_from_file/railtie"
 require "enum_from_file/core_ext"
 
-module EnumFromFile
-  extend ActiveSupport::Concern
-
-  included do
-    include EnumFromFile::CoreExt
-  end
+class ActiveRecord::Base
+  include EnumFromFile::CoreExt
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enum_from_file
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - andrew_r
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails