talkable 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc0bac26d175250304d53bcca0e69e5a83c43163cffca720581bb558befbea5b
-  data.tar.gz: 2a2c1a77fde9c92880c9e1a548349313afd2b7c17634f874d6c8a631d2cc4116
+  metadata.gz: dfac324b1c97544345b619d961a90244939d5bc3339e1fdf56ea6449dfcd752c
+  data.tar.gz: 0a07dab13a18256305d9b77db35d3b081ea361319427486e108b19c01a82641e
 SHA512:
-  metadata.gz: feb459f6acdea06f76194d0e5af90ddbc13ee9083db5b78f0e778b7ab7477782ff7f8d51badb5c15aea6f7eac92b9c880b38fc0576804710ac6d65cc0e4dec8e
-  data.tar.gz: '09e6ba2d47c01e9d8a66735084186fc0e5a1d5c4b580938499fc078fd89dd6f641156068dec080da8f10e64445c99d633cf993d789ee8edbde00d77b12966f9a'
+  metadata.gz: b96a3e80842934650d0e089a1a2024dae1aa2bb1c28431cfc9f73564fa28e8780784d4d9bd781610fb9a72024fed7d81bbacce4f5ca613c932a2bf334c9ee311
+  data.tar.gz: 7769641a1ad4f93a0725f2b11635808ccd9715c100e53e62532e88d185b905d5cedf30240015f3609551a01cc7be8e19b8c6684bdf511b02b4da28f9fbf8e3c7

data/.circleci/config.yml

@@ -1,14 +1,15 @@
 version: 2.1
 
 orbs:
+  git-shallow-clone: guitarrapc/git-shallow-clone@2.8.0
   ruby-orbs: sue445/ruby-orbs@volatile
 
 jobs:
-  ruby-3-1: &template
+  ruby-3-4: &template
     docker:
-      - image: cimg/ruby:3.1
+      - image: cimg/ruby:3.4
     steps:
-      - checkout
+      - git-shallow-clone/checkout
 
       - run:
           name: Display Versions
@@ -29,23 +30,18 @@ jobs:
       - run:
           name: RSpec
           command: bundle exec rspec
-  ruby-3-0:
+  ruby-3-3:
     <<: *template
     docker:
-      - image: cimg/ruby:3.0
-  ruby-2-7:
+      - image: cimg/ruby:3.3
+  ruby-3-2:
     <<: *template
     docker:
-      - image: cimg/ruby:2.7
-  ruby-2-6:
-    <<: *template
-    docker:
-      - image: cimg/ruby:2.6
+      - image: cimg/ruby:3.2
 
 workflows:
   workflow:
     jobs:
-      - ruby-3-1
-      - ruby-3-0
-      - ruby-2-7
-      - ruby-2-6
+      - ruby-3-4
+      - ruby-3-3
+      - ruby-3-2

data/README.md

@@ -13,12 +13,12 @@ See a live demo at http://spree-example.talkable.com.
 ## Requirements
 
 The gem requires:
- - Ruby version 2.6 or newer
+ - Ruby version 3.2 or newer
  - Rack version 2.2 or newer
 
 For integration with:
- - Ruby on Rails 6.0 or newer
- - Sinatra 2.0 or newer
+ - Ruby on Rails 7.1 or newer
+ - Sinatra 3.0 or newer
 
 ## Gem Installation
 

data/TUTORIAL.md

