fluent-plugin-sforce 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0187aac8337c5f6f85a9ea34b9207eb8c5056eb19ad25de83ce0cf8826c5328
-  data.tar.gz: 970036defa6d99dd0564e3dc54cc305a22cb70059fc8cc30788721be4f24b367
+  metadata.gz: 8863f1e04136df66a435721438f38036aaf395f7f4e097b060489a67c1a8ecba
+  data.tar.gz: 7b968ebbffa37441ce8502df1352f3f9cdb0fd003dd0abc25736c80ea21d919f
 SHA512:
-  metadata.gz: b30e5497b815f6a52c57232677a64c4a1ac567888d6ec3bc0a0f4d5ec58e841734514df609000795b27d705d3044eab8d96fc3abeac6bcce91212f994b2cd975
-  data.tar.gz: 53b5bd1d7d667d3aefe09d960b80edfdabc966939ee143c4a2d06d622b2c372ca6decbb567a7a9017f11bbbe9899f4df9c92a8e7db8c4c21b192b8098538a942
+  metadata.gz: dc7eff2c230abddec690465a64b6e68e232277f3859363418f7340c66018fb9378f3814b05fafc34a90f69f63f4c1a7a8750098cbedf1d6167fb84c92dcd1217
+  data.tar.gz: 1a14bc0f6d6d7a3f8b270c44f37fb5fa3ebd9bd81dc88fec0cdb80053be14fda08fdc8d2def53c70795550f6c901c8d047244c0525d002cf27fd1225929bc1e8

data/.gitignore

@@ -14,3 +14,4 @@
 *.gem
 mkmf.log
 /vendor/bundle
+/.idea

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 2.4.10
-  - 2.5.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.2

data/Makefile

@@ -0,0 +1,13 @@
+.PHONY: test
+test:
+	bundle exec rake test
+
+.PHONY:
+install:
+	bundle install --path=vendor/bundle -j4
+
+
+.PHONY: release
+release:
+	bundle exec rake release
+

data/README.md

@@ -29,14 +29,18 @@ Or install it yourself as:
   query SELECT id, Body FROM FeedItem
   polling_interval 60
   # topic AllMessages
+  # version 43.0
+  # login_endpoint test.salesforce.com
 </source>
 ```
 
-username : Salesforce Username for exporting data.  
-password : Salesforce User's Password.  
-query : SOQL Query.  
-polling_interval : Query Interval Time.  
-topic : PushTopic name to subscribe. 
+|key|description|
+|-|-|
+|username|Salesforce Username for exporting data.|
+|password|Salesforce User's Password.|
+|query|SOQL Query.|
+|polling_interval|Query Interval Time.|
+|topic|PushTopic name to subscribe.|
 
 ## Contributing
 

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/fluent-plugin-sforce.gemspec

@@ -3,22 +3,23 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
-  spec.name          = "fluent-plugin-sforce"
-  spec.version       = File.read("VERSION").strip
-  spec.authors       = ["Makoto Tajitsu"]
-  spec.email         = ["makoto_tajitsu@hotmail.co.jp"]
+  spec.name          = 'fluent-plugin-sforce'
+  spec.version       = File.read('VERSION').strip
+  spec.authors       = ['Makoto Tajitsu']
+  spec.email         = ['makoto_tajitsu@hotmail.co.jp']
   spec.summary       = %q{Fluent Plugin to export data from Salesforce.com.}
   spec.description   = %q{Fluent Plugin to export data from Salesforce.com.}
-  spec.homepage      = "https://github.com/tzmfreedom/fluent-plugin-sforce"
+  spec.homepage      = 'https://github.com/tzmfreedom/fluent-plugin-sforce'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "fluentd", "~> 1.1.3"
-  spec.add_dependency "restforce", "~> 3.0.0"
-  spec.add_dependency "faye", "~> 1.2.4"
-  spec.add_dependency "nokogiri", "~> 1.8.2"
-  spec.add_development_dependency "rake"
+  spec.add_dependency 'fluentd'
+  spec.add_dependency 'restforce', '~> 3.0.0'
+  spec.add_dependency 'faye', '~> 1.2.4'
+  spec.add_dependency 'nokogiri', '~> 1.8.2'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'test-unit'
 end

data/lib/fluent/plugin/in_sforce.rb

@@ -5,111 +5,123 @@ require 'restforce'
 require 'date'
 require 'net/http'
 require 'faye'
+require 'fluent/plugin/input'
 
 module Fluent
-  class SforceInput < Input
-    unless method_defined?(:log)
-      define_method("log") { $log }
-    end
+  module Plugin
+    class SforceInput < Input
+      class SforceConnectionError < StandardError; end
 
-    Plugin.register_input('sforce', self)
+      Fluent::Plugin.register_input('sforce', self)
 
-    config_param :query, :string, :default => "SELECT id, Body, CreatedById FROM FeedItem"
-    config_param :tag, :string, :default => "sforce"
-    config_param :polling_interval, :integer, :default => 60
-    config_param :topic, :string, :default => nil
-    config_param :username, :string
-    config_param :password, :string
+      config_param :query, :string, default: 'SELECT id, Body, CreatedById FROM FeedItem'
+      config_param :tag, :string, default: 'sforce'
+      config_param :polling_interval, :integer, default: 60
+      config_param :topic, :string, default: nil
+      config_param :username, :string
+      config_param :password, :string
+      config_param :version, :string, default: '43.0'
+      config_param :login_endpoint, :string, default: 'login.salesforce.com'
 
-    def configure(conf)
-      super
-    end
+      def configure(conf)
+        super
+      end
 
-    def start
-      super
-      login_info = login()
-      client = Restforce.new :oauth_token => login_info["sessionId"],
-        :instance_url => login_info["instanceUrl"]
-
-      th_low = DateTime.now().strftime("%Y-%m-%dT%H:%M:%S.000%Z")
-      # query
-      if @topic == nil then
-        sleep(@polling_interval)
-        th_high = DateTime.now().strftime("%Y-%m-%dT%H:%M:%S.000%Z")
-        loop do
-          # create soql query string
-          where = "CreatedDate <= #{th_high} AND CreatedDate > #{th_low}"
-          soql = ""
-          if @query =~ /^(.+)\s(where|WHERE)\s(.+)$/ then
-            soql = "#{$1} WHERE #{where} AND #{$3}"
-          elsif @query =~ /^(.+)$/ then
-            soql = "#{$1} WHERE #{where}"
-          end
+      def start
+        super
+        login_info = login
+        client = Restforce.new login_info.merge(api_version: @version)
 
-          begin
-            log.info "query: #{soql}"
-            records = client.query(soql)
-            records.each do |record|
-              Fluent::Engine.emit(@tag, Fluent::Engine.now, record)
+        th_low = DateTime.now.strftime('%Y-%m-%dT%H:%M:%S.000%Z')
+        # query
+        if @topic == nil then
+          sleep(@polling_interval)
+          th_high = DateTime.now.strftime('%Y-%m-%dT%H:%M:%S.000%Z')
+          loop do
+            # create soql query string
+            where = "CreatedDate <= #{th_high} AND CreatedDate > #{th_low}"
+            soql = ''
+            if @query =~ /^(.+)\s(where|WHERE)\s(.+)$/ then
+              soql = "#{$1} WHERE #{where} AND #{$3}"
+            elsif @query =~ /^(.+)$/ then
+              soql = "#{$1} WHERE #{where}"
+            end
+
+            begin
+              log.info "query: #{soql}"
+              records = client.query(soql)
+              records.each do |record|
+                router.emit(@tag, Fluent::Engine.now, record)
+              end
+              sleep(@polling_interval)
+              th_low = th_high
+              th_high = DateTime.now.strftime('%Y-%m-%dT%H:%M:%S.000%Z')
+            rescue Restforce::UnauthorizedError => e
+              log.error e
+              # retry login
+              login_info = login
+              client = Restforce.new login_info.merge(api_version: @version)
             end
-            sleep(@polling_interval)
-            th_low = th_high
-            th_high = DateTime.now().strftime("%Y-%m-%dT%H:%M:%S.000%Z")
-          rescue Restforce::UnauthorizedError => e
-            log.error e
-            # retry login
-            login_info = login()
-            client = Restforce.new :oauth_token => login_info["sessionId"],
-              :instance_url => login_info["instanceUrl"]
           end
-        end
-      # streaming api
-      else
-        EM.run do
-          log.info "suscribe: #{@topic}"
-          # Subscribe to the PushTopic.
-          client.subscribe @topic do |message|
-            Fluent::Engine.emit(@tag, Fluent::Engine.now, message)
+          # streaming api
+        else
+          EM.run do
+            log.info "suscribe: #{@topic}"
+            # Subscribe to the PushTopic.
+            client.subscribe @topic do |message|
+              router.emit(@tag, Fluent::Engine.now, message)
+            end
           end
         end
+      rescue SforceConnectionError => e
+        log.error e.message
       end
-    end
 
-    def shutdown
-    end
+      def shutdown
+        super
+      end
 
-    private
+      private
 
-    def login
-      uri = URI('https://login.salesforce.com/services/Soap/u/30.0')
-      request = Net::HTTP::Post.new(uri.request_uri, initheader = {'Content-Type' =>'text/xml', 'SOAPAction' => '""'})
-      request.body = <<"BODY"
+      def login
+        uri = URI(login_endpoint)
+        request = Net::HTTP::Post.new(uri.request_uri, initheader = {'Content-Type' =>'text/xml', 'SOAPAction' => "''"})
+        request.body = <<BODY
 <?xml version="1.0" encoding="utf-8"?>
 <env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">
 <env:Body>
 <n1:login xmlns:n1="urn:partner.soap.sforce.com">
-<n1:username>#{@username}</n1:username>
-<n1:password>#{@password}</n1:password>
+<n1:username>#{@username.encode(xml: :text)}</n1:username>
+<n1:password>#{@password.encode(xml: :text)}</n1:password>
 </n1:login>
 </env:Body>
 </env:Envelope>
 BODY
 
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      # request login call and parse login response.
-      http.start do |h|
-        response = h.request(request)
-        doc = Nokogiri::XML(response.body)
-        session_id = doc.css("sessionId").inner_text
-        /^(https:\/\/.+\.salesforce\.com)\//.match(doc.css("serverUrl").inner_text)
-        instance_url = $1
-        log.info "login is successful."
-        {"sessionId" => session_id, "instanceUrl" => instance_url}
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+        # request login call and parse login response.
+        http.start do |h|
+          response = h.request(request)
+          doc = Nokogiri::XML(response.body)
+          fault = doc.css('faultstring').inner_text
+          raise SforceConnectionError, fault unless fault.empty?
+
+          session_id = doc.css('sessionId').inner_text
+          /^(https:\/\/.+\.salesforce\.com)\//.match(doc.css('serverUrl').inner_text)
+          instance_url = $1
+          log.info "login is successful. instance_url = '#{instance_url}'"
+
+          {oauth_token: session_id, instance_url: instance_url}
+        end
+      end
+
+      def login_endpoint
+        "https://#{@login_endpoint}/services/Soap/u/#{@version}"
       end
     end
   end

data/test/helper.rb

@@ -7,11 +7,14 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+require 'test-unit'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'fluent/test'
+require 'fluent/test/helpers'
+
 unless ENV.has_key?('VERBOSE')
   nulllogger = Object.new
   nulllogger.instance_eval {|obj|
@@ -23,6 +26,3 @@ unless ENV.has_key?('VERBOSE')
 end
 
 require 'fluent/plugin/in_sforce'
-
-class Test::Unit::TestCase
-end

data/test/plugin/test_in_sforce.rb

@@ -14,21 +14,22 @@ class SforceInputTest < Test::Unit::TestCase
     polling_interval 60
   ]
 
-  def create_driver(conf = CONFIG)
-    Fluent::Test::InputTestDriver.new(Fluent::SforceInput).configure(conf)
-  end
-
   def test_configure
     d = create_driver
 
-    assert_equal "test@example.com", d.instance.username
-    assert_equal "hogefuga", d.instance.password
-    assert_equal "test.access", d.instance.tag
-    assert_equal "SELECT id, Name FROM Account", d.instance.query
+    assert_equal 'test@example.com', d.instance.username
+    assert_equal 'hogefuga', d.instance.password
+    assert_equal 'test.access', d.instance.tag
+    assert_equal 'SELECT id, Name FROM Account', d.instance.query
     assert_equal 60, d.instance.polling_interval
   end
 
-  #def test_emit
-    #TODO
-  #end
+  # TODO
+  def test_emit; end
+
+  private
+
+  def create_driver(conf = CONFIG)
+    Fluent::Test::InputTestDriver.new(Fluent::Plugin::SforceInput).configure(conf)
+  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sforce
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Makoto Tajitsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2019-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: restforce
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fluent Plugin to export data from Salesforce.com.
 email:
 - makoto_tajitsu@hotmail.co.jp
@@ -91,6 +105,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - VERSION
@@ -117,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Fluent Plugin to export data from Salesforce.com.