alephant-broker 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d298df3c0ecc64c933b538cf9996c1075ca45be
-  data.tar.gz: e23d34bff06c5add699e2cd0f9e6c297e825ca38
+  metadata.gz: 0eaf7f1fcaa9778c9c88112a3cffdcdc1de72115
+  data.tar.gz: 14f82c42772e0c91ae2edadfa07e00821bc6dae1
 SHA512:
-  metadata.gz: 2d6f9d6f4e88b2a6a92c9b8fc4ec70d63046b7aea5fcac89c1541c75c65024ea16c8201868541628fd882181416747d6686c11b97fd4de790c43c2b34e05ac39
-  data.tar.gz: f1014f49a9d43b23d41e2020b30c64bab6704749a461c9b27ef0d9fe9881eb98bfa55107f41a2a8b53a4fea945ddecd6564c55c248fb016551ea71f48f863930
+  metadata.gz: fc5ff5fe4db92a920b1f4cab1cb53856561e7e6787b8142e44791c1498d178186788194f0fb7e52e3e046123cbbefc7a76b69691225a0b01d7125ad9ec58912a
+  data.tar.gz: 761ebd1fd85cdbf61c1dbfaeb5168ffc36aeedf6f9a26b9dacc670453233cdb3c55703dfa346b790c749352293fca971605c7a36873fde97d61ebd192cca3b83

data/lib/alephant/broker/component_factory.rb

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

data/lib/alephant/broker/component_meta.rb

@@ -1,20 +1,27 @@
 module Alephant
   module Broker
     class ComponentMeta
-      attr_reader :id, :options, :batch_id
+      attr_reader :id, :raw_options, :batch_id
       attr_accessor :cached
 
-      def initialize(id, batch_id, options)
-        @id = id
-        @batch_id = batch_id
-        @options = options
-        @cached = true
+      def initialize(id, batch_id, raw_options)
+        @id          = id
+        @batch_id    = batch_id
+        @raw_options = raw_options
+        @cached      = true
       end
 
       def cache_key
         "#{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

@@ -27,13 +27,6 @@ module Alephant
         settings['QUERY_STRING'] || ""
       end
 
-      def options
-        query.split('&').reduce({}) do |object, key_pair|
-          key, value = key_pair.split('=')
-          object.tap { |o| o.store(key.to_sym, value) }
-        end
-      end
-
       def path
         settings['PATH_INFO']
       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.options
+            component_meta.raw_options
           )
         end
       end

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

@@ -14,11 +14,11 @@ module Alephant
           return if env.nil?
 
           component_id = env.path.split('/')[2] || nil
-          options      = env.options
+          raw_options  = env.query
 
           raise InvalidAssetId.new("No Asset ID specified") if component_id.nil?
 
-          @component = component_factory.create(component_id, nil, options)
+          @component = component_factory.create(component_id, nil, raw_options)
         end
       end
     end

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

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

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

data/spec/fixtures/json/batch.json

@@ -1 +1 @@
-{"batch_id":"baz","components":[{"component":"ni_council_results_table"},{"component":"ni_council_results_table"}]}
+{"batch_id":"baz","components":[{"component":"ni_council_results_table", "options":{"foo" : "bar"}},{"component":"ni_council_results_table"}]}

data/spec/fixtures/json/batch_compiled.json

@@ -1 +1 @@
-{"batch_id":"baz","components":[{"component":"ni_council_results_table","options":{},"status":200,"content_type":"foo/bar","body":"Test"},{"component":"ni_council_results_table","options":{},"status":200,"content_type":"foo/bar","body":"Test"}]}
+{"batch_id":"baz","components":[{"component":"ni_council_results_table","options":{"foo" : "bar"},"status":200,"content_type":"foo/bar","body":"Test"},{"component":"ni_council_results_table","options":{},"status":200,"content_type":"foo/bar","body":"Test"}]}

data/spec/http_spec.rb

@@ -35,7 +35,7 @@ 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(:options).and_return Hash.new
+        allow(component_meta).to receive(:raw_options).and_return Hash.new
       end
 
       context "and available over HTTP" do
@@ -59,7 +59,7 @@ describe Alephant::Broker::LoadStrategy::HTTP do
 
       context "and HTTP request fails" do
         before :each do
-          allow(Faraday).to receive(:get).and_raise 
+          allow(Faraday).to receive(:get).and_raise
         end
 
         specify do

metadata

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