self_data 1.0.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c8962303f898d24eda050395bd35c083e49398da
-  data.tar.gz: a374856a6e86a6b75f41d94d98fe22a665b2f912
+SHA256:
+  metadata.gz: b79811eeab45fe00ca77ccf2829d2f95a3fb870bab871f3f67ce359d206b42c3
+  data.tar.gz: 402041e352b55e2c165d2753ae162d5892182624cbf5d49c545201abe5b964d2
 SHA512:
-  metadata.gz: 401be953df4e180a387f1e2c35cbe4b7a706ddfde483ec91ec56a9dcb1b8d43625ff3547dffcdee396318c6fe4fd33c7adbbeeec3392d9ff7e1a21c1ae61eedc
-  data.tar.gz: eb071a1c1c2f3b5fe5f5039a3fc694cbf09326dd5fe3223e1acb2fe80e4556a3cb6b43db8e2d9a305da819fbb9a3c0eaedc14fb6fdc41f8a04ed5189c9ec8a9a
+  metadata.gz: 1ef0ffbbfe322e6318141e0e3c08bab970ecc310c494e57b79557d2e803c91ac5e44d156c2e84661d84ce819d0f45ae4870a891c8e6a9b3fd67f5b36ac8e9dc3
+  data.tar.gz: 2c3622cb728c06b46721a8e748df2482197a3301aa9221510fa4591229703712bf0e5e39aeac6e0cfd57b91055d906478f54ffe5d1ecaead4b3657b8045d8461

data/.github/workflows/ci.yml

@@ -0,0 +1,28 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    # We want to run on external PRs, but not on our own internal PRs as they'll be run on push event
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'umbrellio/self_data'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.6", "2.7", "3.0", "3.1"]
+
+    name: ${{ matrix.ruby }}
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+
+    - run: bundle exec rspec
+    - run: bundle exec rubocop

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rspec

@@ -1,2 +1,3 @@
 --color
+--format=progress
 --require spec_helper

data/.rubocop.yml

@@ -1,16 +1,6 @@
-Metrics/LineLength:
-  Max: 100
-  Exclude:
-    - 'self_data.gemspec'
+inherit_gem:
+  rubocop-config-umbrellio: lib/rubocop.yml
 
-Style/Documentation:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
-Style/AndOr:
-  EnforcedStyle: conditionals
+AllCops:
+  DisplayCopNames: true
+  TargetRubyVersion: 2.6

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Changelog
+
+## [1.3.0] - 2022-01-13
+
+- Drop Ruby 2.5 support.
+- Use `YAML.unsafe_load` if available.

data/Gemfile

@@ -1,4 +1,8 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in self_data.gemspec
 gemspec
+
+gem "activesupport", "~> 6.0" # AS 7 requires ruby > 2.7

data/Gemfile.lock

@@ -0,0 +1,123 @@
+PATH
+  remote: .
+  specs:
+    self_data (1.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.1.4.4)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    coveralls (0.7.2)
+      multi_json (~> 1.3)
+      rest-client (= 1.6.7)
+      simplecov (>= 0.7)
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    minitest (5.15.0)
+    multi_json (1.15.0)
+    parallel (1.21.0)
+    parser (3.1.0.0)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.24.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.15.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.1)
+      parser (>= 3.0.1.1)
+    rubocop-config-umbrellio (1.24.0.56)
+      rubocop (= 1.24.0)
+      rubocop-performance (= 1.13.0)
+      rubocop-rails (= 2.13.0)
+      rubocop-rake (= 0.6.0)
+      rubocop-rspec (= 2.7.0)
+      rubocop-sequel (= 0.3.3)
+    rubocop-performance (1.13.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.13.0)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.7.0)
+      rubocop (~> 1.19)
+    rubocop-sequel (0.3.3)
+      rubocop (~> 1.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
+    thor (0.18.1)
+    tins (0.13.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.3)
+
+PLATFORMS
+  arm64-darwin-21
+  x86_64-linux
+
+DEPENDENCIES
+  activesupport (~> 6.0)
+  bundler
+  coveralls
+  pry
+  rake
+  rspec
+  rubocop-config-umbrellio
+  self_data!
+  simplecov
+
+BUNDLED WITH
+   2.3.5

data/README.md

@@ -1,8 +1,26 @@
-# SelfData
+# SelfData · [![Gem Version](https://badge.fury.io/rb/self_data.svg)](https://badge.fury.io/rb/self_data) [![Build Status](https://travis-ci.org/umbrellio/self_data.svg?branch=master)](https://travis-ci.org/umbrellio/self_data) [![Coverage Status](https://coveralls.io/repos/github/umbrellio/self_data/badge.svg)](https://coveralls.io/github/umbrellio/self_data)
 
-It's like native ruby DATA but you can use it not only for main file.
+It's like native ruby `DATA` but you can use it not only for main file.
+
+## Installation
+
+```ruby
+# Gemfile
+gem 'self_data'
+```
+
+```shell
+$ bundle install
+-- or --
+$ gem install self_data
+```
+
+```ruby
+require 'self_data'
+```
+
+## Synopsis
 
-For example:
 ```ruby
 # main.rb
 
@@ -36,16 +54,33 @@ a.rb data
 ```
 
 and if you execute it, you'll get:
-```
+
+```shell
 $ ruby main.rb
 DATA: main.rb data
 SelfData: a.rb data
 ```
 
-# Usage
+## Usage and Notes
+
 Use `SelfData.read()` to get text or use `SelfData.load(*formats, **options)` to get formatted data (like yaml, xml, erb, etc).
 
 Look at the [lib/self_data/config.rb](https://github.com/umbrellio/self_data/blob/master/lib/self_data/config.rb) for more details.
 
-# Note
-SelfData use caller, it's not fast, that is why you shouldn't use SelfData in loops.
+SelfData uses `caller`, it's not fast, that's why you shouldn't use SelfData in loops.
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/umbrellio/self_data.
+
+## License
+
+Released under MIT License.
+
+## Authors
+
+Created by [7dr1v3](https://github.com/7dr1v3)
+
+<a href="https://github.com/umbrellio/">
+<img style="float: left;" src="https://umbrellio.github.io/Umbrellio/supported_by_umbrellio.svg" alt="Supported by Umbrellio" width="439" height="72">
+</a>

data/Rakefile

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"

data/bin/console

@@ -2,13 +2,5 @@
 
 require "bundler/setup"
 require "self_data"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+require "pry"
+Pry.start

data/bin/rubocop

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rubocop", "rubocop")

data/lib/self_data/config.rb

@@ -1,7 +1,15 @@
+# frozen_string_literal: true
+
+require "erb"
+require "yaml"
+require "json"
+
 SelfData.default_formats = [:erb, :yaml]
 SelfData.default_options = {}
-SelfData.filters = []
 
-SelfData.add_converter :erb, ->(data, options) { ERB.new(data).result(options[:context]) }
-SelfData.add_converter :yaml, ->(data, _options) { YAML.load(data) }
-SelfData.add_converter :json, ->(data, _options) { JSON.parse(data) }
+SelfData.add_converter :erb, -> (data, options) { ERB.new(data).result(options[:context]) }
+SelfData.add_converter :json, -> (data, _options) { JSON.parse(data) }
+
+SelfData.add_converter :yaml do |data, _options|
+  YAML.respond_to?(:unsafe_load) ? YAML.unsafe_load(data) : YAML.load(data)
+end

data/lib/self_data/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SelfData
   Error = Class.new(StandardError)
 

data/lib/self_data/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SelfData
-  VERSION = "1.0.0"
+  VERSION = "1.3.0"
 end

data/lib/self_data.rb

@@ -1,21 +1,31 @@
-require "yaml"
-require "json"
-require "active_support/core_ext/module/delegation.rb"
-require "active_support/core_ext/class/attribute.rb"
+# frozen_string_literal: true
 
 class SelfData
-  class_attribute :default_formats, :default_options, :filters, :converters
-
   class << self
-    delegate :read, :load, to: :new
+    attr_accessor :default_formats, :default_options
+
+    def read(*args, **kargs)
+      new.read(*args, **kargs)
+    end
+
+    def load(*args, **kargs)
+      new.load(*args, **kargs)
+    end
+
+    def filters
+      @filters ||= []
+    end
 
     def add_filter(&block)
       filters << block
     end
 
-    def add_converter(name, block)
-      self.converters ||= {}
-      self.converters[name] = block
+    def converters
+      @converters ||= {}
+    end
+
+    def add_converter(name, proc = nil, &block)
+      converters[name] = proc || block
     end
   end
 
@@ -26,33 +36,33 @@ class SelfData
   end
 
   def load(*formats, **options)
-    formats = default_formats if formats.empty?
-    options = default_options if options.empty?
+    formats = self.class.default_formats if formats.empty?
+    options = self.class.default_options if options.empty?
 
     formats.reduce(read) do |data, format|
-      fail ConverterNotFound, format unless converters[format]
+      raise ConverterNotFound, format unless self.class.converters[format]
       begin
-        converters[format].call(data, options)
-      rescue => e
-        raise ConversionError.new(format, e)
+        self.class.converters[format].call(data, options)
+      rescue => error
+        raise ConversionError.new(format, error)
       end
     end
   end
 
   def read
-    IO.read(file).scan(/\n__END__\n(.*)/m).flatten.first or fail NoDataFound, file
+    File.read(file).scan(/\n__END__\n(.*)/m).flatten.first or raise NoDataFound, file
   end
 
   private
 
   def caller_file
     calls = caller.lazy
-      .map { |call_string| call_string.split(':').first }
-      .select { |file| file != __FILE__ }
-      .select(&File.method(:exist?))
+      .map { |call_string| call_string.split(":").first }
+      .reject { |file| file == __FILE__ }
+      .select { |x| File.exist?(x) }
 
-    filters.each do |filter|
-      calls = calls.select(&filter.method(:call))
+    self.class.filters.each do |filter|
+      calls = calls.select { |x| filter.call(x) }
     end
 
     calls.first

data/self_data.gemspec

@@ -1,29 +1,35 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'self_data/version'
+require "self_data/version"
+
+files_regexp = %r{^(test|spec|features)/}
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = ">= 2.6.0"
+
   spec.name          = "self_data"
   spec.version       = SelfData::VERSION
   spec.authors       = ["Umbrellio"]
   spec.email         = ["info@umbrellio.biz"]
 
-  spec.summary       = ""
+  spec.summary       = "It's like DATA but better"
   spec.description   = "It's like DATA but better"
   spec.homepage      = "https://github.com/umbrellio/self_data"
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(files_regexp) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.metadata      = { "rubygems_mfa_required" => "false" }
 
-  spec.add_runtime_dependency "activesupport", ">= 3.0"
-
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.4"
-  spec.add_development_dependency "rubocop", "~> 0.35"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop-config-umbrellio"
+  spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,87 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: self_data
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Umbrellio
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-06-09 00:00:00.000000000 Z
+date: 2022-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-config-umbrellio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,16 +115,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/rspec
+- bin/rubocop
 - bin/setup
 - lib/self_data.rb
 - lib/self_data/config.rb
@@ -120,8 +137,9 @@ files:
 homepage: https://github.com/umbrellio/self_data
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'false'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,17 +147,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.3.5
+signing_key:
 specification_version: 4
-summary: ''
+summary: It's like DATA but better
 test_files: []
-has_rdoc: 

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.3
-before_install: gem install bundler -v 1.10.6