Merge pull request apotonick#7 from apotonick/ruby27

test ruby 2.7

Author: seuros

.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
+before_install: gem install bundler
+cache: bundler
 rvm:
-  - 2.3.1
-  - 1.9.3
-gemfile:
-  - Gemfile
-before_install:
-  - gem install bundler
+  - ruby-head
+  - 2.7
+  - 2.6
+  - 2.5
+  - 2.4
+jobs:
+  allow_failures:
+    - rvm: ruby-head

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015 Nick Sutterer
+Copyright (c) 2015-2020 Nick Sutterer
 
 MIT License
 

declarative.gemspec

@@ -12,12 +12,13 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/apotonick/declarative"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test)/})
+  end
+  spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-line"
 end

lib/declarative/deep_dup.rb

@@ -1,12 +1,19 @@
+# frozen_string_literal: true
+
 module Declarative
-  class DeepDup
+  module DeepDup
     def self.call(args)
-      return Array[*dup_items(args)] if args.is_a?(Array)
-      return ::Hash[dup_items(args)] if args.is_a?(::Hash)
-      args
+      case args
+      when Array
+        Array[*dup_items(args)]
+      when ::Hash
+        ::Hash[dup_items(args)]
+      else
+        args
+
+      end
     end
 
-  private
     def self.dup_items(arr)
       arr.to_a.collect { |v| call(v) }
     end

lib/declarative/defaults.rb

@@ -22,7 +22,7 @@ def call(name, given_options)
       evaluated_options = @dynamic_options.(name, given_options)
 
       options = Variables.merge( @static_options, handle_array_and_deprecate(evaluated_options) )
-      options = Variables.merge( options, handle_array_and_deprecate(given_options) ) # FIXME: given_options is not tested!
+      Variables.merge( options, handle_array_and_deprecate(given_options) ) # FIXME: given_options is not tested!
     end
 
     def handle_array_and_deprecate(variables)

lib/declarative/definitions.rb

@@ -1,7 +1,7 @@
 module Declarative
   class Definitions < ::Hash
     class Definition
-      def initialize(name, options={}, &block)
+      def initialize(name, options={})
         @options = options.dup
         @options[:name] = name.to_s
       end
@@ -40,7 +40,7 @@ def add(name, options={}, &block)
       options = options[:_defaults].(name, options) if options[:_defaults] # FIXME: pipeline?
       base    = options[:_base]
 
-      if options.delete(:inherit) and parent_property = get(name)
+      if options.delete(:inherit) and (parent_property = get(name))
         base    = parent_property[:nested]
         options = parent_property.merge(options) # TODO: Definition#merge
       end

lib/declarative/heritage.rb

@@ -13,13 +13,6 @@ def call(inheritor, &block)
       each { |cfg| call!(inheritor, cfg, &block) }
     end
 
-  private
-    def call!(inheritor, cfg)
-      yield cfg if block_given? # allow messing around with recorded arguments.
-
-      inheritor.send(cfg[:method], *cfg[:args], &cfg[:block])
-    end
-
     module DSL
       def heritage
         @heritage ||= Heritage.new
@@ -41,5 +34,12 @@ def included(mod)
         heritage.(mod)
       end
     end
+
+  private
+    def call!(inheritor, cfg)
+      yield cfg if block_given? # allow messing around with recorded arguments.
+
+      inheritor.send(cfg[:method], *cfg[:args], &cfg[:block])
+    end
   end
 end

lib/declarative/schema.rb

@@ -45,9 +45,10 @@ def definition_class # TODO: test me.
 
     private
       def build_definition(name, options={}, &block)
-        default_options = {}
-        default_options[:_base]           = default_nested_class
-        default_options[:_defaults]       = _defaults
+        default_options = {
+            _base: default_nested_class,
+            _defaults: _defaults
+        }
         default_options[:_nested_builder] = nested_builder if block
 
         # options = options.merge( Defaults.wrap_arrays(options) )

lib/declarative/testing.rb

@@ -1,22 +1,24 @@
+# frozen_string_literal: true
+
 module Declarative
   def self.Inspect(obj)
     string = obj.inspect
 
     if obj.is_a?(Proc)
-      elements = string.split("/")
+      elements = string.split('/')
       string = "#{elements.first}#{elements.last}"
     end
-    string.gsub(/0x\w+/, "")
+    string.gsub(/0x\w+/, '')
   end
 
   module Inspect
     def inspect
       string = super
       if is_a?(Proc)
-        elements = string.split("/")
+        elements = string.split('/')
         string = "#{elements.first}#{elements.last}"
       end
-      string.gsub(/0x\w+/, "")
+      string.gsub(/0x\w+/, '')
     end
 
     module Schema
@@ -29,15 +31,15 @@ def inspect
 
   module Definitions::Inspect
     def inspect
-      each { |dfn|
+      each do |dfn|
         dfn.extend(Declarative::Inspect)
 
-        if dfn[:nested] && dfn[:nested].is_a?(Declarative::Schema::DSL)
+        if dfn[:nested]&.is_a?(Declarative::Schema::DSL)
           dfn[:nested].extend(Declarative::Inspect::Schema)
         else
-          dfn[:nested].extend(Declarative::Definitions::Inspect) if dfn[:nested]
+          dfn[:nested]&.extend(Declarative::Definitions::Inspect)
         end
-      }
+      end
       super
     end
 

lib/declarative/version.rb

@@ -1,3 +1,3 @@
 module Declarative
-  VERSION = "0.0.10"
+  VERSION = "0.0.20"
 end