alephant-broker 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70f99d4f4a6e8be1fa904432ebc5c88582b798e4
-  data.tar.gz: 1d20ca33dea4ced011ed482e08f4f8ad026f874a
+  metadata.gz: c8260c3c562810f056f45d46d56a3d5456cf10ab
+  data.tar.gz: b2d1e13aaf854e7c1b9ed76c0a8505d49bbc191c
 SHA512:
-  metadata.gz: 4ffed8d1b703c047dd93c24a805f5a0da2a68377a413d5470334da27e07b044d7e85f8dd67da06bac7bc6acbebc8fcd97a830870a4fc8454636e1863ec22fad7
-  data.tar.gz: 2330d1a13a6c61515514bd04939ae9374f0819cd91bc74bf5c9493b7df44dc1207ad552deb8246c0783f49ea741dbc511cff26bc8f5342af754d95194445049a
+  metadata.gz: f73fff98e5832614f68af4473ec6d6b05faa2a346cc5de5e51c60784c09d4dbbf8cbf267b8152a6686ba82d3d948d19e4239ef6a8d555efc574c8300ad95c1bf
+  data.tar.gz: 484cefb4a13f492438d7eab51c5bf9bf5a7603a46695846c1bb8187a8ca0bb8ff80464a14b5ff55f1dddc61ad226faab974198080c221f489125c35224ab8378

data/alephant-broker.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'alephant-logger'
   spec.add_runtime_dependency 'alephant-sequencer'
   spec.add_runtime_dependency "dalli-elasticache"
-  spec.add_runtime_dependency 'pmap'
+  spec.add_runtime_dependency "pmap"
   spec.add_runtime_dependency "faraday"
+  spec.add_runtime_dependency "crimp"
 end

data/lib/alephant/broker/component_factory.rb

@@ -12,8 +12,8 @@ module Alephant
         @load_strategy = load_strategy
       end
 
-      def create(id, batch_id, raw_options)
-        component_meta = ComponentMeta.new(id, batch_id, raw_options)
+      def create(id, batch_id, options)
+        component_meta = ComponentMeta.new(id, batch_id, options)
         Component.new(
           component_meta,
           @load_strategy.load(component_meta)

data/lib/alephant/broker/component_meta.rb

@@ -1,13 +1,13 @@
 module Alephant
   module Broker
     class ComponentMeta
-      attr_reader :id, :raw_options, :batch_id
+      attr_reader :id, :options, :batch_id
       attr_accessor :cached
 
-      def initialize(id, batch_id, raw_options)
+      def initialize(id, batch_id, options)
         @id          = id
         @batch_id    = batch_id
-        @raw_options = raw_options
+        @options     = options
         @cached      = true
       end
 
@@ -15,13 +15,6 @@ module Alephant
         "#{id}/#{opts_hash}/#{version}"
       end
 
-      def options
-        @options ||= raw_options.split('&').reduce({}) do |object, key_pair|
-          key, value = key_pair.split('=')
-          object.tap { |o| o.store(key.to_sym, value) }
-        end
-      end
-
       def version
         Broker.config.fetch(
           'elasticache_cache_version', 'not available'

data/lib/alephant/broker/environment.rb

@@ -35,8 +35,16 @@ module Alephant
         parse(rack_input) if post?
       end
 
+      def options
+        convert_keys Rack::Utils.parse_nested_query(query)
+      end
+
       private
 
+      def convert_keys(hash)
+        Hash[ hash.map { |k, v| [k.to_sym, v] } ]
+      end
+
       def rack_input
         (settings['rack.input'].read).tap { settings['rack.input'].rewind }
       end

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

@@ -56,7 +56,7 @@ module Alephant
         def url_for(component_meta)
           url_generator.generate(
             component_meta.id,
-            component_meta.raw_options
+            component_meta.options
           )
         end
       end

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

@@ -1,5 +1,4 @@
 require 'alephant/logger'
-require 'alephant/broker/component'
 require 'alephant/broker/errors/invalid_asset_id'
 
 module Alephant
@@ -12,13 +11,17 @@ module Alephant
 
         def initialize(component_factory, env = nil)
           return if env.nil?
+          @component = component_factory.create(
+            component_id(env.path),
+            nil,
+            env.options
+          )
+        end
 
-          component_id = env.path.split('/')[2] || nil
-          raw_options  = env.query
-
-          raise InvalidAssetId.new("No Asset ID specified") if component_id.nil?
+        private
 
-          @component = component_factory.create(component_id, nil, raw_options)
+        def component_id(path)
+          path.split('/')[2] || (raise InvalidAssetId.new 'No Asset ID specified')
         end
       end
     end

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

@@ -22,16 +22,12 @@ module Alephant
 
         private
 
-        def build_query(hash)
-          hash.nil? ? '' : Rack::Utils.build_query(hash)
-        end
-
         def components_for(env)
           env.data['components'].pmap do |c|
             @component_factory.create(
               c['component'],
               batch_id,
-              build_query(c['options'])
+              c['options']
             )
           end
         end

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

@@ -26,7 +26,7 @@ module Alephant
 
         def json
           logger.info "Broker: Batch load started (#{batch_id})"
-          result = components.map do |component|
+          components.map do |component|
             {
               'component'    => component.id,
               'options'      => component.options,
@@ -34,10 +34,7 @@ module Alephant
               'content_type' => component.content_type,
               'body'         => component.content
             }
-          end
-          logger.info "Broker: Batch load done (#{batch_id})"
-
-          result
+          end.tap { logger.info "Broker: Batch load done (#{batch_id})" }
         end
 
       end

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "2.1.0"
+    VERSION = "2.1.1"
   end
 end

data/spec/environment_spec.rb

@@ -0,0 +1,20 @@
+require_relative 'spec_helper'
+
+describe Alephant::Broker::Environment do
+  subject { described_class.new env }
+  let(:env) do
+    {
+      'QUERY_STRING' => 'variant=K03000001'
+    }
+  end
+
+  describe '#options' do
+    let(:expected) do
+      {
+        :variant => "K03000001"
+      }
+    end
+
+    specify { expect(subject.options).to eq expected }
+  end
+end

data/spec/http_spec.rb

@@ -4,7 +4,12 @@ describe Alephant::Broker::LoadStrategy::HTTP do
   subject { described_class.new(url_generator) }
 
   let(:component_meta) do
-    double('Alephant::Broker::ComponentMeta', cache_key: 'cache_key', id: 'test')
+    double(
+      'Alephant::Broker::ComponentMeta',
+      cache_key: 'cache_key',
+      id: 'test',
+      options: {}
+    )
   end
   let(:url_generator) { double(generate: "http://foo.bar") }
   let(:cache) { double('Alephant::Broker::Cache::Client') }
@@ -35,7 +40,6 @@ describe Alephant::Broker::LoadStrategy::HTTP do
       before :each do
         allow(cache).to receive(:get).and_yield
         allow(component_meta).to receive(:'cached=').with(false) { false }
-        allow(component_meta).to receive(:raw_options).and_return Hash.new
       end
 
       context "and available over HTTP" do

metadata

@@ -1,267 +1,281 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Steven Jack
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec-nc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry-remote
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: pry-nav
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-nav
   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'
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake-rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rack-test
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: alephant-lookup
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: alephant-lookup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: alephant-cache
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: alephant-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: alephant-logger
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: alephant-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: alephant-sequencer
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: alephant-sequencer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: dalli-elasticache
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dalli-elasticache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: pmap
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pmap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: faraday
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: crimp
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
 description: Brokers requests for alephant components
 email:
 - stevenmajack@gmail.com
@@ -303,6 +317,7 @@ files:
 - lib/alephant/broker/response/factory.rb
 - lib/alephant/broker/response/multi.rb
 - lib/alephant/broker/version.rb
+- spec/environment_spec.rb
 - spec/fixtures/json/batch.json
 - spec/fixtures/json/batch_compiled.json
 - spec/http_spec.rb
@@ -313,7 +328,7 @@ homepage: https://github.com/BBC-News/alephant-broker
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -328,12 +343,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
 specification_version: 4
 summary: Brokers requests for alephant components
 test_files:
+- spec/environment_spec.rb
 - spec/fixtures/json/batch.json
 - spec/fixtures/json/batch_compiled.json
 - spec/http_spec.rb