@@ -6,7 +6,7 @@ You may read the [first tutorial](https://railsapps.github.io/talkable-referral-
 
 ## Requirements
 
-Ruby 2.6+ and Rails 6.0+ (if you're using Rails).
+Ruby 3.2+ and Rails 7.1+ (if you're using Rails).
 
 ## Create an Account
 

data/lib/talkable/api/base.rb

@@ -86,7 +86,6 @@ module Talkable
           else
             raise BadRequest.new(result[:error_message])
           end
-
         rescue JSON::ParserError
           raise_invalid_response
         end

data/lib/talkable/api/origin.rb

@@ -5,7 +5,7 @@ module Talkable
       PURCHASE          = "Purchase".freeze
       EVENT             = "Event".freeze
 
-      DEFAULT_TRAFFIC_SOURCE = 'talkable-gem'
+      DEFAULT_TRAFFIC_SOURCE = "talkable-gem".freeze
 
       class << self
         def create(origin_type, params)

data/lib/talkable/api/referral.rb

@@ -1,9 +1,9 @@
 module Talkable
   module API
     class Referral < Base
-      APPROVED  = 'approved'
-      VOIDED    = 'voided'
-      UNBLOCKED = 'unblocked'
+      APPROVED  = "approved".freeze
+      VOIDED    = "voided".freeze
+      UNBLOCKED = "unblocked".freeze
 
       class << self
         def update(origin_slug, status)

data/lib/talkable/api/share.rb

@@ -3,16 +3,16 @@ module Talkable
   module API
     class Share < Base
       # social
-      VIA_FACEBOOK    = "facebook"
-      VIA_FB_MESSAGE  = "facebook_message"
-      VIA_TWITTER     = "twitter"
-      VIA_LINKEDIN    = "linkedin"
-      VIA_WHATSAPP    = "whatsapp"
-      VIA_SMS         = "sms"
-      VIA_OTHER       = "other"
+      VIA_FACEBOOK    = "facebook".freeze
+      VIA_FB_MESSAGE  = "facebook_message".freeze
+      VIA_TWITTER     = "twitter".freeze
+      VIA_LINKEDIN    = "linkedin".freeze
+      VIA_WHATSAPP    = "whatsapp".freeze
+      VIA_SMS         = "sms".freeze
+      VIA_OTHER       = "other".freeze
 
       # direct
-      SEND_EMAIL      = "email"
+      SEND_EMAIL      = "email".freeze
 
       class << self
         def create(short_url_code, channel)

data/lib/talkable/generators/shared_generator_methods.rb

@@ -1,11 +1,11 @@
 module Talkable::SharedGeneratorMethods
   def template_lang
     @template_lang ||= if options[:haml]
-     'haml'
+      'haml'
     elsif options[:slim]
-     'slim'
+      'slim'
     else
-     Rails::Generators.options[:rails][:template_engine].to_s.downcase
+      Rails::Generators.options[:rails][:template_engine].to_s.downcase
     end
   end
 

data/lib/talkable/generators/templates/app/views/example_newsletter_signup/register.html.erb

@@ -1,4 +1,4 @@
-<h3>Example newsletter signup (this form will just submit an event to talkable)</h3>
+<h3>Example newsletter signup (this form will just submit an event to Talkable)</h3>
 <%= form_tag :example_newsletter_signup do %>
   <%= email_field_tag :email %>
   <%= submit_tag 'SignUp' %>

data/lib/talkable/generators/templates/app/views/example_newsletter_signup/register.html.haml

@@ -1,4 +1,4 @@
-%h3 Example newsletter signup (this form will just submit an event to talkable)
+%h3 Example newsletter signup (this form will just submit an event to Talkable)
 = form_tag :example_newsletter_signup do
   = email_field_tag :email
   = submit_tag 'SignUp'

data/lib/talkable/generators/templates/app/views/example_newsletter_signup/register.html.slim

@@ -1,4 +1,4 @@
-h3 Example newsletter signup (this form will just submit an event to talkable)
+h3 Example newsletter signup (this form will just submit an event to Talkable)
 = form_tag :example_newsletter_signup do
   = email_field_tag :email
   = submit_tag 'SignUp'

data/lib/talkable/generators/templates/app/views/example_newsletter_signup/thank_you.html.erb

@@ -1 +1 @@
-<h3>You should now have a closed referral loop, see talkable admin for more details</h3>
+<h3>You should now have a closed referral loop, see Talkable admin for more details</h3>

data/lib/talkable/generators/templates/app/views/example_newsletter_signup/thank_you.html.haml

@@ -1 +1 @@
-%h3 You should now have a closed referral loop, see talkable admin for more details
+%h3 You should now have a closed referral loop, see Talkable admin for more details

data/lib/talkable/generators/templates/app/views/example_newsletter_signup/thank_you.html.slim

@@ -1 +1 @@
-h3 You should now have a closed referral loop, see talkable admin for more details
+h3 You should now have a closed referral loop, see Talkable admin for more details

data/lib/talkable/generators/templates/config/initializers/talkable.rb

@@ -1,5 +1,5 @@
 Talkable.configure do |config|
-  # site slug is taken takes form ENV["TALKABLE_SITE_SLUG"]
+  # site slug is taken from ENV["TALKABLE_SITE_SLUG"]
   config.site_slug  = <%= @site_slug.inspect %>
 
   # api key is taken from ENV["TALKABLE_API_KEY"]

data/lib/talkable/middleware.rb

@@ -20,7 +20,6 @@ module Talkable
         content = inject_uuid_in_body(uuid, content)
         inject_integration_js_in_head(content)
       end
-
     end
 
     protected
@@ -142,6 +141,5 @@ module Talkable
       content_disposition = headers['Content-Disposition']
       content_disposition && content_disposition.include?('attachment')
     end
-
   end
 end

data/lib/talkable/resources/origin.rb

@@ -3,7 +3,7 @@ require 'time'
 module Talkable
   class Origin < Hashie::Mash
     def self.parse(result_hash)
-      return nil unless result_hash && result_hash[:origin] &&  result_hash[:origin].size > 0
+      return nil unless result_hash && result_hash[:origin] && result_hash[:origin].size > 0
       origin_hash = result_hash[:origin]
       order_date = (origin_hash ? origin_hash[:order_date] : nil)
 

data/lib/talkable/version.rb

@@ -1,3 +1,3 @@
 module Talkable
-  VERSION = "1.1.0"
+  VERSION = "1.3.0"
 end

data/talkable.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
 
   spec.summary     = "Talkable Referral Program API"
   spec.homepage    = "https://github.com/talkable/talkable-ruby"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
 
   spec.metadata = {
     "homepage_uri"      => spec.homepage,
@@ -28,15 +28,16 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rack", "~> 2.2"
+  spec.add_dependency "rack", ">= 2.2"
   spec.add_dependency "furi", "~> 0.2"
   spec.add_dependency "hashie", "~> 5.0"
 
   spec.add_development_dependency "rake", ">= 13.0"
-  spec.add_development_dependency "rspec", ["~> 3", "< 3.11"]
-  spec.add_development_dependency "simplecov", "~> 0.21"
-  spec.add_development_dependency "webmock", "~> 3.14"
+  spec.add_development_dependency "rspec", "~> 3.13"
+  spec.add_development_dependency "simplecov", "~> 0.22"
+  spec.add_development_dependency "webmock", "~> 3.23"
 
   spec.add_development_dependency "ammeter" # specs for generators
+  spec.add_development_dependency "ostruct" # removed from standard library in Ruby 3.5, used by gem "ammeter"
   spec.add_development_dependency "haml" # check haml syntax in generators
 end

metadata

@@ -1,27 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: talkable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Talkable
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
@@ -72,48 +71,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.23'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  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: haml
   requirement: !ruby/object:Gem::Requirement
@@ -240,11 +247,10 @@ licenses:
 metadata:
   homepage_uri: https://github.com/talkable/talkable-ruby
   bug_tracker_uri: https://github.com/talkable/talkable-ruby/issues
-  changelog_uri: https://github.com/talkable/talkable-ruby/releases/tag/v1.1.0
-  source_code_uri: https://github.com/talkable/talkable-ruby/tree/v1.1.0
+  changelog_uri: https://github.com/talkable/talkable-ruby/releases/tag/v1.3.0
+  source_code_uri: https://github.com/talkable/talkable-ruby/tree/v1.3.0
   allowed_push_host: https://rubygems.org
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -252,15 +258,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Talkable Referral Program API
 test_files: []