conifer 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e65067414f6a9fcaf9bde6230138b19174617dd99c94368d0bdacbfbb5b9a49f
-  data.tar.gz: 3a307793593c2d0d07de4cd8ee9decfb10d72bec471343dec51216a4b38dfa8a
+  metadata.gz: 242c45c7c55f650e17a190ab1451c4c44600d737881d8a2e37c10291c46f9e48
+  data.tar.gz: 160ef67508c13a2e05e3efc9aa4dce2dd07bfd41c16979da8c77dc6b96bac2a4
 SHA512:
-  metadata.gz: 77d67b7c3bc8a97cd4f40b55db432b499c7a496adf7638f7b1dc14f6636c4efefcbfabc73b736347e1dcb591b0579fcb6d5180b8893cc3ab2f6bde9d375ce765
-  data.tar.gz: 34ac10cf5e9c5c8d3f92ee867f8639ab54fe2e2e8944fe76c0f05a035904db60b1d3b7907dbcee74ac7b313246e4425c2355eaa1f2fa3d0ce9f44dc46ad393cd
+  metadata.gz: 4ddc85687be772047571e4c7f56a60e4b2b44f867828de6abc5e38c308467faba238b51c4a6b2d1f880dbb53d9df8938ec1714b96044026b4843d356b0be61b9
+  data.tar.gz: 2567e3a020b165acdb8479ffe2b54163c69fe231814fa89a39eddb0df08751b2d305eccd663b44df07d0220d4caa22db78a122cb4c49ef2fef53b2beb780b346

data/.github/workflows/ruby.yml

@@ -0,0 +1,20 @@
+name: Ruby
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby 2.6
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.6.x
+      - name: Build and test with RSpec
+        run: |
+          gem install bundler -v 1.17.3 --no-document
+          bundle install --jobs 4 --retry 3
+          bundle exec rspec

data/.rubocop.yml

@@ -14,3 +14,6 @@ Style/PercentLiteralDelimiters:
     '%W': '()'
     '%i': '()'
     '%I': '()'
+
+Style/NumericLiterals:
+  Enabled: false

data/Gemfile.lock

@@ -1,23 +1,12 @@
 PATH
   remote: .
   specs:
-    conifer (0.3.0)
-      activesupport (>= 5.0.0)
+    conifer (1.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.2.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
-    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    i18n (1.8.2)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -32,10 +21,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.6)
-      thread_safe (~> 0.1)
-    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby

data/conifer.gemspec

@@ -24,8 +24,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 5.0.0'
-
   spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/conifer.rb

@@ -3,19 +3,19 @@
 require 'conifer/version'
 require 'conifer/file'
 
-require 'active_support/concern'
-
 module Conifer
-  extend ActiveSupport::Concern
+  def self.included(base)
+    base.extend ClassMethods
+  end
 
-  class_methods do
-    def conifer(file, prefix: nil, dir: nil, method: ::File.basename(file.to_s, '.yml'), singleton: false)
-      directory = dir || ::File.expand_path(::File.dirname(caller_locations.first.path))
+  module ClassMethods
+    def conifer(name, prefix: nil, dir: nil, method: ::File.basename(name.to_s, '.yml'), singleton: false)
+      dir ||= ::File.expand_path(::File.dirname(caller_locations.first.path))
 
       body = proc do
         return instance_variable_get("@conifer_#{method}") if instance_variable_defined?("@conifer_#{method}")
 
-        instance_variable_set "@conifer_#{method}", Conifer::File.new(file, prefix: prefix, dir: directory)
+        instance_variable_set "@conifer_#{method}", Conifer::File.new(name, prefix: prefix, dir: dir).tap(&:validate!)
       end
 
       if singleton

data/lib/conifer/file.rb

@@ -17,33 +17,43 @@ module Conifer
 
     def [](key)
       args = key.split('.').tap { |v| v.prepend(prefix) if prefix }
-      config.dig(*args)
+      parsed.dig(*args)
     end
 
-    def as_hash
-      config
+    def parsed
+      @parsed ||= YAML.safe_load(ERB.new(::File.read(path)).result)
     end
 
-    private
+    def path
+      return @path if defined? @path
+
+      @path = find_path
+    end
+
+    def exists?
+      !path.nil?
+    end
 
-    def config
-      @config ||= YAML.safe_load(ERB.new(::File.read(path)).result)
+    def filename
+      "#{::File.basename(name.to_s, '.yml')}.yml"
     end
 
-    def path(directory = dir)
+    def validate!
+      raise NotFoundError, "Could not find file #{filename}" if path.nil?
+    end
+
+    private
+
+    def find_path(directory = dir)
       file = ::File.join(directory, filename).to_s
 
       if ::File.exist?(file)
         file
       else
-        raise NotFoundError, "Could not find file #{filename}" if directory == '/'
+        return if directory == '/'
 
-        path(::File.expand_path('..', directory))
+        find_path(::File.expand_path('..', directory))
       end
     end
-
-    def filename
-      "#{::File.basename(name.to_s, '.yml')}.yml"
-    end
   end
 end

data/lib/conifer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Conifer
-  VERSION = '0.3.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conifer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Hamed Asghari
@@ -10,20 +10,6 @@ bindir: exe
 cert_chain: []
 date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"