pwush 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64bff134d7da6b063f84423e182951488f3ebaef7fd405fc6371f31cad48673f
-  data.tar.gz: f19a0d73e8b422386ea32f14844a30233b0a7c73d3cd626012624a9a31707c07
+  metadata.gz: e3273bf6a132f726c154ad5fa9141f2b83378cd665a7a22653beb55ebd5afd91
+  data.tar.gz: e5ef888ebfdb4bf8d1fd30bec420c4ffd36635a71f9cba8304d00c5f7680d5b1
 SHA512:
-  metadata.gz: 5c79ed4759b0d6a6e3d0a7609e16590ea5b48af20e0e4b522fb1ef73d72f04228093914a50a9c909d0bd5c3d2d77192a90524117d90d9780dbff8768f0eb0eef
-  data.tar.gz: 5e8e154198262bcd980667c3aeead254a85145539aa5f6ab5d58550f1c6dc05dacb0e9a064eba8e04fac90a76c2650f5c7dccf3451b4d2887fcded36bd4f0384
+  metadata.gz: f8f8a3fb2027788d4977dd417877cc09062878f376a428e1312257e4531599c71238e29a23722b487630031bc4114a5dbc9b557666ab331ad2da3715b96cd09a
+  data.tar.gz: 8226de0c179cf7d7247fcd624d5dd380215464f741aa2262b674e6969d4bf12404a8f248330c19ef71637dd71c1921efaa7ff0f37007e4e66a199dad8d722845

data/.circleci/config.yml

@@ -8,20 +8,20 @@ defaults: &default_job
   steps:
     - checkout
 
-    - type: cache-restore
-      name: Restore bundle cache
-      key: pwush-{{ checksum "Gemfile.lock" }}
+    # - 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
+    # - type: cache-save
+    #   name: Store bundle cache
+    #   key: pwush-{{ checksum "Gemfile.lock" }}
+    #   paths:
+    #     - vendor/bundle
 
     - run:
         name: Download cc-test-reporter
@@ -42,10 +42,6 @@ defaults: &default_job
           ./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:
@@ -54,11 +50,15 @@ jobs:
     <<: *default_job
     docker:
       - image: circleci/ruby:2.5-node-browsers
+  ruby-2.6:
+    <<: *default_job
+    docker:
+      - image: circleci/ruby:2.6-node-browsers
 
 workflows:
   version: 2
   multiple-rubies:
     jobs:
-      - ruby-2.3
       - ruby-2.4
       - ruby-2.5
+      - ruby-2.6

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock
 
 # rspec failure tracking
 .rspec_status

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Change Log
+
+## [0.2.0](https://github.com/iarie/pwush/tree/HEAD)
+
+**Added:**
+- Introduce devices api [\#4](https://github.com/iarie/pwush/pull/4) ([iarie](https://github.com/iarie))
+
+## [0.1.2](https://github.com/iarie/pwush/tree/HEAD)
+
+**Changed:**
+- Update dry-rb gems [\#3](https://github.com/iarie/pwush/pull/3)
+
+## [0.1.1](https://github.com/iarie/pwush/tree/HEAD)
+
+**Added:**
+- timeout config options added [\#1](https://github.com/iarie/pwush/pull/1) ([achernik](https://github.com/achernik))

data/README.md

@@ -12,7 +12,7 @@ Pwush is a remote api toolkit for [Pushwoosh](https://www.pushwoosh.com/v1.0/ref
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'pwush', '~> 0.1.0'
+gem 'pwush', '~> 0.2.0'
 ```
 
 And then execute:
@@ -31,6 +31,10 @@ MyPW = Pwush.new(auth: 'AUTH_KEY', app: 'APP_CODE', timeout: { connect: 5, read:
 ```
 ### Push message
 ```ruby
+MyPW.create_message(content: 'Hello, there!')
+```
+### Using built-in struct
+```ruby
 first_message = Pwush::Message.new(
   content: { en: 'Hello' },
   send_date: '2018-04-06 23:00',

data/lib/pwush/api/applications.rb

@@ -0,0 +1,9 @@
+module Pwush
+  module Api
+    module Applications
+      def applications
+        post(:getApplications)
+      end
+    end
+  end
+end

data/lib/pwush/api/devices.rb

@@ -0,0 +1,41 @@
+module Pwush
+  module Api
+    module Devices
+      def register_device(params)
+        post(:registerDevice, params)
+      end
+
+      def unregister_device(hwid)
+        post(:unregisterDevice, hwid: hwid)
+      end
+
+      def create_test_device(params)
+        post(:createTestDevice, params)
+      end
+
+      def list_test_devices
+        post(:listTestDevices)
+      end
+
+      def set_badge(hwid, badge)
+        post(:setBadge, hwid: hwid, badge: badge)
+      end
+
+      def application_open(hwid)
+        post(:applicationOpen, hwid: hwid)
+      end
+
+      def push_stat(hwid, hash_tag = nil)
+        post(:pushStat, hwid: hwid, hash: hash_tag)
+      end
+
+      def message_delivery_event(hwid, hash_tag = nil)
+        post(:messageDeliveryEvent, hwid: hwid, hash: hash_tag)
+      end
+
+      def set_purchase(hwid, params = {})
+        post(:setPurchase, params.merge(hwid: hwid))
+      end
+    end
+  end
+end

data/lib/pwush/api/messages.rb

@@ -0,0 +1,30 @@
+module Pwush
+  module Api
+    module Messages
+      def create_message(*messages)
+        post(:createMessage, notifications: messages.flatten)
+      end
+      alias push create_message
+
+      def delete_message(message_code)
+        post(:deleteMessage, message: message_code)
+      end
+
+      def message_details(message)
+        post(:getMessageDetails, message: message)
+      end
+
+      def message_stats(message)
+        post(:getMsgStats, message: message)
+      end
+
+      def results(request_id)
+        post(:getResults,  request_id: request_id)
+      end
+
+      def preset(preset_code)
+        post(:getPreset, preset_code: preset_code)
+      end
+    end
+  end
+end

data/lib/pwush/client.rb

@@ -1,78 +1,19 @@
 require 'http'
 
+require 'pwush/api/messages'
+require 'pwush/api/devices'
+require 'pwush/api/applications'
+
 module Pwush
   class Client
+    include Api::Messages
+    include Api::Devices
+    include Api::Applications
+
     def initialize(options)
       @config = Config.new(options)
     end
 
-    def create_message(*messages)
-      post(:createMessage, notifications: messages.flatten)
-    end
-    alias push create_message
-
-    def message_details(message)
-      post(:getMessageDetails, message: message)
-    end
-
-    # enterprise api
-    def message_stats(message)
-      post(:getMsgStats, message: message)
-    end
-
-    # enterprise api
-    def results(request_id)
-      post(:getResults,  request_id: request_id)
-    end
-
-    # enterprise api
-    def applications
-      post(:getApplications)
-    end
-
-    # enterprise api
-    def preset(preset_code)
-      post(:getPreset, preset_code: preset_code)
-    end
-
-    ### DEVICE API
-
-    def register_device(params)
-      post(:registerDevice, params)
-    end
-
-    def unregister_device(hwid)
-      post(:unregisterDevice, hwid: hwid)
-    end
-
-    def create_test_device(params)
-      post(:createTestDevice, params)
-    end
-
-    def list_test_devices
-      post(:listTestDevices)
-    end
-
-    def set_badge(hwid, badge)
-      post(:setBadge, hwid: hwid, badge: badge)
-    end
-
-    def application_open(hwid)
-      post(:applicationOpen, hwid: hwid)
-    end
-
-    def push_stat(hwid, hash_tag = nil)
-      post(:pushStat, hwid: hwid, hash: hash_tag)
-    end
-
-    def message_delivery_event(hwid, hash_tag = nil)
-      post(:messageDeliveryEvent, hwid: hwid, hash: hash_tag)
-    end
-
-    def set_purchase(hwid, params = {})
-      post(:setPurchase, params.merge(hwid: hwid))
-    end
-
     private
 
     def get(action, payload = nil)

data/lib/pwush/message.rb

@@ -6,17 +6,17 @@ module Pwush
     # https://www.pushwoosh.com/v1.0/reference#createmessage
 
     # YYYY-MM-DD HH:mm  OR 'now'
-    attribute :send_date, Types::Strict::String.default('now')
+    attribute :send_date, Types::Strict::String.default('now').freeze
 
     attribute :ignore_user_timezone, Types::Strict::Bool.default(true)
 
     # "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.meta(omittable: true)
+    attribute? :timezone, Types::Strict::String
 
     # "campaign":"CAMPAIGN_CODE", optional.
     # Campaign code to which you want to assign this push message
-    attribute :campaign, Types::Strict::String.meta(omittable: true)
+    attribute? :campaign, Types::Strict::String
 
     # "content":{
     #    "en":"English",
@@ -26,96 +26,90 @@ module Pwush
     attribute :content, Types::Strict::String | Types::Hash
 
     #  "page_id": 39, optional. HTML Pages. integer
-    attribute :page_id, Types::Strict::Integer.meta(omittable: true)
+    attribute? :page_id, Types::Strict::Integer
 
     # "rich_page_id": 42, optional. Rich Pages. integer
-    attribute :rich_page_id, Types::Strict::Integer.meta(omittable: true)
+    attribute? :rich_page_id, Types::Strict::Integer
 
     # "rich_media": "XXXX-XXXX", optional. Rich Media code. string
-    attribute :rich_media, Types::Strict::String.meta(omittable: true)
+    attribute? :rich_media, Types::Strict::String
 
     # "remote_page" : "http://myremoteurl.com",
     # Remote Rich HTML Page URL. <scheme>://<authority>
-    attribute :remote_page, Types::Strict::String.meta(omittable: true)
+    attribute? :remote_page, Types::Strict::String
 
     # "link": "http://google.com", optional, string.
     # For deeplinks add "minimize_link":0
-    attribute :link, Types::Strict::String.meta(omittable: true)
+    attribute? :link, Types::Strict::String
 
     # "minimize_link": 0, optional.
     # False or 0 - do not minimize, 1 - Google, 2 - bitly. Default = 1
-    attribute :minimize_link, Types::Strict::Integer.constrained(included_in: 0..2)
-                                                    .meta(omittable: true)
+    attribute? :minimize_link, Types::Strict::Integer.constrained(included_in: 0..2)
 
     # "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 | Types::Hash).meta(omittable: true)
+    attribute? :data, Types::Strict::String | Types::Hash
 
     # 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::Integer.enum(1, 2, 3, 5, 7, 8, 9, 10, 11, 12)
-    attribute :platforms, Types::Strict::Array.of(Platforms).meta(omittable: true)
+    attribute? :platforms, Types::Strict::Array.of(Platforms)
 
     # "preset":"Q1A2Z-6X8SW", Push Preset Code from your Control Panel
-    attribute :preset, Types::Strict::String.meta(omittable: true)
+    attribute? :preset, Types::Strict::String
 
     # "send_rate": 100, throttling. Valid values are from 100 to 1000 pushes/second.
-    attribute :send_rate, Types::Strict::Integer.constrained(included_in: 100..1000)
-                                                .meta(omittable: true)
+    attribute? :send_rate, Types::Strict::Integer.constrained(included_in: 100..1000)
 
     # 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)
-                                            .meta(omittable: true)
+    attribute? :devices, Types::Strict::Array.of(Types::Strict::String)
 
     # "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)
-                                          .meta(omittable: true)
+    attribute? :users, Types::Strict::Array.of(Types::Strict::String)
 
     #  "filter": "FILTER_NAME", optional.
-    attribute :filter, Types::Strict::String.meta(omittable: true)
+    attribute? :filter, Types::Strict::String
 
     #  optional, placeholders for dynamic content instead of device tags
     #  "dynamic_content_placeholders" :{
     #      "firstname":"John",
     #      "lastname":"Doe"
     #  },
-    attribute :dynamic_content_placeholders, Types::Hash.meta(omittable: true)
+    attribute? :dynamic_content_placeholders, Types::Hash
 
     # "conditions": [TAG_CONDITION1, TAG_CONDITION2, ..., TAG_CONDITIONN],
     # Optional.
-    attribute :conditions, Types::Strict::Array.of(Types::Strict::String)
-                                               .meta(omittable: true)
+    attribute? :conditions, Types::Strict::Array.of(Types::Strict::String)
 
     # 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::Integer.meta(omittable: true)
+    attribute? :ios_badges, Types::Strict::Integer
 
     # "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.meta(omittable: true)
+    attribute? :ios_sound, Types::Strict::String
 
     # "ios_ttl": 3600, optional.
     # Time to live parameter - maximum message lifespan in seconds
-    attribute :ios_ttl, Types::Strict::Integer.meta(omittable: true)
+    attribute? :ios_ttl, Types::Strict::Integer
 
     # "ios_silent": 1, optional.
     # Enable silent notifications (ignore "sound" and "content")
-    attribute :ios_silent, Types::Strict::Integer.constrained(included_in: 0..1)
-                                                 .meta(omittable: true)
+    attribute? :ios_silent, Types::Strict::Integer.constrained(included_in: 0..1)
 
     # iOS8 category ID from Pushwoosh
-    attribute :ios_category_id, Types::Strict::Integer.meta(omittable: true)
+    attribute? :ios_category_id, Types::Strict::Integer
 
     # Optional - root level parameters to the aps dictionary
     # "ios_root_params" : {
@@ -126,121 +120,118 @@ module Pwush
     #    "attachment":"YOUR_ATTACHMENT_URL", // iOS 10 media attachment URL
     #   "data": << User supplied data, max of 4KB>>
     #  },
-    attribute :ios_root_params, Types::Hash.meta(omittable: true)
+    attribute? :ios_root_params, Types::Hash
 
     #  "apns_trim_content":1, optional. (0|1)
     # Trims the exceeding content strings with ellipsis
-    attribute :apns_trim_content, Types::Strict::Integer.constrained(included_in: 0..1)
-                                                        .meta(omittable: true)
+    attribute? :apns_trim_content, Types::Strict::Integer.constrained(included_in: 0..1)
 
     # "ios_title":"Title", optional. Add Title for push notification
-    attribute :ios_title, Types::Strict::String.meta(omittable: true)
+    attribute? :ios_title, Types::Strict::String
 
     # "ios_subtitle" : "SubTitle", //Optional. Added sub-title for push notification
-    attribute :ios_subtitle, Types::Strict::String.meta(omittable: true)
+    attribute? :ios_subtitle, Types::Strict::String
 
     # 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.meta(omittable: true)
+    attribute? :android_root_params, Types::Hash
 
     # "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.meta(omittable: true)
+    attribute? :android_sound, Types::Strict::String
 
     # "android_header":"header", optional. Android notification header
-    attribute :android_header, Types::Strict::String.meta(omittable: true)
+    attribute? :android_header, Types::Strict::String
 
     # "android_icon": "icon",
-    attribute :android_icon, Types::Strict::String.meta(omittable: true)
+    attribute? :android_icon, Types::Strict::String
 
     # "android_custom_icon": "http://example.com/image.png", optional.
     # Full path URL to the image file
-    attribute :android_custom_icon, Types::Strict::String.meta(omittable: true)
+    attribute? :android_custom_icon, Types::Strict::String
 
     # "android_banner": "http://example.com/banner.png", optional.
     # Full path URL to the image file
-    attribute :android_banner, Types::Strict::String.meta(omittable: true)
+    attribute? :android_banner, Types::Strict::String
 
     # "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::Integer.meta(omittable: true)
+    attribute? :android_badges, Types::Strict::Integer
 
     # "android_gcm_ttl": 3600, optional.
     # Time to live parameter - maximum message lifespan in seconds
-    attribute :android_gcm_ttl, Types::Strict::Integer.meta(omittable: true)
+    attribute? :android_gcm_ttl, Types::Strict::Integer
 
     # "android_vibration": 0, Android force-vibration for high-priority pushes, boolean
-    attribute :android_vibration, Types::Strict::Bool.meta(omittable: true)
+    attribute? :android_vibration, Types::Strict::Bool
 
     # "android_led":"#rrggbb", LED hex color, device will do its best approximation
-    attribute :android_led, Types::Strict::String.meta(omittable: true)
+    attribute? :android_led, Types::Strict::String
 
     # "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::Integer.constrained(included_in: -2..2)
-                                                       .meta(omittable: true)
+    attribute? :android_priority, Types::Strict::Integer.constrained(included_in: -2..2)
 
     # "android_ibc":"#RRGGBB", icon background color on Lollipop,
     # #RRGGBB, #AARRGGBB, "red", "black", "yellow", etc.
-    attribute :android_ibc, Types::Strict::String.meta(omittable: true)
+    attribute? :android_ibc, Types::Strict::String
 
     # "android_silent": 1, optional. 0 or 1
     # Enable silent notificaiton (ignore sound and content)
-    attribute :android_silent, Types::Strict::Integer.constrained(included_in: 0..1)
-                                                     .meta(omittable: true)
+    attribute? :android_silent, Types::Strict::Integer.constrained(included_in: 0..1)
 
     # Amazon related
 
     # "adm_root_params": {"key": "value"}, // custom key-value object
-    attribute :adm_root_params, Types::Hash.meta(omittable: true)
+    attribute? :adm_root_params, Types::Hash
     # "adm_sound": "push.mp3",
-    attribute :adm_sound, Types::Strict::String.meta(omittable: true)
+    attribute? :adm_sound, Types::Strict::String
     # "adm_header": "Header",
-    attribute :adm_header, Types::Strict::String.meta(omittable: true)
+    attribute? :adm_header, Types::Strict::String
     # "adm_icon": "icon",
-    attribute :adm_icon, Types::Strict::String.meta(omittable: true)
+    attribute? :adm_icon, Types::Strict::String
     # "adm_custom_icon": "http://example.com/image.png",
-    attribute :adm_custom_icon, Types::Strict::String.meta(omittable: true)
+    attribute? :adm_custom_icon, Types::Strict::String
     # "adm_banner": "http://example.com/banner.png",
-    attribute :adm_banner, Types::Strict::String.meta(omittable: true)
+    attribute? :adm_banner, Types::Strict::String
     # "adm_ttl": 3600, optional. Time to live parameter - the maximum message lifespan in seconds
-    attribute :adm_ttl, Types::Strict::Integer.meta(omittable: true)
+    attribute? :adm_ttl, Types::Strict::Integer
     # "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::Integer.meta(omittable: true)
+    attribute? :adm_priority, Types::Strict::Integer.constrained(included_in: -2..2)
 
     # Windows Phone related
 
     # Windows Phone notification type. 'Tile' or 'Toast'. Raw notifications are not supported. 'Tile' if default
-    attribute :wp_type, Types::Strict::String.meta(omittable: true)
+    attribute? :wp_type, Types::Strict::String
     # tile image
-    attribute :wp_background, Types::Strict::String.meta(omittable: true)
+    attribute? :wp_background, Types::Strict::String
     # back tile image
-    attribute :wp_backbackground, Types::Strict::String.meta(omittable: true)
+    attribute? :wp_backbackground, Types::Strict::String
     # back tile title
-    attribute :wp_backtitle, Types::Strict::String.meta(omittable: true)
+    attribute? :wp_backtitle, Types::Strict::String
     # back tile content
-    attribute :wp_backcontent, Types::Strict::String.meta(omittable: true)
+    attribute? :wp_backcontent, Types::Strict::String
     # Badge for Windows Phone notification
-    attribute :wp_count, Types::Strict::Integer.meta(omittable: true)
+    attribute? :wp_count, Types::Strict::Integer
 
     # BlackBerry related
 
     # BlackBerry header, applicable to BB10 Series devices
-    attribute :blackberry_header, Types::Strict::String.meta(omittable: true)
+    attribute? :blackberry_header, Types::Strict::String
 
     # Mac OS X related
 
     # "mac_badges": 3,
-    attribute :mac_badges, Types::Strict::Integer.meta(omittable: true)
+    attribute? :mac_badges, Types::Strict::Integer
     # "mac_sound": "sound.caf",
-    attribute :mac_sound, Types::Strict::String.meta(omittable: true)
+    attribute? :mac_sound, Types::Strict::String
     # "mac_root_params": {"content-available":1},
-    attribute :mac_root_params, Types::Hash.meta(omittable: true)
+    attribute? :mac_root_params, Types::Hash
     # Time to live parameter — maximum message lifespan in seconds
-    attribute :mac_ttl, Types::Strict::Integer.meta(omittable: true)
+    attribute? :mac_ttl, Types::Strict::Integer
 
     # WNS related
 
@@ -248,79 +239,73 @@ module Pwush
     #     "en": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48YmFkZ2UgdmFsdWU9ImF2YWlsYWJsZSIvPg==",
     #     "de": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz48YmFkZ2UgdmFsdWU9Im5ld01lc3NhZ2UiLz4="
     #  },
-    attribute :wns_content, Types::Hash.meta(omittable: true)
+    attribute? :wns_content, Types::Hash
     # 'Tile' | 'Toast' | 'Badge' | 'Raw'
-    attribute :wns_type, Types::Strict::String.meta(omittable: true)
+    attribute? :wns_type, Types::Strict::String
     #  optional. Used in Tile replacement policy. An alphanumeric string of no more than 16 characters.
-    attribute :wns_tag, Types::Strict::String.meta(omittable: true)
+    attribute? :wns_tag, Types::Strict::String
     #  optional. (1|0) Translates into X-WNS-Cache-Policy value
-    attribute :wns_cache, Types::Strict::Integer.meta(omittable: true)
+    attribute? :wns_cache, Types::Strict::Integer
     #  optional. Expiration time for notification in seconds
-    attribute :wns_ttl, Types::Strict::Integer.meta(omittable: true)
+    attribute? :wns_ttl, Types::Strict::Integer
 
     # Safari related
 
     # obligatory, title of the notification
-    attribute :safari_title, Types::Strict::String.meta(omittable: true)
+    attribute? :safari_title, Types::Strict::String
 
     # "safari_action": "Click here", // optional
-    attribute :safari_action, Types::Strict::String.meta(omittable: true)
+    attribute? :safari_action, Types::Strict::String
 
     # "safari_url_args": ["firstArgument", "secondArgument"],
     # Obligatory, but the value may be empty
-    attribute :safari_url_args, Types::Strict::Array.of(Types::Strict::String)
-                                                    .meta(omittable: true)
+    attribute? :safari_url_args, Types::Strict::Array.of(Types::Strict::String)
 
     # Optional. Time to live parameter - the maximum lifespan of a message in seconds
-    attribute :safari_ttl, Types::Strict::Integer.constrained(min_size: 0)
-                                                 .meta(omittable: true)
+    attribute? :safari_ttl, Types::Strict::Integer.constrained(min_size: 0)
 
     # Chrome related
 
     # You can specify the header of the message in this parameter
-    attribute :chrome_title, Types::Strict::String.meta(omittable: true)
+    attribute? :chrome_title, Types::Strict::String
 
     # "chrome_icon":"", full path URL to the icon or extension resources file path
-    attribute :chrome_icon, Types::Strict::String.meta(omittable: true)
+    attribute? :chrome_icon, Types::Strict::String
 
     # Time to live parameter - maximum message lifespan in seconds
-    attribute :chrome_gcm_ttl, Types::Strict::Integer.meta(omittable: true)
+    attribute? :chrome_gcm_ttl, Types::Strict::Integer
 
     # optional, changes chrome push display time.
     # Set to 0 to display push until user interacts with it
-    attribute :chrome_duration, Types::Strict::Integer.meta(omittable: true)
+    attribute? :chrome_duration, Types::Strict::Integer
 
     # optional, URL to large image.
-    attribute :chrome_image, Types::Strict::String.meta(omittable: true)
+    attribute? :chrome_image, Types::Strict::String
 
-    attribute :chrome_button_text1, Types::Strict::String.meta(omittable: true)
+    attribute? :chrome_button_text1, Types::Strict::String
 
     # ignored if chrome_button_text1 is not set
-    attribute :chrome_button_url1, Types::Strict::String.meta(omittable: true)
+    attribute? :chrome_button_url1, Types::Strict::String
 
-    attribute :chrome_button_text2, Types::Strict::String.meta(omittable: true)
+    attribute? :chrome_button_text2, Types::Strict::String
 
     # ignored if chrome_button_text2 is not set
-    attribute :chrome_button_url2, Types::Strict::String.meta(omittable: true)
+    attribute? :chrome_button_url2, Types::Strict::String
 
     # Firefox-related
 
     # optional. You can specify message header here
-    attribute :firefox_title, Types::Strict::String.meta(omittable: true)
+    attribute? :firefox_title, Types::Strict::String
 
     # full path URL to the icon or path to the file in extension resources
-    attribute :firefox_icon, Types::Strict::String.meta(omittable: true)
-
-    def defined_attributes
-      __attributes__.reject { |_, v| v.nil? }
-    end
+    attribute? :firefox_icon, Types::Strict::String
 
     def to_json(options = nil)
-      defined_attributes.to_json(options)
+      attributes.to_json(options)
     end
 
     def inspect
-      attrs = defined_attributes.map { |k, v| " #{k}=#{v.inspect}" }.join
+      attrs = attributes.map { |k, v| " #{k}=#{v.inspect}" }.join
       "#<#{self.class}#{attrs}>"
     end
   end

data/lib/pwush/response/value.rb

@@ -2,8 +2,8 @@ module Pwush
   module Response
     class Value < Dry::Struct::Value
       attribute :status_code, Types::Coercible::Integer
-      attribute :status_message, Types::Strict::String.meta(omittable: true)
-      attribute :body, (Types::Hash | Types::String).meta(omittable: true)
+      attribute? :status_message, Types::Strict::String
+      attribute? :body, (Types::Hash | Types::String).optional
     end
   end
 end

data/lib/pwush/types.rb

@@ -2,6 +2,6 @@ require 'dry-struct'
 
 module Pwush
   module Types
-    include Dry::Types.module
+    include Dry.Types()
   end
 end

data/lib/pwush/version.rb

@@ -1,3 +1,3 @@
 module Pwush
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/pwush.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.4.0'
+
   spec.add_dependency 'dry-monads', '~> 1.0'
-  spec.add_dependency 'dry-struct', '<= 0.5.1 '
-  spec.add_dependency 'dry-types', '<= 0.13.2'
+  spec.add_dependency 'dry-struct', '~> 1.0'
   spec.add_dependency 'http', '~> 3.0'
   spec.add_dependency 'oj', '~> 3'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwush
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Yaroslav Litvinov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2019-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-monads
@@ -28,30 +28,16 @@ dependencies:
   name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: dry-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -190,15 +176,18 @@ files:
 - ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
 - lib/pwush.rb
+- lib/pwush/api/applications.rb
+- lib/pwush/api/devices.rb
+- lib/pwush/api/messages.rb
 - lib/pwush/client.rb
 - lib/pwush/config.rb
 - lib/pwush/message.rb
@@ -221,15 +210,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Pushwoosh remote API ruby toolkit

data/Gemfile.lock

@@ -1,119 +0,0 @@
-PATH
-  remote: .
-  specs:
-    pwush (0.1.4)
-      dry-monads (~> 1.0)
-      dry-struct (<= 0.5.1)
-      dry-types (<= 0.13.2)
-      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.20180417)
-      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.7)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.1)
-    dry-inflector (0.1.2)
-    dry-logic (0.4.2)
-      dry-container (~> 0.2, >= 0.2.6)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
-    dry-monads (1.0.1)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer
-    dry-struct (0.5.1)
-      dry-core (~> 0.4, >= 0.4.3)
-      dry-equalizer (~> 0.2)
-      dry-types (~> 0.13)
-      ice_nine (~> 0.11)
-    dry-types (0.13.2)
-      concurrent-ruby (~> 1.0)
-      dry-container (~> 0.3)
-      dry-core (~> 0.4, >= 0.4.4)
-      dry-equalizer (~> 0.2)
-      dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 0.4, >= 0.4.2)
-    hashdiff (0.3.7)
-    http (3.3.0)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (2.1.1)
-    http_parser.rb (0.6.0)
-    ice_nine (0.11.2)
-    json (2.1.0)
-    method_source (0.9.0)
-    oj (3.6.8)
-    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)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      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
-  bundler (~> 1.16)
-  pry-byebug (~> 3.6)
-  pwush!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rspec_junit_formatter (~> 0.3)
-  simplecov (~> 0.16)
-  webmock (~> 3.0)
-
-BUNDLED WITH
-   1.16.2