k_sequencing 0.1.24 → 0.1.25

data/k_sequencing.gemspec

@@ -1,12 +1,10 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |s|
   s.name          = 'k_sequencing'
-  s.version       = '0.1.24'
-  s.date          = '2017-12-27'
+  s.version       = '0.1.25'
+  s.date          = '2018-03-28'
   s.summary       = 'KSequencing is a moderator service for your online content'
   s.description   = 'Moderation suite'
   s.post_install_message = File.read('INSTALL.md') if File.exist?('INSTALL.md')
@@ -17,7 +15,11 @@ Gem::Specification.new do |s|
   s.license       = 'Commercial'
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'json', '~> 1.8', '>= 1.8.3'
-  s.add_runtime_dependency 'faraday', '~> 0.13.1', '>= 0.13.1'
+  s.add_runtime_dependency 'faraday',            '~> 0.13.1', '>= 0.13.1'
   s.add_runtime_dependency 'faraday_middleware', '~> 0.12.2', '>= 0.12.2'
+  s.add_runtime_dependency 'json',               '~> 1.8',    '>= 1.8.3'
+  s.add_development_dependency 'minitest',       '~> 5.11', '>= 5.11.3'
+  s.add_development_dependency 'rake',           '~> 12.3'
+  s.add_development_dependency 'simplecov',      '~> 0.15.1'
+  s.add_development_dependency 'webmock',        '~> 3.3'
 end

data/lib/k_sequencing.rb

@@ -10,8 +10,6 @@ require_relative 'k_sequencing/image_messages'
 require_relative 'k_sequencing/predictions'
 # :nodoc:
 module KSequencing
-  mattr_accessor :user_key, :project_key
-
   class << self
     def setup
       yield self
@@ -40,7 +38,5 @@ module KSequencing
     def prediction
       Prediction.new
     end
-
   end
-
 end

data/lib/k_sequencing/client.rb

@@ -1,7 +1,6 @@
 module KSequencing
   # :nodoc:
   class Client
-
     def create_image_choices(options = {})
       options[:token] ||= KSequencing.project_key
       connection.post('/api/images/choices', options)
@@ -84,11 +83,10 @@ module KSequencing
       connection.get("/api/projects/images/#{id}", options)
     end
 
-  private
+    private
 
     def connection
       @connection ||= Connection.new
     end
-
   end
 end

data/lib/k_sequencing/client_response.rb

@@ -1,23 +1,18 @@
 module KSequencing
-
   class Response
-
-    attr_reader :count, :message, :status
+    attr_reader :total, :message, :status
     attr_accessor :data, :meta
 
-    def initialize(data, success, response_code = "", response_message = "success", meta = nil, total = 0)
+    def initialize(data, response_code = '', response_message = 'success', meta = nil, total = 0)
       @data = data
-      @success = success
       @status = response_code
       @message = response_message
-      @total = total unless total.nil?
       @meta = meta
+      @total = total unless total.nil?
     end
 
     def successful?
-      !something.nil?
+      [200, 201].include? status
     end
-
   end
-
 end

data/lib/k_sequencing/connection.rb

@@ -1,31 +1,30 @@
 require File.expand_path('../faraday/raise_http_exception.rb', __FILE__)
 require File.expand_path('../client_response.rb', __FILE__)
-require 'active_support/all'
 
 module KSequencing
   # :nodoc:
   class Connection
     def get(path, options = {})
-      response = connection.get do |request|
+      @response = connection.get do |request|
         request.url(path)
         request.headers['Content-Type'] = 'application/json'
         request.headers['Authorization'] = options[:token] unless options[:token].nil?
-        request.params = options
+        request.params = options[:path_param] ? prediction_options(options) : options
       end
-      Response.new(data(response), true, response.status, 'success', meta(response), total(response))
+      Response.new(data, status_code, message, meta, total)
     rescue Error, Faraday::Error => e
       handle_error(e)
     end
 
     def post(path, options = {}, query_params = {})
-      response = connection.post do |request|
+      @response = connection.post do |request|
         request.path = path
         request.headers['Content-Type'] = 'application/json'
         request.headers['Authorization'] = options[:token] unless options[:token].nil?
         request.params = query_params
-        request.body = options unless options.empty?
+        request.body = options unless options.nil?
       end
-      Response.new(data(response), true, status_code(response), meta(response), meta(response), nil)
+      Response.new(data, status_code, message, meta, nil)
     rescue Error, Faraday::Error => e
       handle_error(e)
     end
