haystack_worker 0.0.2 → 1.0.0

data/README.md

@@ -9,10 +9,10 @@ A haystack worker's sole responsibility is to calculate surpluses of characters
 It receives 'jobs' from a haystack server which come in the form:
 
 ```ruby
-{ 'id' => 123, 'ranges' => [1..10, 3..4, 8..14, etc] }
+{ 'id' => 123, 'from' => [1, 3, 8, etc], 'to' => [10, 4, 14, etc] }
 ```
 
-The ranges represent the search space that this worker has been assigned to explore. The ID is used by the haystack worker to keep track of jobs.
+The 'from' and 'to' arrays represent the search space that this worker has been assigned to explore. The ID is used by the haystack worker to keep track of jobs.
 
 It posts data back to the haystack at /job/:id in the form:
 

data/lib/haystack_worker/jobs.rb

@@ -8,9 +8,9 @@ module HaystackWorker::Jobs
     data = data_for(results)
 
     json = Net::HTTP.post_form(path, data).body
-    hash = with_support_for_ranges { JSON.parse(json) }
+    hash = JSON.parse(json)
 
-    [hash['id'], hash['ranges']]
+    [hash['id'], ranges_for(hash)]
   end
 
   private
@@ -18,18 +18,14 @@ module HaystackWorker::Jobs
     { :results => results.to_json }
   end
 
-  def job_path(id = nil)
-    URI("http://#@haystack_domain/job/#{id}")
-  end
-
-  def with_support_for_ranges(&block)
-    hash = yield
-
-    if hash['ranges']
-      ranges = hash['ranges'].map { |r| eval(r) }
-      hash.merge!('ranges' => ranges)
+  def ranges_for(hash)
+    if hash['from'] && hash['to']
+      pairs = hash['from'].zip(hash['to'])
+      pairs.inject([]) { |arr, (f, t)| arr << (f..t) }
     end
+  end
 
-    hash
+  def job_path(id = nil)
+    URI("http://#@haystack_domain/job/#{id}")
   end
 end

metadata

@@ -1,91 +1,91 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: haystack_worker
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
-authors:
+authors: 
 - Christopher Patuzzo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-11-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rack
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Works on behalf of a haystack server.
 email: chris.patuzzo@gmail.com
-executables:
+executables: 
 - haystack
-extensions:
+extensions: 
 - ext/haystack_worker/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - lib/haystack_worker/base.rb
 - lib/haystack_worker/benchmark.rb
+- lib/haystack_worker/haystack_worker.bundle
 - lib/haystack_worker/jobs.rb
 - lib/haystack_worker/surpluses.rb
 - lib/haystack_worker.rb
@@ -96,26 +96,37 @@ files:
 - bin/haystack
 homepage: https://github.com/cpatuzzo/haystack_worker
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Haystack Worker
 test_files: []
+
+has_rdoc: