evil-client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3ce5ab3f46cc4b5835d2ca831403c9f7090c7df
-  data.tar.gz: 0a46913313a0cb465864f58a0af5ca8c69862b2d
+  metadata.gz: 3657d0246cbb2f95df2b4aa8562d4fe192a93050
+  data.tar.gz: 8f9c4cd0be983d7942749801c2a440cc4650d7fb
 SHA512:
-  metadata.gz: 58cd0f896ad69d342e01eb8d0839012154ab09940138ad337c723bc5b2f9c8e1eb35fa7726b9544e9451c9ac179faa94da5286f3e645711453db67e611ddfaed
-  data.tar.gz: 7a300cbf1de16050958f698ab869679babac7888998b3eacc27de369f8df654ea2b9a26a60c02f0124925fc18e65932536b3e6b5685315f44cbdaae4f54f2243
+  metadata.gz: 482ff1dc21692b4680bdb2d342d39c624f20f7eb33f8d0f88ffa74ac3d9d2d1723977b32f281c399a42a4a472465daef5e170ede3f5e4afdbcdb04c58df306e7
+  data.tar.gz: 4bcb567014c69fe09a5611947c893be8e2518347344651a27f297861da5c3eb832c2132d720e85649017f799ed53610064ff1bed1aa236c42bcf3c5079cf449d

data/evil-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name     = "evil-client"
-  gem.version  = "0.2.1"
+  gem.version  = "0.2.2"
   gem.author   = "Andrew Kozin (nepalez)"
   gem.email    = "andrew.kozin@gmail.com"
   gem.homepage = "https://github.com/evilmartians/evil-client"
@@ -13,9 +13,9 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.3"
 
-  gem.add_runtime_dependency "dry-initializer", "~> 0.7.0"
+  gem.add_runtime_dependency "dry-initializer", "~> 0.9.0"
   gem.add_runtime_dependency "mime-types", "~> 3.0"
-  gem.add_runtime_dependency "rack"
+  gem.add_runtime_dependency "rack", "~> 2"
 
   gem.add_development_dependency "dry-types", "~> 0.9"
   gem.add_development_dependency "rspec", "~> 3.0"

data/lib/evil/client.rb

@@ -77,21 +77,6 @@ module Evil
     require_relative "client/operation"
     require_relative "client/dsl"
 
-    extend  DSL
-    include Dry::Initializer.define -> { param :operations }
-
-    # Builds a client instance with custom settings
-    def self.new(*settings)
-      super finalize(*settings)
-    end
-
-    private
-
-    def initialize(schema)
-      @operations = \
-        schema[:operations].each_with_object({}) do |(key, val), hash|
-          hash[key] = Operation.new val, schema[:connection]
-        end
-    end
+    extend DSL
   end
 end

data/lib/evil/client/dsl.rb

@@ -13,6 +13,11 @@ class Evil::Client
       run Middleware::NormalizeHeaders
     end
 
+    # Adds [#operations] to a specific client's instances
+    def self.extended(klass)
+      klass.include Dry::Initializer.define -> { param :operations }
+    end
+
     # Helper to define params and options a for a client's constructor
     #
     # @example
@@ -78,24 +83,30 @@ class Evil::Client
       self
     end
 
-    # Takes constructor arguments and builds a final schema for the instance
+    # Takes constructor arguments and builds a final schema for an instance
+    # (All the instantiation magics goes here)
     #
     # @param  [Object] *args
     # @return [Hash<Symbol, Object>]
     #
-    def finalize(*args)
+    def new(*args)
       settings   = schema[:settings].new(*args)
-      uri        = URI(schema[:base_url].call(settings))
-      client     = schema[:connection].new(uri)
+      base_url   = schema[:base_url].call(settings)
       middleware = schema[:middleware].finalize(settings)
-      stack = Middleware.prepend.(middleware.(Middleware.append.(client)))
+      operations = schema[:operations].finalize(settings)
+      client     = schema[:connection].new URI(base_url)
+      connection = Middleware.prepend.(middleware.(Middleware.append.(client)))
+
+      data = operations.each_with_object({}) do |(key, schema), hash|
+        hash[key] = Evil::Client::Operation.new schema, connection
+      end
 
-      { connection: stack, operations: schema[:operations].finalize(settings) }
+      super(data)
     end
 
     private
 