@@ -47,20 +46,24 @@ module KSequencing
       end
     end
 
-    def status_code(response)
-      meta(response)['code'] if meta(response).present?
+    def data
+      @response.body['data']
     end
 
-    def meta(response)
-      response.body['meta']
+    def meta
+      @response.body['meta']
     end
 
-    def total(response)
-      meta(response)['total_count'] if meta(response).present?
+    def status_code
+      meta['code'] unless meta.nil?
     end
 
-    def data(response)
-      response.body['data']
+    def message
+      meta['message'] unless meta.nil?
+    end
+
+    def total
+      meta['total_count'] unless meta.nil?
     end
 
     def handle_error(exception)
@@ -72,7 +75,12 @@ module KSequencing
         message = exception.to_s.partition(':').last
       end
 
-      Response.new(nil, false, code, message, 0)
+      Response.new(nil, code, message, nil)
+    end
+
+    def prediction_options(options)
+      %i[id path_param].each { |e| options.delete(e) }
+      options
     end
   end
 end

data/lib/k_sequencing/faraday/raise_http_exception.rb

@@ -1,11 +1,8 @@
 require 'faraday_middleware'
 
 module KSequencing
-
   module FaradayMiddleware
-
     class RaiseHttpException < Faraday::Middleware
-
       def call(request_env)
         @app.call(request_env).on_complete do |response|
           case response[:status].to_i
@@ -33,14 +30,11 @@ module KSequencing
       private
 
       def error_message(response_body)
-        if response_body.present? && response_body.is_a?(String)
+        if !response_body.nil? && response_body.is_a?(String)
           response_body = JSON.parse(response_body)
-          response_body["message"]
+          response_body['message']
         end
       end
-
     end
-
   end
-
 end

data/lib/k_sequencing/predictions.rb

@@ -1,7 +1,6 @@
 module KSequencing
   # :nodoc:
   class Prediction
-
     def all(options = {})
       options[:token] ||= KSequencing.project_key
       connection.get('/api/prime/predictions', options)
@@ -14,15 +13,14 @@ module KSequencing
 
     def find_by(options = {})
       options[:token] ||= KSequencing.project_key
+      options[:path_param] = true
       connection.get("/api/prime/predictions/#{options[:id]}", options)
     end
 
-  private
+    private
 
     def connection
       @connection ||= Connection.new
     end
-
   end
-
 end

data/lib/k_sequencing/version.rb

@@ -1,3 +1,3 @@
 module KSequencing
-  VERSION = '0.1.24'.freeze
+  VERSION = '0.1.25'.freeze
 end

data/test/fixtures/image_choice/all.json

@@ -0,0 +1,27 @@
+{
+  "data": {
+    "images": [
+      {
+        "id": "5a44671ab3957c2ab5c33326",
+        "allow_empty": false,
+        "answer": [],
+        "categories": [
+          "Gnoon"
+        ],
+        "credit_charged": 0,
+        "custom_id": null,
+        "data": "https://assets-cdn.github.com/images/modules/open_graph/github-mark.png",
+        "instruction": "Instruction",
+        "multiple": false,
+        "postback_url": "https://9333bbac.ngrok.io/callbacks",
+        "processed_at": null,
+        "project_id": 102,
+        "status": "unprocess"
+      }
+    ]
+  },
+  "meta": {
+    "code": 200,
+    "message": "success"
+  }
+}

data/test/fixtures/image_choice/create.json

@@ -0,0 +1,25 @@
+{
+  "data": {
+    "image": {
+      "id": "5a44671ab3957c2ab5c33326",
+      "allow_empty": false,
+      "answer": [],
+      "categories": [
+        "foo,bar"
+      ],
+      "credit_charged": 0,
+      "custom_id": null,
+      "data": "https://assets-cdn.github.com/images/modules/open_graph/github-mark.png",
+      "instruction": "Image's instruction",
+      "multiple": false,
+      "postback_url": "https://9333bbac.ngrok.io/callbacks",
+      "processed_at": null,
+      "project_id": 105,
+      "status": "unprocess"
+    }
+  },
+  "meta": {
+    "code": 200,
+    "message": "success"
+  }
+}

data/test/fixtures/image_closed_question/all.json

@@ -0,0 +1,21 @@
+{
+  "data": {
+    "images": [
+      {
+        "id": "5a44671ab3957c2ab5c33326",
+        "answer": "declined",
+        "credit_charged": 1,
+        "custom_id": null,
+        "data": "https://assets-cdn.github.com/images/modules/open_graph/github-mark.png",
+        "postback_url": "https://9333bbac.ngrok.io/callbacks",
+        "processed_at": "2017-12-28T10:40:30.462+07:00",
+        "project_id": 102,
+        "status": "processed"
+      }
+    ]
+  },
+  "meta": {
+    "code": 200,
+    "message": "success"
+  }
+}

data/test/fixtures/image_closed_question/create.json

@@ -0,0 +1,19 @@
+{
+  "data": {
+    "image": {
+      "id": "5a44671ab3957c2ab5c33326",
+      "answer": "declined",
+      "credit_charged": 1,
+      "custom_id": null,
+      "data": "https://assets-cdn.github.com/images/modules/open_graph/github-mark.png",
+      "postback_url": "https://9333bbac.ngrok.io/callbacks",
+      "processed_at": "2017-12-28T10:40:30.462+07:00",
+      "project_id": 102,
+      "status": "processed"
+    }
+  },
+  "meta": {
+    "code": 200,
+    "message": "success"
+  }
+}

data/test/fixtures/image_message/all.json

@@ -0,0 +1,22 @@
+{
+  "data": {
+    "images": [
+      {
+        "id": "5a44671ab3957c2ab5c33326",
+        "answer": null,
+        "credit_charged": 0,
+        "custom_id": null,
+        "data": "https://assets-cdn.github.com/images/modules/open_graph/github-mark.png",
+        "instruction": "Instruction",
+        "postback_url": "https://9333bbac.ngrok.io/callbacks",
+        "processed_at": null,
+        "project_id": 102,
+        "status": "unprocess"
+      }
+    ]
+  },
+  "meta": {
+    "code": 200,
+    "message": "success"
+  }
+}

data/test/fixtures/image_message/create.json

@@ -0,0 +1,20 @@
+{
+  "data": {
+    "image": {
+      "id": "5a44671ab3957c2ab5c33326",
+      "answer": null,
+      "credit_charged": 0,
+      "custom_id": null,
+      "data": "https://assets-cdn.github.com/images/modules/open_graph/github-mark.png",
+      "instruction": "Instruction",
+      "postback_url": "https://9333bbac.ngrok.io/callbacks",
+      "processed_at": null,
+      "project_id": 102,
+      "status": "unprocess"
+    }
+  },
+  "meta": {
+    "code": 200,
+    "message": "success"
+  }
+}

data/test/fixtures/image_photo_tag/all.json

@@ -0,0 +1,22 @@
+{
+  "data": {
+    "images": [
+      {
+        "id": "5a44671ab3957c2ab5c33326",
+        "answer": [],
+        "credit_charged": 0,
+        "custom_id": null,
+        "data": "https://assets-cdn.github.com/images/modules/open_graph/github-mark.png",
+        "instruction": "Instruction",
+        "postback_url": "https://9333bbac.ngrok.io/callbacks",
+        "processed_at": null,
+        "project_id": 102,
+        "status": "unprocess"
+      }
+    ]
+  },
+  "meta": {
+    "code": 200,
+    "message": "success"
+  }
+}

data/test/fixtures/image_photo_tag/create.json

@@ -0,0 +1,20 @@
+{
+  "data": {
+    "image": {
+      "id": "5a44671ab3957c2ab5c33326",
+      "answer": [],
+      "credit_charged": 0,
+      "custom_id": null,
+      "data": "https://assets-cdn.github.com/images/modules/open_graph/github-mark.png",
+      "instruction": "Instruction",
+      "postback_url": "https://9333bbac.ngrok.io/callbacks",
+      "processed_at": null,
+      "project_id": 102,
+      "status": "unprocess"
+    }
+  },
+  "meta": {
+    "code": 200,
+    "message": "success"
+  }
+}

data/test/fixtures/prediction/all.json

@@ -0,0 +1,21 @@
+{
+  "data": {
+    "image": [
+      {
+        "id": "5a44671ab3957c2ab5c33326",
+        "answer": "approved",
+        "credit_charged": 0,
+        "custom_id": null,
+        "data": "https://s3-ap-northeast-1.amazonaws.com/marinchat/uploads/user/6951939/profile_icon/veOSbIBCR.jpg",
+        "postback_url": "http://localhost:3000/projects",
+        "processed_at": "2017-11-16T10:10:56.282+07:00",
+        "project_id": 93,
+        "status": "processed"
+      }
+    ]
+  },
+  "meta": {
+    "code": 200,
+    "message": "success"
+  }
+}