cloudflare_localizable 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7d39c3be36591f5cf59b7bd0ec5744f4313b9cd4
-  data.tar.gz: 2b2dcc0c64c7c359a6f7f71e4211a160f80ff51c
+SHA256:
+  metadata.gz: 9d6007461042c4f48b203ba0329c5425f9a77bf5047ad18664dea26f58d924ce
+  data.tar.gz: df71329ae0f016a4402896f82234bd45e8e4885fd7cb4451e05cfd31e57270ba
 SHA512:
-  metadata.gz: 7a8d7405719b275221a2e765c737f6df9b90390f9bf3cfecf331619834baf507a265a19bb16623ea3975cffc62e24032cb3a790905254391b30316be1c278b01
-  data.tar.gz: 911068764308d62232e42925a6d465fef537f9a91041030f69f0fc414ee4b6f19b5d5226d42903ddc6ebc2e3ff8237e73a7db02bba319911ce5e28b10788a906
+  metadata.gz: ca1987748c2dc9ba972fa599ae28e8497647cd600011b90d09d77f699dfae7dba472b6d1bd8a082c7f62b173e06bdfa233eb8c0cb697b6714d8ee9cd851d5331
+  data.tar.gz: 8c9130523bede2ad4a1694b6adb002ab11a71644992b5f10c90d4eebd931043f4764fabc4f8e1bb248ce2097f4c4e11651bdfadba40bc0c2a7848cc6ed10b175

data/.rspec

@@ -1,2 +1,4 @@
 --format documentation
 --color
+--order rand
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,13 @@
+Metrics/LineLength:
+  Max: 100
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/*
+
+Metrics/ModuleLength:
+  Exclude:
+    - lib/cloudflare_localizable/country_list.rb
+
+Style/ExpandPathArguments:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.5.0

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.2.2
+  - 2.1.0
   - 2.2.3
-before_install: gem install bundler -v 1.10.6
+  - 2.3.1
+  - 2.4.3
+  - 2.5.0
+before_install: gem install bundler -v 1.16.1

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in cloudflare_localizable.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# frozen_string_literal: true
+
 require 'bundler/setup'
 require 'cloudflare_localizable'
 

data/cloudflare_localizable.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
@@ -21,8 +22,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'actionpack', '~> 4.2', '>= 4.2.5'
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4', '>= 3.4.0'
-  spec.add_development_dependency 'actionpack', '~> 4.2', '>= 4.2.5'
+  spec.add_development_dependency 'rubocop', '~> 0.54.0'
 end

data/lib/cloudflare_localizable.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'cloudflare_localizable/version'
 require 'cloudflare_localizable/country'
 
-# This module can be included in any Rails controller that needs country
-# information. You get a helper method called cf_country to be used whenever you
-# need to know the country of the user.
+# This module can be included in any Rails controller that needs country information. You get a
+# helper method called cf_country to be used whenever you need to know the country of the user.
 #
 # === Example
 #
@@ -16,7 +17,7 @@ require 'cloudflare_localizable/country'
 #     end
 #   end
 module CloudFlareLocalizable
-  CF_HEADER = 'HTTP_CF_IPCOUNTRY'.freeze
+  CF_HEADER = 'HTTP_CF_IPCOUNTRY'
 
   def self.included(base)
     base.send(:helper_method, :cf_country)
@@ -24,6 +25,6 @@ module CloudFlareLocalizable
 
   # Returns the real name of the country, based on the country code.
   def cf_country
-    @_cf_country ||= Country.find(request.headers[CF_HEADER] || 'XX')
+    @cf_country ||= Country.find(request.headers[CF_HEADER] || 'XX')
   end
 end

data/lib/cloudflare_localizable/country.rb

@@ -1,16 +1,25 @@
+# frozen_string_literal: true
+
 require 'cloudflare_localizable/country_list'
 
 module CloudFlareLocalizable
+  # This class represents a country, and stores name and code for the countries.
+  #
+  # === Example
+  #
+  #     country = Country.find('BB')
+  #     country.code # => "BB"
+  #     country.name # => "Barbados"
   class Country
     attr_accessor :name, :code
 
     def self.find(code)
-      record = CF_COUNTRIES.find { |country| country[:code] == code }
+      record = CF_COUNTRIES.find { |country| country[:code] == code } || {}
 
-      new(record[:code], record[:name])
+      new(record.fetch(:code, 'XX'), record.fetch(:name, 'Unknown'))
     end
 
-    def initialize(code, name)
+    def initialize(code = 'XX', name = 'Unknown')
       self.code = code
       self.name = name
     end

data/lib/cloudflare_localizable/country_list.rb

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 module CloudFlareLocalizable
   # Countries
   CF_COUNTRIES = [
@@ -252,5 +253,5 @@ module CloudFlareLocalizable
     { code: 'ZM', name: 'Zambia' },
     { code: 'ZW', name: 'Zimbabwe' },
     { code: 'XX', name: 'Unknown' }
-  ]
+  ].freeze
 end

data/lib/cloudflare_localizable/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CloudFlareLocalizable
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare_localizable
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ricardo Otero
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2018-04-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,25 +79,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 0.54.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 0.54.0
 description: |-
   If you're using CloudFlare you can easily get the location of your requests
                           based on a special header that CloudFlare attaches to every request.
@@ -89,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -122,9 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Localize your requests with CloudFlare.
 test_files: []
-has_rdoc: