pwush 0.0.0 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d8d77497c47ca280c06fd2b2060182aa35f2507
-  data.tar.gz: ffd8c230450b4ee67d0fd84edf41b80557e24fe3
+  metadata.gz: aaa9bec7f09191281344c77afb61d0de59852570
+  data.tar.gz: cac9d2719b8e21e063faa2d2ff2c8785a3317804
 SHA512:
-  metadata.gz: 32d179a4c3d209330d4c7f7106197cfeec1d33e57f7a99ff34c3f62b5ceb5ccb46da92cbf96a3237b5905b379aaa7f4f306254e7682569aa4ac5757a18d0ff07
-  data.tar.gz: d856987601c229d4a2ce043e0eefbd82a05a69a4923f38d0fdd3b676390858d1e2d6044047b7994cdd2cd7d1dcea011e7152d15f0d672c20a4fa3fd069833683
+  metadata.gz: 4357cbe52d3f48562f57be99bfb198e7dec8b601df355b0c7549cf305aece196c622c45f27cdeaddd24c6735c1e09ec0c9bd17eb978f86525684b9cb4c9a123d
+  data.tar.gz: 128fb28825c1a47baabc2320e15a40892ee9161abc61dc8903759b18a76c21f8f34383769f984424f22600ba6afdfae04eb898311d207b0f04db5e35054e9ac2

data/.circleci/config.yml

@@ -0,0 +1,64 @@
+version: 2.0
+defaults: &default_job
+  working_directory: ~/repo
+
+  docker:
+    - image: circleci/ruby:2.4-node-browsers
+
+  steps:
+    - checkout
+
+    - type: cache-restore
+      name: Restore bundle cache
+      key: pwush-{{ checksum "Gemfile.lock" }}
+
+    - run:
+        name: install dependencies
+        command: |
+          bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+    - type: cache-save
+      name: Store bundle cache
+      key: pwush-{{ checksum "Gemfile.lock" }}
+      paths:
+        - vendor/bundle
+
+    - run:
+        name: Download cc-test-reporter
+        command: |
+          mkdir -p tmp/
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter
+          chmod +x ./tmp/cc-test-reporter
+
+    - run:
+        name: Run tests
+        command: |
+          bundle exec rake
+          ./tmp/cc-test-reporter format-coverage -t simplecov -o tmp/codeclimate.json
+
+    - run:
+        name: Upload coverage results to Code Climate
+        command: |
+          ./tmp/cc-test-reporter upload-coverage -i tmp/codeclimate.json -r ce337e25b76b0c3048abfdb2d5aa6d3e87cc8540d90f0029ef7416683814732e
+
+jobs:
+  ruby-2.3:
+    <<: *default_job
+    docker:
+      - image: circleci/ruby:2.3-node-browsers
+  ruby-2.4:
+    <<: *default_job
+    docker:
+      - image: circleci/ruby:2.4-node-browsers
+  ruby-2.5:
+    <<: *default_job
+    docker:
+      - image: circleci/ruby:2.5-node-browsers
+
+workflows:
+  version: 2
+  multiple-rubies:
+    jobs:
+      - ruby-2.3
+      - ruby-2.4
+      - ruby-2.5

data/.gitignore

@@ -9,3 +9,4 @@
 
 # rspec failure tracking
 .rspec_status
+*.gem

data/Gemfile.lock

@@ -1,21 +1,77 @@
 PATH
   remote: .
   specs:
-    Pwush (0.0.0)
+    pwush (0.1.0)
+      dry-monads (~> 0.4)
+      dry-struct (~> 0.4)
+      dry-types (~> 0.12)
+      http (~> 3.0)
+      oj (~> 3)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     byebug (10.0.2)
     coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
+    docile (1.3.0)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
+    dry-configurable (0.7.0)
+      concurrent-ruby (~> 1.0)
+    dry-container (0.6.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1, >= 0.1.3)
+    dry-core (0.4.5)
+      concurrent-ruby (~> 1.0)
+    dry-equalizer (0.2.0)
+    dry-logic (0.4.2)
+      dry-container (~> 0.2, >= 0.2.6)
+      dry-core (~> 0.2)
+      dry-equalizer (~> 0.2)
+    dry-monads (0.4.0)
+      dry-core (~> 0.3, >= 0.3.3)
+      dry-equalizer
+    dry-struct (0.4.0)
+      dry-core (~> 0.4, >= 0.4.1)
+      dry-equalizer (~> 0.2)
+      dry-types (~> 0.12, >= 0.12.2)
+      ice_nine (~> 0.11)
+    dry-types (0.12.2)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.1)
+      dry-container (~> 0.3)
+      dry-core (~> 0.2, >= 0.2.1)
+      dry-equalizer (~> 0.2)
+      dry-logic (~> 0.4, >= 0.4.2)
+      inflecto (~> 0.0.0, >= 0.0.2)
+    hashdiff (0.3.7)
+    http (3.0.0)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (>= 2.0.0.pre.pre2, < 3)
+      http_parser.rb (~> 0.6.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (2.1.0)
+    http_parser.rb (0.6.0)
+    ice_nine (0.11.2)
+    inflecto (0.0.2)
+    json (2.1.0)
     method_source (0.9.0)
+    oj (3.5.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.6.0)
       byebug (~> 10.0)
       pry (~> 0.10)
+    public_suffix (3.0.2)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -30,16 +86,34 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
+    rspec_junit_formatter (0.3.0)
+      rspec-core (>= 2, < 4, != 2.12.0)
+    safe_yaml (1.0.4)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.5)
+    webmock (3.3.0)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  Pwush!
   bundler (~> 1.16)
   pry-byebug
+  pwush!
   rake (~> 10.0)
   rspec (~> 3.0)
+  rspec_junit_formatter
+  simplecov
+  webmock (~> 3.0)
 
 BUNDLED WITH
    1.16.1

data/README.md

