arstotzka 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcdfefb20e55716afccbdb1db14cb24c1b23f5c3609e0cdaccfb897e6f949c32
-  data.tar.gz: f374f9f717e7f3b867d40270bc531eb3c22e54b9060f232e5984157c4039e612
+  metadata.gz: b1fd5f8ae512abca296de96373bd5f07d48b3172091437ccf50c5e47a2c5797a
+  data.tar.gz: 46ff041da66faf1bffe3fb0df64b71d268dd6e95dc2e9c43be2583eda005a924
 SHA512:
-  metadata.gz: 9c2b0cce20c80bdfdc92bfd3dbb0eeff17585e7c2373daa5cfb960bf9356b54feb5d5c9ea66353a52f9b6400720e3fdcc2d27529f5456b9b2c6f0f50a066adc7
-  data.tar.gz: 2996ef066a6d98673f10961f82962e9d570fc23a34882d3a5d280efdb93677425eac4a52b0786551c324d04b296333b0c551603a5fd8923b99e61f81229ccf8e
+  metadata.gz: 51f92382c369a3fdc44eaa02915f8837a3760f36b8a80fcb7b315ad2a11646cd9578e02a165d32eeebeb0114341865c540b8a5ba3cfd8025fc75382dca6aa63c
+  data.tar.gz: a2d26c467a2c768927a8cf18ade4682792522f5fb4e90332b8fd41e08b13516d5022a95b30da20f658f37924b2467494fe7cd8bb1109d092476279a7f1b77a94

data/.rubocop.yml

@@ -17,3 +17,7 @@ RSpec/AlignLeftLetBrace:
 Style/ClassAndModuleChildren:
   Exclude:
     - spec/integration/**/*.rb
+
+Style/ClassVars:
+  Exclude:
+    - spec/support/models/arstotzka/fetcher/class_variable.rb

data/README.md

@@ -38,7 +38,7 @@ gem 'arstotzka'
 
 Yard Documentation
 -------------------
-https://www.rubydoc.info/gems/arstotzka/1.2.1
+https://www.rubydoc.info/gems/arstotzka/1.2.2
 
 Getting Started
 ---------------

data/config/yardstick.yml

@@ -23,7 +23,6 @@ rules:
       - Arstotzka::Crawler#options
       - Arstotzka::Fetcher#instance
       - Arstotzka::Fetcher#options
-      - Arstotzka::Fetcher#hash
       - Arstotzka::FetcherBuilder#options
       - Arstotzka::MethodBuilder#attr_names
       - Arstotzka::MethodBuilder#options
@@ -38,7 +37,6 @@ rules:
       - Arstotzka::Crawler#options
       - Arstotzka::Fetcher#instance
       - Arstotzka::Fetcher#options
-      - Arstotzka::Fetcher#hash
       - Arstotzka::FetcherBuilder#options
       - Arstotzka::MethodBuilder#attr_names
       - Arstotzka::MethodBuilder#options

data/lib/arstotzka/fetcher.rb

@@ -93,9 +93,23 @@ module Arstotzka
     delegate :instance, :after, :flatten, to: :options
     delegate :wrap, to: :wrapper
 
+    # @private
+    #
+    # Retrieves the hash to be crawled from the instance
+    #
+    # @return [Hash]
+    # rubocop:disable Metrics/AbcSize
     def hash
-      @hash ||= instance.send(:eval, options.json.to_s)
+      @hash ||= case options.json.to_s
+                when /^@@.*/
+                  instance.class.class_variable_get(options.json)
+                when /^@.*/
+                  then instance.instance_variable_get(options.json)
+                else
+                  instance.send(options.json.to_s)
+                end
     end
+    # rubocop:enable Metrics/AbcSize
 
     # @private
     #

data/lib/arstotzka/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arstotzka
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/spec/lib/arstotzka/fetcher_spec.rb

@@ -7,13 +7,13 @@ describe Arstotzka::Fetcher do
     described_class.new options
   end
 
-  let(:options)  { Arstotzka::Options.new(options_hash) }
+  let(:options)  { Arstotzka::Options.new(options_hash.merge(instance: instance)) }
   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_hash) { { instance: instance, key: key } }
+    let(:options_hash) { { key: key } }
     let(:key)          { 'id' }
 
     it 'retrieves attribute from base json' do
