alephant-lookup 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff6ba6dbad05c1c01c5363957f3811447c4f3ce5
-  data.tar.gz: 0e0e0e340627956a2262bf27f92890238a504e73
+  metadata.gz: ee47867bea727abbcf73e15a82c9e5faefea229f
+  data.tar.gz: b8d17607728acc5524896fd71c60d4dbcd15edb8
 SHA512:
-  metadata.gz: fdaf1f60f7e8c4dadd04abd4a2b2911d8c70f2b79e13d0ecf4c22a96bfca7adb82520bb77331a4a769dd96d0ffb2493dd4cf79617b72d6addd5265b17a182d7b
-  data.tar.gz: ddad00ab88263ad247740a44721e95d8a8cb191317fad62646a8cdd7a2a1f7f42c7de7235806d89619efef582c8e2195f39b62edbbc0453cc820f8bcb3121dff
+  metadata.gz: 1840b7398c7c5aa69d141f575e03e61b43e50c3fd718afa8b16916b3187f058783cf2844bcbcc9817b3e902594270ce3c80bb36cd7a299f4b021d7c5ccffcd8f
+  data.tar.gz: ae986df6e7645c0f6376af0af41caf511aa008db4b19d17947163c881eb09210668758d746d16bf17114396f58f59b09fff4723281f71ed95e6cf8d06fa59d79

data/lib/alephant/lookup.rb

@@ -6,9 +6,9 @@ module Alephant
   module Lookup
     @@lookup_tables = {}
 
-    def self.create(table_name, component_id = nil)
+    def self.create(table_name)
       @@lookup_tables[table_name] ||= LookupTable.new(table_name)
-      LookupHelper.new(@@lookup_tables[table_name], component_id)
+      LookupHelper.new(@@lookup_tables[table_name])
     end
   end
 end

data/lib/alephant/lookup/lookup_helper.rb

@@ -6,43 +6,28 @@ require 'alephant/lookup/location_write'
 module Alephant
   module Lookup
     class LookupHelper
-      attr_reader :component_id
+      attr_reader :lookup_table
 
-      def initialize(lookup_table, component_id = nil)
+      def initialize(lookup_table)
         @lookup_table = lookup_table
-        @component_id = component_id
-        create_lookup_table
-      end
-
-      def read(opts, ident = nil)
-        ident = @component_id || ident
-        reader = LocationRead.new(@lookup_table)
-        reader.read(LookupQuery.new(ident, opts)).location
-      end
-
-      def write(opts, location, ident = nil)
-        ident = @component_id || ident
-        batch_write(opts, location, ident)
-        batch_process
-      end
-
-      def batch_write(opts, location, ident = nil)
-        ident = @component_id || ident
-        @batch_write ||= LocationWrite.new(@lookup_table)
-        @batch_write << LookupQuery.new(ident, opts, location)
+        @lookup_table.create
       end
 
-      def batch_process
-        @batch_write.process!
-        @batch_write = nil
+      def read(id, opts, batch_version)
+        LookupQuery.new(lookup_table.table_name, id, opts, batch_version).run!
       end
 
-      private
-
-      def create_lookup_table
-        @lookup_table.create
+      def write(id, opts, batch_version, location)
+        LookupLocation.new(id, batch_version, opts, location).tap do |l|
+          lookup_table.table.batch_put([
+            {
+              :component_key => l.component_key,
+              :batch_version => l.batch_version,
+              :location      => l.location
+            }
+          ])
+        end
       end
-
     end
   end
 end

data/lib/alephant/lookup/lookup_location.rb

@@ -1,23 +1,29 @@
+require 'crimp'
+
 module Alephant
   module Lookup
     class LookupLocation
-      S3_LOCATION_FIELD = 'location'
-
-      attr_reader :component_id, :opts, :location
+      attr_reader :component_id, :component_key, :opts, :opts_hash, :batch_version
+      attr_accessor :location
 
-      def initialize(component_id, opts, location)
+      def initialize(component_id, batch_version, opts, location = nil)
         @component_id = component_id
+        @batch_version = batch_version
         @opts = opts
+        @opts_hash = hash_for(opts)
         @location = location
       end
 
-      def to_h
-        {
-          :component_id => @component_id,
-          :opts => opts,
-          S3_LOCATION_FIELD => @location
-        }
+      def component_key
+        "#{component_id}/#{opts_hash}"
+      end
+
+      private
+
+      def hash_for(opts)
+        Crimp.signature opts
       end
+
     end
   end
 end

data/lib/alephant/lookup/lookup_query.rb

@@ -3,27 +3,50 @@ require 'alephant/lookup/lookup_location'
 
 module Alephant
   module Lookup
-    class LookupQuery < LookupLocation
-      attr_reader :opts_hash
-      attr_writer :location
+    class LookupQuery
+      attr_reader :table_name, :lookup_location
 
-      def initialize(component_id, opts, location = nil)
-        super(component_id, opts, location)
-        @opts_hash = hash_for(opts)
+      def initialize(table_name, component_id, batch_version, opts)
+        @client = AWS::DynamoDB::Client::V20120810.new
+        @table_name = table_name
+        @lookup_location = LookupLocation.new(component_id, batch_version, opts)
       end
 
-      def to_h
-        {
-          :component_id => @component_id,
-          :opts_hash => @opts_hash,
-          S3_LOCATION_FIELD => @location
-        }
+      def run!
+        lookup_location.tap do |l|
+          l.location = s3_location_from(
+            @client.query(to_q)
+          )
+        end
       end
 
       private
 
-      def hash_for(opts)
-        Crimp.signature opts
+      def s3_location_from(result)
+        result[:count] == 1 ? result[:member].first['location'][:s] : 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 }
+              ]
+            }
+          }
+        }
       end
     end
   end

data/lib/alephant/lookup/lookup_table.rb

@@ -14,10 +14,10 @@ module Alephant
       }
       SCHEMA = {
         :hash_key => {
-          :component_id => :string
+          :component_key => :string
         },
         :range_key => {
-          :opts_hash => :string
+          :batch_version => :number
         }
       }
 

data/lib/alephant/lookup/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Lookup
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/spec/lookup_spec.rb

@@ -6,9 +6,8 @@ describe Alephant::Lookup do
       Alephant::Lookup::LookupHelper
         .any_instance
         .stub(:initialize)
-        .and_return(double())
 
-      expect(subject.create(:table_name, :component_id)).to be_a Alephant::Lookup::LookupHelper
+      expect(subject.create(:table_name)).to be_a Alephant::Lookup::LookupHelper
     end
   end
 
@@ -19,93 +18,88 @@ describe Alephant::Lookup do
       it 'calls create on lookup_table' do
         table = double()
         table.should_receive(:create)
-        subject.new(table, :component_id)
+        subject.new(table)
       end
     end
 
-    describe '#read(opts)' do
-      let (:lookup_table) { Alephant::Lookup::LookupTable }
-      let (:s3_location)  { '/s3-render-example/test/html/england_council_election_results/responsive' }
-      let (:location_read){ Alephant::Lookup::LocationRead }
-
-      it 'returns correct S3 Location' do
-        subject
-          .any_instance
-          .stub(:create_lookup_table)
+    describe '#read(id, opts, batch_version)' 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/9dd916afd5516828a91d259967fd394a"}]
+            },
+            "batch_version"=>{
+              :comparison_operator=>"EQ",
+              :attribute_value_list=>[{"n"=>"{:variant=>\"foo\"}"}]
+            }
+          }
+        }
+      end
 
-        lookup_table
+      it 'queries DynamoDb and returns a location' do
+        AWS::DynamoDB::Client::V20120810
           .any_instance
           .stub(:initialize)
 
-        location = Alephant::Lookup::LookupLocation.new(:component_id,:opts_hash, s3_location)
-
-        location_read
+        AWS::DynamoDB::Client::V20120810
           .any_instance
-          .stub(:read)
-          .and_return(location)
+          .should_receive(:query)
+          .with(expected_query)
+          .and_return(
+            {
+              :count => 1,
+              :member => [
+                { 'location' => { :s => '/location' } }
+              ]
+            }
+          )
 
-        pal_opts = {
-          :id   => :england_council_election_results,
-          :env  => :test,
-          :type => :responsive
-        }
+        table = double().as_null_object
+        table.stub(:table_name).and_return('table_name')
 
-        instance      = subject.new(lookup_table.new, pal_opts[:id])
-        read_location = instance.read(pal_opts)
+        instance = subject.new(table)
+        lookup = instance.read('id',{:variant => "foo"},0)
 
-        expect(read_location).to eq(s3_location)
+        expect(lookup.location).to eq('/location')
       end
     end
 
     describe '#write(opts, location)' do
-
-      let (:lookup_table)  { Alephant::Lookup::LookupTable }
-      let (:s3_location)   { '/s3-render-example/test/html/england_council_election_results/responsive' }
-      let (:location_write){ Alephant::Lookup::LocationWrite }
-
-      it 'returns lookup_table.update_location_for(component_id, opts_hash, data)' do
-
-        subject
-          .any_instance
-          .stub(:create_lookup_table)
-
-        lookup_table
+      it 'does not fail' do
+        AWS::DynamoDB
           .any_instance
           .stub(:initialize)
+          .and_return(
+            double().as_null_object
+          )
 
-        lookup_table
-          .any_instance
-          .stub(:table_name)
-          .and_return('table_name')
-
-        pal_opts = {
-          :id   => :england_council_election_results,
-          :env  => :test,
-          :type => :responsive
-        }
+        ddb_table = double().as_null_object
+        ddb_table
+          .should_receive(:batch_put)
+          .with([{
+            :component_key => "id/7e0c33c476b1089500d5f172102ec03e",
+            :batch_version => "0",
+            :location => "/location"
+          }])
 
-        AWS::DynamoDB::BatchWrite
-          .any_instance
-          .should_receive(:put)
-          .with(
-            'table_name',
-              [
-                {
-                  :component_id=> :england_council_election_results,
-                  :opts_hash=>"52a25baaaa8c4527ddc869feaa285c3a",
-                  "location"=>:s3_location
-                }
-              ]
-          )
+        lookup_table = double().as_null_object
+        lookup_table
+          .should_receive(:table)
+          .and_return(ddb_table)
 
-        AWS::DynamoDB::BatchWrite
+        Alephant::Lookup::LookupHelper
           .any_instance
-          .should_receive(:process!)
+          .stub(:lookup_table)
+          .and_return(lookup_table)
 
-        subject.new(
-          lookup_table.new,
-          pal_opts[:id]
-        ).write(pal_opts, :s3_location)
+        instance = subject.new(lookup_table)
+        instance.write('id',{},'0','/location')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-lookup
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Robert Kenny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -195,8 +195,6 @@ files:
 - Rakefile
 - alephant-lookup.gemspec
 - lib/alephant/lookup.rb
-- lib/alephant/lookup/location_read.rb
-- lib/alephant/lookup/location_write.rb
 - lib/alephant/lookup/lookup_helper.rb
 - lib/alephant/lookup/lookup_location.rb
 - lib/alephant/lookup/lookup_query.rb

data/lib/alephant/lookup/location_read.rb

@@ -1,71 +0,0 @@
-require 'aws-sdk'
-require 'alephant/lookup/lookup_location'
-require 'alephant/lookup/lookup_query'
-require 'alephant/logger'
-
-module Alephant
-  module Lookup
-    class LocationRead
-      include ::Alephant::Logger
-
-      attr_reader :table_name
-
-      def initialize(lookup_table)
-        @client = AWS::DynamoDB::Client::V20120810.new
-        @table_name = lookup_table.table_name
-      end
-
-      def read(lookup)
-        logger.info("LocationRead#read: looking up #{lookup.to_h}")
-        raise TypeError unless lookup.is_a? LookupQuery
-
-        location = LookupLocation.new(
-          lookup.component_id,
-          lookup.opts_hash,
-          s3_location_from(
-            run_query(
-              lookup.component_id,
-              lookup.opts_hash
-            )
-          )
-        )
-        logger.info("LocationRead#read: got location #{location.to_h}")
-
-        location
-      end
-
-      private
-
-      def s3_location_from(result)
-        result[:count] == 1 ? result[:member].first[LookupLocation::S3_LOCATION_FIELD][:s] : nil
-      end
-
-      def run_query(component_id, opts_hash)
-        @client.query(query(component_id, opts_hash))
-      end
-
-      def query(component_id, opts_hash)
-        {
-          :table_name => table_name,
-          :consistent_read => true,
-          :select => 'SPECIFIC_ATTRIBUTES',
-          :attributes_to_get => [LookupLocation::S3_LOCATION_FIELD],
-          :key_conditions => {
-            'component_id' => {
-              :comparison_operator => 'EQ',
-              :attribute_value_list => [
-                { 's' => component_id.to_s }
-              ],
-            },
-            'opts_hash' => {
-              :comparison_operator => 'EQ',
-              :attribute_value_list => [
-                { 's' => opts_hash }
-              ]
-            }
-          }
-        }
-      end
-    end
-  end
-end

data/lib/alephant/lookup/location_write.rb

@@ -1,50 +0,0 @@
-require 'aws-sdk'
-require 'alephant/lookup/lookup_query'
-require 'alephant/logger'
-
-module Alephant
-  module Lookup
-    class LocationWrite
-      include ::Alephant::Logger
-
-      attr_reader :table_name
-      attr_reader :lookups
-
-      def initialize(lookup_table)
-        @table_name = lookup_table.table_name
-        @batch = AWS::DynamoDB::BatchWrite.new
-        @lookups = []
-        @processed = false
-      end
-
-      def <<(lookup)
-        raise TypeError unless lookup.is_a? LookupQuery
-
-        @lookups << lookup
-      end
-
-      def processed?
-        @processed
-      end
-
-      def process!
-        logger.info("LocationWrite#process! #{processed? ? "not" : "is"} running batch put on #{table_name}")
-        processed? ? false : process_batch_put
-      end
-
-      private
-
-      def process_batch_put
-        logger.info("LocationWrite#process_batch_put to #{table_name} for #{@lookups.map { |lookup| lookup.to_h }}")
-
-        @batch.put(
-          table_name,
-          @lookups.map { |lookup| lookup.to_h }
-        )
-        @batch.process!
-
-        processed = true
-      end
-    end
-  end
-end