@@ -1,6 +1,11 @@
-# PwRb
+[![CircleCI](https://circleci.com/gh/iarie/pwush/tree/master.svg?style=shield)](https://circleci.com/gh/iarie/pwush/tree/master)
+[![Gem Version](https://badge.fury.io/rb/pwush.svg)](https://badge.fury.io/rb/pwush)
+[![Maintainability](https://api.codeclimate.com/v1/badges/d1887381dee84e26e860/maintainability)](https://codeclimate.com/github/iarie/pwush/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/d1887381dee84e26e860/test_coverage)](https://codeclimate.com/github/iarie/pwush/test_coverage)
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/pw_rb`. To experiment with that code, run `bin/console` for an interactive prompt.
+# Pwush
+
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/pwush.rb`. To experiment with that code, run `bin/console` for an interactive prompt.
 
 TODO: Delete this and the text above, and describe your gem
 
@@ -9,7 +14,7 @@ TODO: Delete this and the text above, and describe your gem
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'pw'
+gem 'pwush'
 ```
 
 And then execute:
@@ -18,7 +23,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install pw_rb
+    $ gem install pwush
 
 ## Usage
 
@@ -32,7 +37,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/pw. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/iarie/pwush. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 
@@ -40,4 +45,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the PwRb project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/pw_rb/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the PwRb project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/iarie/pwush/blob/master/CODE_OF_CONDUCT.md).

data/bin/console

@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "pw"
+require 'bundler/setup'
+require 'pwush'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
+require 'pry'
 Pry.start

data/lib/pwush/client.rb

@@ -1,11 +1,13 @@
+require 'http'
+
 module Pwush
   class Client
     def initialize(options)
       @config = Config.new(options)
     end
 
-    def create_message(*notifications)
-      post(:createMessage, notifications: notifications)
+    def create_message(*messages)
+      post(:createMessage, notifications: messages)
     end
     alias push create_message
 
@@ -33,6 +35,10 @@ module Pwush
       post(:getPreset, preset_code: preset_code)
     end
 
+    def fail
+      post(:someshit, shit: 'crap')
+    end
+
     private
 
     def get(action, payload = nil)
@@ -44,18 +50,15 @@ module Pwush
     end
 
     def perform_request(verb, action, payload)
-      response = Http.request(
-        verb, url(action), json: build_request(payload).body
-      )
-      parse_response(response)
+      Response.wrap { raw_request(verb, action, payload) }
     end
 
-    def build_request(payload = nil)
-      Request.new(auth: @config.auth, app: @config.app, payload: payload)
+    def raw_request(verb, action, payload)
+      Http.request(verb, url(action), json: build_request(payload).body)
     end
 
-    def parse_response(response)
-      Oj.load(response.body)
+    def build_request(payload = nil)
+      Request.new(auth: @config.auth, app: @config.app, payload: payload)
     end
 
     def url(action)

data/lib/pwush/{notification.rb → message.rb}

@@ -1,8 +1,8 @@
 module Pwush
-  class Notification < Dry::Struct::Value
+  class Message < Dry::Struct
     # https://www.pushwoosh.com/v1.0/reference#createmessage
 
-    constructor_type :schema
+    constructor_type :strict_with_defaults
 
     # YYYY-MM-DD HH:mm  OR 'now'
     attribute :send_date, Types::Strict::String.default('now')
@@ -11,11 +11,11 @@ module Pwush
 
     # "timezone":"America/New_York", optional, if ignored UTC-0 is default in "send_date".
     # See http://php.net/manual/timezones.php for supported timezones
-    attribute :timezone, Types::Strict::String.optional
+    attribute :timezone, Types::Strict::String.optional.default('UTC-0')
 
     # "campaign":"CAMPAIGN_CODE", optional.
     # Campaign code to which you want to assign this push message
-    attribute :campaign, Types::Strict::String.optional
+    attribute :campaign, Types::Strict::String.optional.default(nil)
 
     # "content":{
     #    "en":"English",
@@ -25,21 +25,21 @@ module Pwush
     attribute :content, Types::Strict::String | Types::Hash
 
     #  "page_id": 39, optional. HTML Pages. integer
-    attribute :page_id, Types::Strict::String.optional
+    attribute :page_id, Types::Strict::Int.optional.default(nil)
 
     # "rich_page_id": 42, optional. Rich Pages. integer
-    attribute :rich_page_id, Types::Strict::String.optional
+    attribute :rich_page_id, Types::Strict::Int.optional.default(nil)
 
     # "rich_media": "XXXX-XXXX", optional. Rich Media code. string
-    attribute :rich_media, Types::Strict::String.optional
+    attribute :rich_media, Types::Strict::String.optional.default(nil)
 
     # "remote_page" : "http://myremoteurl.com",
     # Remote Rich HTML Page URL. <scheme>://<authority>
-    attribute :remote_page, Types::Strict::String.optional
+    attribute :remote_page, Types::Strict::String.optional.default(nil)
 
     # "link": "http://google.com", optional, string.
     # For deeplinks add "minimize_link":0
-    attribute :link, Types::Strict::String.optional
+    attribute :link, Types::Strict::String.optional.default(nil)
 
     # "minimize_link": 0, optional.
     # False or 0 - do not minimize, 1 - Google, 2 - bitly. Default = 1
@@ -47,68 +47,68 @@ module Pwush
 
     # "data": {"key":"value"}, JSON string or JSON object,
     # will be passed as "u" parameter in the payload (converted to JSON string)
-    attribute :data, Types::Strict::String.optional | Types::Hash
+    attribute :data, (Types::Strict::String | Types::Hash).optional.default(nil)
 
     # 1 - iOS; 2 - BB; 3 - Android; 5 - Windows Phone; 7 - OS X; 8 - Windows 8;
     # 9 - Amazon; 10 - Safari; 11 - Chrome; 12 - Firefox;
     # ignored if "devices" < 10
     Platforms = Types::Strict::Int.enum(1, 2, 3, 5, 7, 8, 9, 10, 11, 12)
-    attribute :platforms, Types::Strict::Array.of(Platforms).optional
+    attribute :platforms, Types::Strict::Array.of(Platforms).optional.default(nil)
 
     # "preset":"Q1A2Z-6X8SW", Push Preset Code from your Control Panel
-    attribute :preset, Types::Strict::String.optional
+    attribute :preset, Types::Strict::String.optional.default(nil)
 
     # "send_rate": 100, throttling. Valid values are from 100 to 1000 pushes/second.
-    attribute :send_rate, Types::Strict::Int.optional.constrained(included_in: 100..1000)
+    attribute :send_rate, Types::Strict::Int.constrained(included_in: 100..1000).optional.default(nil)
 
     # Optional. Specify tokens or hwids to send targeted push notifications.
     # Not more than 1000 tokens/hwids in an array.
     # If set, the message will only be sent to the devices on the list.
     # Ignored if the Applications Group is used. iOS push tokens can only be lower case.
-    attribute :devices, Types::Strict::Array.of(Types::Strict::String).optional
+    attribute :devices, Types::Strict::Array.of(Types::Strict::String).optional.default(nil)
 
     # "users":["user_3078a"], optional.
     # If set, message will only be delivered to the specified users Id's
     # (specified via /registerUser call).
     # If specified together with devices parameter, the latter will be ignored.
-    attribute :users, Types::Strict::Array.of(Types::Strict::String).optional
+    attribute :users, Types::Strict::Array.of(Types::Strict::String).optional.default(nil)
 
     #  "filter": "FILTER_NAME", optional.
-    attribute :filter, Types::Strict::String.optional
+    attribute :filter, Types::Strict::String.optional.default(nil)
 
     #  optional, placeholders for dynamic content instead of device tags
     #  "dynamic_content_placeholders" :{
     #      "firstname":"John",
     #      "lastname":"Doe"
     #  },
-    attribute :dynamic_content_placeholders, Types::Hash.optional
+    attribute :dynamic_content_placeholders, Types::Hash.optional.default(nil)
 
     # "conditions": [TAG_CONDITION1, TAG_CONDITION2, ..., TAG_CONDITIONN],
     # Optional.
-    attribute :conditions, Types::Strict::Array.of(Types::Strict::String).optional
+    attribute :conditions, Types::Strict::Array.of(Types::Strict::String).optional.default(nil)
 
     # iOS related
 
     # "ios_badges": 5, optional, integer.
     # iOS application badge number.
     # Use "+n" or "-n" to increment/decrement the badge value by n
-    attribute :ios_badges, Types::Strict::Int.optional
+    attribute :ios_badges, Types::Strict::Int.optional.default(nil)
 
     # "ios_sound": "sound file.wav", optional.
     # Sound file name in the main bundle of application.
     # If left empty, the device will produce no sound upon receiving a push
-    attribute :ios_sound, Types::Strict::String.optional
+    attribute :ios_sound, Types::Strict::String.optional.default(nil)
 
     # "ios_ttl": 3600, optional.
     # Time to live parameter - maximum message lifespan in seconds
-    attribute :ios_ttl, Types::Strict::Int.optional
+    attribute :ios_ttl, Types::Strict::Int.optional.default(nil)
 
     # "ios_silent": 1, optional.
     # Enable silent notifications (ignore "sound" and "content")
-    attribute :ios_silent, Types::Strict::Int.optional
+    attribute :ios_silent, Types::Strict::Int.constrained(included_in: 0..1).optional.default(nil)
 
     # iOS8 category ID from Pushwoosh
-    attribute :ios_category_id, Types::Strict::Int.optional.constrained(included_in: 0..1)
+    attribute :ios_category_id, Types::Strict::Int.optional.default(nil)
 
     # Optional - root level parameters to the aps dictionary
     # "ios_root_params" : {
@@ -119,167 +119,197 @@ module Pwush
     #    "attachment":"YOUR_ATTACHMENT_URL", // iOS 10 media attachment URL
     #   "data": << User supplied data, max of 4KB>>
     #  },
-    attribute :ios_root_params, Types::Hash.optional
+    attribute :ios_root_params, Types::Hash.optional.default(nil)
 
     #  "apns_trim_content":1, optional. (0|1)
     # Trims the exceeding content strings with ellipsis
-    attribute :apns_trim_content, Types::Strict::Int.optional.constrained(included_in: 0..1)
+    attribute :apns_trim_content, Types::Strict::Int.constrained(included_in: 0..1).optional.default(nil)
 
     # "ios_title":"Title", optional. Add Title for push notification
-    attribute :ios_title, Types::Strict::String.optional
+    attribute :ios_title, Types::Strict::String.optional.default(nil)
 
     # "ios_subtitle" : "SubTitle", //Optional. Added sub-title for push notification
-    attribute :ios_subtitle, Types::Strict::String.optional
+    attribute :ios_subtitle, Types::Strict::String.optional.default(nil)
 
     # Android related
 
     # "android_root_params": {"key": "value"}
     # custom key-value object. root level parameters for the android payload recipients
-    attribute :android_root_params, Types::Hash
+    attribute :android_root_params, Types::Hash.optional.default(nil)
 
     # "android_sound" : "soundfile", optional. No file extension.
     # If left empty, the device will produce no sound upon receiving a push
-    attribute :android_sound, Types::Strict::String.optional
+    attribute :android_sound, Types::Strict::String.optional.default(nil)
 
     # "android_header":"header", optional. Android notification header
-    attribute :android_header, Types::Strict::String.optional
+    attribute :android_header, Types::Strict::String.optional.default(nil)
 
     # "android_icon": "icon",
-    attribute :android_icon, Types::Strict::String.optional
+    attribute :android_icon, Types::Strict::String.optional.default(nil)
 
     # "android_custom_icon": "http://example.com/image.png", optional.
     # Full path URL to the image file
-    attribute :android_custom_icon, Types::Strict::String.optional
+    attribute :android_custom_icon, Types::Strict::String.optional.default(nil)
 
     # "android_banner": "http://example.com/banner.png", optional.
     # Full path URL to the image file
-    attribute :android_banner, Types::Strict::String.optional
+    attribute :android_banner, Types::Strict::String.optional.default(nil)
 
     # "android_badges": 5, optional, integer.
     # Android application icon badge number.
     # Use "+n" or "-n" to increment/decrement the badge value by n
-    attribute :android_badges, Types::Strict::Int.optional
+    attribute :android_badges, Types::Strict::Int.optional.default(nil)
 
     # "android_gcm_ttl": 3600, optional.
-    # Time to live parameter — maximum message lifespan in seconds
-    attribute :android_gcm_ttl, Types::Strict::Int.optional
+    # Time to live parameter - maximum message lifespan in seconds
+    attribute :android_gcm_ttl, Types::Strict::Int.optional.default(nil)
 
     # "android_vibration": 0, Android force-vibration for high-priority pushes, boolean
-    attribute :android_vibration, Types::Strict::Bool.default(false)
+    attribute :android_vibration, Types::Strict::Bool.optional.default(nil)
 
     # "android_led":"#rrggbb", LED hex color, device will do its best approximation
-    attribute :android_led, Types::Strict::String.optional
+    attribute :android_led, Types::Strict::String.optional.default(nil)
 
     # "android_priority":-1,  priority of the push in the Android push drawer.
     # Valid values are -2, -1, 0, 1 and 2
-    attribute :android_priority, Types::Strict::Int.optional.constrained(included_in: -2..2)
+    attribute :android_priority, Types::Strict::Int.constrained(included_in: -2..2).optional.default(nil)
 
     # "android_ibc":"#RRGGBB", icon background color on Lollipop,
     # #RRGGBB, #AARRGGBB, "red", "black", "yellow", etc.
-    attribute :android_ibc, Types::Strict::String.optional
+    attribute :android_ibc, Types::Strict::String.optional.default(nil)
 
     # "android_silent": 1, optional. 0 or 1
     # Enable silent notificaiton (ignore sound and content)
-    attribute :android_silent, Types::Strict::Int.optional.constrained(included_in: 0..1)
+    attribute :android_silent, Types::Strict::Int.constrained(included_in: 0..1).optional.default(nil)
 
     # Amazon related
 
     # "adm_root_params": {"key": "value"}, // custom key-value object
+    attribute :adm_root_params, Types::Hash.optional.default(nil)
     # "adm_sound": "push.mp3",
+    attribute :adm_sound, Types::Strict::String.optional.default(nil)
     # "adm_header": "Header",
+    attribute :adm_header, Types::Strict::String.optional.default(nil)
     # "adm_icon": "icon",
+    attribute :adm_icon, Types::Strict::String.optional.default(nil)
     # "adm_custom_icon": "http://example.com/image.png",
+    attribute :adm_custom_icon, Types::Strict::String.optional.default(nil)
     # "adm_banner": "http://example.com/banner.png",
+    attribute :adm_banner, Types::Strict::String.optional.default(nil)
     # "adm_ttl": 3600, optional. Time to live parameter - the maximum message lifespan in seconds
+    attribute :adm_ttl, Types::Strict::Int.optional.default(nil)
     # "adm_priority":-1, priority of the push in Amazon push drawer, valid values are -2, -1, 0, 1 and 2
+    attribute :adm_priority, Types::Strict::Int.optional.default(nil)
 
     # Windows Phone related
 
-    # "wp_type": "Tile",           // Windows Phone notification type. 'Tile' or 'Toast'. Raw notifications are not supported. 'Tile' if default
-    # "wp_background": "/Resources/Red.jpg", // tile image
-    # "wp_backbackground": "/Resources/Green.jpg", // back tile image
-    # "wp_backtitle": "back title",  // back tile title
-    # "wp_backcontent": "back content",  // back tile content
-    # "wp_count": 3,               // optional. Int. Badge for Windows Phone notification
+    # Windows Phone notification type. 'Tile' or 'Toast'. Raw notifications are not supported. 'Tile' if default
+    attribute :wp_type, Types::Strict::String.optional.default(nil)
+    # tile image
+    attribute :wp_background, Types::Strict::String.optional.default(nil)
+    # back tile image
+    attribute :wp_backbackground, Types::Strict::String.optional.default(nil)
+    # back tile title
+    attribute :wp_backtitle, Types::Strict::String.optional.default(nil)
+    # back tile content
+    attribute :wp_backcontent, Types::Strict::String.optional.default(nil)
+    # Badge for Windows Phone notification
+    attribute :wp_count, Types::Strict::Int.optional.default(nil)
 
     # BlackBerry related
 
-    # "blackberry_header": "header", BlackBerry header, applicable to BB10 Series devices
+    # BlackBerry header, applicable to BB10 Series devices
+    attribute :blackberry_header, Types::Strict::String.optional.default(nil)
 
     # Mac OS X related
 
     # "mac_badges": 3,
+    attribute :mac_badges, Types::Strict::Int.optional.default(nil)
     # "mac_sound": "sound.caf",
+    attribute :mac_sound, Types::Strict::String.optional.default(nil)
     # "mac_root_params": {"content-available":1},
-    # "mac_ttl": 3600, // Optional. Time to live parameter — maximum message lifespan in seconds
+    attribute :mac_root_params, Types::Hash.optional.default(nil)
+    # Time to live parameter — maximum message lifespan in seconds
+    attribute :mac_ttl, Types::Strict::Int.optional.default(nil)
 
     # WNS related
 
-    #  "wns_content": { // Content (XML or raw) of notification encoded in MIME's base64 in form of Object( language1: 'content1', language2: 'content2' ) OR String
+    # Content (XML or raw) of notification encoded in MIME's base64 in form of Object( language1: 'content1', language2: 'content2' ) OR String
     #     "en": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48YmFkZ2UgdmFsdWU9ImF2YWlsYWJsZSIvPg==",
     #     "de": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48YmFkZ2UgdmFsdWU9Im5ld01lc3NhZ2UiLz4="
     #  },
-    #  "wns_type": "Badge", // 'Tile' | 'Toast' | 'Badge' | 'Raw'
-    #  "wns_tag": "myTag", // optional. Used in Tile replacement policy. An alphanumeric string of no more than 16 characters.
-    #  "wns_cache": 1, // optional. (1|0) Translates into X-WNS-Cache-Policy value
-    #  "wns_ttl": 600, // optional. Expiration time for notification in seconds
+    attribute :wns_content, Types::Hash.optional.default(nil)
+    # 'Tile' | 'Toast' | 'Badge' | 'Raw'
+    attribute :wns_type, Types::Strict::String.optional.default(nil)
+    #  optional. Used in Tile replacement policy. An alphanumeric string of no more than 16 characters.
+    attribute :wns_tag, Types::Strict::String.optional.default(nil)
+    #  optional. (1|0) Translates into X-WNS-Cache-Policy value
+    attribute :wns_cache, Types::Strict::Int.optional.default(nil)
+    #  optional. Expiration time for notification in seconds
+    attribute :wns_ttl, Types::Strict::Int.optional.default(nil)
 
     # Safari related
 
     # obligatory, title of the notification
-    attribute :safari_title, Types::Strict::String.optional
+    attribute :safari_title, Types::Strict::String.optional.default(nil)
 
     # "safari_action": "Click here", // optional
-    attribute :safari_action, Types::Strict::String.optional
+    attribute :safari_action, Types::Strict::String.optional.default(nil)
 
     # "safari_url_args": ["firstArgument", "secondArgument"],
     # Obligatory, but the value may be empty
-    attribute :safari_url_args, Types::Strict::Array.of(Types::Strict::String).optional
+    attribute :safari_url_args, Types::Strict::Array.of(Types::Strict::String).optional.default(nil)
 
     # Optional. Time to live parameter - the maximum lifespan of a message in seconds
-    attribute :safari_ttl, Types::Strict::Int.constrained(min_size: 0).optional
+    attribute :safari_ttl, Types::Strict::Int.constrained(min_size: 0).optional.default(nil)
 
     # Chrome related
 
-    # "chrome_title":"", optional.
     # You can specify the header of the message in this parameter
-    attribute :chrome_title, Types::Strict::String.optional
+    attribute :chrome_title, Types::Strict::String.optional.default(nil)
 
     # "chrome_icon":"", full path URL to the icon or extension resources file path
-    attribute :chrome_icon, Types::Strict::String.optional
+    attribute :chrome_icon, Types::Strict::String.optional.default(nil)
 
-    # "chrome_gcm_ttl": 3600, optional.
     # Time to live parameter - maximum message lifespan in seconds
-    attribute :chrome_gcm_ttl, Types::Strict::Int.optional
+    attribute :chrome_gcm_ttl, Types::Strict::Int.optional.default(nil)
 
-    # "chrome_duration": 20, optional, changes chrome push display time.
+    # optional, changes chrome push display time.
     # Set to 0 to display push until user interacts with it
-    attribute :chrome_duration”, Types::Strict::Int.optional
+    attribute :chrome_duration, Types::Strict::Int.optional.default(nil)
 
-    # "chrome_image": "image_url", optional, URL to large image.
-    attribute :chrome_image, Types::Strict::String.optional
+    # optional, URL to large image.
+    attribute :chrome_image, Types::Strict::String.optional.default(nil)
 
-    # "chrome_button_text1": "1", optional
-    attribute :chrome_button_text1, Types::Strict::String.optional
+    attribute :chrome_button_text1, Types::Strict::String.optional.default(nil)
 
-    # "chrome_button_url1": "button1_url", optional,
     # ignored if chrome_button_text1 is not set
-    attribute :chrome_button_url1, Types::Strict::String.optional
+    attribute :chrome_button_url1, Types::Strict::String.optional.default(nil)
 
-    # "chrome_button_text2": "2", optional
-    attribute :chrome_button_text2”, Types::Strict::String.optional
+    attribute :chrome_button_text2, Types::Strict::String.optional.default(nil)
 
-    # "chrome_button_url2": "button2_url", optional,
     # ignored if chrome_button_text2 is not set
-    attribute :chrome_button_url2”, Types::Strict::String.optional
+    attribute :chrome_button_url2, Types::Strict::String.optional.default(nil)
 
     # Firefox-related
 
-    # "firefox_title":"", optional. You can specify message header here
-    attribute :firefox_title, Types::Strict::String.optional
+    # optional. You can specify message header here
+    attribute :firefox_title, Types::Strict::String.optional.default(nil)
 
-    # "firefox_icon":"",
     # full path URL to the icon or path to the file in extension resources
-    attribute :firefox_icon, Types::Strict::String.optional
+    attribute :firefox_icon, Types::Strict::String.optional.default(nil)
+
+    def defined_attributes
+      __attributes__.reject { |_, v| v.nil? }
+    end
+
+    def to_json(options = nil)
+      defined_attributes.to_json(options)
+    end
+
+    def inspect
+      attrs = defined_attributes.map { |k, v| " #{k}=#{v.inspect}" }.join
+      "#<#{self.class}#{attrs}>"
+    end
   end
 end

data/lib/pwush/request.rb

@@ -16,11 +16,7 @@ module Pwush
     private
 
     def build_body(payload)
-      wrap_request payload.merge(auth: @auth, application: @app)
-    end
-
-    def wrap_request(request)
-      { request: request }
+      { request: payload.merge(auth: @auth, application: @app) }
     end
   end
 end

data/lib/pwush/response/deffered.rb

@@ -0,0 +1,53 @@
+module Pwush
+  module Response
+    class Deffered
+      def initialize(raw_result)
+        @_raw_result = raw_result
+      end
+
+      def resolve
+        return http_request_failure if raw_result.status != 200
+        return api_request_failure if value_from_api.status_code != 200
+        api_request_succesful
+      end
+
+      private
+
+      def http_request_failure
+        Failure.new(value_from_http)
+      end
+
+      def api_request_failure
+        Failure.new(value_from_api)
+      end
+
+      def api_request_succesful
+        Success.new(value_from_api)
+      end
+
+      def raw_result
+        @_raw_result
+      end
+
+      def parsed_result
+        @_parsed_result ||= raw_result.parse
+      end
+
+      def value_from_http
+        @_value_from_http ||= Value.new(
+          status_code: raw_result.status,
+          status_message: raw_result.reason,
+          body: nil
+        )
+      end
+
+      def value_from_api
+        @_value_from_api ||= Value.new(
+          status_code:    parsed_result['status_code'],
+          status_message: parsed_result['status_message'],
+          body:           parsed_result['response']
+        )
+      end
+    end
+  end
+end

data/lib/pwush/response/value.rb

@@ -0,0 +1,11 @@
+module Pwush
+  module Response
+    class Value < Dry::Struct::Value
+      constructor_type :strict
+
+      attribute :status_code, Types::Coercible::Int
+      attribute :status_message, Types::Strict::String.optional
+      attribute :body, (Types::Hash | Types::String).optional
+    end
+  end
+end

data/lib/pwush/response.rb

@@ -0,0 +1,17 @@
+require 'dry-monads'
+
+require 'pwush/response/deffered'
+require 'pwush/response/value'
+
+module Pwush
+  module Response
+    def self.wrap
+      Deffered.new(yield).resolve
+    rescue Http::TimeoutError => e
+      Failure.new(e)
+    end
+
+    class Success < Dry::Monads::Success; end
+    class Failure < Dry::Monads::Failure; end
+  end
+end

data/lib/pwush/version.rb

@@ -1,3 +1,3 @@
 module Pwush
-  VERSION = '0.0.0'.freeze
+  VERSION = '0.1.0'.freeze
 end

data/lib/pwush.rb

@@ -1,16 +1,15 @@
 require 'pwush/config'
-require 'pwush/client'
-require 'pwush/request'
+
 require 'pwush/types'
-require 'pwush/notification'
+require 'pwush/message'
+
+require 'pwush/response'
+require 'pwush/request'
+
+require 'pwush/client'
 
 module Pwush
   def self.new(options)
     Client.new(options)
   end
 end
-
-# Pwush::Qlean = Pwush.new(
-#   auth: App::Settings.pushwoosh.auth,
-#   app: App::Settings.pushwoosh.clients_app
-# )

data/pwush.gemspec

@@ -1,28 +1,36 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "pwush/version"
+require 'pwush/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "pwush"
+  spec.name          = 'pwush'
   spec.version       = Pwush::VERSION
-  spec.authors       = ["Yaroslav Litvinov"]
-  spec.email         = ["litvinov@applicot.ru"]
+  spec.authors       = ['Yaroslav Litvinov']
+  spec.email         = ['litvinov@applicot.ru']
 
-  spec.summary       = ""
-  spec.description   = ""
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.summary       = 'Pushwoosh remote API ruby toolkit'
+  spec.description   = spec.summary
+  spec.homepage      = 'https://github.com/iarie/pwush'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.bindir        = 'bin'
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'dry-monads', '~> 0.4'
+  spec.add_dependency 'dry-struct', '~> 0.4'
+  spec.add_dependency 'dry-types', '~> 0.12'
+  spec.add_dependency 'http', '~> 3.0'
+  spec.add_dependency 'oj', '~> 3'
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec_junit_formatter'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'webmock', '~> 3.0'
 end

metadata

@@ -1,15 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: pwush
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors:
 - Yaroslav Litvinov
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-04-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: dry-monads
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: dry-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: dry-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +137,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec_junit_formatter
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,16 +164,32 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: ''
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: Pushwoosh remote API ruby toolkit
 email:
 - litvinov@applicot.ru
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -87,12 +201,15 @@ files:
 - lib/pwush.rb
 - lib/pwush/client.rb
 - lib/pwush/config.rb
-- lib/pwush/notification.rb
+- lib/pwush/message.rb
 - lib/pwush/request.rb
+- lib/pwush/response.rb
+- lib/pwush/response/deffered.rb
+- lib/pwush/response/value.rb
 - lib/pwush/types.rb
 - lib/pwush/version.rb
 - pwush.gemspec
-homepage: ''
+homepage: https://github.com/iarie/pwush
 licenses:
 - MIT
 metadata: {}
@@ -115,5 +232,5 @@ rubyforge_project:
 rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: ''
+summary: Pushwoosh remote API ruby toolkit
 test_files: []

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4.3
-before_install: gem install bundler -v 1.16.1