i18n-backend-http 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36137a83ff8e2c9c616f494ab4b84c55f6751f1c
-  data.tar.gz: 827f9ac3ed6688b05ca39dee9a90cc3f55ca2c61
+  metadata.gz: 6253fa4b449db0c86fc538654b5d435d1cbcf0a7
+  data.tar.gz: 7672f4606b3645647594312efe3e3c1f4f93bfc3
 SHA512:
-  metadata.gz: 73bba6050a343f6c5fdcb44add77fd1a00c05e9fbdd6ba74b138533d1e3a66ae171140672982f23af13a242d5182874c349ff3e26aa7f30fe1915f29da196986
-  data.tar.gz: b372946bcb397e949af0218b86fa9f4ccdfdfdc254437fdea4dd2b1bf892a06d238bf8b1cf3b9ecca4c7abf7957377898a899dffa045ab30ca2e27f3701da447
+  metadata.gz: f98a33068b3b8766b80d6c32c4939ed2546b7ebf9fd3b0f4d9f4ff47821b80ea089a7960ce645870f233e49f404f2131f0085441d5b87dd21477e4b16bee1ebd
+  data.tar.gz: b80e56c5688166d236e6f941000a23f958dd27b768fc7cd600e4772c83bffe7676dc250a91c93012dee400cb455e5a8b5cfbfc7d5e82ede0e892a5e5e2e85843

data/lib/i18n/backend/http.rb

@@ -1,11 +1,11 @@
 require 'i18n'
 require 'i18n/backend/transliterator'
 require 'i18n/backend/base'
-require 'gem_of_thrones'
 require 'i18n/backend/http/version'
 require 'i18n/backend/http/etag_http_client'
 require 'i18n/backend/http/null_cache'
 require 'i18n/backend/http/lru_cache'
+require 'socket'
 
 module I18n
   module Backend
@@ -70,19 +70,31 @@ module I18n
       end
 
       def locked_update_cache(locale)
-        @aspirants ||= {}
-        aspirant = @aspirants[locale] ||= GemOfThrones.new(
-          :cache => @options[:cache],
-            :timeout => (@options[:polling_interval] * 3).ceil,
-            :cache_key => "i18n/backend/http/locked_update_caches/#{locale}"
-        )
-        if aspirant.rise_to_power
-          download_and_cache_translations(locale)
-        else
+        unless update_cache(locale) { download_and_cache_translations(locale) }
           update_memory_cache_from_cache(locale)
         end
       end
 
+      def update_cache(locale)
+        cache = @options.fetch(:cache)
+        key = "i18n/backend/http/locked_update_caches/#{locale}"
+        me = "#{Socket.gethostname}-#{Process.pid}-#{Thread.current.object_id}"
+        if current = cache.read(key)
+          if current == me
+            try = false  # I am responsible, renew expiration
+          else
+            return # someone else is responsible, do not touch
+          end
+        else
+          try = true # nobody is responsible, try to get responsibility
+        end
+
+        return unless cache.write(key, me, expires_in: (@options[:polling_interval] * 3).ceil, unless_exist: try)
+
+        yield
+        true
+      end
+
       def update_memory_cache_from_cache(locale)
         @translations[locale] = translations_from_cache(locale)
       end

data/lib/i18n/backend/http/etag_http_client.rb

@@ -3,31 +3,30 @@ require 'faraday'
 module I18n
   module Backend
     class Http
-    end
-  end
-end
+      class I18n::Backend::Http::EtagHttpClient
+        def initialize(options)
+          @options = options
+          @etags = {}
+        end
 
-class I18n::Backend::Http::EtagHttpClient
-  def initialize(options)
-    @options = options
-    @etags = {}
-  end
-
-  def download(path)
-    @client ||= Faraday.new(@options[:host])
-    response = @client.get(path) do |request|
-      request.headers["If-None-Match"] = @etags[path] if @etags[path]
-      request.options[:timeout] = @options[:http_read_timeout]
-      request.options[:open_timeout] = @options[:http_open_timeout]
-    end
+        def download(path)
+          @client ||= Faraday.new(@options[:host])
+          response = @client.get(path) do |request|
+            request.headers["If-None-Match"] = @etags[path] if @etags[path]
+            request.options[:timeout] = @options[:http_read_timeout]
+            request.options[:open_timeout] = @options[:http_open_timeout]
+          end
 
-    @etags[path] = response['ETag']
+          @etags[path] = response['ETag']
 
-    case response.status
-    when 200 then yield response.body
-    when 304
-    else
-      raise "Failed request: #{response.inspect}"
+          case response.status
+          when 200 then yield response.body
+          when 304
+          else
+            raise "Failed request: #{response.inspect}"
+          end
+        end
+      end
     end
   end
 end

data/lib/i18n/backend/http/lru_cache.rb

@@ -1,40 +1,39 @@
+# http://codesnippets.joyent.com/posts/show/12329
 module I18n
   module Backend
     class Http
-    end
-  end
-end
-
-# http://codesnippets.joyent.com/posts/show/12329
-class I18n::Backend::Http::LRUCache
-  def initialize(size = 10)
-    @size = size
-    @store = {}
-    @lru = []
-  end
+      class I18n::Backend::Http::LRUCache
+        def initialize(size = 10)
+          @size = size
+          @store = {}
+          @lru = []
+        end
 
-  def []=(key, value)
-    @store[key] = value
-    set_lru(key)
-    @store.delete(@lru.pop) if @lru.size > @size
-  end
+        def []=(key, value)
+          @store[key] = value
+          set_lru(key)
+          @store.delete(@lru.pop) if @lru.size > @size
+        end
 
-  def [](key)
-    set_lru(key)
-    @store[key]
-  end
+        def [](key)
+          set_lru(key)
+          @store[key]
+        end
 
-  def keys
-    @store.keys
-  end
+        def keys
+          @store.keys
+        end
 
-  def values
-    @store.values
-  end
+        def values
+          @store.values
+        end
 
-  private
+        private
 
-  def set_lru(key)
-    @lru.unshift(@lru.delete(key) || key)
+        def set_lru(key)
+          @lru.unshift(@lru.delete(key) || key)
+        end
+      end
+    end
   end
 end

data/lib/i18n/backend/http/null_cache.rb

@@ -1,19 +1,18 @@
 module I18n
   module Backend
     class Http
-    end
-  end
-end
+      class I18n::Backend::Http::NullCache
+        def fetch(*args)
+          yield
+        end
 
-class I18n::Backend::Http::NullCache
-  def fetch(*args)
-    yield
-  end
+        def read(key)
+        end
 
-  def read(key)
-  end
-
-  def write(key, value)
-    value
+        def write(key, value)
+          value
+        end
+      end
+    end
   end
 end

data/lib/i18n/backend/http/version.rb

@@ -1,7 +1,7 @@
 module I18n
   module Backend
     class Http
-      VERSION = Version = "0.1.3"
+      VERSION = Version = "0.2.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-backend-http
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gem_of_thrones
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,13 +39,125 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: maxitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: single_cov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -75,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -83,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails I18n Backend for Http APIs with etag-aware background polling and memory+[memcache]