conifer 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a170b07790bedd693faf1f86de8cea5bc2b6a8b1adcaa10360816a05a00de72
-  data.tar.gz: 6d3913dae889d4543fcda4c3686d88614c5bb95bfb8704fa41e55b4bb14731e6
+  metadata.gz: 520bd98270d714e155b05def5414531da4568094fae4266bcea73327f29d8a2e
+  data.tar.gz: ffdb5f410b458f83d22dc6fbf450c46b056cd09532bf42059ab8391db4e0340c
 SHA512:
-  metadata.gz: bfef2f2a00f2a7bbebd5c805876ee51276216c37169fc5e782f78ee218013de0f76afcc68abdea9b0844989dea9d9c7c7405e22ff75749c915068f734ef9880d
-  data.tar.gz: c13bc23806654f72898a68044485f294d4116fd127abd4cddbe0c45b11c6d46c59dd6c59eb9d1d5c89575b524b262325b3e5723a05c0c20fa7c6c175f1d78459
+  metadata.gz: 9d9b2b3f1c21db80010ea8ca424b44e859da81fefddf26be66a30aa91c96fe1f1ddcc65be465160dced4978e93932978545dafc3b4efd0a8313b9ee654e53eb0
+  data.tar.gz: fc9c43b0a7f6d89881e50a5e9e10c79f3864c2c5ceee1ddc19ca6153f72be811416d695782914b0f1c5564a581f7d8893c58dc82e91386f6189bc94cb0998430

data/.github/workflows/ruby.yml

@@ -7,12 +7,18 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        ruby:
+          - 2.6.x
+          - 2.7.x
+
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Ruby 2.6
+      - name: Set up Ruby
         uses: actions/setup-ruby@v1
         with:
-          ruby-version: 2.6.x
+          ruby-version: ${{ matrix.ruby }}
       - name: Configure Bundler
         run: |
           gem install bundler -v 1.17.3 --no-document
@@ -20,7 +26,7 @@ jobs:
       - name: Run tests with RSpec
         uses: paambaati/codeclimate-action@v2.5.3
         env:
-          CC_TEST_REPORTER_ID: 0e4e712966b3d2fdf63128dc4d0c863fd4c61888b557ffb1673111b4c8b3bdc9
+          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
         with:
           coverageCommand: bundle exec rspec
           debug: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    conifer (1.1.0)
+    conifer (1.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -16,7 +16,7 @@ GEM
     parser (2.7.0.3)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rexml (3.2.4)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -56,7 +56,7 @@ DEPENDENCIES
   bundler (~> 1.17)
   climate_control (~> 0.2)
   conifer!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.80)
   rubocop-rspec (~> 1.38)

data/conifer.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'climate_control', '~> 0.2'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.80'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.38'

data/lib/conifer.rb

@@ -10,8 +10,8 @@ module Conifer
 
   # rubocop:disable Metrics/ParameterLists
   module ClassMethods
-    def conifer(name, prefix: nil, dir: nil, method: ::File.basename(name.to_s, '.yml'), singleton: false,
-                allowed_classes: [])
+    def conifer(name, prefix: nil, dir: nil, format: :yml, method: ::File.basename(name.to_s, ".#{format}"),
+                singleton: false, allowed_classes: [])
       dir ||= ::File.expand_path(::File.dirname(caller_locations.first.path))
 
       body = proc do

data/lib/conifer/file.rb

@@ -6,13 +6,15 @@ require 'erb'
 module Conifer
   class File
     NotFoundError = Class.new(StandardError)
+    UnsupportedFormatError = Class.new(StandardError)
 
-    attr_reader :name, :prefix, :dir, :allowed_classes
+    attr_reader :name, :dir, :prefix, :format, :allowed_classes
 
-    def initialize(name, dir:, prefix: nil, allowed_classes: [])
+    def initialize(name, dir:, prefix: nil, format: :yml, allowed_classes: [])
       @name = name
-      @prefix = prefix
       @dir = dir
+      @prefix = prefix
+      @format = format
       @allowed_classes = allowed_classes
     end
 
@@ -22,7 +24,14 @@ module Conifer
     end
 
     def parsed
-      @parsed ||= YAML.safe_load(ERB.new(::File.read(path)).result, allowed_classes)
+      @parsed ||= case format
+                  when :yml, :yaml
+                    YAML.safe_load(ERB.new(::File.read(path)).result, allowed_classes)
+                  when :json
+                    JSON.parse(ERB.new(::File.read(path)).result)
+                  else
+                    raise UnsupportedFormatError, "Format '#{format}' is not supported"
+                  end
     end
 
     def path
@@ -36,7 +45,7 @@ module Conifer
     end
 
     def filename
-      "#{::File.basename(name.to_s, '.yml')}.yml"
+      "#{::File.basename(name.to_s, ".#{format}")}.#{format}"
     end
 
     def validate!

data/lib/conifer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conifer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Hamed Asghari
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement