seiun 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91891c974d9bc379c22e7898c44eea9bcd842a83
-  data.tar.gz: 9adeee1ecea3a7d4be408742db193b8ad4308492
+  metadata.gz: fd4d5b8aaf37821bb1efec1af1fb64efe71ef7d0
+  data.tar.gz: 8aef3925e79e43429f865114a63a09dccbd40165
 SHA512:
-  metadata.gz: fae81b3efd78c7994b9ab669021572597ec4864da079af25e11470abf6dc729286a32caac1c46ccc84bd6849b922ed7816b37a33b6ac7d061001e6be5c9fd96f
-  data.tar.gz: 303c872863a668447e83fd07d98f1da1a0b9b89162132c9beb1e52433f06c54507460ce8aa5bd8f73ee70db58ad0e9fff71cddfd98b420391fdafd1f09f71232
+  metadata.gz: 9fd8129d8785ea5914db0649e597cc04bbcaa56555ba9b472a62644acb48338d6f2b10d9c5340bcfbb7359987524cf4c6033cc668c133e4962fd6bec4f26e48f
+  data.tar.gz: 96917774a6a228ad1c1f1acf880582a50d2e0c8b6473f3d0c2991a889ae72199c58a1473ea0179e6ce13bffd198b2838c23025ee540b64cbb2d5182e7b7d93c3

data/lib/seiun/callback/wrapper.rb

@@ -5,6 +5,10 @@ module Seiun
         @class = callback_class
       end
 
+      def job=(job)
+        @job = job
+      end
+
       def after_build_xml(xml)
         return unless callback_defined?(:after_build_xml)
         @class.__send__(callbacks[:after_build_xml], xml)
@@ -27,46 +31,50 @@ module Seiun
 
       def mock_response_create_job
         return unless callback_defined?(:mock_response_create_job)
-        @class.__send__(callbacks[:mock_response_create_job])
+        @class.__send__(callbacks[:mock_response_create_job], operation: operation)
       end
 
       def mock_response_close_job
         return unless callback_defined?(:mock_response_close_job)
-        @class.__send__(callbacks[:mock_response_close_job])
+        @class.__send__(callbacks[:mock_response_close_job], operation: operation)
       end
 
       def mock_response_add_query
         return unless callback_defined?(:mock_response_add_query)
-        @class.__send__(callbacks[:mock_response_add_query])
+        @class.__send__(callbacks[:mock_response_add_query], operation: operation)
       end
 
       def mock_response_add_batch
         return unless callback_defined?(:mock_response_add_batch)
-        @class.__send__(callbacks[:mock_response_add_batch])
+        @class.__send__(callbacks[:mock_response_add_batch], operation: operation)
       end
 
       def mock_response_get_job_details
         return unless callback_defined?(:mock_response_get_job_details)
-        @class.__send__(callbacks[:mock_response_get_job_details])
+        @class.__send__(callbacks[:mock_response_get_job_details], operation: operation)
       end
 
       def mock_response_get_batch_details
         return unless callback_defined?(:mock_response_get_batch_details)
-        @class.__send__(callbacks[:mock_response_get_batch_details])
+        @class.__send__(callbacks[:mock_response_get_batch_details], operation: operation)
       end
 
       def mock_response_get_result
         return unless callback_defined?(:mock_response_get_result)
-        @class.__send__(callbacks[:mock_response_get_result])
+        @class.__send__(callbacks[:mock_response_get_result], operation: operation)
       end
 
       def mock_response_get_query_result
         return unless callback_defined?(:mock_response_get_query_result)
-        @class.__send__(callbacks[:mock_response_get_query_result])
+        @class.__send__(callbacks[:mock_response_get_query_result], operation: operation)
       end
 
       private
 
+      def operation
+        @job.operation(get: false)
+      end
+
       def callback_defined?(name)
         !!callbacks[name]
       end

data/lib/seiun/client.rb

@@ -1,8 +1,5 @@
 module Seiun
   class Client
-    SEC_TO_WAIT_ASYNC = 60*10
-    private_constant :SEC_TO_WAIT_ASYNC
-
     def initialize(databasedotcom: nil, batch_size: 10_000)
       @batch_size = batch_size
       @connection = Seiun::Connection.new(databasedotcom)
@@ -57,30 +54,26 @@ module Seiun
       operate(:query, table_name, soql: soql, callback: callback_class)      
     end
 
+    def find_job(id, callback_class: nil)
+      callback_class = wrap_callback(callback_class)
+      Seiun::Job.new(@connection, id: id, callback: callback_class)
+    end
+
     private
 
     def operate(operation, object, records: [], soql: "", ext_field_name: nil, callback: nil, async: true)
-      callback = Seiun::Callback::Wrapper.new(callback) if callback
+      callback = wrap_callback(callback)
       records = records.map{|r| Seiun::Callback::RecordWrapper.new(r) }
-      job = Seiun::Job.new(@connection, operation, object, ext_field_name: ext_field_name, callback: callback)
+      job = Seiun::Job.new(@connection, operation: operation, object_name: object, ext_field_name: ext_field_name, callback: callback)
       job.post_creation
       operation == :query ? job.add_query(soql) : records.each_slice(@batch_size).each{|chunk| job.add_batch(chunk) }
       job.post_closing
-      wait_asyc(job) if operation == :query || async == false
-      operation == :query ? job.get_query_result : job
-    end
-
-    def wait_asyc(job)
-      Timeout.timeout(sec_to_wait_async) do
-        until job.all_batch_finished?
-          job.get_batch_details
-          sleep 1
-        end
-      end
+      job.wait_finish if async == false
+      operation == :query ? job.get_results : job
     end
 
-    def sec_to_wait_async
-      SEC_TO_WAIT_ASYNC
+    def wrap_callback(callback)
+      Seiun::Callback::Wrapper.new(callback) if callback
     end
   end
 end

data/lib/seiun/connection.rb

@@ -20,6 +20,10 @@ module Seiun
       connect(:add_batch, data: data, job_id: job_id, callback: callback)
     end
 
+    def get_job_details(job_id, callback: nil)
+      connect(:get_job_details, job_id: job_id, callback: callback)
+    end
+
     def get_batch_details(job_id, callback: nil)
       connect(:get_batch_details, job_id: job_id, callback: callback)
     end
@@ -67,7 +71,7 @@ module Seiun
       case type
       when :create_job
         "/services/async/#{api_version}/job"
-      when :close_job
+      when :close_job, :get_job_details
         "/services/async/#{api_version}/job/#{job_id}"
       when :add_query, :add_batch, :get_batch_details
         "/services/async/#{api_version}/job/#{job_id}/batch"

data/lib/seiun/job.rb

@@ -1,14 +1,20 @@
 module Seiun
   class Job
-    attr_reader :operation
+    SEC_TO_WAIT = 60*10  # 10 minutes
+    private_constant :SEC_TO_WAIT
 
-    def initialize(connection, operation, object_name, id: nil, ext_field_name: nil, callback: nil)
+    attr_reader :id
+
+    def initialize(connection, operation: nil, object_name: nil, id: nil, ext_field_name: nil, callback: nil)
       @connection = connection
-      @operation = operation
-      @object_name = object_name
-      @id = id if id
-      @ext_field_name = ext_field_name if ext_field_name
-      @callback = callback
+      @operation = operation.to_sym if operation
+      @object_name = object_name.to_s if object_name
+      @id = id
+      @ext_field_name = ext_field_name
+      if callback
+        callback.job = self
+        @callback = callback
+      end
       @batches = []
     end
 
@@ -32,32 +38,72 @@ module Seiun
       parse_batch_xml(response_body)
     end
 
-    def get_batch_details
-      response_body = @connection.get_batch_details(@id, callback: @callback)
-      parse_batch_xml(response_body)
-    end
-
-    def get_query_result
-      result = []
-      @batches.each do |batch|
+    def each_result
+      wait_finish
+      batches.each do |batch|
         result_response_body = @connection.get_result(@id, batch.id, callback: @callback)
         Seiun::XMLParsers::ResultXML.each(result_response_body) do |result_response|
