representable 3.0.4 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 04ca3309b8af78dd1eaa8b4d47c457323180a881
-  data.tar.gz: c7d43dc372fc53576a6b64f22d3fc0bd1bff5a4e
+SHA256:
+  metadata.gz: f3a1388b7570e31d62c555a87d6165793e9d095cf1bed18c04cb8cbe86bc2ba2
+  data.tar.gz: 43e418db52478d3d4fc33f505ce86d840fcb666a8abc83e20269bbfab4c53a3a
 SHA512:
-  metadata.gz: 528696ff8d8eae7b409566d9831a0117a90a361fdabe5a0345d0e5accac5cfbb2f3bfae5a34589000b5bdbf2632f7951356861215d210172c602b581694e68dc
-  data.tar.gz: 4d7409a62a9a25d31fc1c67d20e2b32b9cd0a1d8e9987b2cbe118bd4e069fe271dd82127f3e7656b92f01e8f1266524965def4089e439b4a1eac370e13a06bff
+  metadata.gz: 39e957975d24f76894ef9a7186fff69155525e5f777c120a77e2ecee8a7dcdccee62b2140ed8ab34ebc9de916a9098d9da846e0befda2c90fa32e4a9ff470ecc
+  data.tar.gz: cf309756f2470854283c09bbca25b3200b26ba1702b75e533573382dabd2f33a6f3eeaee963c2cc2bb0ddb9d3bdf026bf7dacba6da3f22f44dc805bc8d1ca505

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6, 2.7, '3.0', "3.1"]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/CHANGES.md

