nd-enum 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c3a846e4f2d4625cfa4defce4320e1b6a66d2328a5bab3aad579fee30bddd2f
-  data.tar.gz: b872195ecf8bfaf2d381cf8eb07647c1317d71b7fd49a7044bcd8e8256f8b98a
+  metadata.gz: e8c39fe2ee839c606ce8bba0ed32181fff0ab45b39d091f6d5f4070d560eff9e
+  data.tar.gz: 190d2bd1a22ed5b7551b91a1ffe086e8f80d2010228cc568c86d1dc8b7d99fab
 SHA512:
-  metadata.gz: bab3df4478ed3eda30c254a380c69d29c690abbc371e03fc923c353fb90e5c3259aef0839cde49402a9961d6da8035006356195df81a7b9cc43f9f5d626b5019
-  data.tar.gz: d772f43733c33204c0acaafb9d0d38c797cebb603efc4ae311990f8afac2eb15a4538ade187b5f4df8dc489cf6e7ddd54548a0ef021663ad735f619cc37d1006
+  metadata.gz: f4adb87f1df4b296625c32c3eedaef521bc5fccf8de94ef8bf77644be19324e5395cbed035cb96bd023a8555c30ca7843a802c2289f553ef310f5fb2f9e788a3
+  data.tar.gz: 8df576525c8d46cdb705e7ade16a4158e0d0387baaf7429239fc9e74e7ddb6dd6878787d77dde8fa0f8a8d3c61b55d58e64aea82cd6994d447c30568336e5884

data/.rspec

@@ -1,3 +1,6 @@
 --format documentation
 --color
 --require spec_helper
+--require mocha
+--require active_record
+--require pry

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.1.2] - 2022-08-08
+
+- Add specs
+
+## [0.1.1] - 2022-08-07
+
+- Fix bugs
+
 ## [0.1.0] - 2022-08-07
 
 - Initial release

data/Gemfile

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in nd-enum.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
-
-gem "rspec", "~> 3.0"
+gem 'rake',        '~> 13.0'
+gem 'rspec',       '~> 3.0'
+gem 'mocha',       '~> 1.13'
+gem 'pry',         '~> 0.13'
+gem 'guard',       '~> 2.18'
+gem 'guard-rspec', '~> 4.7', require: false

data/Gemfile.lock

@@ -1,13 +1,62 @@
 PATH
   remote: .
   specs:
-    nd-enum (0.1.0)
+    nd-enum (0.1.1)
+      activerecord (>= 6.0.0)
+      activesupport (>= 6.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activesupport (7.0.3.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
+    guard (2.18.0)
+      formatador (>= 0.2.4)
+      listen (>= 2.7, < 4.0)
+      lumberjack (>= 1.0.12, < 2.0)
+      nenv (~> 0.1)
+      notiffany (~> 0.0)
+      pry (>= 0.13.0)
+      shellany (~> 0.0)
+      thor (>= 0.18.1)
+    guard-compat (1.2.1)
+    guard-rspec (4.7.3)
+      guard (~> 2.1)
+      guard-compat (~> 1.1)
+      rspec (>= 2.99.0, < 4.0)
+    i18n (1.12.0)
+      concurrent-ruby (~> 1.0)
+    listen (3.7.1)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    minitest (5.16.2)
+    mocha (1.14.0)
+    nenv (0.3.0)
+    notiffany (0.1.3)
+      nenv (~> 0.1)
+      shellany (~> 0.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rake (13.0.6)
+    rb-fsevent (0.11.1)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -21,12 +70,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
+    shellany (0.0.1)
+    thor (1.2.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
 
 PLATFORMS
   x86_64-darwin-21
 
 DEPENDENCIES
+  guard (~> 2.18)
+  guard-rspec (~> 4.7)
+  mocha (~> 1.13)
   nd-enum!
+  pry (~> 0.13)
   rake (~> 13.0)
   rspec (~> 3.0)
 

data/Guardfile

@@ -0,0 +1,70 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist")}
+
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+  # Rails files
+  rails = dsl.rails(view_extensions: %w(erb haml slim))
+  dsl.watch_spec_files_for(rails.app_files)
+  dsl.watch_spec_files_for(rails.views)
+
+  watch(rails.controllers) do |m|
+    [
+      rspec.spec.call("routing/#{m[1]}_routing"),
+      rspec.spec.call("controllers/#{m[1]}_controller"),
+      rspec.spec.call("acceptance/#{m[1]}")
+    ]
+  end
+
+  # Rails config changes
+  watch(rails.spec_helper)     { rspec.spec_dir }
+  watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
+  watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
+
+  # Capybara features specs
+  watch(rails.view_dirs)     { |m| rspec.spec.call("features/#{m[1]}") }
+  watch(rails.layouts)       { |m| rspec.spec.call("features/#{m[1]}") }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$}) do |m|
+    Dir[File.join("**/#{m[1]}.feature")][0] || "spec/acceptance"
+  end
+end

data/lib/nd/enum/base.rb

@@ -1,50 +1,35 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+require 'active_support'
+
 module ND
-  module Base
-    extend ActiveSupport::Concern
+  module Enum
+    module Base
+      extend ActiveSupport::Concern
 
-    included do
-      class << self
-        include Enumerable
-        extend Forwardable
+      included do
+        class << self
+          include Enumerable
+          extend Forwardable
 
-        def_delegators :all, :size, :length, :[], :empty?, :last, :index
+          def_delegators :all, :size, :length, :[], :empty?, :last, :index
 
-        def each(&block)
-          all.each(&block)
-        end
+          def each(&block)
+            all.each(&block)
+          end
 
-        def to_h
-          all.map { |value| [value.to_sym, value] }.to_h
-        end
+          def to_h
+            all.map { |value| [value.to_sym, value] }.to_h
+          end
 
-        def [](value)
-          value.is_a?(Integer) ? all[value] : to_h[value.to_sym]
-        end
+          def [](value)
+            value.is_a?(Integer) ? all[value] : to_h[value.to_sym]
+          end
 
-        # TODO: Warning if not defined
-        # `t(:foo)`
-        # fr:
-        #   table_name:
-        #     attribute:
-        #       base:
-        #         foo: Foo
-        #
-        # or
-        #
-        # `t(:foo, :scope_a)`
-        # fr:
-        #   table_name:
-        #     attribute:
-        #       base:
-        #         foo: Foo
-        #       scope_a:
-        #         foo: Foo A
-        #       scope_b:
-        #         foo: Foo B
-        def t(value, scope = :base)
-          I18n.t(value, scope: "#{model.table_name}.#{attribute}.#{scope}")
+          def t(value, scope = :base)
+            I18n.t(value, scope: "#{model.table_name}.#{attribute}.#{scope}")
+          end
         end
       end
     end

data/lib/nd/enum/version.rb

@@ -2,6 +2,6 @@
 
 module ND
   module Enum
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/lib/nd/enum.rb

@@ -1,27 +1,38 @@
 # frozen_string_literal: true
 
+require 'active_record'
+require 'active_record/enum.rb'
+
+require 'active_support'
+require 'active_support/core_ext/string/inflections.rb'
+
 require_relative 'enum/version'
+require_relative 'enum/base'
 
 module ND
   module Enum
-    class << self
-      def nd_enum(db: false, i18n: {}, **configuration)
-        set_options(binding)
-        enum_module = define_module(@options)
+    extend ActiveSupport::Concern
 
-        define_db_enum(db, enum_module) if @options[:db]
+    included do
+      def self.nd_enum(db: false, i18n: {}, **configuration)
+        options = ND::Enum.set_options(binding, self)
+        enum_module = ND::Enum.define_module(options)
 
-        const_set(@options[:attribute].to_s.camelize, enum_module)
-      end
+        ND::Enum.define_db_enum(options, enum_module) if options[:db]
 
-      private
+        const_set(options[:attribute].to_s.camelize, enum_module)
+      end
+    end
 
-      def set_options(caller_binding)
-        @options = method(:nd_enum).parameters.each_with_object({}) do |(_, name), options|
+    class << self
+      def set_options(caller_binding, caller_class)
+        options = caller_class.method(:nd_enum).parameters.each_with_object({}) do |(_, name), options|
           options[name.to_sym] = caller_binding.local_variable_get(name)
         end
-        @options[:attribute], @options[:values] = @options.delete(:configuration).to_a.first
-        @options[:model] = self
+        options[:attribute], options[:values] = options.delete(:configuration).to_a.first
+        options[:model] = caller_class
+
+        options
       end
 
       def define_module(options)
@@ -30,7 +41,7 @@ module ND
 
           # Public methods
 
-          define_singleton_method(:all)     { options[:values] }
+          define_singleton_method(:all) { options[:values] }
 
           # Private methods
 
@@ -52,9 +63,13 @@ module ND
       end
 
       def define_db_enum(options, enum_module)
-        options = options.is_a?(Hash) ? options : {}
-        enum(@attribute => enum_module.to_h, **options)
+        enum_options = options[:db].is_a?(Hash) ? options[:db] : {}
+        options[:model].enum(options[:attribute] => enum_module.to_h, **enum_options)
       end
     end
   end
 end
+
+class ActiveRecord::Base
+  include ND::Enum
+end

data/nd-enum.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   # Uncomment to register a new dependency of your gem
-  # spec.add_dependency 'example-gem', '~> 1.0'
+  spec.add_dependency 'activesupport', '>= 6.0.0'
+  spec.add_dependency 'activerecord',  '>= 6.0.0'
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nd-enum
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Romain Clavel
@@ -9,7 +9,35 @@ autorequire:
 bindir: exe
 cert_chain: []
 date: 2022-08-08 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 description:
 email:
 - romain@clavel.io
@@ -21,6 +49,7 @@ files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile