alephant-lookup 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deaebe646ca7347e5bb7d2ecd027faefd36afd1f
-  data.tar.gz: 741d490929b137b788f302deba7737f5861e6fe9
+  metadata.gz: a20e83924522b6a80a8042132e7fd59511a7a635
+  data.tar.gz: 651101ad39d0187fba1d05c5d4857ad54d7ce36d
 SHA512:
-  metadata.gz: 273c627e6a1944afe7dfa30366d1a8030711771e9c847f701c301eb38b3c18cff39810e327acebe7c4e53cd7fb47096a7f810a87c00a1682f2fbad6521c671d3
-  data.tar.gz: ec3d7c1f449386a622666c3f66536f1dc03dc1cee6c07baa1962679810e4f3f35608d5688c877f67b0cdaf0316e24682048d385836e0d97894444ce408dc17ba
+  metadata.gz: e8d9c2010e6c9b70e20690c38ab6938c0e97c42179d689be18228a776327c3a4deda6f89e1562196537d6f160833e8e8a51a5d8abd7f3a36315ba2a21c9e6439
+  data.tar.gz: 63124e6a099f40062775a0fbd24c72be79e587406e6d4cc6b3fcc162a66fdf0c39c0c5bf67bea3908803cd0a85e967ae8c0597049223713f37145d6911f43cca

data/.gitignore

@@ -3,6 +3,7 @@
 Gemfile.lock
 .rspec
 *.gem
+*.log
 
 /pkg
 /tmp

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.17
+2.3.1

data/.travis.yml

@@ -1,20 +1,12 @@
-sudo: false
-cache: bundler
 language: ruby
-
-# Ruby build matrix
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - ruby
-  - jruby
-
-# Ensure we don't build for *every* commit (doesn't apply to PR builds)
-branches:
-  only:
-  - master
-
+  - "2.3.1"
+  - "jruby"
 script:
   - bundle exec rspec --format documentation
+notifications:
+  email:
+    recipients:
+      - D&ENewsFrameworksTeam@bbc.co.uk
+    on_failure: change
+    on_success: never

data/alephant-lookup.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "alephant-lookup"
   spec.version       = Alephant::Lookup::VERSION
   spec.authors       = ["BBC News"]
-  spec.email         = ["FutureMediaNewsRubyGems@bbc.co.uk"]
+  spec.email         = ["D&ENewsFrameworksTeam@bbc.co.uk"]
   spec.summary       = "Lookup a location in S3 using DynamoDB."
   spec.homepage      = "https://github.com/BBC-News/alephant-lookup"
   spec.license       = "MIT"
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
 
-  spec.add_runtime_dependency "aws-sdk", "~> 1.0"
+  spec.add_runtime_dependency "aws-sdk-dynamodb"
   spec.add_runtime_dependency "alephant-logger"
   spec.add_runtime_dependency "alephant-support"
 

data/lib/alephant/lookup/lookup_query.rb

@@ -9,9 +9,11 @@ module Alephant
       attr_reader :table_name, :lookup_location
 
       def initialize(table_name, component_id, opts, batch_version)
