alephant-broker 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b93740e5628e1841d3f296c5675304678cc0be7
-  data.tar.gz: 9412546f75f2f95a77c3b2cbfa3b53e98a296f9d
+  metadata.gz: a1b76434c055f4c00da0b9c3f3d5e890cf214b17
+  data.tar.gz: 37cf91c81f2defc12f72bb7a294558aa7d132aa7
 SHA512:
-  metadata.gz: 34c3356dc0bab54c046bf2d8c269a07ea08c60ebfa9077d9f3eadd46a3df6fb48e1dd01d0bab710022607228629f98b6a4b91448153ed125cc38340e7a6e3626
-  data.tar.gz: 9414facbf42866a0eba6e903ec71ba365f0f342c183edb13a8710125c9fba411b08067a6493551bd1fb8223c64f3a5ef58722404fcf796c7faed88fae2ed56bd
+  metadata.gz: 1b04c27451fbe768abe05155821acbccb51b0ce85b2dc62aa994466d7e3422ac992542fef5a2cea6c9f0999e8331a500bc7650a81e159a577aa36cbbebb1574b
+  data.tar.gz: 586130904e241c497b9ce8e4dc01e4cd8a8830c64fdfdecef64ed5e99326d0e7f522bf68d408dc68a6e9daf55a5ee5427e1fb080f1d00a67317046e8412da64a

data/lib/alephant/broker/models/request/get_request.rb

@@ -7,9 +7,9 @@ module Alephant
       attr_reader :type, :component_id, :extension, :options, :content_type
 
       def initialize
+        super(:asset)
         env = RequestStore.store[:env]
         parse requested_components(env.path, env.query)
-        super(:asset)
       end
 
       def requested_components(path, query_string)

data/lib/alephant/broker/models/request_factory.rb

@@ -11,7 +11,7 @@ module Alephant
         case type
         when :component
           GetRequest.new
-        when :component_batch
+        when :components_batch
           PostRequest.new
         when :status
           StatusRequest.new

data/lib/alephant/broker/models/request_handler.rb

@@ -32,7 +32,9 @@ module Alephant
       def request_type
         case env.request_type
         when 'components'
-          component_type
+          :components_batch
+        when 'component'
+          :component
         when 'status'
           :status
         else
@@ -40,15 +42,6 @@ module Alephant
         end
       end
 
-      def component_type
-        case env.method
-        when 'POST'
-          :component_batch
-        when 'GET'
-          :component
-        end
-      end
-
       def env
         @env ||= RequestStore.store[:env]
       end

data/lib/alephant/broker/models/response/asset_response.rb

@@ -41,19 +41,17 @@ module Alephant
       end
 
       def s3_path
-        lookup.read(id, request.options, version).tap { |cache_id| raise InvalidCacheKey if cache_id.nil? }
+        lookup.read(component_id, request.options, version).tap do |lookup_object|
+          raise InvalidCacheKey if lookup_object.location.nil?
+        end.location unless version.nil?
       end
 
       def lookup
         @lookup ||= Alephant::Lookup.create(config[:lookup_table_name])
       end
 
-      def asset?
-        request.type == :asset
-      end
-
       def key
-        asset? ? component_key : renderer_key
+        request.type == :batch ? renderer_key : component_key
       end
 
       def component_key
@@ -64,10 +62,6 @@ module Alephant
         "#{renderer_id}/#{opts_hash}"
       end
 
-      def id
-        asset? ? component_id : renderer_id
-      end
-
       def component_id
         request.component_id
       end

data/lib/alephant/broker/models/response_factory.rb

@@ -25,16 +25,15 @@ module Alephant
           end
       end
 
+      def response(status)
+        Response.new(status)
+      end
+
       private
 
       def config
         @config
       end
-
-      def response(status)
-        Response.new(status)
-      end
-
     end
   end
 end

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/rack_spec.rb

@@ -48,14 +48,14 @@ describe 'Broker Rack Application' do
   end
 
   it "Test asset data is returned" do
-    get '/components/test_component'
+    get '/component/test_component'
 
     expect(last_response).to be_ok
     expect(last_response.body).to eq('Test')
   end
 
   it "Tests query string parameters are passed correctly to lookup" do
-    get '/components/test_component?variant=test_variant'
+    get '/component/test_component?variant=test_variant'
 
     expect(last_response).to be_ok
     expect(last_response.body).to eq('Test')
@@ -67,7 +67,7 @@ describe 'Broker Rack Application' do
       .stub(:status)
       .and_return(404)
 
-    get '/components/test_component'
+    get '/component/test_component'
 
     expect(last_response.status).to eq(404)
   end
@@ -78,7 +78,7 @@ describe 'Broker Rack Application' do
       .stub(:status)
       .and_return(500)
 
-    get '/components/test_component'
+    get '/component/test_component'
 
     expect(last_response.status).to eq(500)
   end

metadata

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