@@ -1,3 +1,17 @@
+# 3.2.0
+* Drop support for Virtus Coercion
+* Fix deprecation warning with Nokogiri 1.13.0
+
+# 3.1.1
+
+* Upgrade `trailblazer-option` to `0.1.1` which supports passing an empty `keyword_arguments`.
+
+# 3.1.0
+* Remove circular require
+* Use Dry-types 1.0.0+ as coercion library
+* Renamed Coercion to VirtusCoercion to support old codebases
+* Replace `declarative-option` with [`trailblazer-option`](https://github.com/trailblazer/trailblazer-option)
+
 # 3.0.4
 
 * Add proper XML namespace support.

data/Gemfile

@@ -1,14 +1,11 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
 group :test do
-  gem 'nokogiri', '~> 1.6.8', require: false
-  gem "multi_json", require: false
   gem "minitest-line"
+  gem "multi_json", require: false
+  gem "nokogiri", require: false
 end
+gem 'pry-byebug'
 
-# gem "declarative", path: "../declarative"
-# gem "declarative", github: "apotonick/declarative"
-
-# gem "uber","0.0.15" #, path: "../uber"

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 - 2013 Nick Sutterer and the roar contributors
+Copyright (c) 2011 - 2021 Nick Sutterer and the roar contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -2,20 +2,19 @@
 
 Representable maps Ruby objects to documents and back.
 
-[![Gitter Chat](https://badges.gitter.im/trailblazer/chat.svg)](https://gitter.im/trailblazer/chat)
-[![TRB Newsletter](https://img.shields.io/badge/TRB-newsletter-lightgrey.svg)](http://trailblazer.to/newsletter/)
-[![Build
-Status](https://travis-ci.org/trailblazer/representable.svg)](https://travis-ci.org/trailblazer/representable)
+![Build
+Status](https://github.com/trailblazer/representable/actions/workflows/ci.yml/badge.svg?branch=master)
 [![Gem Version](https://badge.fury.io/rb/representable.svg)](http://badge.fury.io/rb/representable)
 
+
 In other words: Take an object and decorate it with a representer module. This will allow you to render a JSON, XML or YAML document from that object. But that's only half of it! You can also use representers to parse a document and create or populate an object.
 
-Representable is helpful for all kind of mappings, rendering and parsing workflows. However, it is mostly useful in API code. Are you planning to write a real REST API with representable? Then check out the [Roar](http://github.com/apotonick/roar) gem first, save work and time and make the world a better place instead.
+Representable is helpful for all kind of mappings, rendering and parsing workflows. However, it is mostly useful in API code. Are you planning to write a real REST API with representable? Then check out the [Roar](https://github.com/trailblazer/roar) gem first, save work and time and make the world a better place instead.
 
 
 ## Full Documentation
 
-Representable comes with a rich set of options and semantics for parsing and rendering documents. Its [full documentation](http://trailblazer.to/gems/representable/3.0/api.html) can be found on the Trailblazer site.
+Representable comes with a rich set of options and semantics for parsing and rendering documents. Its [full documentation](https://trailblazer.to/2.1/docs/representable.html) can be found on the Trailblazer site.
 
 ## Example
 
@@ -64,7 +63,7 @@ song = SongRepresenter.new(song).from_json(%{ {"title":"Roxanne"} })
 #=> #<Song title="Roxanne", track=nil>
 ```
 
-Note that parsing hashes per default does [require string keys](http://trailblazer.to/gems/representable/3.0/api.html#symbol-keys) and does _not_ pick up symbol keys.
+Note that parsing hashes per default does [require string keys](https://trailblazer.to/2.1/docs/representable.html#representable-api-symbol-keys) and does _not_ pick up symbol keys.
 
 
 ## Collections
@@ -130,19 +129,20 @@ class AlbumRepresenter < Representable::Decorator
     property :track
     collection :composers
   end
+end
 ```
 
 ## More
 
 Representable has many more features and can literally parse and render any kind of document to an arbitrary Ruby object graph.
 
-Please check the [official documentation for more](http://trailblazer.to/gems/representable/).
+Please check the [official documentation for more](https://trailblazer.to/2.1/docs/representable.html#representable-api).
 
 
 ## Installation
 
-The representable gem runs with all Ruby versions >= 1.9.3.
-
+The representable gem runs with all Ruby versions >= 2.4.0.
+t
 ```ruby
 gem 'representable'
 ```
@@ -168,7 +168,7 @@ gem 'nokogiri'
 
 Representable started as a heavily simplified fork of the ROXML gem. Big thanks to Ben Woosley for his extremely inspiring work.
 
-* Copyright (c) 2011-2016 Nick Sutterer <apotonick@gmail.com>
+* Copyright (c) 2011-2020 Nick Sutterer <apotonick@gmail.com>
 * ROXML is Copyright (c) 2004-2009 Ben Woosley, Zak Mandhro and Anders Engstrom.
 
-Representable is released under the [MIT License](http://www.opensource.org/licenses/MIT).
+Representable is released under the [MIT License](https://www.opensource.org/licenses/MIT).

data/Rakefile

@@ -1,3 +1,4 @@
+require "bundler/gem_tasks"
 require 'bundler/setup'
 require 'rake/testtask'
 
@@ -9,9 +10,3 @@ Rake::TestTask.new(:test) do |test|
   test.test_files = FileList['test/**/*_test.rb']
   test.verbose = true
 end
-
-Rake::TestTask.new(:dtest) do |test|
-  test.libs << 'test-with-deprecations'
-  test.test_files = FileList['test-with-deprecations/**/*_test.rb']
-  test.verbose = true
-end

data/lib/representable/binding.rb

@@ -1,8 +1,26 @@
+# frozen_string_literal: true
+
+require 'uber/delegates'
+
 module Representable
   # The Binding provides methods to read/write the fragment for one property.
   #
   # Actually parsing the fragment from the document happens in Binding#read, everything after that is generic.
   class Binding
+    class Map < Array
+      def call(method, options)
+        each do |bin|
+          options[:binding] = bin # this is so much faster than options.merge().
+          bin.send(method, options)
+        end
+      end
+
+      # TODO: Merge with Definitions.
+      def <<(binding) # can be slow. this is compile time code.
+        (existing = find { |bin| bin.name == binding.name }) ? self[index(existing)] = binding : super(binding)
+      end
+    end
+
     class FragmentNotFound
     end
 
@@ -29,12 +47,12 @@ module Representable
     module Deprecatable
       # Retrieve value and write fragment to the doc.
       def compile_fragment(options)
-        render_pipeline(nil, options).(nil, options)
+        render_pipeline(nil, options).call(nil, options)
       end
 
       # Parse value from doc and update the model property.
       def uncompile_fragment(options)
-        parse_pipeline(options[:doc], options).(options[:doc], options)
+        parse_pipeline(options[:doc], options).call(options[:doc], options)
       end
     end
     include Deprecatable
@@ -43,7 +61,7 @@ module Representable
       def evaluate_option(name, input, options)
         proc = self[name]
         # puts "@@@@@ #{self.inspect}, #{name}...... #{self[name]}"
-        proc.(send(:exec_context, options), options.merge(user_options: options[:options][:user_options], input: input)) # from Uber::Options::Value. # NOTE: this can also be the Proc object if it's not wrapped by Uber:::Value.
+        proc.call(exec_context: send(:exec_context, options), keyword_arguments: options.merge(user_options: options[:options][:user_options], input: input)) # from Uber::Options::Value. # NOTE: this can also be the Proc object if it's not wrapped by Uber:::Value.
       end
     end
     include EvaluateOption
@@ -53,29 +71,30 @@ module Representable
     end
 
     def skipable_empty_value?(value)
-      value.nil? and not self[:render_nil]
+      value.nil? and !(self[:render_nil])
     end
 
     def default_for(value)
       return self[:default] if skipable_empty_value?(value)
+
       value
     end
 
     attr_accessor :cached_representer
 
-    require "representable/pipeline_factories"
+    require 'representable/pipeline_factories'
     include Factories
 
-  private
+    private
 
     def setup_exec_context!
-      @exec_context = ->(options) { options[:represented] }     unless self[:exec_context]
-      @exec_context = ->(options) { self }                      if self[:exec_context] == :binding
-      @exec_context = ->(options) { options[:decorator] }       if self[:exec_context] == :decorator
+      @exec_context = ->(options) { options[:represented] } unless self[:exec_context]
+      @exec_context = ->(_options) { self } if self[:exec_context] == :binding
+      @exec_context = ->(options) { options[:decorator] } if self[:exec_context] == :decorator
     end
 
     def exec_context(options)
-      @exec_context.(options)
+      @exec_context.call(options)
     end
 
     def parse_pipeline(input, options)
@@ -90,8 +109,9 @@ module Representable
     module Collection
       def skipable_empty_value?(value)
         # TODO: this can be optimized, again.
-        return true if value.nil? and not self[:render_nil] # FIXME: test this without the "and"
-        return true if self[:render_empty] == false and value and value.size == 0  # TODO: change in 2.0, don't render emtpy.
+        return true if value.nil? && !(self[:render_nil]) # FIXME: test this without the "and"
+
+        true if (self[:render_empty] == false) && value && value.empty? # TODO: change in 2.0, don't render emtpy.
       end
     end
   end

data/lib/representable/cached.rb

@@ -19,4 +19,4 @@ module Representable
       self.class.map
     end
   end
-end
+end

data/lib/representable/coercion.rb

@@ -1,16 +1,18 @@
-require "virtus"
+gem 'dry-types', '>= 1.0.0'
+require "dry-types"
 
 module Representable
   module Coercion
+    module Types
+      include Dry::Types()
+    end
     class Coercer
       def initialize(type)
         @type = type
       end
 
-      # This gets called when the :render_filter or :parse_filter option is evaluated.
-      # Usually the Coercer instance is an element in a Pipeline to allow >1 filters per property.
-      def call(input, options)
-        Virtus::Attribute.build(@type).coerce(input)
+      def call(input, _options)
+        @type.call(input)
       end
     end
 
@@ -34,4 +36,4 @@ module Representable
       end
     end
   end
-end
+end

data/lib/representable/config.rb

@@ -1,4 +1,8 @@
+require 'declarative/definitions'
+
 module Representable
+  autoload :Option, 'representable/option'
+
   # Stores Definitions from ::property. It preserves the adding order (1.9+).
   # Same-named properties get overridden, just like in a Hash.
   #
@@ -20,16 +24,17 @@ module Representable
 
     def wrap=(value)
       value = value.to_s if value.is_a?(Symbol)
-      @wrap = ::Declarative::Option(value, instance_exec: true, callable: Uber::Callable)
+      @wrap = ::Representable::Option(value)
     end
 
     # Computes the wrap string or returns false.
-    def wrap_for(represented, *args, &block)
+    def wrap_for(represented, options = {}, &block)
       return unless @wrap
 
-      value = @wrap.(represented, *args)
+      value = @wrap.(exec_context: represented, keyword_arguments: options.to_hash)
 
       return value if value != true
+
       infer_name_for(represented.class.name)
     end
 

data/lib/representable/debug.rb

@@ -1,16 +1,24 @@
+require 'logger'
+
 module Representable
   module Debug
+    module_function def _representable_logger
+      @logger ||= Logger.new(STDOUT)
+    end
+
+    module_function def representable_log(message)
+      _representable_logger.debug { message }
+    end
+
     def update_properties_from(doc, options, format)
-      puts
-      puts "[Deserialize]........."
-      puts "[Deserialize] document #{doc.inspect}"
+      representable_log "[Deserialize]........."
+      representable_log "[Deserialize] document #{doc.inspect}"
       super
     end
 
     def create_representation_with(doc, options, format)
-      puts
-      puts "[Serialize]........."
-      puts "[Serialize]"
+      representable_log "[Serialize]........."
+      representable_log "[Serialize]"
       super
     end
 
@@ -22,13 +30,13 @@ module Representable
 
     module Binding
       def evaluate_option(name, *args, &block)
-        puts "=====#{self[name]}" if name ==:prepare
-        puts (evaled = self[name]) ?
+        Debug.representable_log "=====#{self[name]}" if name ==:prepare
+        Debug.representable_log (evaled = self[name]) ?
           "                #evaluate_option [#{name}]: eval!!!" :
           "                #evaluate_option [#{name}]: skipping"
         value = super
-        puts "                #evaluate_option [#{name}]: --> #{value}" if evaled
-        puts "                #evaluate_option [#{name}]: -->= #{args.first}" if name == :setter
+        Debug.representable_log "                #evaluate_option [#{name}]: --> #{value}" if evaled
+        Debug.representable_log "                #evaluate_option [#{name}]: -->= #{args.first}" if name == :setter
         value
       end
 
@@ -45,17 +53,17 @@ module Representable
 
   module Pipeline::Debug
     def call(input, options)
-      puts "Pipeline#call: #{inspect}"
-      puts "               input: #{input.inspect}"
+      Debug.representable_log "Pipeline#call: #{inspect}"
+      Debug.representable_log "               input: #{input.inspect}"
       super
     end
 
     def evaluate(block, memo, options)
       block.extend(Pipeline::Debug) if block.is_a?(Collect)
 
-      puts "  Pipeline   :   -> #{_inspect_function(block)} "
+      Debug.representable_log "  Pipeline   :   -> #{_inspect_function(block)} "
       super.tap do |res|
-        puts "  Pipeline   :     result: #{res.inspect}"
+        Debug.representable_log "  Pipeline   :     result: #{res.inspect}"
       end
     end
 
@@ -70,8 +78,8 @@ module Representable
     def _inspect_function(func)
       return func.extend(Pipeline::Debug).inspect if func.is_a?(Collect)
       return func unless func.is_a?(Proc)
+
       File.readlines(func.source_location[0])[func.source_location[1]-1].match(/^\s+(\w+)/)[1]
     end
   end
 end
-

data/lib/representable/declarative.rb

@@ -1,4 +1,9 @@
+require "declarative/schema"
+
 module Representable
+  autoload :Decorator, "representation/decorator"
+  autoload :Definition, "representation/definition"
+
   module Declarative
     def representation_wrap=(name)
       heritage.record(:representation_wrap=, name)
@@ -21,9 +26,9 @@ module Representable
     # them to the original object.
     def nested(name, options={}, &block)
       options = options.merge(
-        getter:   ->(opts) { self },
+        getter:   ->(_opts) { self },
         setter:   ->(opts) { },
-        instance: ->(opts) { self },
+        instance: ->(_opts) { self },
       )
 
       if block
@@ -64,4 +69,4 @@ module Representable
 
     alias_method :representable_attrs, :definitions
   end
-end
+end

data/lib/representable/decorator.rb

@@ -1,5 +1,5 @@
-require "representable"
 require "uber/inheritable_attr"
+require "representable"
 
 module Representable
   class Decorator

data/lib/representable/definition.rb

@@ -1,6 +1,10 @@
-require "representable/populator"
+require 'declarative/definitions'
 
 module Representable
+  autoload :Pipeline, "representable/pipeline"
+  autoload :Populator, "representable/populator"
+  autoload :Option, "representable/option"
+
   # Created at class compile time. Keeps configuration options for one property.
   class Definition < ::Declarative::Definitions::Definition
 
@@ -53,6 +57,7 @@ module Representable
 
     def representable?
       return if self[:representable] == false
+
       self[:representable] or typed?
     end
 
@@ -101,7 +106,7 @@ module Representable
       @runtime_options = {}
 
       for name, value in options
-        value = ::Declarative::Option(value, instance_exec: true, callable: Uber::Callable) if dynamic_options.include?(name)
+        value = ::Representable::Option(value) if dynamic_options.include?(name)
         @runtime_options[name] = value
       end
     end

data/lib/representable/deserializer.rb

@@ -11,11 +11,11 @@ module Representable
   ReadFragment = ->(input, options) { options[:binding].read(input, options[:as]) }
   Reader = ->(input, options) { options[:binding].evaluate_option(:reader, input, options) }
 
-  StopOnNotFound = ->(input, options) do
+  StopOnNotFound = ->(input, _options) do
     Binding::FragmentNotFound == input ? Pipeline::Stop : input
   end
 
-  StopOnNil = ->(input, options) do # DISCUSS: Not tested/used, yet.
+  StopOnNil = ->(input, _options) do # DISCUSS: Not tested/used, yet.
     input.nil? ? Pipeline::Stop : input
   end
 
@@ -103,6 +103,7 @@ module Representable
 
     return input if options[:options][:include]&&res
     return input if options[:options][:exclude]&&!res
+
     Pipeline::Stop
   end
-end
+end

data/lib/representable/for_collection.rb

@@ -24,4 +24,4 @@ module Representable
       @collection_representer = collection_representer!(options)
     end
   end
-end
+end

data/lib/representable/hash/allow_symbols.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
 module Representable
   module Hash
     module AllowSymbols
-    private
+      private
+
       def filter_wrap_for(data, *args)
         super(Conversion.stringify_keys(data), *args)
       end
@@ -11,17 +14,12 @@ module Representable
       end
     end
 
-    class Conversion
-      # DISCUSS: we could think about mixin in IndifferentAccess here (either hashie or ActiveSupport).
-      # or decorating the hash.
+    module Conversion
       def self.stringify_keys(hash)
-        hash = hash.dup
-
-        hash.keys.each do |k|
-          hash[k.to_s] = hash.delete(k)
-        end
-        hash
+        hash.keys.collect do |key|
+          [ key.to_s, hash[key] ]
+        end.to_h
       end
     end
   end
-end
+end

data/lib/representable/hash/binding.rb

@@ -5,6 +5,7 @@ module Representable
     class Binding < Representable::Binding
       def self.build_for(definition)
         return Collection.new(definition) if definition.array?
+
         new(definition)
       end
 

data/lib/representable/hash/collection.rb

@@ -1,3 +1,5 @@
+require 'representable/hash'
+
 module Representable::Hash
   module Collection
     include Representable::Hash
@@ -20,7 +22,7 @@ module Representable::Hash
     # TODO: revise lonely collection and build separate pipeline where we just use Serialize, etc.
 
     def create_representation_with(doc, options, format)
-      options = normalize_options(options)
+      options = normalize_options(**options)
       options[:_self] = options
 
       bin   = representable_bindings_for(format, options).first
@@ -30,7 +32,7 @@ module Representable::Hash
     end
 
     def update_properties_from(doc, options, format)
-      options = normalize_options(options)
+      options = normalize_options(**options)
       options[:_self] = options
 
       bin   = representable_bindings_for(format, options).first

data/lib/representable/hash.rb

@@ -6,6 +6,9 @@ module Representable
   # If you plan to write your own representer for a new media type, try to use this module (e.g., check how JSON reuses Hash's internal
   # architecture).
   module Hash
+    autoload :Collection, 'representable/hash/collection'
+    autoload :AllowSymbols, 'representable/hash/allow_symbols'
+
     def self.included(base)
       base.class_eval do
         include Representable # either in Hero or HeroRepresentation.
@@ -34,7 +37,7 @@ module Representable
       hash = create_representation_with({}, options, binding_builder)
 
       return hash if options[:wrap] == false
-      return hash unless wrap = options[:wrap] || representation_wrap(options)
+      return hash unless (wrap = options[:wrap] || representation_wrap(options))
 
       {wrap => hash}
     end
@@ -45,7 +48,8 @@ module Representable
   private
     def filter_wrap(data, options)
       return data if options[:wrap] == false
-      return data unless wrap = options[:wrap] || representation_wrap(options)
+      return data unless (wrap = options[:wrap] || representation_wrap(options))
+
       filter_wrap_for(data, wrap)
     end
 

data/lib/representable/hash_methods.rb

@@ -20,8 +20,9 @@ module Representable
     def filter_keys_for!(hash, options)
       excluding = options[:exclude]
       # TODO: use same filtering method as in normal representer in Representable#create_representation_with.
-      return hash unless props = options.delete(:exclude) || options.delete(:include)
-      hash.reject { |k,v| excluding ? props.include?(k.to_sym) : !props.include?(k.to_sym) }
+      return hash unless (props = (options.delete(:exclude) || options.delete(:include)))
+
+      hash.select { |k, _v| excluding ? !props.include?(k.to_sym) : props.include?(k.to_sym) }
     end
   end
 end

data/lib/representable/insert.rb

@@ -35,4 +35,4 @@ module Representable
 
     Insert = Pipeline::Function::Insert.new
   end # Pipeline
-end
+end

data/lib/representable/json/collection.rb

@@ -1,3 +1,6 @@
+require 'representable/json'
+require 'representable/hash/collection'
+
 module Representable::JSON
   module Collection
     include Representable::JSON

data/lib/representable/json/hash.rb

@@ -1,3 +1,4 @@
+require 'representable/json'
 require 'representable/hash_methods'
 
 module Representable::JSON

data/lib/representable/json.rb

@@ -1,15 +1,13 @@
-require "representable/hash"
-require "representable/json/collection"
+gem "multi_json", '>= 1.14.1'
+require "multi_json"
 
-begin
-  require "multi_json"
-rescue LoadError => _
-  abort "Missing dependency 'multi_json' for Representable::JSON. See dependencies section in README.md for details."
-end
+require "representable"
 
 module Representable
   # Brings #to_json and #from_json to your object.
   module JSON
+    autoload :Collection, "representable/json/collection"
+
     extend Hash::ClassMethods
     include Hash