-        @client          = AWS::DynamoDB::Client::V20120810.new
-        @table_name      = table_name
-        @lookup_location = LookupLocation.new(component_id, opts, batch_version)
+        options = {}
+        options[:endpoint] = ENV['AWS_DYNAMO_DB_ENDPOINT'] if ENV['AWS_DYNAMO_DB_ENDPOINT']
+        @client            = Aws::DynamoDB::Client.new(options)
+        @table_name        = table_name
+        @lookup_location   = LookupLocation.new(component_id, opts, batch_version)
 
         logger.info(
           "event"        => "LookupQueryInitialized",
@@ -40,28 +42,21 @@ module Alephant
       private
 
       def s3_location_from(result)
-        result[:count] == 1 ? result[:member].first["location"][:s] : nil
+        result.count == 1 ? result.items.first['location'] : nil
       end
 
       def to_q
         {
           :table_name => table_name,
           :consistent_read => true,
-          :select => "SPECIFIC_ATTRIBUTES",
-          :attributes_to_get => ["location"],
-          :key_conditions => {
-            "component_key" => {
-              :comparison_operator => "EQ",
-              :attribute_value_list => [
-                { "s" => @lookup_location.component_key }
-              ],
-            },
-            "batch_version" => {
-              :comparison_operator => "EQ",
-              :attribute_value_list => [
-                { "n" => @lookup_location.batch_version.to_s }
-              ]
-            }
+          :projection_expression => '#loc',
+          :expression_attribute_names => {
+            '#loc' => 'location'
+          },
+          :key_condition_expression => 'component_key = :component_key AND batch_version = :batch_version',
+          :expression_attribute_values => {
+            ':component_key' => @lookup_location.component_key,
+            ':batch_version' => @lookup_location.batch_version.to_i # @TODO: Verify if this is nil as this would be 0
           }
         }
       end

data/lib/alephant/lookup/lookup_table.rb

@@ -1,4 +1,4 @@
-require "aws-sdk"
+require "aws-sdk-dynamodb"
 require "thread"
 require "timeout"
 
@@ -12,8 +12,10 @@ module Alephant
       attr_reader :table_name, :client
 
       def initialize(table_name)
+        options = {}
+        options.merge!({endpoint: ENV['AWS_DYNAMO_DB_ENDPOINT']}) if ENV['AWS_DYNAMO_DB_ENDPOINT']
         @mutex      = Mutex.new
-        @client     = AWS::DynamoDB::Client::V20120810.new
+        @client     = Aws::DynamoDB::Client.new(options)
         @table_name = table_name
         logger.info(
           "event"     => "LookupTableInitialized",
@@ -24,17 +26,11 @@ module Alephant
 
       def write(component_key, version, location)
         client.put_item({
-          :table_name => table_name,
-          :item => {
-            'component_key' => {
-              'S' => component_key.to_s
-            },
-            'batch_version' => {
-              'N' => version.to_s
-            },
-            'location' => {
-              'S' => location.to_s
-            }
+          table_name: table_name,
+          item: {
+            'component_key' => component_key.to_s,
+            'batch_version' => version,
+            'location'      => location.to_s
           }
         }).tap do
           logger.info(

data/lib/alephant/lookup/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Lookup
-    VERSION = "2.0.2".freeze
+    VERSION = "2.1.0".freeze
   end
 end

data/spec/lookup_spec.rb

@@ -2,9 +2,9 @@ require "spec_helper"
 
 describe Alephant::Lookup do
   describe ".create" do
-    it "returns a lookup" do
-      expect_any_instance_of(Alephant::Lookup::LookupHelper).to receive(:initialize)
+    subject { Alephant::Lookup }
 
+    it "returns a lookup" do
       expect(subject.create(:table_name)).to be_a Alephant::Lookup::LookupHelper
     end
   end
@@ -23,44 +23,30 @@ describe Alephant::Lookup do
     describe "#read" do
       let(:expected_query) do
         {
-          :table_name=>"table_name",
-          :consistent_read=>true,
-          :select=>"SPECIFIC_ATTRIBUTES",
-          :attributes_to_get=>["location"],
-          :key_conditions=>{
-            "component_key"=> {
-              :comparison_operator=>"EQ",
-              :attribute_value_list=>[{"s"=>"id/218c835cec343537589dbf1619532e4d"}]
-            },
-            "batch_version"=>{
-              :comparison_operator=>"EQ",
-              :attribute_value_list=>[{"n"=>"0"}]
-            }
+          :table_name => 'table_name',
+          :consistent_read => true,
+          :projection_expression => '#loc',
+          :expression_attribute_names => {
+            '#loc' => 'location'
+          },
+          :key_condition_expression => 'component_key = :component_key AND batch_version = :batch_version',
+          :expression_attribute_values => {
+            ':component_key' => 'id/218c835cec343537589dbf1619532e4d',
+            ':batch_version' => 0 # @TODO: Verify if this is nil as this would be 0
           }
         }
       end
 
       it "queries DynamoDb and returns a location when not in cache" do
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
         expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
 
         expect_any_instance_of(Dalli::Client).to receive(:get)
         expect_any_instance_of(Dalli::Client).to receive(:set)
 
-        expect_any_instance_of(AWS::DynamoDB::Client::V20120810)
-          .to receive(:initialize)
-
-        expect_any_instance_of(AWS::DynamoDB::Client::V20120810)
+        expect_any_instance_of(Aws::DynamoDB::Client)
           .to receive(:query)
           .with(expected_query)
-          .and_return(
-            {
-              :count => 1,
-              :member => [
-                { "location" => { :s => "/location" } }
-              ]
-            }
-          )
+          .and_return(double(count: 1, items: [{ "location" => "/location"}]))
 
         table = double().as_null_object
         expect(table).to receive(:table_name).and_return("table_name").exactly(4).times
@@ -76,7 +62,6 @@ describe Alephant::Lookup do
       it "reads location from the cache when in cache" do
         lookup_location = Alephant::Lookup::LookupLocation.new("id", {:variant => "foo"}, 0, "/location")
 
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
         expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
 
         expect_any_instance_of(Dalli::Client).to receive(:get)
@@ -84,9 +69,7 @@ describe Alephant::Lookup do
           .and_return(lookup_location)
         expect_any_instance_of(Dalli::Client).to_not receive(:set)
 
-        expect_any_instance_of(AWS::DynamoDB::Client::V20120810).to_not receive(:initialize)
-
-        expect_any_instance_of(AWS::DynamoDB::Client::V20120810).to_not receive(:query)
+        expect_any_instance_of(Aws::DynamoDB::Client).to_not receive(:query)
 
         table = double().as_null_object
         expect(table).to receive(:table_name).and_return("table_name").twice

data/spec/spec_helper.rb

@@ -5,3 +5,4 @@ require 'alephant/lookup'
 require 'crimp'
 require 'logger'
 
+ENV['AWS_REGION'] = 'eu-west-1'

metadata

@@ -1,236 +1,236 @@
 --- !ruby/object:Gem::Specification
 name: alephant-lookup
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - BBC News
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2018-05-16 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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec-nc
+  prerelease: false
   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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: guard
+  prerelease: false
   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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
+  prerelease: false
   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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: pry
+  prerelease: false
   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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: pry-remote
+  prerelease: false
   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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: pry-nav
+  prerelease: false
   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'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: listen
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.8
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <=
+    - - "<="
       - !ruby/object:Gem::Version
         version: 3.0.8
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: bundler
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 3.0.8
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-dynamodb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-  prerelease: false
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: alephant-logger
+  prerelease: false
   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'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: alephant-support
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: alephant-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: dalli-elasticache
+  prerelease: false
   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'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: crimp
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: crimp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-description:
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 
 email:
-- FutureMediaNewsRubyGems@bbc.co.uk
+- D&ENewsFrameworksTeam@bbc.co.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .hound.yml
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".hound.yml"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -250,24 +250,24 @@ homepage: https://github.com/BBC-News/alephant-lookup
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.12
+signing_key: 
 specification_version: 4
 summary: Lookup a location in S3 using DynamoDB.
 test_files: