cleantalk 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 023627ab25949a050d5ecf967503261f3643698e
-  data.tar.gz: ee19c974e4f91eead37a688bb6470d8dc582e26a
+  metadata.gz: f2c0b40a43f70a7403492f512e744c5d10c2d752
+  data.tar.gz: 50def2748310bcb6b902bac7e2e35a6fdad87991
 SHA512:
-  metadata.gz: 4ef7d507a1002406a8ffa498ec6ffc42f617272bf6f2254152590c16f88931394b62c5dfff84072c8e85b66079b93cf0dcf425c776b9d82f9f183da325f5fba6
-  data.tar.gz: 298a42c598ec3949a87a78f1926f0cc9401f6069568d29aeadc6e9cc1248fa9521904114d65d67b9fe3bef297e32b9150658629534b0398daea8f33276a025b5
+  metadata.gz: 8b162b23499da00a3db9154669bc4d0e248cab7c9c0b9d67c5782e6dd966d70d601b6f358814f5e1a92ccee5bc700b32a38f52d7edc85f0f1412e8945da3bbfb
+  data.tar.gz: fd9330e52a3ec636416cd62337d957d27ae34f770517836aee1da09e1827b717f775adda4fda6851ec1bdd8ba6a890d645a69ca1bb29de903ff45857c0bde4a8

data/lib/cleantalk.rb

@@ -1,31 +1,12 @@
-require 'net/http'
-require 'json'
-
 class Cleantalk
-  class Request
-    attr_accessor :all_headers, :last_error_no, :last_error_time, \
-                  :last_error_text, :message, :example, :auth_key, :agent, \
-                  :stoplist_check, :response_lang, :sender_ip, :sender_email, \
-                  :sender_nickname, :sender_info, :post_info, :allow_links, \
-                  :submit_time, :js_on, :tz, :feedback, :phone
-
-    # Fill params with constructor
-    def initialize(params = nil)
-      unless params.nil?
-        params.each do |key, value|
-          instance_variable_set("@#{key}", value)
-        end
-      end
-    end
-  end
-
   #
   # Function checks whether it is possible to publish the message
   # @param CleantalkRequest $request
   # @return type
   #
   def is_allowed_message(request)
-    return http_request('check_message', request)
+    request.method_name = 'check_message'
+    return request.http_request
   end
 
   #
@@ -34,21 +15,24 @@ class Cleantalk
   # @return type
   #
   def is_allowed_user(request)
-    return http_request('check_newuser', request)
+    request.method_name = 'check_newuser'
+    return request.http_request
   end
 
-  def http_request(method_name, request)
-    uri = URI 'https://moderate.cleantalk.org/api2.0'
+  @@auth_key = nil
 
-    form_data = {method_name: method_name}
-    attrs = request.instance_variables
-    attrs.each {|elem| form_data[elem.to_s.sub('@','')] = request.instance_variable_get(elem) }
+  def self.auth_key
+    @@auth_key
+  end
 
-    req = Net::HTTP::Post.new(uri, {'Content-Type' =>'application/json'})
-    req.body = form_data.to_json
-    response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
-      http.request(req)
-    end
-    return JSON.parse(response.entity)
+  def self.auth_key= value
+    @@auth_key = value
   end
 end
+
+require 'cleantalk/request'
+require 'cleantalk/check_newuser'
+require 'cleantalk/check_message'
+require 'cleantalk/result'
+require 'cleantalk/check_newuser_result'
+require 'cleantalk/check_message_result'

data/lib/cleantalk/check_message.rb

@@ -0,0 +1,9 @@
+class Cleantalk::CheckMessage < Cleantalk::Request
+  attr_accessor :message
+
+  def result
+    @result ||= Cleantalk::CheckMessageResult.new(http_request_without_parse)
+  end
+
+  METHOD = "check_message".freeze
+end

data/lib/cleantalk/check_message_result.rb

@@ -0,0 +1,3 @@
+class Cleantalk::CheckMessageResult < Cleantalk::Result
+  attr_reader :stop_queue, :spam
+end

data/lib/cleantalk/check_newuser.rb

@@ -0,0 +1,7 @@
+class Cleantalk::CheckNewuser < Cleantalk::Request
+  def result
+    @result ||= Cleantalk::CheckNewuserResult.new(http_request_without_parse)
+  end
+
+  METHOD = "check_newuser".freeze
+end

data/lib/cleantalk/check_newuser_result.rb

@@ -0,0 +1,2 @@
+class Cleantalk::CheckNewuserResult < Cleantalk::Result
+end

data/lib/cleantalk/request.rb

@@ -0,0 +1,72 @@
+require 'net/http'
+require 'json'
+
+class Cleantalk::Request
+  attr_accessor :method_name, :auth_key, #required
+                :all_headers, :last_error_no, :last_error_time,
+                :last_error_text, :message, :example, :agent,
+                :stoplist_check, :response_lang, :sender_ip, :sender_email,
+                :sender_nickname, :sender_info, :post_info, :allow_links,
+                :submit_time, :js_on, :tz, :feedback, :phone
+
+  # Fill params with constructor
+  def initialize(params = {})
+    self.method_name, self.auth_key = params.delete(:method_name) || self.class::METHOD, nil
+    unless params.empty?
+      params.each do |key, value|
+        send("#{key}=", value)
+      end
+    end
+  end
+
+  def http_request_without_parse
+    valid?
+    form_data = self.instance_variables.inject({}) do |params, var_name|
+      param_key = var_name.to_s.sub('@','')
+      params[param_key] = send(param_key)
+      params
+    end
+
+    req = Net::HTTP::Post.new(API_URI, API_HEADERS)
+    req.body = JSON.generate(form_data)
+    response = Net::HTTP.start(API_URI.hostname, API_URI.port, use_ssl: true) do |http|
+      http.request(req)
+    end
+
+    response.entity
+  end
+
+  # Remote Call
+  def http_request
+    JSON.parse http_request_without_parse
+  end
+
+  def auth_key
+    @auth_key || Cleantalk.auth_key
+  end
+
+  def method_name= value
+    @method_name = self.class::METHOD || value
+  end
+
+  def result
+    @result ||= http_request
+  end
+
+  def allowed?
+    self.result.allow == 1
+  end
+
+  private
+
+  def valid?
+    [:auth_key, :method_name].freeze.each do |required_param|
+      raise Cleantalk::Request::BadParameters, "params `#{required_param}` is required for #{self.class}" if send(required_param).nil?
+    end
+  end
+
+  API_URI = URI.parse('https://moderate.cleantalk.org/api2.0').freeze
+  API_HEADERS = {'Content-Type' =>'application/json'}.freeze
+  METHOD = nil
+  class Cleantalk::Request::BadParameters < StandardError; end
+end

data/lib/cleantalk/result.rb

@@ -0,0 +1,11 @@
+class Cleantalk::Result
+  attr_reader :id, :version, :inactive, :js_disabled, :blacklisted,
+              :comment, :codes,:fast_submit, :account_status, :allow
+
+  def initialize body
+    body = body.is_a?(String) ? JSON.parse(body) : body
+    body.each do |meth, value|
+      instance_variable_set("@#{meth}", value) if respond_to? meth
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cleantalk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ''
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -45,7 +45,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cleantalk.rb
-homepage: https://github.com/francois2metz/ruby-antispam
+- lib/cleantalk/check_message.rb
+- lib/cleantalk/check_message_result.rb
+- lib/cleantalk/check_newuser.rb
+- lib/cleantalk/check_newuser_result.rb
+- lib/cleantalk/request.rb
+- lib/cleantalk/result.rb
+homepage: https://github.com/CleanTalk/ruby-antispam
 licenses:
 - MIT
 metadata: {}