arstotzka 1.1.0 → 1.2.0

data/spec/lib/arstotzka/fetcher_spec.rb

@@ -4,17 +4,16 @@ require 'spec_helper'
 
 describe Arstotzka::Fetcher do
   subject(:fetcher) do
-    described_class.new json, instance, options.merge(path: path)
+    described_class.new instance, options
   end
 
-  let(:path)     { '' }
-  let(:instance) { Arstotzka::Fetcher::Dummy.new }
+  let(:instance) { Arstotzka::Fetcher::Dummy.new(json) }
   let(:json)     { load_json_fixture_file('arstotzka.json') }
   let(:value)    { fetcher.fetch }
 
   context 'when fetching with no options' do
-    let(:options) { {} }
-    let(:path) { 'id' }
+    let(:options) { { key: key } }
+    let(:key) { 'id' }
 
     it 'retrieves attribute from base json' do
       expect(value).to eq(json['id'])
@@ -45,17 +44,18 @@ describe Arstotzka::Fetcher do
   end
 
   describe 'flatten options' do
-    let(:json) { [[[1, 2], [3, 4]], [[5, 6], [7, 8]]] }
+    let(:json)  { { value: value } }
+    let(:value) { [[[1, 2], [3, 4]], [[5, 6], [7, 8]]] }
 
     context 'when flatten option is true' do
-      let(:options) { { flatten: true } }
+      let(:options) { { flatten: true, key: :value } }
 
       it 'returns the fetched value flattened' do
         expect(fetcher.fetch).to eq((1..8).to_a)
       end
 
       context 'when value is not an array' do
-        let(:json) { 1 }
+        let(:value) { 1 }
 
         it 'returns the fetched value flattened' do
           expect(fetcher.fetch).to eq(1)
@@ -64,18 +64,18 @@ describe Arstotzka::Fetcher do
     end
 
     context 'when flatten option is false' do
-      let(:options) { { flatten: false } }
+      let(:options) { { flatten: false, key: :value } }
 
       it 'returns the fetched value non flattened' do
-        expect(fetcher.fetch).to eq(json)
+        expect(fetcher.fetch).to eq(value)
       end
     end
   end
 
   describe 'after option' do
     let(:instance) { MyParser.new(json) }
-    let(:json)     { [100, 250, -25] }
-    let(:options)  { { after: :sum } }
+    let(:json)     { { value: [100, 250, -25] } }
+    let(:options)  { { after: :sum, key: :value } }
 
     it 'applies after call ' do
       expect(fetcher.fetch).to eq(325)
@@ -86,7 +86,7 @@ describe Arstotzka::Fetcher do
     let(:path) { 'name' }
     let(:name)    { 'Robert' }
     let(:json)    { { name: name } }
-    let(:options) { { klass: wrapper } }
+    let(:options) { { klass: wrapper, path: path } }
     let(:wrapper) { Person }
 
     it 'wraps the result in an object' do

data/spec/lib/arstotzka/{builder_spec.rb → method_builder_spec.rb}

@@ -2,13 +2,14 @@
 
 require 'spec_helper'
 
-describe Arstotzka::Builder do
+describe Arstotzka::MethodBuilder do
   subject(:builder) do
     described_class.new(attr_names, klass, **full_options)
   end
 
   let(:klass) do
     Class.new.tap do |c|
+      c.send(:include, Arstotzka)
       c.send(:attr_reader, :json)
       c.send(:define_method, :initialize) do |json = {}|
         @json = json

data/spec/lib/arstotzka/options_spec.rb

@@ -205,4 +205,87 @@ describe Arstotzka::Options do
       expect(options.merge(default: 10).json).to eq(:hash)
     end
   end
+
+  describe '#keys' do
+    let(:options_hash) { { path: path, key: key, full_path: full_path } }
+    let(:key)          { :id }
+    let(:path)         { nil }
+    let(:full_path)    { nil }
+
+    context 'when full_path is nil' do
+      context 'when path is nil' do
+        it 'returns only the key' do
+          expect(options.keys).to eq(['id'])
+        end
+      end
+
+      context 'when path is empty' do
+        let(:path) { '' }
+
+        it 'returns only the key' do
+          expect(options.keys).to eq(['id'])
+        end
+      end
+
+      context 'when path is not empty' do
+        let(:path) { 'account.person' }
+
+        it 'returns the path splitted and the key' do
+          expect(options.keys).to eq(%w[account person id])
+        end
+      end
+    end
+
+    context 'when full_path is empty' do
+      let(:full_path) { '' }
+
+      context 'when path is nil' do
+        it 'returns empty array' do
+          expect(options.keys).to eq([])
+        end
+      end
+
+      context 'when path is empty' do
+        let(:path) { '' }
+
+        it 'returns empty array' do
+          expect(options.keys).to eq([])
+        end
+      end
+
+      context 'when path is not empty' do
+        let(:path) { 'account.person' }
+
+        it 'returns empty array' do
+          expect(options.keys).to eq([])
+        end
+      end
+    end
+
+    context 'when full_path is not empty' do
+      let(:full_path) { 'account.person_id' }
+
+      context 'when path is nil' do
+        it 'returns splitted full path' do
+          expect(options.keys).to eq(%w[account person_id])
+        end
+      end
+
+      context 'when path is empty' do
+        let(:path) { '' }
+
+        it 'returns splitted full path' do
+          expect(options.keys).to eq(%w[account person_id])
+        end
+      end
+
+      context 'when path is not empty' do
+        let(:path) { 'account.person' }
+
+        it 'returns splitted full path' do
+          expect(options.keys).to eq(%w[account person_id])
+        end
+      end
+    end
+  end
 end

data/spec/lib/arstotzka/reader_spec.rb

@@ -24,10 +24,11 @@ end
 
 describe Arstotzka::Reader do
   subject(:reader) do
-    described_class.new(keys: keys, case: case_type)
+    described_class.new(full_path: full_path, case: case_type)
   end
 
   let(:keys)      { %w[user full_name] }
+  let(:full_path) { keys.join('.') }
   let(:json_file) { 'complete_person.json' }
   let(:full_json) { load_json_fixture_file(json_file) }
   let(:json)      { full_json }

data/spec/support/models/account.rb

@@ -1,8 +1,14 @@
 # frozen_string_literal: true
 
 class Account
+  def initialize(json = {})
+    @json = json
+  end
+
   private
 
+  attr_reader :json
+
   def filter_income(transactions)
     transactions.select(&:positive?)
   end

data/spec/support/models/arstotzka/fetcher/dummy.rb

@@ -3,6 +3,13 @@
 module Arstotzka
   class Fetcher
     class Dummy
+      def initialize(json = {})
+        @json = json
+      end
+
+      private
+
+      attr_reader :json
     end
   end
 end

data/spec/support/models/my_model.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class MyModel
+  include Arstotzka
+
   attr_reader :json
 
   def initialize(json)

data/spec/support/models/star.rb

@@ -1,9 +1,20 @@
 # frozen_string_literal: true
 
 class Star
-  attr_reader :name
+  attr_reader :name, :color
 
-  def initialize(name:)
+  def initialize(name:, color: 'yellow')
     @name = name
+    @color = color
+  end
+
+  def yellow?
+    color == 'yellow'
+  end
+
+  def ==(other)
+    return false unless other.is_a?(self.class)
+    other.color == color &&
+      other.name == name
   end
 end

data/spec/support/models/star_gazer.rb

@@ -11,4 +11,10 @@ class StarGazer
   def initialize(json = {})
     @json = json
   end
+
+  private
+
+  def only_yellow(stars)
+    stars.select(&:yellow?)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arstotzka
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.x
+        version: 1.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.x
+        version: 1.16.1
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
@@ -204,11 +204,12 @@ files:
 - docker-compose.yml
 - lib/arstotzka.rb
 - lib/arstotzka/base.rb
-- lib/arstotzka/builder.rb
 - lib/arstotzka/class_methods.rb
 - lib/arstotzka/crawler.rb
 - lib/arstotzka/exception.rb
 - lib/arstotzka/fetcher.rb
+- lib/arstotzka/fetcher_builder.rb
+- lib/arstotzka/method_builder.rb
 - lib/arstotzka/options.rb
 - lib/arstotzka/reader.rb
 - lib/arstotzka/type_cast.rb
@@ -222,17 +223,19 @@ files:
 - spec/fixtures/person.json
 - spec/integration/readme/arstotzka_spec.rb
 - spec/integration/readme/my_parser_spec.rb
-- spec/integration/yard/arstotzka/builder_spec.rb
 - spec/integration/yard/arstotzka/class_methods_spec.rb
 - spec/integration/yard/arstotzka/crawler_spec.rb
+- spec/integration/yard/arstotzka/fetcher_builder_spec.rb
 - spec/integration/yard/arstotzka/fetcher_spec.rb
+- spec/integration/yard/arstotzka/method_builder_spec.rb
 - spec/integration/yard/arstotzka/reader_spec.rb
 - spec/integration/yard/arstotzka/type_cast_spec.rb
 - spec/integration/yard/arstotzka/wrapper_spec.rb
 - spec/integration/yard/arstotzka_spec.rb
-- spec/lib/arstotzka/builder_spec.rb
 - spec/lib/arstotzka/crawler_spec.rb
+- spec/lib/arstotzka/fetcher_builder_spec.rb
 - spec/lib/arstotzka/fetcher_spec.rb
+- spec/lib/arstotzka/method_builder_spec.rb
 - spec/lib/arstotzka/options_spec.rb
 - spec/lib/arstotzka/reader_spec.rb
 - spec/lib/arstotzka/wrapper_spec.rb
@@ -279,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Arstotzka
@@ -291,17 +294,19 @@ test_files:
 - spec/fixtures/person.json
 - spec/integration/readme/arstotzka_spec.rb
 - spec/integration/readme/my_parser_spec.rb
-- spec/integration/yard/arstotzka/builder_spec.rb
 - spec/integration/yard/arstotzka/class_methods_spec.rb
 - spec/integration/yard/arstotzka/crawler_spec.rb
+- spec/integration/yard/arstotzka/fetcher_builder_spec.rb
 - spec/integration/yard/arstotzka/fetcher_spec.rb
+- spec/integration/yard/arstotzka/method_builder_spec.rb
 - spec/integration/yard/arstotzka/reader_spec.rb
 - spec/integration/yard/arstotzka/type_cast_spec.rb
 - spec/integration/yard/arstotzka/wrapper_spec.rb
 - spec/integration/yard/arstotzka_spec.rb
-- spec/lib/arstotzka/builder_spec.rb
 - spec/lib/arstotzka/crawler_spec.rb
+- spec/lib/arstotzka/fetcher_builder_spec.rb
 - spec/lib/arstotzka/fetcher_spec.rb
+- spec/lib/arstotzka/method_builder_spec.rb
 - spec/lib/arstotzka/options_spec.rb
 - spec/lib/arstotzka/reader_spec.rb
 - spec/lib/arstotzka/wrapper_spec.rb