-    BASE_URL = -> (_) { fail NotImplementedError.new "Base url not defined" }
+    BASE_URL = -> (_) { fail NotImplementedError.new "Base url is not defined" }
 
     def schema
       @schema ||= {

data/lib/evil/client/model.rb

@@ -10,8 +10,6 @@ class Evil::Client
   class Model
     class << self
       include Dry::Initializer::Mixin
-      alias_method :attribute, :option
-      alias_method :param, :option
 
       def new(value)
         return value if value.is_a? self
@@ -20,27 +18,33 @@ class Evil::Client
         end
         super value
       end
+      alias_method :call, :new
+      alias_method :[], :new
 
-      def call(value)
-        new(value).to_h
+      def attributes
+        @attributes ||= []
       end
-      alias_method :[], :call
-    end
 
-    tolerant_to_unknown_options
+      def option(name, type = nil, **opts)
+        super.tap { attributes << name.to_sym }
+      end
+      alias_method :attribute, :option
+      alias_method :param, :option
+
+      private
+
+      def inherited(klass)
+        super
+        klass.instance_variable_set :@attributes, attributes.dup
+      end
+    end
 
     def ==(other)
-      return false unless other.respond_to? :to_h
-      to_h == other.to_h
+      other.respond_to?(:to_h) ? to_h == other.to_h : false
     end
 
     def to_h
-      attributes = method(:initialize)
-                   .parameters
-                   .map { |item| item[1] unless item[0] == :keyrest }
-                   .compact
-
-      attributes.each_with_object({}) do |key, hash|
+      self.class.attributes.each_with_object({}) do |key, hash|
         val = send(key)
         hash[key] = hashify(val) unless val == Dry::Initializer::UNDEFINED
       end

data/spec/features/instantiation_spec.rb

@@ -30,7 +30,7 @@ RSpec.describe "instantiation" do
     let(:client) { Test::Client.new(**options) }
 
     it "is rejected" do
-      expect { client }.to raise_error(ArgumentError)
+      expect { client }.to raise_error(KeyError)
     end
   end
 
@@ -45,8 +45,8 @@ RSpec.describe "instantiation" do
   context "with unexpected option settings:" do
     before { options[:foo] = "bar" }
 
-    it "is rejected" do
-      expect { client }.to raise_error(ArgumentError)
+    it "is accepted" do
+      expect { client }.not_to raise_error
     end
   end
 
@@ -54,7 +54,7 @@ RSpec.describe "instantiation" do
     before { options.delete :user }
 
     it "is rejected" do
-      expect { client }.to raise_error(ArgumentError)
+      expect { client }.to raise_error(KeyError)
     end
   end
 

data/spec/features/operation_with_form_body_spec.rb

@@ -140,7 +140,7 @@ RSpec.describe "operation with form body" do
     end
 
     it "requires mandatory arguments" do
-      expect { operation.call bar: 2, baz: 3 }.to raise_error(ArgumentError)
+      expect { operation.call bar: 2, baz: 3 }.to raise_error(KeyError)
     end
 
     it "applies type restrictions" do

data/spec/features/operation_with_headers_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe "operation with headers" do
 
   it "requires mandatory headers" do
     expect { client.operations[:clear_data].call bar: "BAR", baz: "BAZ" }
-      .to raise_error(ArgumentError)
+      .to raise_error(KeyError)
   end
 
   it "applies type constraints" do

data/spec/features/operation_with_json_body_spec.rb

@@ -138,7 +138,7 @@ RSpec.describe "operation with json body" do
     end
 
     it "requires mandatory arguments" do
-      expect { operation.call bar: 2, baz: 3 }.to raise_error(ArgumentError)
+      expect { operation.call bar: 2, baz: 3 }.to raise_error(KeyError)
     end
 
     it "applies type restrictions" do

data/spec/features/operation_with_query_spec.rb

@@ -65,7 +65,7 @@ RSpec.describe "operation with query" do
 
   it "applies type restrictuions" do
     expect { client.operations[:filter].call id: 1, name: "Joe" }
-      .to raise_error(ArgumentError)
+      .to raise_error(KeyError)
   end
 
   it "supports nesting in a Rails style" do

data/spec/unit/evil/client/dsl/scope_spec.rb

@@ -3,6 +3,8 @@ RSpec.describe Evil::Client::DSL, ".scope" do
     class Test::Foo
       extend Evil::Client::DSL
 
+      base_url { "https://example.com" }
+
       scope :foo do
         param :bar
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evil-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Kozin (nepalez)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-initializer
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +199,6 @@ files:
 - spec/unit/evil/client/dsl/operations_spec.rb
 - spec/unit/evil/client/dsl/scope_spec.rb
 - spec/unit/evil/client/dsl/security_spec.rb
-- spec/unit/evil/client/dsl_spec.rb
 - spec/unit/evil/client/middleware/merge_security_spec.rb
 - spec/unit/evil/client/middleware/normalize_headers_spec.rb
 - spec/unit/evil/client/middleware/stringify_form_spec.rb
@@ -257,7 +256,6 @@ test_files:
 - spec/unit/evil/client/dsl/operations_spec.rb
 - spec/unit/evil/client/dsl/scope_spec.rb
 - spec/unit/evil/client/dsl/security_spec.rb
-- spec/unit/evil/client/dsl_spec.rb
 - spec/unit/evil/client/middleware/merge_security_spec.rb
 - spec/unit/evil/client/middleware/normalize_headers_spec.rb
 - spec/unit/evil/client/middleware/stringify_form_spec.rb

data/spec/unit/evil/client/dsl_spec.rb

@@ -1,57 +0,0 @@
-RSpec.describe Evil::Client::DSL do
-  before do
-    class Test::Middleware
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        app.call(env).reverse
-      end
-    end
-
-    class Test::Foo
-      extend Evil::Client::DSL
-
-      settings do
-        param  :version,  type: Dry::Types["coercible.int"]
-        option :user,     type: Dry::Types["strict.string"]
-        option :password, type: Dry::Types["strict.string"]
-      end
-
-      base_url do |settings|
-        "https://example.com/v#{settings.version}"
-      end
-
-      connection do |_|
-        run Test::Middleware
-      end
-
-      operation do |settings|
-        security { basic_auth settings.user, settings.password }
-      end
-
-      operation :find_user do |_|
-        path { |id:| "users/#{id}" }
-        http_method :get
-
-        response 200 do |data|
-          data.reverse
-        end
-      end
-    end
-  end
-
-  subject { Test::Foo.finalize(4, user: "foo", password: "bar") }
-
-  it "builds a proper schema" do
-    operation = subject[:operations][:find_user]
-
-    expect(operation[:security].call)
-      .to eq headers: { "authorization" => "Basic Zm9vOmJhcg==" }
-    expect(operation[:path].call(id: 3)).to eq "users/3"
-    expect(operation[:method]).to eq "get"
-
-    expect(operation[:responses][200][:coercer].call "foo").to eq "oof"
-  end
-end