@@ -50,7 +50,7 @@ describe Arstotzka::Fetcher do
 
     context 'when flatten option is true' do
       let(:options_hash) do
-        { instance: instance, flatten: true, key: :value }
+        { flatten: true, key: :value }
       end
 
       it 'returns the fetched value flattened' do
@@ -68,7 +68,7 @@ describe Arstotzka::Fetcher do
 
     context 'when flatten option is false' do
       let(:options_hash) do
-        { instance: instance, flatten: false, key: :value }
+        { flatten: false, key: :value }
       end
 
       it 'returns the fetched value non flattened' do
@@ -82,7 +82,7 @@ describe Arstotzka::Fetcher do
     let(:json)     { { value: [100, 250, -25] } }
 
     let(:options_hash) do
-      { instance: instance, after: :sum, key: :value }
+      { after: :sum, key: :value }
     end
 
     it 'applies after call ' do
@@ -97,7 +97,7 @@ describe Arstotzka::Fetcher do
     let(:wrapper) { Person }
 
     let(:options_hash) do
-      { instance: instance, klass: wrapper, path: path }
+      { klass: wrapper, path: path }
     end
 
     it 'wraps the result in an object' do
@@ -115,7 +115,6 @@ describe Arstotzka::Fetcher do
 
     let(:options_hash) do
       {
-        instance:   instance,
         full_path:  full_path,
         after_each: :create_person,
         json:       :@hash,
@@ -142,4 +141,40 @@ describe Arstotzka::Fetcher do
       expect(fetcher.fetch).to all(be_a(Person))
     end
   end
+
+  describe 'json options' do
+    context 'when json is a method' do
+      let(:instance)     { described_class::HashJson.new(hash) }
+      let(:hash)         { { name: 'John Doe' } }
+      let(:options_hash) { { key: :name, json: :hash } }
+
+      it 'fetches hash from given method' do
+        expect(fetcher.fetch).to eq('John Doe')
+      end
+    end
+
+    context 'when json is an instance variable' do
+      let(:instance)     { described_class::NoAccessor.new(hash) }
+      let(:hash)         { { name: 'John Doe' } }
+      let(:options_hash) { { key: :name, json: :@hash } }
+
+      it 'fetches hash from given method' do
+        expect(fetcher.fetch).to eq('John Doe')
+      end
+    end
+
+    context 'when json is an instance variable' do
+      let(:instance)     { described_class::ClassVariable.new }
+      let(:hash)         { { name: 'John Doe' } }
+      let(:options_hash) { { key: :name, json: :@@json } }
+
+      before do
+        described_class::ClassVariable.json = hash
+      end
+
+      it 'fetches hash from given method' do
+        expect(fetcher.fetch).to eq('John Doe')
+      end
+    end
+  end
 end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Arstotzka
+  class Fetcher
+    class ClassVariable
+      def self.json=(json)
+        @@json = json
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Arstotzka
+  class Fetcher
+    class HashJson
+      def initialize(hash)
+        @hash = hash
+      end
+
+      private
+
+      attr_reader :hash
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Arstotzka
+  class Fetcher
+    class NoAccessor
+      def initialize(hash)
+        @hash = hash
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arstotzka
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Darthjee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-24 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -247,7 +247,10 @@ files:
 - spec/support/models/account.rb
 - spec/support/models/application.rb
 - spec/support/models/arstotzka/dummy.rb
+- spec/support/models/arstotzka/fetcher/class_variable.rb
 - spec/support/models/arstotzka/fetcher/dummy.rb
+- spec/support/models/arstotzka/fetcher/hash_json.rb
+- spec/support/models/arstotzka/fetcher/no_accessor.rb
 - spec/support/models/arstotzka/type_cast.rb
 - spec/support/models/arstotzka/wrapper/dummy.rb
 - spec/support/models/bar.rb
@@ -327,7 +330,10 @@ test_files:
 - spec/support/models/account.rb
 - spec/support/models/application.rb
 - spec/support/models/arstotzka/dummy.rb
+- spec/support/models/arstotzka/fetcher/class_variable.rb
 - spec/support/models/arstotzka/fetcher/dummy.rb
+- spec/support/models/arstotzka/fetcher/hash_json.rb
+- spec/support/models/arstotzka/fetcher/no_accessor.rb
 - spec/support/models/arstotzka/type_cast.rb
 - spec/support/models/arstotzka/wrapper/dummy.rb
 - spec/support/models/bar.rb