liedetector 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61795781cd370a2ac0d5aec455ce7ec975809bf
-  data.tar.gz: c2a9cfdc741c5f04a7976c144507d2a18a17aa14
+  metadata.gz: aa03058163399affa0461be6673a9d3e5a12c890
+  data.tar.gz: 1c53a79fe362a04d08772d26bc805877c9b2e098
 SHA512:
-  metadata.gz: dbb02fb245886090664c4b78ac42e8f0c73e59d2e750930189608517d3aff88f58aa78d5f636c658af654e949ecfce12ca39f9c56d2c5ad6c0848b56ce9b909e
-  data.tar.gz: d60f6ada6be527870ae719e953683e89bee2845316a3ce7a1e99497a7f30cd5bb4dbb4843b1ce31095fa7d9a489175f30754949aeffeeb5d7b0f0ccc789cdc81
+  metadata.gz: 20a421fc36dbd658fc3d6dbed033d94e32c3a8e5fd8f1ae71bab8e42304636698037baec78522f5c8dcfc6bcb78bd548eb1b26443f5f9b8953361cc8466018af
+  data.tar.gz: 5d19b4011700ddd9b7482a5b1164929d64846d2c666e8cef031f92203039cd5eadd76da67b88f1de953d83f5d718e486a3b1ae95f9657bca6d3d757bc2e9f17a

data/Gemfile.lock

@@ -27,7 +27,7 @@ GEM
       rspec-support (~> 3.0.0)
     rspec-support (3.0.3)
     thread_safe (0.3.4)
-    trafaret (1.5.7)
+    trafaret (1.5.9)
       activesupport
     tzinfo (1.2.1)
       thread_safe (~> 0.1)

data/lib/liedetector/request.rb

@@ -4,40 +4,27 @@ module LieDetector
       @suite = suite
     end
 
-    def method(method)
-      @method = method
-    end
-
-    def path(path)
-      @path = path
-    end
-
-    def data(data)
-      @data = data
-    end
-
-    def query(query)
-      @query = query
-    end
+    %w{method path data query headers status description}.each do |name|
+      define_method name do |arg|
+        self.instance_variable_set("@#{name}", arg)
+      end
 
-    def headers(headers)
-      @headers = headers
+      define_method "get_#{name}" do
+        data = self.instance_variable_get("@#{name}")
+        if data.is_a? Proc
+          @suite.instance_eval &data
+        else
+          data
+        end
+      end
     end
 
     def await(trafaret)
       @trafaret = T.construct(trafaret)
     end
 
-    def description(description)
-      @description = description
-    end
-
     def describe
-      "#{@description}\nExecute #{@method.to_s.upcase} #{@path}\n"
-    end
-
-    def status(status)
-      @status = status
+      "#{@description}\nExecute #{@method.to_s.upcase} #{get_path}\n"
     end
 
     def store(name)
@@ -46,21 +33,21 @@ module LieDetector
 
     def call
       res = @suite.session.send(
-        @method,
-        @suite.build_uri(@path, query: @query),
+        get_method,
+        @suite.build_uri(get_path, query: get_query),
         {
-          data: @data,
-          header: @suite.headers_defaults.merge(@headers || {})
+          data: get_data,
+          header: @suite.headers_defaults.merge(get_headers || {})
         }
       )
-      unless res.status == @status
-        raise "Bad status(#{@status} != #{res.status}): #{res.inspect}"
+      unless res.status == get_status
+        raise "Bad status(#{get_status} != #{res.status}): #{res.inspect}"
       end
-      res = @trafaret.call(Oj.load(res.content))
-      if res.is_a? Trafaret::Error
-        raise "Unmatched data #{res.dump}"
+      check = @trafaret.call(Oj.load(res.content))
+      if check.is_a? Trafaret::Error
+        raise "Unmatched data #{check.dump} #{res.content}"
       end
-      @suite.store_key(@store_key, res) if @store_key
+      @suite.store_key(@store_key, check) if @store_key
     end
   end
 end

data/lib/liedetector/suite.rb

@@ -3,6 +3,8 @@ module LieDetector
     HEADERS_DEFAULTS = {'Accept' => 'application/json'}
     HTTP_DEFAULTS = {host: '127.0.0.1', port: 3000}
 
+    attr_accessor :http_defaults
+
     def headers_defaults
       HEADERS_DEFAULTS
     end

data/lib/liedetector/version.rb

@@ -1,3 +1,3 @@
 module LieDetector
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liedetector
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Mikhail Krivushin