bucket_cake 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 971c717cd37127c460012f0458ec88770e7bb582
-  data.tar.gz: 9667d6d81df2479dbcfd9636f75f0c78f93cc183
+  metadata.gz: 87c40cb79610b73decea42bbe95851d52ac91b42
+  data.tar.gz: 9cc67aee2afdb05469072c802e7b1ad5acd7e167
 SHA512:
-  metadata.gz: cbeec6767901aafbe9dfd6b51f5a8d000b029ebbcf130766822917502928e50643f3d7280157490564e79081289e5029e4429d32caae36eb013af498d5feaf89
-  data.tar.gz: d639a0956dbd956221c6821b5254483ab494622955e65e345c49296d010aeb8ad6cfd70bfc8e136519ac6a91d0ed75da2b3f8bd4c76194fa4917338452d5367c
+  metadata.gz: f2355e18dccb3ddce2f141ae7a0740a5721f12df438dbadcfc7911e1d19ea72e9432985ebc188968a2010ce3f594c5cdb021de933c25e794135fe2bef7287732
+  data.tar.gz: e8fd595e130a1e8d4284b240000941335eb7b65871ee621d5864a19bce5623c014ffe80b154db2aa2f1c4a506f68dbea02cbacc3e9fed63af0b6d23edfe4134f

data/lib/bucket_cake.rb

@@ -29,5 +29,5 @@ require 'bucket_cake/facts'
 Protobuf.ignore_unknown_fields = false
 
 module BucketCake
-  CACHE_PREFIX = 'bucket-cake-latest'
+  CURSOR_REGEXP = %r{\A\d{4}/\d{2}/\d{2}/\d{6}\z}
 end

data/lib/bucket_cake/base.rb

@@ -1,39 +1,30 @@
 # frozen_string_literal: true
 module BucketCake
   class Base
-    def initialize(cache)
-      @cache = cache
-      check_cache!
+    class Range < self
+      def initialize(cursor)
+        raise 'BucketCake: cursor has invalid format!' unless cursor.nil? || cursor =~ CURSOR_REGEXP
+        @cursor = cursor
+      end
+
+      def items
+        get Source::Range.new(self.class::FOLDER, cursor), self.class::PROTOCLASS
+      end
     end
 
-    private
-
-    attr_reader :cache
-
-    def check_cache!
-      return if cache && cache.respond_to?(:read) && cache.respond_to?(:write)
-
-      raise 'BucketCake: cache parameter must respond to #read and #write. ' \
-        'Use Rails.cache if you are not sure.'
+    class Latest < self
+      def items
+        get Source::Latest.new(self.class::FOLDER, nil), self.class::PROTOCLASS
+      end
     end
 
-    def latest(type, klass)
-      get Source::Latest.new(type, cache), klass
-    end
+    attr_reader :cursor
 
-    def range(type, klass)
-      get Source::Range.new(type, cache), klass
-    end
+    private
 
     def get(source, klass)
-      return unless source.new_data?
-
-      Enumerator.new do |y|
-        Decoder.new(source.zip_files, klass).items.each do |item|
-          y << item
-        end
-        source.confirm!
-      end.lazy
+      @cursor = source.latest_cursor
+      Decoder.new(source.zip_files, klass).items.lazy
     end
   end
 end

data/lib/bucket_cake/entities.rb

@@ -1,24 +1,29 @@
 # frozen_string_literal: true
 module BucketCake
-  class Entities < Base
-    def advertisers
-      latest 'advertisers', Cakeproto::Advertiser
+  module Entities
+    class Advertisers < Base::Latest
+      FOLDER = 'advertisers'
+      PROTOCLASS = Cakeproto::Advertiser
     end
 
-    def affiliates
-      latest 'affiliates', Cakeproto::Affiliate
+    class Affiliates < Base::Latest
+      FOLDER = 'affiliates'
+      PROTOCLASS = Cakeproto::Affiliate
     end
 
-    def campaigns
-      latest 'campaigns', Cakeproto::Campaign
+    class Campaigns < Base::Latest
+      FOLDER = 'campaigns'
+      PROTOCLASS = Cakeproto::Campaign
     end
 
-    def creatives
-      latest 'creatives', Cakeproto::Creative
+    class Creatives < Base::Latest
+      FOLDER = 'creatives'
+      PROTOCLASS = Cakeproto::Creative
     end
 
-    def offers
-      latest 'offers', Cakeproto::Offer
+    class Offers < Base::Latest
+      FOLDER = 'offers'
+      PROTOCLASS = Cakeproto::Offer
     end
   end
 end

data/lib/bucket_cake/facts.rb

@@ -1,24 +1,29 @@
 # frozen_string_literal: true
 module BucketCake
-  class Facts < Base
-    def clicks
-      range 'clicks', Cakeproto::Click
+  module Facts
+    class Clicks < Base::Range
+      FOLDER = 'clicks'
+      PROTOCLASS = Cakeproto::Click
     end
 
-    def conversions
-      range 'conversions', Cakeproto::Conversion
+    class Conversions < Base::Range
+      FOLDER = 'conversions'
+      PROTOCLASS = Cakeproto::Conversion
     end
 
-    def conversion_changes
-      range 'conversion_changes', Cakeproto::ConversionChange
+    class ConversionChanges < Base::Range
+      FOLDER = 'conversion_changes'
+      PROTOCLASS = Cakeproto::ConversionChange
     end
 
