artemis 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb8351e9d06cd0d45eec2321fbdea32691030d55b717145a8165df83d0fd91f3
-  data.tar.gz: 98f117a37598ece1f224b50cedbfa8587432c8440da16ca179460a9732604ed7
+  metadata.gz: 6d63a9c3c0a9082fd9b93c55499fae9865425d01178c4ec637fb96a16acc9a3f
+  data.tar.gz: c0892fe01fe9b5d9c6c4e8b19c13d313e8efc75c1b3235db141cacd472f0dff6
 SHA512:
-  metadata.gz: 2933d4c334cf13af3f923f7915c5eae745837667bb0f1322310944fb3a54ef117ab1666b38e242814bd433e27b8dfb96691b38e2aaa1e271882fe4e6c4952fa5
-  data.tar.gz: 9c780829798e9a3bff896bcf6b52aa97918eea1c93336f4295f0bf478030dbeeb53670d1f6f0b4c96776e59cb35cf6935ce61eec3ca9d538462d3527f50936a6
+  metadata.gz: efced6e7780065414b95d47248f6f2b71055ed1512a5a19b2f86c82dcb42e9ef205894935ec8a0f3a106dfd109cb8bf12f978ceeb3357e6caac61a6a7818cce7
+  data.tar.gz: a45b2cb975cb8399a3a9e26e6dc4abdbf8afeaeead80ace29a2f6fd9c31966d7ede04724a53d23cb7abfa1e1611ea9d30839be4eb2677e71e9fce846cd5d27d4

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [v0.5.0](https://github.com/yuki24/artemis/tree/v0.5.0)
+
+_<sup>released at 2019-06-02 22:01:57 UTC</sup>_
+
+#### Features
+
+- Add support for Rails 6.0, 4.1, and 4.0
+- [<tt>6701b54</tt>](https://github.com/yuki24/artemis/commit/6701b546a143c22109c7ab30018acf96d67067d1), [#62](https://github.com/yuki24/artemis/issues/62): Allow to dynamically call the operation ([@JanStevens](https://github.com/JanStevens))
+
+#### Fixes
+
+- [#67](https://github.com/yuki24/artemis/pull/67): Fix the wrong test version constraints in `Appraisals` ([@daemonsy](https://github.com/daemonsy))
+- [#60](https://github.com/yuki24/artemis/pull/60): Fix an issue where not all adapters send required HTTP headers
+
 ## [v0.4.0](https://github.com/yuki24/artemis/tree/v0.4.0)
 
 _<sup>released at 2019-01-30 03:42:14 UTC</sup>_

data/lib/artemis/client.rb

@@ -5,6 +5,7 @@ require 'delegate'
 require 'active_support/configurable'
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/string/inflections'
 
 require 'artemis/graphql_endpoint'
@@ -16,10 +17,10 @@ module Artemis
 
     # The paths in which the Artemis client looks for files that have the +.graphql+ extension.
     # In a rails app, this value will be set to +["app/operations"]+ by Artemis' +Artemis::Railtie+.
-    config.query_paths = []
+    cattr_accessor :query_paths
 
     # Default context that is appended to every GraphQL request for the client.
-    config.default_context = {}
+    config.default_context = nil
 
     # List of before callbacks that get invoked in every +execute+ call.
     #
@@ -59,7 +60,7 @@ module Artemis
     end
 
     class << self
-      delegate :query_paths, :default_context, :query_paths=, :default_context=, to: :config
+      delegate :default_context=, to: :config
 
       # Creates a new instance of the GraphQL client for the service.
       #
@@ -137,7 +138,7 @@ module Artemis
       #   end
       #
       def before_execute(&block)
-        config.before_callbacks << block
+        config.before_callbacks = [*config.before_callbacks, block]
       end
 
       # Defines a callback that will get called right after the
@@ -155,7 +156,14 @@ module Artemis
       #   end
       #
       def after_execute(&block)
-        config.after_callbacks << block
+        config.after_callbacks = [*config.after_callbacks, block]
+      end
+
+      # Returns the default configured context or an empty hash by default
+      #
+      # @return [Hash]
+      def default_context
+        config.default_context || {}
       end
 
       def resolve_graphql_file_path(filename, fragment: false)
@@ -278,7 +286,7 @@ module Artemis
 
         client.query(self.class.const_get(const_name), variables: arguments, context: context)
       else
-        raise GraphQLFileNotFound.new("Query #{query}.graphql not found in: #{config.query_paths.join(", ")}")
+        raise GraphQLFileNotFound.new("Query #{query}.graphql not found in: #{query_paths.join(", ")}")
       end
     end
 

data/lib/artemis/test_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'erb'
+require 'yaml'
 
 require 'active_support/core_ext/module/attribute_accessors'
 
@@ -41,7 +42,7 @@ module Artemis
     #   da_vinci.data.artist.name      # => "Leonardo da Vinci"
     #
     def stub_graphql(service, query_name, arguments =  :__unspecified__)
-      StubbingDSL.new(service.to_s, graphql_fixtures(query_name), arguments)
+      StubbingDSL.new(service.to_s, query_name, graphql_fixture_files, arguments)
     end
 
     # Returns out-going GraphQL requests.
@@ -60,15 +61,11 @@ module Artemis
       __graphql_fixture_path__ || raise(Artemis::ConfigurationError, "GraphQL fixture path is unset")
     end
 
-    def graphql_fixtures(query_name) #:nodoc:
-      graphql_fixture_files.detect {|fixture| fixture.name == query_name.to_s } || \
-        raise(Artemis::FixtureNotFound, "Fixture file `#{File.join(graphql_fixture_path, "#{query_name}.{yml,json}")}' not found")
-    end
-
     def graphql_fixture_files #:nodoc:
       @graphql_fixture_sets ||= Dir["#{graphql_fixture_path}/{**,*}/*.{yml,json}"]
-                              .select {|file| ::File.file?(file) }
-                              .map    {|file| GraphQLFixture.new(File.basename(file, File.extname(file)), file, read_erb_yaml(file)) }
+                                  .uniq
+                                  .select {|file| ::File.file?(file) }
+                                  .map    {|file| GraphQLFixture.new(File.basename(file, File.extname(file)), file, read_erb_yaml(file)) }
     end
 
     def read_erb_yaml(path) #:nodoc:
@@ -76,15 +73,30 @@ module Artemis
     end
 
     class StubbingDSL #:nodoc:
-      attr_reader :service_name, :fixture_set, :arguments
+      attr_reader :service_name, :query_name, :fixture_sets, :arguments
+
+      def initialize(service_name, query_name, fixture_sets, arguments) #:nodoc:
+        @service_name, @query_name, @fixture_sets, @arguments = service_name, query_name, fixture_sets, arguments
+      end
+
+      def get(fixture_key)
+        fixture_set = find_fixture_set
+        fixture     = fixture_set.data[fixture_key.to_s]
+
+        if fixture.nil?
+          raise Artemis::FixtureNotFound, "Fixture `#{fixture_key}' not found in #{fixture_set.path}"
+        end
 
-      def initialize(service_name, fixture_set, arguments) #:nodoc:
-        @service_name, @fixture_set, @arguments = service_name, fixture_set, arguments
+        fixture
       end
 
       def to_return(fixture_key) #:nodoc:
-        fixture = fixture_set.data[fixture_key.to_s] || \
-          raise(Artemis::FixtureNotFound, "Fixture `#{fixture_key}' not found in #{fixture_set.path}")
+        fixture_set = find_fixture_set
+        fixture     = fixture_set.data[fixture_key.to_s]
+
+        if fixture.nil?
+          raise Artemis::FixtureNotFound, "Fixture `#{fixture_key}' not found in #{fixture_set.path}"
+        end
 
         Artemis::Adapters::TestAdapter.responses <<
           TestResponse.new(
@@ -93,6 +105,20 @@ module Artemis
             fixture
           )
       end
+
+      private
+
+      def find_fixture_set
+        fixture_set = fixture_sets
+                        .detect { |fixture| %r{#{service_name.downcase}/#{query_name}\.(yml|json)\z} =~ fixture.path }
+        fixture_set ||= fixture_sets.detect { |fixture| fixture.name == query_name.to_s }
+
+        if fixture_set.nil?
+          raise Artemis::FixtureNotFound, "Fixture file `#{query_name}.{yml,json}' not found"
+        end
+
+        fixture_set
+      end
     end
 
     TestResponse      = Struct.new(:operation_name, :arguments, :data) #:nodoc:

data/lib/artemis/version.rb

@@ -1,3 +1,3 @@
 module Artemis
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/callbacks_spec.rb

@@ -19,6 +19,20 @@ describe "#{GraphQL::Client} Callbacks" do
     end
   end
 
+  Spotify = Class.new(Artemis::Client) do
+    def self.name
+      'Spotify'
+    end
+
+    before_execute do
+      raise "this callback should not get invoked"
+    end
+
+    after_execute do
+      raise "this callback should not get invoked"
+    end
+  end
+
   describe ".before_execute" do
     it "gets invoked before executing" do
       Client.artist(id: 'yayoi-kusama', context: { user_id: 'yuki24' })

data/spec/fixtures/responses/{artist.yml → metaphysics/artist.yml}

@@ -15,3 +15,10 @@ yuki:
     artist:
       name: Yuki Nishijima
       birthday: <%= Date.today.year %>/01/01
+
+yoshiki:
+  data:
+    artist:
+      id: artist-yoshiki
+      name: Artist Yoshiki
+      birthday: null

data/spec/fixtures/responses/spotify/artist.yml

@@ -0,0 +1,5 @@
+yoshiki:
+  data:
+    artist:
+      id: pianist-yoshiki
+      name: Pianist Yoshiki

data/spec/test_helper_spec.rb

@@ -1,7 +1,7 @@
 require 'artemis/test_helper'
 require 'date'
 
-describe GraphQL::Client do
+describe Artemis::TestHelper do
   include Artemis::TestHelper
 
   def graphql_fixture_path
@@ -53,12 +53,33 @@ describe GraphQL::Client do
   it "can mock a GraphQL request for a query that has a query name"
 
   it "raises an exception if the specified fixture file does not exist" do
-    expect { stub_graphql(Metaphysics, :does_not_exist) }
-      .to raise_error(Artemis::FixtureNotFound, %r|spec/fixtures/responses/does_not_exist.{yml,json}|)
+    expect { stub_graphql(Metaphysics, :does_not_exist).to_return(:data) }
+      .to raise_error(Artemis::FixtureNotFound, %r|does_not_exist.{yml,json}|)
   end
 
   it "raises an exception if the specified fixture file exists but fixture key does not exist" do
     expect { stub_graphql(Metaphysics, :artist).to_return(:does_not_exist) }
-      .to raise_error(Artemis::FixtureNotFound, %r|spec/fixtures/responses/artist.yml|)
+      .to raise_error(Artemis::FixtureNotFound, %r|spec/fixtures/responses/metaphysics/artist.yml|)
+  end
+
+  it "picks up the fixture for the given different service if multiple services have the exact same fixture" do
+    stub_graphql(Metaphysics, :artist).to_return(:yoshiki)
+
+    yoshiki = Metaphysics.artist(id: "artist-yoshiki")
+
+    expect(yoshiki.data.artist.name).to eq("Artist Yoshiki")
+  end
+
+  it "allows to get raw fixture data as a Hash" do
+    data = stub_graphql("Spotify", :artist).get(:yoshiki)
+
+    expect(data).to eq({
+      "data" => {
+        "artist" => {
+          "id" => "pianist-yoshiki",
+          "name" => "Pianist Yoshiki"
+        }
+      }
+    })
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artemis
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jon Allured
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-02 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -220,8 +220,9 @@ files:
 - spec/fixtures/metaphysics/artists.graphql
 - spec/fixtures/metaphysics/artwork.graphql
 - spec/fixtures/metaphysics/schema.json
-- spec/fixtures/responses/artist.yml
-- spec/fixtures/responses/artwork.json
+- spec/fixtures/responses/metaphysics/artist.yml
+- spec/fixtures/responses/metaphysics/artwork.json
+- spec/fixtures/responses/spotify/artist.yml
 - spec/spec_helper.rb
 - spec/test_helper_spec.rb
 - tmp/.gitkeep