alephant-broker 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71dd81ac255c7701b1676aa6f0e57d6c9913789e
-  data.tar.gz: 1ddc1f6954fe7302e9c87aba60ea0d1daee40b3d
+  metadata.gz: 68a9bc33df3994006cc8a45e6c03e7609ad87a85
+  data.tar.gz: b9f7f4f87c2d11c774a4ccaaeed7c7e1ee3b6f9a
 SHA512:
-  metadata.gz: adf9b7900d4723e2f7686c26848b856cc43d440c1e12d0e5fe524461939aab2950aba64ca3c7adf8bc69036c952e7a55c21a41371655605294274668e4d1a80c
-  data.tar.gz: 25553c80bb8a7c8c25c330d728df926fc9662d46df3349dd8491064c4c8babc56996fc47aa90cb5b885e2b109f6a1adbc0d1e6f326bfc3cf7c3f3c5e5ee2de48
+  metadata.gz: 02b9c8a85184e32b00019a3401727c32d06445e1afc61248d16e9960b0378a1ed153df9da524c5b8c198aa53792e9dc6f488695edaf52e6ee9369d83d8ebd126
+  data.tar.gz: f5f3d1fee60fa8ce65a8615fcd51d159e5ddb7bd8551fa2916cfd695fc318eb0142aa3b32070e91f250b2520b98962b1994c0cb1dd2d569edcc96f58d43b6e55

data/README.md

@@ -31,8 +31,8 @@ require 'alephant/broker'
 require 'alephant/broker/load_strategy/s3'
 
 config = {
-  :bucket_id         => 'test_bucket',
-  :path              => 'foo',
+  :s3_bucket_id      => 'test_bucket',
+  :s3_object_path    => 'foo',
   :lookup_table_name => 'test_lookup'
 }
 
@@ -78,7 +78,30 @@ Alephant::Broker::Application.new(
 end
 ```
 
-**Note**: the HTML load strategy relies upon being given a [URLGenerator](https://github.com/BBC-News/alephant-broker/blob/master/lib/alephant/broker/load_strategy/http.rb#L9-L13). This must be implemented within your own application, and extend `Alephant::Broker::LoadStrategy::HTTP::URL` (see above for an example). It is used to generate the URL which will act as the HTML endpoint.
+**Note**
+
+The HTML load strategy relies upon being given a URLGenerator, which is used to generate the URL of the HTML endpoint (see below for example). The class must:
+
+* be implemented within your own application.
+* extend [`Alephant::Broker::LoadStrategy::HTTP::URL`](https://github.com/BBC-News/alephant-broker/blob/master/lib/alephant/broker/load_strategy/http.rb#L9-L13).
+* include a `#generate` method which takes `id` (string) and `options` (hash) as parameters.
+
+```ruby
+require 'alephant/broker/load_strategy/http'
+require 'rack'
+
+class UrlGenerator < Alephant::Broker::LoadStrategy::HTTP::URL
+  def generate(id, options)
+    "http://api.my-app.com/component/#{id}?#{to_query_string(options)}"
+  end
+
+  private
+
+  def to_query_string(hash)
+    Rack::Utils.build_query hash
+  end
+end
+```
 
 ### Rack App
 

data/lib/alephant/broker/cache.rb

@@ -55,7 +55,7 @@ module Alephant
       class NullClient
         def get(key); end
 
-        def set(key, value)
+        def set(key, value, ttl = nil)
           value
         end
       end

data/lib/alephant/broker/load_strategy/s3.rb

@@ -21,7 +21,7 @@ module Alephant
           )
         end
 
-        private 
+        private
 
         def add_s3_headers(component_data, component_meta)
           component_data.merge(
@@ -38,7 +38,7 @@ module Alephant
         end
 
         def sequence(component_meta)
-          sequencer(component_meta).get_last_seen
+          sequencer.get_last_seen component_meta.key
         end
 
         def retrieve_object(component_meta)
@@ -77,9 +77,9 @@ module Alephant
           )
         end
 
-        def sequencer(component_meta)
-          Alephant::Sequencer.create(
-            Broker.config[:sequencer_table_name], component_meta.key
+        def sequencer
+          @sequencer ||= Alephant::Sequencer.create(
+            Broker.config[:sequencer_table_name], nil
           )
         end
       end

data/lib/alephant/broker/request/batch.rb

@@ -11,13 +11,11 @@ module Alephant
         attr_reader :batch_id, :components, :load_strategy
 
         def initialize(component_factory, env)
-          logger.debug("Request::Batch#initialize(#{env.settings})")
+          logger.info "Request::Batch#initialize: id: #{env.data['batch_id']}"
 
+          @batch_id          = env.data['batch_id']
           @component_factory = component_factory
-          @batch_id   = env.data['batch_id']
-          @components = components_for env
-
-          logger.debug("Request::Batch#initialize: id: #{@batch_id}")
+          @components        = components_for env
         end
 
         private

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "3.0.0"
+    VERSION = "3.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Steven Jack
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec