moromi-request_header 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f1866e95548f3bc4b8418e5fa4af51863385582d
-  data.tar.gz: fdf987d6321e835e519021bccda5dab8b49dfdb3
+SHA256:
+  metadata.gz: 8cfb14b9c6c726a05f5eb0470f63b03f2d56b07c6102da275bde45be89e654d6
+  data.tar.gz: 00e7df682c693abf22ed6f398999ea5266e2fac3571dc289a9a63e64eb451533
 SHA512:
-  metadata.gz: b2dd2404da1d26a75b66535cb2a7df5e616b99fa4bcb939ccf3d56e7070165c661c133ba1525dd1e833d0ec3a2382b1a18da0febb0050d9680e7a48c1577a655
-  data.tar.gz: 98c3fcac74ee6da72d5c41e066677b3674cb4514e0e6d409de662732d7b7314ee4b0db7ac520871b68dd7e29775e90b38bedeb89b6b5bbecf471bc058ddbcf9e
+  metadata.gz: 2718cd19c5f1d6a494544ee6984a2e8c848ec654ec2481bc3890feaaf5d851ce3a541ed8c4668daf9374c4e19a0511b7a12d356c2277b58fbb529402fda60bec
+  data.tar.gz: 936f25dacfc5fad0b9944bf990061c2bc4ed8c64cba8bf08443d3eead12351ccbbfe2deaf31e720e8197004a8441844b3bc47ebfddcf1d2abf683509043c572b

data/.github/workflows/ruby.yml

@@ -0,0 +1,23 @@
+name: Ruby
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        ruby: [2.7, 3.0]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: |
+          gem install bundler
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+          bundle exec rspec

data/README.md

@@ -1,10 +1,8 @@
-# Moromi::Apns
+# Moromi::RequestHeader
 
 [![Latest Version](https://img.shields.io/gem/v/moromi-request_header.svg)](http://rubygems.org/gems/moromi-request_header)
 [![Circle CI](https://circleci.com/gh/moromi/moromi-request_header.svg?style=svg)](https://circleci.com/gh/moromi/moromi-request_header)
 
-APNS model.
-
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/moromi/request_header.rb

@@ -1,6 +1,7 @@
 require 'moromi/request_header/version'
 require 'moromi/request_header/config'
-require 'moromi/request_header/ios'
+require 'moromi/request_header/core'
+require 'moromi/request_header/default'
 
 module Moromi
   module RequestHeader

data/lib/moromi/request_header/{ios.rb → core.rb}

@@ -1,13 +1,17 @@
-require 'active_support/core_ext/string'
+require 'active_support'
+require 'active_support/core_ext'
 
 module Moromi
   module RequestHeader
-    class Ios
+    module Core
+      extend ActiveSupport::Concern
+
       PROPERTIES = %i(
         token
         bundle_identifier
         bundle_version_string
         bundle_version
+        platform
         os
         os_version
         device_model
@@ -15,7 +19,10 @@ module Moromi
         seconds_from_gmt
         language_code
         region_code
-      )
+      ).freeze
+
+      PROPERTY_DEFAULT_VALUES = {
+      }.freeze
 
       attr_accessor *PROPERTIES
 
@@ -25,19 +32,24 @@ module Moromi
         names = self.class::header_names(app_name: @app_name)
         self.class::PROPERTIES.each do |property|
           name = names[property]
-          send("#{property.to_s}=", headers[name]) rescue nil
+          value = headers[name] || PROPERTY_DEFAULT_VALUES[property]
+          public_send("#{property.to_s}=", value)
+        rescue
+          nil
         end
       end
 
       def to_hash
         {}.tap do |results|
           self.class::header_names(app_name: @app_name).invert.each do |k, v|
-            results[k] = send(v) rescue nil
+            results[k] = public_send(v)
+          rescue
+            nil
           end
         end
       end
 
-      class << self
+      class_methods do
         def default_app_name
           Moromi::RequestHeader.config.app_name
         end
@@ -54,6 +66,7 @@ module Moromi
             bundle_identifier: "X-#{app_class_name}-Bundle-Identifier",
             bundle_version_string: "X-#{app_class_name}-Bundle-Version-String",
             bundle_version: "X-#{app_class_name}-Bundle-Version",
+            platform: "X-#{app_class_name}-Platform", # ios, android, web, etc
             os: "X-#{app_class_name}-Os",
             os_version: "X-#{app_class_name}-Os-Version",
             device_model: "X-#{app_class_name}-Device-Model",
@@ -67,10 +80,18 @@ module Moromi
         def create(app_name: nil, args: {})
           new(app_name: app_name).tap do |header|
             PROPERTIES.each do |property|
-              header.send("#{property.to_s}=", args[property]) rescue nil
+              value = args[property] || PROPERTY_DEFAULT_VALUES[property]
+              header.public_send("#{property.to_s}=", value)
+            rescue
+              nil
             end
           end
         end
+
+        def fetch_header(key, headers, app_name)
+          name = header_name(key, app_name: app_name)
+          headers[name].presence || headers[key]
+        end
       end
     end
   end

data/lib/moromi/request_header/default.rb

@@ -0,0 +1,7 @@
+module Moromi
+  module RequestHeader
+    class Default
+      include Core
+    end
+  end
+end

data/lib/moromi/request_header/version.rb

@@ -1,5 +1,5 @@
 module Moromi
   module RequestHeader
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/moromi-request_header.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport"
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moromi-request_header
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Takahiro Oishi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -28,44 +28,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Useful HTTP Header
 email:
 - takahiro.oishi@dena.jp
@@ -73,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
 - Gemfile
@@ -81,10 +82,10 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- circle.yml
 - lib/moromi/request_header.rb
 - lib/moromi/request_header/config.rb
-- lib/moromi/request_header/ios.rb
+- lib/moromi/request_header/core.rb
+- lib/moromi/request_header/default.rb
 - lib/moromi/request_header/version.rb
 - moromi-request_header.gemspec
 homepage: https://github.com/moromi/moromi-request_header
@@ -105,8 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Useful HTTP Header

data/circle.yml

@@ -1,17 +0,0 @@
-dependencies:
-  pre:
-    - >
-      case $CIRCLE_NODE_INDEX in
-        0)
-          rvm use 2.3.3 --default
-          ;;
-        1)
-          rvm use 2.2.6 --default
-          ;;
-        3)
-          rvm use 2.1.10 --default
-          ;;
-      esac
-test:
-  override:
-    - ruby -v && bundle exec rspec: {parallel: true}