rest-scrapyd 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a432b7b410654bb0c2b236d10b38f9f897e4961
-  data.tar.gz: 6a4ffb540f02a85f136b642157f04462ee79c4fb
+  metadata.gz: c3d5781f0a6f053ff042d5e6847b1e1c1ddd13b8
+  data.tar.gz: 598b7f96d881d5d3bf1ad801fe0eae6490eca04d
 SHA512:
-  metadata.gz: 47838ab472ed6cff33d4be2586dfaa90b2fa354c2e009c4753ec2bc26d39c047bf92bb0d2af1552e6e1f47b699f5071e561179b6c801dbfb3f901256b9e2aff0
-  data.tar.gz: 8e342c482a30ff15aa14cea0137ab17120b94c8fd1308c3c65400d1490247db6b850a82d2478e7064cd4e1d25a02563f97db4f3d1556bb5600a565ec74b28272
+  metadata.gz: 78ab7ae366c148834c72cb57b2b1c39384189ae205ca5679b071010363672a59288f86dd0df7da7535b742f8cb92de363841f884098461a11410cbb7c5f00be1
+  data.tar.gz: 10f2860676973107cb76788826d8eb508c4a8f617982f99f846e2ee87b02faa9a6432c9e36da61b0c6dc13b24b51cc94b857ced10f83218ac1689d32cae6edfb

data/lib/rest-scrapyd.rb

@@ -12,7 +12,7 @@ RestScrapyd = RC::Builder.client do
 
   use RC::CommonLogger  , nil
   use RC::ErrorHandler  , lambda {|env| RuntimeError.new(env[RC::RESPONSE_BODY]['message']) }
-  use RC::ErrorDetector , lambda {|env| env[RC::RESPONSE_BODY]['status'] != 'ok'}
+  use RC::ErrorDetector , lambda {|env| env[RC::RESPONSE_BODY]['status'] != 'ok' rescue false }
   use RC::ErrorDetectorHttp
   use RC::JsonResponse  , true
   use RC::Cache         , nil, 600
@@ -44,12 +44,20 @@ class RestScrapyd
   # @param spider [String] Spider name
   # @param version [String] Project version
   # @param settings [Hash<String, String>] Additional Scrapy settings
-  # @option settings [String] :project ({self.project}) Project name
+  # @param arguments [Hash<String, String>] Additional spider arguments
+  # @option arguments [String] :project ({self.project}) Project name
   # @return [String] Job id
   # @see http://scrapyd.readthedocs.org/en/latest/api.html#schedule-json
-  def schedule(spider, version, settings={})
-    settings = {project: self.project, spider: spider}.merge(settings)
-    post('schedule.json', settings)['jobid']
+  def schedule(spider, version, settings={}, arguments={})
+    # +setting+ may appear multiple times, so can't use hash
+    params = {project: self.project, spider: spider}.to_a
+    params += settings.to_a.map{|k,v| ["setting", "#{k}=#{v}"]}
+    params += arguments.to_a
+    # rest-core doesn't (yet) support array payload, encode ourselves
+    params.map{|p| p[0] = p[0].to_s} # like stringify_keys
+    params = RestCore::Middleware.percent_encode(params)
+    s_headers = headers.merge({'Content-Type' => 'application/x-www-form-urlencoded'})
+    post('schedule.json', params, {}, headers: s_headers)['jobid']
   end
 
   # Cancel a scheduled or running job

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-scrapyd
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - wvengen