mock_gcm 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmM2YTc2NGEyMWY2OWM0OWZmZWE2NTM3YWJhNmUwMmUxYjYwMDE5Ng==
+  data.tar.gz: !binary |-
+    YjY1NDJlOWUzMWY3NmVmOWE2MDVlNzQ0M2YxZGE2NDNkNDdhMWFiYg==
+SHA512:
+  metadata.gz: !binary |-
+    MTU0MmZmMzU4NzM5NTQ2MzM4YzRiZTFjMzFiZTg3MGNlNjE4NjY4MzUxM2Zm
+    YmY0NzAyM2FiYWNlMmEzMGIwMDE0ZWJiNzMwODcxMTQ0ZGQ3OGI5N2MwN2I0
+    OGQ5NGVjNmY0OWUzNDk2NjdhNDE1YzliOTkzYzNiOTAwYzVjMmU=
+  data.tar.gz: !binary |-
+    ZjA0YThlZDE5OTkxMTgxMTI3MjE2NTZlYWM3ZGVkZDViYjQ3NTg1NmE4NzJl
+    ODljNTVhYzk3Mjc0MjE1OGNjODlhOTUzZTQ0NTEwZTc1Y2E0N2RiZTJlMjQ4
+    YzgxY2FlN2UwODVhYTljYzllZGMxMjY4OGJlMDMzODkwY2Q1ZTA=

data/lib/mock_gcm/server.rb

@@ -3,6 +3,16 @@ require 'json'
 require 'thread'
 require 'forwardable'
 
+# Workaround bug in stdlib
+HttpServer::Table.class_eval do
+  def initialize_with_dup(hash={})
+    initialize_without_dup(hash.dup)
+  end
+
+  alias_method :initialize_without_dup, :initialize
+  alias_method :initialize, :initialize_with_dup
+end
+
 module MockGCM
   class Server
     extend Forwardable
@@ -18,7 +28,7 @@ module MockGCM
       @server = HttpServer.new(self, port, DEFAULT_HOST, 1, File.open("/dev/null"), false, false)
 
       # Configurable error behaviour
-      @next_request_errno = nil
+      @next_request_failure = nil
       @canonicals        = {}
       @errors            = {}
     end
@@ -27,8 +37,11 @@ module MockGCM
 
     def_delegators :@server, :start, :stop, :stopped?
 
-    def mock_next_request_failure(errno)
-      @mutex.synchronize { @next_request_errno = Integer(errno) }
+    def mock_next_request_failure(errno, retry_after = nil)
+      @mutex.synchronize do
+        @next_request_failure = {:errno => Integer(errno)}
+        @next_request_failure[:retry_after] = retry_after if retry_after
+      end
     end
 
     def mock_canonical_id(reg_id, canonical_reg_id)
@@ -61,13 +74,15 @@ module MockGCM
       @mutex.synchronize { @received_messages.dup }
     end
 
-    def add_received(reg_id, collapse_key, time_to_live, delay_while_idle, data)
+    def add_received(reg_id, collapse_key, time_to_live, delay_while_idle, data, dry_run, restrict_package_name)
       hsh = {
-        'registration_id'  => reg_id.freeze,
-        'collapse_key'     => collapse_key.freeze,
-        'time_to_live'     => time_to_live.freeze,
-        'delay_while_idle' => delay_while_idle.freeze,
-        'data'             => data.freeze,
+        'registration_id'       => reg_id.freeze,
+        'collapse_key'          => collapse_key.freeze,
+        'time_to_live'          => time_to_live.freeze,
+        'delay_while_idle'      => delay_while_idle.freeze,
+        'data'                  => data.freeze,
+        'dry_run'               => dry_run.freeze,
+        'restrict_package_name' => restrict_package_name.freeze
       }.freeze
       @mutex.synchronize { @received_messages << hsh }
     end
@@ -75,16 +90,17 @@ module MockGCM
     # Check stuff
 
     def check_fail_next_request(request, response, req_data)
-      next_request_errno = @mutex.synchronize do
-        @next_request_errno.tap { @next_request_errno = nil }
+      return true unless next_request_failure = @mutex.synchronize do
+        @next_request_failure.tap { @next_request_failure = nil }
       end
 
-      if next_request_errno
-        response.status = next_request_errno
-        false
-      else
-        true
+      response.status = next_request_failure[:errno]
+
+      next_request_failure[:retry_after].tap do |retry_after|
+        response.header['Retry-After'] = retry_after if retry_after
       end
+
+      false
     end
 
     def check_authorization_header(request, response, req_data)
@@ -118,9 +134,11 @@ module MockGCM
       # Optional
       fail.call unless json.fetch("collapse_key", "").is_a?(String)
       fail.call unless json.fetch("time_to_live", 1).is_a?(Integer)
+      fail.call unless json.fetch("restrict_package_name", "").is_a?(String)
+      fail.call unless [true,false].include?(json.fetch("dry_run", false))
       fail.call unless [true,false].include?(json.fetch("delay_while_idle", false))
 
-      valid_fields = ["data", "registration_ids", "collapse_key", "time_to_live", "delay_while_idle"]
+      valid_fields = ["data", "registration_ids", "collapse_key", "time_to_live", "delay_while_idle", "dry_run", "restrict_package_name"]
       json.keys.each do |key|
         fail.call unless valid_fields.include?(key)
       end
@@ -151,7 +169,8 @@ module MockGCM
           success += 1
 
           add_received(reg_id, req_json['collapse_key'], req_json['time_to_live'],
-                       req_json['delay_while_idle'], req_json.fetch('data'))
+                       req_json['delay_while_idle'], req_json.fetch('data'),
+                       req_json['dry_run'], req_json['restrict_package_name'])
         end
       end
 

data/lib/mock_gcm/version.rb

@@ -1,3 +1,3 @@
 module MockGCM
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/spec/mock_gcm_spec.rb

@@ -14,10 +14,12 @@ describe MockGCM do
   }
   let(:valid_data) {
     {
-      "collapse_key"     => "score_update",
-      "time_to_live"     => 108,
-      "delay_while_idle" => true,
-      "data"             => {
+      "collapse_key"          => "score_update",
+      "time_to_live"          => 108,
+      "delay_while_idle"      => true,
+      "restrict_package_name" => "com.google.sender",
+      "dry_run"               => true,
+      "data"                  => {
         "score" => "4x8",
         "time" => "15:16.2342"
       },
@@ -29,7 +31,7 @@ describe MockGCM do
   after { mock_gcm.stop; sleep(0.01) until mock_gcm.stopped? }
 
   context 'correct data' do
-    optional_keys = ["collapse_key", "time_to_live", "delay_while_idle"]
+    optional_keys = ["collapse_key", "time_to_live", "delay_while_idle", "dry_run", "restrict_package_name"]
     ([:all, :no] + optional_keys).each do |included_key|
       it "should accept and report messages including #{included_key} optional key(s)" do
         unless included_key == :all
@@ -56,11 +58,13 @@ describe MockGCM do
         end
 
         expected_report = valid_data['registration_ids'].map do |registration_id|
-          { "collapse_key"     => valid_data["collapse_key"],
-            "time_to_live"     => valid_data["time_to_live"],
-            "delay_while_idle" => valid_data['delay_while_idle'],
-            "data"             => valid_data["data"],
-            "registration_id" => registration_id }
+          { "collapse_key"        => valid_data["collapse_key"],
+          "time_to_live"          => valid_data["time_to_live"],
+          "delay_while_idle"      => valid_data['delay_while_idle'],
+          "data"                  => valid_data["data"],
+          "restrict_package_name" => valid_data["restrict_package_name"],
+          "dry_run"               => valid_data["dry_run"],
+          "registration_id"       => registration_id }
         end
         mock_gcm.received_messages.should == expected_report
       end
@@ -249,14 +253,22 @@ describe MockGCM do
         end
       end
 
+      it "should forward the retry-after param if set" do
+        mock_gcm.mock_next_request_failure(500, 10)
+        resp = http_client.post(mock_gcm_url, valid_data.to_json, headers)
+        resp.headers['Retry-after'].to_i.should == 10
+      end
+
       it "should clear after one failure" do
-        mock_gcm.mock_next_request_failure(500)
+        mock_gcm.mock_next_request_failure(500, 10)
         resp = http_client.post(mock_gcm_url, valid_data.to_json, headers)
         resp.status.should == 500
+        resp.headers['Retry-after'].to_i.should == 10
         mock_gcm.received_messages.should be_empty
 
         resp = http_client.post(mock_gcm_url, valid_data.to_json, headers)
         resp.should be_ok
+        resp.headers.should_not include('Retry-after')
       end
 
     end
@@ -293,7 +305,9 @@ describe MockGCM do
       ['registration_ids', [1]],
       ['time_to_live', "123"],
       ['collapse_key', 1],
-      ['delay_while_idle', "1"]
+      ['delay_while_idle', "1"],
+      ['dry_run', "1"],
+      ['restrict_package_name', 1]
     ].each do |key, value|
       it "should fail (400) when #{key} = #{value.inspect} (incorrect type)" do
         resp = http_client.post(mock_gcm_url, valid_data.tap { |d| d[key] = value }.to_json, headers)

metadata

@@ -1,80 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: mock_gcm
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Anders Carling
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-    none: false
-  name: bundler
   type: :development
   prerelease: false
+  name: bundler
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
-    none: false
-- !ruby/object:Gem::Dependency
+        version: '0'
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rake
   type: :development
   prerelease: false
+  name: rake
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rspec
   type: :development
   prerelease: false
+  name: rspec
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: httpclient
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  name: httpclient
 description: Fake GCM server for your integration testing needs
 email:
 - anders.carling@d05.se
@@ -96,6 +87,7 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -105,20 +97,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fake GCM server for your integration testing needs
 test_files:
 - spec/mock_gcm_spec.rb
 - spec/spec_helper.rb
-has_rdoc: