seri 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f3d7fa0dae40ce8b0e43a174185c435c048fed3ae38242a735592ce1d5bc1bc
-  data.tar.gz: b70a1a82b0b75b6396ba5cf78db892b23cd64d60c75a9d7948a7b667af9e9b51
+  metadata.gz: 394f107e4e7ca59a2c4951316e4223ed8f9dec2d14d70610be80079a69974cb2
+  data.tar.gz: 59e58c2f0802df12dff7f3ec1da988978d95c2c1e427113124b3c488fa4bed0c
 SHA512:
-  metadata.gz: 323161f0982a5f25b138b63e929fde6452378efd35023c69761476b653fe6d23d6ddcb5571ff3ee82fe658710f5c9e60bb493dd4c19fe7320632362c49d24558
-  data.tar.gz: d20c18753f7d19bce1fbe02c0466c4e5ff9d6913568b29f4dc2490a8a156b67c7dd6980e21986192f548f48e84e78f154ba4c5fe299255ac7d90e534392c05a0
+  metadata.gz: 004c1bf17667b3da131e4695e9a093d04d4a975ebf4f86644b0bdd4765753b4549120115484ab8285d275b938cc299e31e6270359a9a37a87b5ca055c44f885c
+  data.tar.gz: c3870a1ecd13aae4f159fa8b82547c06edb0015bad397822bb209a0d34e85b2d535545bd5d03ddd7defa542b5f316f352f3c57f7208d28c14224153e79ebc173

data/.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-       - image: circleci/ruby:2.5.3-node-browsers
+       - image: circleci/ruby:2.7.1
 
     working_directory: ~/repo
 
@@ -21,6 +21,7 @@ jobs:
       - run:
           name: install dependencies
           command: |
+            gem install bundler:1.17.3
             bundle install --jobs=4 --retry=3 --path vendor/bundle
 
       - save_cache:

data/.rubocop.yml

@@ -3,6 +3,8 @@ Metrics/BlockLength:
     - 'spec/**/*.rb'
 Style/Documentation:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false
 # This is causing breaking changes:
 Style/ExpandPathArguments:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    seri (1.1.9)
+    seri (1.1.10)
       oj (~> 3.7)
 
 GEM
@@ -10,13 +10,13 @@ GEM
     ast (2.4.0)
     diff-lcs (1.3)
     jaro_winkler (1.5.4)
-    oj (3.10.5)
+    oj (3.10.6)
     parallel (1.19.1)
-    parser (2.7.0.5)
+    parser (2.7.1.2)
       ast (~> 2.4.0)
-    psych (3.1.0)
     rainbow (3.0.0)
     rake (13.0.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -30,16 +30,16 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    rubocop (0.67.2)
+    rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
+      unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -48,7 +48,7 @@ DEPENDENCIES
   bundler (~> 1.16)
   rake (~> 13.0)
   rspec (~> 3.0)
-  rubocop (~> 0.67.2)
+  rubocop (~> 0.82)
   seri!
 
 BUNDLED WITH

data/lib/serializer/value.rb

@@ -1,58 +1,60 @@
-class Value
-  def initialize(attribute, scope = nil)
-    @attribute = attribute
-    @scope = scope
-  end
+class Serializer
+  class Value
+    def initialize(attribute, scope = nil)
+      @attribute = attribute
+      @scope = scope
+    end
 
-  def extraction_key
-    @attribute.from || @attribute.key
-  end
+    def extraction_key
+      @attribute.from || @attribute.key
+    end
 
-  def precondition?
-    raise NotImplementedError, 'needs a method called precondition?'
-  end
+    def precondition?
+      raise NotImplementedError, 'needs a method called precondition?'
+    end
 
-  def value
-    raise NotImplementedError, 'needs a method called value'
+    def value
+      raise NotImplementedError, 'needs a method called value'
+    end
   end
-end
 
-class StaticValue < Value
-  def precondition?
-    @attribute.options.key?(:static_value)
-  end
+  class StaticValue < Value
+    def precondition?
+      @attribute.options.key?(:static_value)
+    end
 
-  def value
-    @attribute.options.fetch(:static_value)
+    def value
+      @attribute.options.fetch(:static_value)
+    end
   end
-end
 
-class SerializedValue < Value
-  def precondition?
-    @scope.respond_to?(extraction_key)
-  end
+  class SerializedValue < Value
+    def precondition?
+      @scope.respond_to?(extraction_key)
+    end
 
-  def value
-    @scope.public_send(extraction_key)
+    def value
+      @scope.public_send(extraction_key)
+    end
   end
-end
 
-class HashValue < Value
-  def precondition?
-    @scope.is_a?(Hash) && @scope.key?(extraction_key)
-  end
+  class HashValue < Value
+    def precondition?
+      @scope.is_a?(Hash)
+    end
 
-  def value
-    @scope.fetch(extraction_key)
+    def value
+      @scope[extraction_key]
+    end
   end
-end
 
-class ObjectValue < Value
-  def precondition?
-    @scope.respond_to?(extraction_key)
-  end
+  class ObjectValue < Value
+    def precondition?
+      @scope.respond_to?(extraction_key)
+    end
 
-  def value
-    @scope.public_send(extraction_key)
+    def value
+      @scope.public_send(extraction_key)
+    end
   end
 end

data/lib/serializer/value_fetcher.rb

@@ -1,59 +1,61 @@
-class ValueFetcher
-  class SerializerError < StandardError; end
-
-  ARRAYS = %w[
-    Array
-    ActiveRecord_AssociationRelation
-    ActiveRecord_Associations_CollectionProxy
-  ].freeze
-
-  def self.fetch(attribute, object, serializer)
-    new(attribute, object, serializer).fetch
-  end
+class Serializer
+  class ValueFetcher
+    class SerializerError < StandardError; end
+
+    ARRAYS = %w[
+      Array
+      ActiveRecord_AssociationRelation
+      ActiveRecord_Associations_CollectionProxy
+    ].freeze
+
+    def self.fetch(attribute, object, serializer)
+      new(attribute, object, serializer).fetch
+    end
 
-  private_class_method :new
+    private_class_method :new
 
-  def initialize(attribute, object, serializer)
-    @attribute = attribute
-    @values = [
-      StaticValue.new(attribute),
-      SerializedValue.new(attribute, serializer),
-      HashValue.new(attribute, object),
-      ObjectValue.new(attribute, object)
-    ]
-  end
+    def initialize(attribute, object, serializer)
+      @attribute = attribute
+      @values = [
+        StaticValue.new(attribute),
+        SerializedValue.new(attribute, serializer),
+        HashValue.new(attribute, object),
+        ObjectValue.new(attribute, object)
+      ]
+    end
 
-  def fetch
-    serializer = @attribute.serializer
+    def fetch
+      serializer = @attribute.serializer
 
-    return value unless serializer
+      return value unless serializer
 
-    if array?
-      value.map { |item| serializer.new(item).to_h }
-    else
-      serializer.new(value).to_h
+      if array?
+        value.map { |item| serializer.new(item).to_h }
+      else
+        serializer.new(value).to_h
+      end
     end
-  end
 
-  # Fetches a value from an attribute by checking if there's a ..
-  # .. static value set, or a ..
-  # .. method defined in the serializer, or a ..
-  # .. method/attribute defined in the object or ..
-  # .. it raises an error
-  def value
-    @value ||= begin
-      extracted_value = @values.detect(&:precondition?)
-
-      if extracted_value.nil?
-        raise SerializerError,
-              "unknown attribute '#{@values[0].extraction_key}'"
+    # Fetches a value from an attribute by checking if there's a ..
+    # .. static value set, or a ..
+    # .. method defined in the serializer, or a ..
+    # .. method/attribute defined in the object or ..
+    # .. it raises an error
+    def value
+      @value ||= begin
+        extracted_value = @values.detect(&:precondition?)
+
+        if extracted_value.nil?
+          raise SerializerError,
+                "unknown attribute '#{@values[0].extraction_key}'"
+        end
+
+        extracted_value.value
       end
-
-      extracted_value.value
     end
-  end
 
-  def array?
-    ARRAYS.any? { |match| value.class.to_s.end_with?(match) }
+    def array?
+      ARRAYS.any? { |match| value.class.to_s.end_with?(match) }
+    end
   end
 end

data/lib/serializer/version.rb

@@ -1,3 +1,3 @@
 class Serializer
-  VERSION = '1.1.9'.freeze
+  VERSION = '1.1.10'.freeze
 end

data/seri.gemspec

@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.67.2'
+  spec.add_development_dependency 'rubocop', '~> 0.82'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seri
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - grdw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: '0.82'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.67.2
+        version: '0.82'
 description: A basic serializer
 email:
 - gerard@wetransfer.com