-    def cap_states
-      range 'cap_states', Cakeproto::CapState
-    end
+    class CapStates < Base::Range
+      FOLDER = 'cap_states'
+      PROTOCLASS = Cakeproto::CapState
 
-    def latest_cap_states
-      latest 'cap_states', Cakeproto::CapState
+      class Latest < Base::Latest
+        FOLDER = 'cap_states'
+        PROTOCLASS = Cakeproto::CapState
+      end
     end
   end
 end

data/lib/bucket_cake/source.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 module BucketCake
   class Source
-    def initialize(type, cache)
-      @type = type
-      @cache = cache
+    def initialize(folder, cursor)
+      @folder = folder
+      @cursor = cursor
     end
 
     def zip_files
@@ -22,6 +22,14 @@ module BucketCake
       end
     end
 
+    def latest_cursor
+      @latest_cursor ||= bucket.object("#{folder}/latest").get.body.read
+    end
+
+    private
+
+    attr_reader :folder, :cursor
+
     def check_success(key)
       @success_files ||= Set.new
       @success_files << key if key.end_with?('/SUCCESS')
@@ -31,30 +39,6 @@ module BucketCake
       @success_files.include?(File.dirname(key) + '/SUCCESS')
     end
 
-    def new_data?
-      current_latest_path != cache_latest_path
-    end
-
-    def confirm!
-      cache.write(cache_key, current_latest_path)
-    end
-
-    private
-
-    attr_reader :type, :cache
-
-    def cache_key
-      "#{CACHE_PREFIX}-#{type}"
-    end
-
-    def current_latest_path
-      @current_latest_path ||= bucket.object("#{type}/latest").get.body.read
-    end
-
-    def cache_latest_path
-      @cache_latest_path ||= cache.read(cache_key)
-    end
-
     def bucket
       @bucket ||= Aws::S3::Bucket.new(ENV.fetch('CAKE_DATA_BUCKET'))
     end
@@ -64,7 +48,7 @@ module BucketCake
     private
 
     def objects
-      bucket.objects(prefix: "#{type}/#{current_latest_path}/")
+      bucket.objects(prefix: "#{folder}/#{latest_cursor}/")
     end
   end
 
@@ -72,13 +56,13 @@ module BucketCake
     private
 
     def objects
-      # If we don't have a timestamp in cache, return everything
-      return bucket.objects(prefix: "#{type}/") if cache_latest_path.nil?
+      # If we don't have a timestamp in cursor, return everything
+      return bucket.objects(prefix: "#{folder}/") if cursor.nil?
 
       # This returns all objects after the current timestamp.
       # By using the 'xxx' suffix, none of the objects of the given timestamp are returned.
       # S3 ensures alphabetical order of the results, so this works fine for date ranges.
-      bucket.objects(marker: "#{type}/#{cache_latest_path}/xxx", prefix: "#{type}/")
+      bucket.objects(marker: "#{folder}/#{cursor}/xxx", prefix: "#{folder}/")
     end
   end
 end

data/lib/bucket_cake/values.rb

@@ -1,36 +1,44 @@
 # frozen_string_literal: true
 module BucketCake
-  class Values < Base
-    def affiliate_tiers
-      latest 'affiliate_tiers', Cakeproto::IdName
+  module Values
+    class AffiliateTiers < Base::Latest
+      FOLDER = 'affiliate_tiers'
+      PROTOCLASS = Cakeproto::IdName
     end
 
-    def blacklist_reasons
-      latest 'blacklist_reasons', Cakeproto::IdName
+    class BlacklistReasons < Base::Latest
+      FOLDER = 'blacklist_reasons'
+      PROTOCLASS = Cakeproto::IdName
     end
 
-    def countries
-      latest 'countries', Cakeproto::Country
+    class Countries < Base::Latest
+      FOLDER = 'countries'
+      PROTOCLASS = Cakeproto::Country
     end
 
-    def currencies
-      latest 'currencies', Cakeproto::Currency
+    class Currencies < Base::Latest
+      FOLDER = 'currencies'
+      PROTOCLASS = Cakeproto::Currency
     end
 
-    def exchange_rates
-      latest 'exchange_rates', Cakeproto::ExchangeRate
+    class ExchangeRates < Base::Latest
+      FOLDER = 'exchange_rates'
+      PROTOCLASS = Cakeproto::ExchangeRate
     end
 
-    def media_types
-      latest 'media_types', Cakeproto::IdName
+    class MediaTypes < Base::Latest
+      FOLDER = 'media_types'
+      PROTOCLASS = Cakeproto::IdName
     end
 
-    def payment_types
-      latest 'payment_types', Cakeproto::IdName
+    class PaymentTypes < Base::Latest
+      FOLDER = 'payment_types'
+      PROTOCLASS = Cakeproto::IdName
     end
 
-    def verticals
-      latest 'verticals', Cakeproto::IdName
+    class Verticals < Base::Latest
+      FOLDER = 'verticals'
+      PROTOCLASS = Cakeproto::IdName
     end
   end
 end

data/lib/bucket_cake/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module BucketCake
-  VERSION = '2.0.1'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bucket_cake
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - ad2games developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Get cakeproto objects from S3.