-          response_body = @connection.get_query_result(@id, batch.id, result_response.result_id, callback: @callback)
-          Seiun::XMLParsers::RecordXML.each(response_body) do |response|
-            result << response.to_hash
+          if query?
+            response_body = @connection.get_query_result(@id, batch.id, result_response.result_id, callback: @callback)
+            Seiun::XMLParsers::RecordXML.each(response_body) do |response|
+              yield(response.to_hash)
+            end
+          else
+            yield(result_response.to_hash)
           end
         end
       end
-      result
     end
 
-    def all_batch_finished?
-      raise "Batches are empty" if @batches.empty?
-      @batches.all?{|batch| !["Queued", "InProgress"].include?(batch.sf_state) }
+    def get_results
+      results = []
+      each_result{|res| results << res }
+      results
+    end
+
+    def operation(get: true)
+      return @operation if @operation || get == false
+      get_job_details
+      @operation
+    end
+
+    def sf_state(get: true)
+      return @sf_state if @sf_state || get == false
+      get_job_details
+      @sf_state
+    end
+
+    def batches(get: true)
+      return @batches if !@batches.empty? || get == false
+      get_batch_details
+      @batches
+    end
+
+    def wait_finish
+      Timeout.timeout(sec_to_wait_finish) do
+        until closed?
+          get_job_details
+          sleep 1
+        end
+        until all_batch_finished?
+          get_batch_details
+          sleep 1
+        end
+      end
     end
 
     private
 
+    def get_job_details
+      response_body = @connection.get_job_details(@id, callback: @callback)
+      parse_job_xml(response_body)
+    end
+
+    def get_batch_details
+      response_body = @connection.get_batch_details(@id, callback: @callback)
+      parse_batch_xml(response_body)
+    end
+
     def create_job_xml
       Seiun::XMLGenerators::JobXML.create_job(@operation, @object_name, ext_field_name: @ext_field_name, callback: @callback)
     end
@@ -72,7 +118,9 @@ module Seiun
 
     def parse_job_xml(response_body)
       Seiun::XMLParsers::JobXML.each(response_body) do |response|
-        @id = response.id || @id
+        @id ||= response.id
+        @operation = ( @operation || response.operation ).to_sym
+        @object_name ||= response.object
         @sf_created_at = response.created_date || @sf_created_at
         @sf_updated_at = response.system_modstamp || @sf_updated_at
         @sf_state = response.state || @sf_state
@@ -94,6 +142,25 @@ module Seiun
       end
     end
 
+    def sec_to_wait_finish
+      SEC_TO_WAIT
+    end
+
+    def closed?
+      sf_state == "Closed"
+    end
+
+    [ :insert, :update, :upsert, :delete, :query ].each do |symbol|
+      define_method "#{symbol}?" do
+        @operation == symbol
+      end
+    end
+
+    def all_batch_finished?
+      return true if batches.empty?
+      batches.all?{|batch| !["Queued", "InProgress"].include?(batch.sf_state) }
+    end
+
     class Batch
       attr_reader :id
       attr_accessor :job_id, :sf_state, :sf_state_message, :sf_created_at, :sf_updated_at, :number_records_processed

data/lib/seiun/version.rb

@@ -1,3 +1,3 @@
 module Seiun
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/seiun/xml_parsers/result_xml.rb

@@ -2,8 +2,8 @@ module Seiun
   module XMLParsers
     class ResultXML < Base
       class << self
-        def each(xml_str, &block)
-          parse(xml_str, "result", block)
+        def each(xml_str, find_tag: "result", &block)
+          parse(xml_str, find_tag, block)
         end
       end
 
@@ -12,7 +12,7 @@ module Seiun
         result
       end
 
-      [ :id, :success ].each do |name|
+      [ :id, :success, :created ].each do |name|
         define_method name do
           return unless result.is_a?(Hash)
           result[Seiun::Utils.camelize(name)]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seiun
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Naoki Watanabe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: databasedotcom