evil-client 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7709a566e45dfcf398b95933a6d91639fd1ad47d
-  data.tar.gz: fa499f5f9856cb8a451bc87c0ff3f44f41ae7733
+  metadata.gz: 1993a11c6b8086dec9802e02c4beeb56e8aadef3
+  data.tar.gz: 273f6c22939793760abc5bbae79681c03490116b
 SHA512:
-  metadata.gz: 98e0553379fa9a0b2105758cf271f7b7c0816a82d0116519e60f84aeadadc1ba8a25c8d4b53028f4fab5d0deaa1dc3a68da5a9efb01482a803b38ae6c59fc34d
-  data.tar.gz: b8f0873e672bbf51531ae4dbcee3948a11b4a16d52cd3c0f06adb50120e4e80186f864b97084cbb16864f9100fbf96e1f0e83908e600276323ca35e465a1b639
+  metadata.gz: 2d639bf5c2a2e8e1362df945d6416cc012052ea653ee8103eaeb7548c9e733aeaa400e3d7fa3c6eafee617a496c6edcfc581e22eb2dca31f003c175c716cca1b
+  data.tar.gz: 07011a575fdbbe193f280fe2cc68c0556547092b752fa617f5d40e1524bb26ee30b207efe4d98f217e1a38997772c8889cc5014ff026be35122e89338e822507

data/.codeclimate.yml

@@ -4,4 +4,15 @@ engines:
     enabled: true
     checks:
       Rubocop/Style/FrozenStringLiteralComment:
-        enabled: false
+        enabled: false
+      Rubocop/Style/Documentation:
+        enabled: false
+      Rubocop/Style/ClassAndModuleChildren:
+        enabled: false
+      Rubocop/Style/SpaceInLambdaLiteral:
+        enabled: false
+      Style/SingleLineBlockParams:
+        enabled: false
+ratings:
+  paths:
+    - "lib/**.rb"

data/.rubocop.yml

@@ -8,21 +8,23 @@ AllCops:
 Style/Alias:
   Enabled: false
 
-Style/CaseEquality:
-  Enabled: false
+Style/FileName:
+  Exclude:
+    - lib/evil-client.rb
 
 Style/Documentation:
   Enabled: false
 
-Style/DoubleNegation:
-  Enabled: false
-
 Style/LambdaCall:
   Enabled: false
 
 Style/MethodMissing:
   Enabled: false
 
+Style/MultilineMethodCallIndentation:
+  Exclude:
+    - spec/**.rb
+
 Style/NumericPredicate:
   Enabled: false
 
@@ -32,12 +34,19 @@ Style/RaiseArgs:
 Style/RescueModifier:
   Enabled: false
 
+Style/SingleLineBlockParams:
+  Enabled: false
+
 Style/SingleLineMethods:
   Exclude:
-    - spec/**/*_spec.rb
+    - spec/**.rb
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
+
+Style/SymbolProc:
+  Exclude:
+    - spec/**.rb

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v0.3.1 2016-11-20
+
+## Internal
+- Class `Evil::Client::Model` is extracted to `evil-struct` gem (nepalez)
+
+[Compare v0.3.0...v0.3.1](https://github.com/dry-rb/dry-initializer/compare/v0.3.0...v0.3.1)
+
 # v0.3.0 2016-11-18
 
 This version changes the way of processing responses. Instead of dealing

data/README.md

@@ -53,7 +53,7 @@ require "dry-types"
 
 class CatsClient < Evil::Client
   # describe a client-specific model of cat (the furry pinnacle of evolution)
-  class Cat < Evil::Client::Model
+  class Cat < Evil::Struct
     attribute :name,  type: Dry::Types["strict.string"], optional: true
     attribute :color, type: Dry::Types["strict.string"]
     attribute :age,   type: Dry::Types["coercible.int"], default: proc { 0 }

data/docs/headers.md

@@ -9,7 +9,7 @@ operation :find_cat do |settings|
 end
 ```
 
-The syntax of the attribute declaration is exactly the same as of [Evil::Client::Model][model]. Type constraints and default values are available.
+The syntax of the attribute declaration is exactly the same as of [Evil::Struct][model]. Type constraints and default values are available.
 
 All values for the headers will be taken from a request options:
 

data/docs/index.md

@@ -42,7 +42,7 @@ require "dry-types"
 
 class CatsClient < Evil::Client
   # describe a client-specific model of cat (the furry pinnacle of evolution)
-  class Cat < Evil::Client::Model
+  class Cat < Evil::Struct
     attribute :name,  type: Dry::Types["strict.string"], optional: true
     attribute :color, type: Dry::Types["strict.string"]
     attribute :age,   type: Dry::Types["coercible.int"], default: proc { 0 }

data/docs/model.md

@@ -4,10 +4,10 @@ They are needed to prepare and validate nested bodies and queries, as well as wr
 
 # Model Definition
 
-To define a model create a subclass of `Evil::Client::Model` and define its attributes.
+To define a model create a subclass of `Evil::Struct` and define its attributes.
 
 ```ruby
-class Cat < Evil::Client::Model
+class Cat < Evil::Struct
   attribute :name,  type: Dry::Types["strict.string"], optional: true
   attribute :age,   type: Dry::Types["coercible.int"], default: proc { 0 }
   attribute :color, type: Dry::Types["strict.string"]
@@ -40,7 +40,7 @@ Cat.new("name" => "Navuxodonosor II", "age" => 15, "color" => "black")
 You can use other (nested) models in type definitions:
 
 ```ruby
-class CatPack < Evil::Client::Model
+class CatPack < Evil::Struct
   attribute :cats, type: Dry::Types["array"].member(Cat)
 end
 
@@ -102,7 +102,7 @@ Nethertheless, there is an important difference between the implementations of n
 
 The main reason to define gem-specific model is the following. In `Dry::Struct` both the `optional` and `default` properties belong to value type constraint. The gem does not draw the line between attributes that are not set, and those that are set to `nil`.
 
-To the contrary, in [dry-initializer][dry-initializer] and `Evil::Client::Model` both `optional` and `default` properties describe not a value type by itself, but its relation to the model. An attribute value can be set to `nil`, or been kept in undefined state.
+To the contrary, in [dry-initializer][dry-initializer] and `Evil::Struct` both `optional` and `default` properties describe not a value type by itself, but its relation to the model. An attribute value can be set to `nil`, or been kept in undefined state.
 
 Let's see the difference on the example of `StructCat` and `ModelCat`:
 
@@ -112,7 +112,7 @@ class StructCat < Dry::Struct
   attribute :age,  type: Dry::Types["coercible.int"].default(0)
 end
 
-class ModelCat < Evil::Client::Model
+class ModelCat < Evil::Struct
   attribute :name, type: Dry::Types["strict.string"], optional: true
   attribute :age,  type: Dry::Types["coercible.int"], default: proc { 0 }
 end

data/docs/query.md

@@ -30,7 +30,7 @@ Non-unicode symbols are encoded as defined in [RFC-3986][rfc-3986]
 Use [models][model] to provide validation of query data:
 
 ```ruby
-class Cat < Evil::Client::Model
+class Cat < Evil::Struct
   attribute :name,  type: Dry::Types["strict.string"], optional: true
   attribute :age,   type: Dry::Types["strict.int"],    default:  proc { 0 }
   attribute :color, type: Dry::Types["strict.string"]

data/evil-client.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |gem|
   gem.name     = "evil-client"
-  gem.version  = "0.3.0"
-  gem.author   = "Andrew Kozin (nepalez)"
+  gem.version  = "0.3.1"
+  gem.author   = ["Andrew Kozin (nepalez)", "Ravil Bairamgalin (brainopia)"]
   gem.email    = "andrew.kozin@gmail.com"
   gem.homepage = "https://github.com/evilmartians/evil-client"
   gem.summary  = "Human-friendly DSL for building HTTP(s) clients in Ruby"
@@ -13,9 +13,9 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.3"
 
-  gem.add_runtime_dependency "dry-initializer", "~> 0.9.1"
-  gem.add_runtime_dependency "mime-types", "~> 3.0"
-  gem.add_runtime_dependency "rack", "~> 2"
+  gem.add_runtime_dependency "evil-struct", ">= 0.0.2"
+  gem.add_runtime_dependency "mime-types", "> 1"
+  gem.add_runtime_dependency "rack", ">= 1", "< 3"
 
   gem.add_development_dependency "dry-types", "~> 0.9"
   gem.add_development_dependency "rspec", "~> 3.0"

data/lib/evil-client.rb

@@ -0,0 +1 @@
+require_relative "evil/client"

data/lib/evil/client.rb

@@ -1,6 +1,7 @@
-require "dry-initializer"
+require "evil-struct"
 require "mime-types"
 require "rack"
+require "json"
 
 # Absctract base class for clients to remote APIs
 #
@@ -71,7 +72,6 @@ require "rack"
 #
 module Evil
   class Client
-    require_relative "client/model"
     require_relative "client/connection"
     require_relative "client/middleware"
     require_relative "client/operation"

data/lib/evil/client/dsl/operation.rb

@@ -94,7 +94,7 @@ module Evil::Client::DSL
       if model && block
         Class.new(model, &block)
       elsif block
-        Class.new(Evil::Client::Model, &block)
+        Class.new(Evil::Struct, &block)
       elsif model
         model
       end

data/lib/evil/client/dsl/response.rb

@@ -37,7 +37,7 @@ module Evil::Client::DSL
 
     def wrapper
       return unless json?
-      proc { |data| Hash === data ? data : { data: data } }
+      proc { |data| data.is_a?(Hash) ? data : { data: data } }
     end
 
     def processor
@@ -54,8 +54,7 @@ module Evil::Client::DSL
       case [model.nil?, addon.nil?]
       when [false, true]  then model
       when [false, false] then Class.new(model).tap(&addon)
-      when [true,  false] then Class.new(Evil::Client::Model).tap(&addon)
-      else nil
+      when [true,  false] then Class.new(Evil::Struct).tap(&addon)
       end
     end
   end

data/lib/evil/client/operation/response.rb

@@ -32,8 +32,8 @@ class Evil::Client::Operation
     private
 
     def handlers(status)
-      schema[:responses].values
-                        .select { |handler| handler[:status] == status }
+      list = schema[:responses].values.select { |item| item[:status] == status }
+      list.reject { |item| item[:raise] } + list.select { |item| item[:raise] }
     end
   end
 end

data/spec/features/operation_with_form_body_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe "operation with form body" do
   # see Test::Client definition in `/spec/support/test_client.rb`
   before do
-    class Test::User < Evil::Client::Model
+    class Test::User < Evil::Struct
       attribute :name
     end
 

data/spec/features/operation_with_json_body_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe "operation with json body" do
   # see Test::Client definition in `/spec/support/test_client.rb`
   before do
-    class Test::User < Evil::Client::Model
+    class Test::User < Evil::Struct
       attribute :name
     end
 

data/spec/features/operation_with_nested_responses_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe "operation with nested responses" do
   # see Test::Client definition in `/spec/support/test_client.rb`
   before do
-    class Test::User < Evil::Client::Model
+    class Test::User < Evil::Struct
       attribute :name
     end
 

data/spec/features/operation_with_query_spec.rb

@@ -1,7 +1,7 @@
 RSpec.describe "operation with query" do
   # see Test::Client definition in `/spec/support/test_client.rb`
   before do
-    class Test::User < Evil::Client::Model
+    class Test::User < Evil::Struct
       attribute :name
     end
 

data/spec/features/scoping_spec.rb

@@ -43,6 +43,6 @@ RSpec.describe "scoping" do
   it "provides access to params over nested scopes" do
     client["qux"].users[7].update name: "baz"
 
-    expect(a_request(:put, path).with body: "name=baz").to have_been_made
+    expect(a_request(:put, path).with(body: "name=baz")).to have_been_made
   end
 end

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

@@ -119,7 +119,7 @@ RSpec.describe Evil::Client::DSL::Operation do
 
     context "with :model without block" do
       before do
-        class Test::Foo < Evil::Client::Model
+        class Test::Foo < Evil::Struct
           attribute :qux
         end
       end
@@ -138,7 +138,7 @@ RSpec.describe Evil::Client::DSL::Operation do
 
     context "with :model and block" do
       before do
-        class Test::Foo < Evil::Client::Model
+        class Test::Foo < Evil::Struct
           attribute :qux
         end
       end
@@ -161,7 +161,7 @@ RSpec.describe Evil::Client::DSL::Operation do
 
   context "with #query" do
     before do
-      class Test::Foo < Evil::Client::Model
+      class Test::Foo < Evil::Struct
         attribute :qux
       end
     end
@@ -183,7 +183,7 @@ RSpec.describe Evil::Client::DSL::Operation do
 
   context "with #headers" do
     before do
-      class Test::Foo < Evil::Client::Model
+      class Test::Foo < Evil::Struct
         attribute :qux
       end
     end
@@ -290,7 +290,7 @@ RSpec.describe Evil::Client::DSL::Operation do
 
     context "with json format and type" do
       before do
-        class Test::Foo < Evil::Client::Model
+        class Test::Foo < Evil::Struct
           attribute :foo
         end
       end
@@ -309,7 +309,7 @@ RSpec.describe Evil::Client::DSL::Operation do
 
     context "with json format, type and handler" do
       before do
-        class Test::Foo < Evil::Client::Model
+        class Test::Foo < Evil::Struct
           attribute :foo
         end
       end
@@ -331,7 +331,7 @@ RSpec.describe Evil::Client::DSL::Operation do
 
     context "with json format and filter" do
       before do
-        class Test::Foo < Evil::Client::Model
+        class Test::Foo < Evil::Struct
           attribute :foo
         end
       end
@@ -352,7 +352,7 @@ RSpec.describe Evil::Client::DSL::Operation do
 
     context "with json format, type and filter" do
       before do
-        class Test::Foo < Evil::Client::Model
+        class Test::Foo < Evil::Struct
           attribute :foo
         end
       end

data/spec/unit/evil/client/operation/request_spec.rb

@@ -1,14 +1,14 @@
 RSpec.describe Evil::Client::Operation::Request do
   before do
-    class Test::Body < Evil::Client::Model
+    class Test::Body < Evil::Struct
       attribute :foo
     end
 
-    class Test::Query < Evil::Client::Model
+    class Test::Query < Evil::Struct
       attribute :bar
     end
 
-    class Test::Headers < Evil::Client::Model
+    class Test::Headers < Evil::Struct
       attribute :baz
     end
   end

metadata

@@ -1,57 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: evil-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Kozin (nepalez)
+- Ravil Bairamgalin (brainopia)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2016-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-initializer
+  name: evil-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +162,7 @@ files:
 - docs/security.md
 - docs/settings.md
 - evil-client.gemspec
+- lib/evil-client.rb
 - lib/evil/client.rb
 - lib/evil/client/connection.rb
 - lib/evil/client/connection/net_http.rb
@@ -175,7 +183,6 @@ files:
 - lib/evil/client/middleware/stringify_multipart.rb
 - lib/evil/client/middleware/stringify_multipart/part.rb
 - lib/evil/client/middleware/stringify_query.rb
-- lib/evil/client/model.rb
 - lib/evil/client/operation.rb
 - lib/evil/client/operation/request.rb
 - lib/evil/client/operation/response.rb
@@ -211,7 +218,6 @@ files:
 - spec/unit/evil/client/middleware/stringify_multipart_spec.rb
 - spec/unit/evil/client/middleware/stringify_query_spec.rb
 - spec/unit/evil/client/middleware_spec.rb
-- spec/unit/evil/client/model_spec.rb
 - spec/unit/evil/client/operation/request_spec.rb
 - spec/unit/evil/client/operation/response_spec.rb
 homepage: https://github.com/evilmartians/evil-client
@@ -268,6 +274,5 @@ test_files:
 - spec/unit/evil/client/middleware/stringify_multipart_spec.rb
 - spec/unit/evil/client/middleware/stringify_query_spec.rb
 - spec/unit/evil/client/middleware_spec.rb
-- spec/unit/evil/client/model_spec.rb
 - spec/unit/evil/client/operation/request_spec.rb
 - spec/unit/evil/client/operation/response_spec.rb

data/lib/evil/client/model.rb

@@ -1,69 +0,0 @@
-# Base structure for models describing parts of requests and responses
-#
-# The initializer accepts a hash with symbol/string keys,
-# from which it takes and validates necessary options.
-#
-# The method [#to_h] converts nested data to hash
-# with symbolic keys at any level of nesting.
-#
-class Evil::Client
-  class Model
-    class << self
-      include Dry::Initializer::Mixin
-
-      def new(value)
-        return value if value.is_a? self
-        value = value.to_h.each_with_object({}) do |(key, val), obj|
-          obj[key.to_sym] = val
-        end
-        super value
-      end
-      alias_method :call, :new
-      alias_method :[], :new
-
-      def attributes
-        @attributes ||= []
-      end
-
-      def option(name, type = nil, as: nil, **opts)
-        super.tap { attributes << (as || 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)
-      other.respond_to?(:to_h) ? to_h == other.to_h : false
-    end
-
-    def to_h
-      self.class.attributes.each_with_object({}) do |key, hash|
-        val = send(key)
-        hash[key] = hashify(val) unless val == Dry::Initializer::UNDEFINED
-      end
-    end
-    alias_method :[], :send
-
-    private
-
-    def hashify(value)
-      if value.is_a? Evil::Client::Model
-        value.to_h
-      elsif value.respond_to? :to_hash
-        value.to_hash
-             .each_with_object({}) { |(key, val), obj| obj[key] = hashify(val) }
-      elsif value.is_a? Enumerable
-        value.map { |val| hashify(val) }
-      else
-        value
-      end
-    end
-  end
-end

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

@@ -1,100 +0,0 @@
-RSpec.describe Evil::Client::Model do
-  before do
-    class Test::User < Evil::Client::Model
-      option :name,  type: Dry::Types["strict.string"]
-      option :email, type: Dry::Types["strict.string"], default:  proc { nil }
-      option :phone, type: Dry::Types["strict.string"], optional: true
-    end
-
-    class Test::Order < Evil::Client::Model
-      param :user,    type: Test::User
-      attribute :sum, type: Dry::Types["strict.int"]
-      option :items,  type: Dry::Types["array"].member(Dry::Types["strict.int"])
-      option :qt,     default: proc { nil }
-    end
-  end
-
-  describe ".new" do
-    it "is tolerant to unknown options" do
-      user = Test::User.new(name: "Andrew", foo: "bar")
-      expect(user.to_h).to eq name: "Andrew", email: nil
-    end
-
-    it "checks types" do
-      expect { Test::User.new(name: "Andrew", email: nil) }
-        .to raise_error TypeError
-    end
-
-    it "accepts string keys" do
-      user = Test::User.new("name" => "Andrew")
-      expect(user).to eq Test::User.new(name: "Andrew")
-    end
-  end
-
-  describe ".call" do
-    it "is shortcuts filtering" do
-      user = Test::User.call(name: "Andrew")
-      expect(user).to eq name: "Andrew", email: nil
-    end
-  end
-
-  describe ".[]" do
-    it "is an alias for .call" do
-      user = Test::User[name: "Andrew"]
-      expect(user).to eq Test::User.call(name: "Andrew")
-    end
-  end
-
-  describe "#to_h" do
-    it "provides a hash with assigned values only" do
-      user = Test::User[name: "Andrew"]
-      expect(user.to_h).to eq name: "Andrew", email: nil
-
-      user = Test::User[name: "Alan", email: "alan@example.com"]
-      expect(user.to_h).to eq name: "Alan", email: "alan@example.com"
-
-      user = Test::User[name: "Alice", phone: "12345"]
-      expect(user.to_h).to eq name: "Alice", email: nil, phone: "12345"
-
-      user = Test::User[name: "Avdi", phone: "12345"]
-      expect(user.to_h).to eq name: "Avdi", email: nil, phone: "12345"
-    end
-
-    it "hashifies models it depth" do
-      order = Test::Order[user: { name: "Bob" }, sum: 100, items: [1, 2]]
-      expect(order.to_h).to eq user:  { name: "Bob", email: nil },
-                               sum:   100,
-                               items: [1, 2],
-                               qt:    nil
-    end
-  end
-
-  describe "#[]" do
-    it "is an alias for #send" do
-      user = Test::User.new(name: "Andrew")
-      expect(user[:name]).to  eq user.name
-      expect(user["name"]).to eq user.name
-    end
-  end
-
-  describe "#==" do
-    it "compares model to model with the same attributes" do
-      user = Test::User[name: "Andrew"]
-      expect(user).to eq Test::User[name: "Andrew"]
-      expect(user).not_to eq Test::User[name: "Andrew", phone: "71112234455"]
-    end
-
-    it "compares model to some hash" do
-      user = Test::User[name: "Andrew"]
-      expect(user).to eq name: "Andrew", email: nil
-    end
-
-    it "makes comparison in depth" do
-      order = Test::Order[user: { name: "Bob" }, sum: 100, items: [1, 2]]
-      expect(order).to eq user:  { name: "Bob", email: nil },
-                          sum:   100,
-                          items: [1, 2],
-                          qt:    nil
-    end
-  end
-end