talkable 0.9.0 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2MzNjExMDczNTIxNjUwMzA4YWNjYTY1M2MzMzg2Y2M1NDAyM2YxNg==
+    MTU1MWNmY2U2ZjE2NTEwODA0NWNhYzc4NmI2ZTVhNWIyOWRjNGRhZg==
   data.tar.gz: !binary |-
-    NTdmZTFiYTIwNzZhNDJmNjhhOWVlNmJkZWQwNzNhYTc2MGNhMTk4Mw==
+    ZmQ5ZWFmMzYyMWYxY2NjMzcxNTc5YjczNGYwNTYxNmYwMGY4OWI2OA==
 SHA512:
   metadata.gz: !binary |-
-    NmNlMGVjMWRiOTZhZTMzOTZhMjZhNGI0ODBhYzRmYzczYjdlOGZkOTg3NDE1
-    NDg3ODIyMzBiMGFhMzMxMzZmMjQ0NTA0NWQ3MWQyOGE5YTFiZTdiZmU1MjVj
-    MGJlYmJjMWFkNzk3M2MwZmZhZjRlNzdjNTQwNDA2MjViNmVhMzA=
+    ZWQ5NjIwM2U4ZTYyMWUzNzMxYjkwMDc3YWM2MmJlZWEwOGYxMGNhYjYxNjkw
+    YTQxMzU1ODQxOTc1NzA4NWYyNWE1NjBmZTc3ZDhlMzQ2ZmEyYjNlOTE0ZDhl
+    ZjE0Zjg3YmFjYTJjOTc0ZTA0OGY0OTMxNTJmNGI2NDhmZTIyOWM=
   data.tar.gz: !binary |-
-    OTBjZDU2NDJhYzYzZWU5NGMxOTZmZGNkMzhmM2NkMjMzODY0ODQzMDg5NDU5
-    M2I0ZjNmNzk0YWVjN2ViNzc2MmIyMDRjMDYxZGZjODc0ZWE5YjUxMTc4YWM3
-    OTExYzhhOTYzZGI1N2Q4Nzk0YjQyZWZiNmY0NWQ3ODNhOGJiYWI=
+    Zjc2OTczMjFjYjljMjk5NTQ4Y2EwYzRkZjljNTNiNWJjNWQ4OTFiN2RjZjQ5
+    MWMzN2JjZWIwNzJiNjZkMmY2ZjU2YzVlYmIzMmRiM2YzYzJiMDIzNzUxODI1
+    Mjc0YzM5MmZkNDYyMDg1NGRhY2NjM2RhNjA4ZDJmMzc4ZGE0Zjk=

data/.gitignore

@@ -42,7 +42,7 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
+Gemfile.lock
 .ruby-version
 .ruby-gemset
 

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in testic.gemspec
+# Specify your gem's dependencies in talkable.gemspec
 gemspec

data/README.md

@@ -101,7 +101,7 @@ class ApplicationController < ActionController::Base
   protected
 
   def load_talkable_offer
-    origin = Talkable.register_affiliate_member(campaign_tags: 'popup')
+    origin = Talkable.register_affiliate_member
     @offer ||= origin.offer if origin
   end
 
@@ -113,7 +113,10 @@ or invite page at specific path
 ```ruby
 class InviteController < ApplicationController
   def show
-    origin = Talkable.register_affiliate_member(campaign_tags: 'invite')
+    # Make sure you have configured Campaign Placements at Talkable site
+    # or explicitly specify campaign tags
+    # origin = Talkable.register_affiliate_member(campaign_tags: 'invite')
+    origin = Talkable.register_affiliate_member
     @offer = origin.offer if origin
   end
 end

data/lib/talkable.rb

@@ -8,6 +8,7 @@ require 'talkable/railtie' if defined? ::Rails::Railtie
 
 module Talkable
   UUID = 'talkable_visitor_uuid'.freeze
+  CURRENT_URL = 'talkable_current_url'.freeze
 
   class << self
     def configure(config = nil)
@@ -27,17 +28,27 @@ module Talkable
       Thread.current[UUID] = uuid
     end
 
-    def with_uuid(uuid)
+    def find_or_generate_uuid
+      visitor_uuid || Talkable::API::Visitor.create[:uuid]
+    end
+
+    def current_url
+      Thread.current[CURRENT_URL]
+    end
+
+    def current_url=(url)
+      Thread.current[CURRENT_URL] = url
+    end
+
+    def with_uuid_and_url(uuid, url)
+      old_url, Talkable.current_url = Talkable.current_url, url
       old_uuid, Talkable.visitor_uuid = Talkable.visitor_uuid, uuid
       yield if block_given?
     ensure
+      Talkable.current_url = old_url
       Talkable.visitor_uuid = old_uuid
     end
 
-    def find_or_generate_uuid
-      visitor_uuid || Talkable::API::Visitor.create[:uuid]
-    end
-
   end
 
 end

data/lib/talkable/generators/install_generator.rb

@@ -29,7 +29,7 @@ RUBY
   protected
 
   def load_talkable_offer
-    origin = Talkable.register_affiliate_member(campaign_tags: 'popup')
+    origin = Talkable.register_affiliate_member
     @offer ||= origin.offer if origin
   end
 RUBY

data/lib/talkable/generators/templates/app/controllers/invite_controller.rb

@@ -2,7 +2,10 @@ class InviteController < ApplicationController
   skip_before_action :load_talkable_offer # skip default trigger widget integration
 
   def show
-    origin = Talkable.register_affiliate_member(campaign_tags: 'invite')
+    # Make sure you have configured Campaign Placements at Talkable site
+    # or explicitly specify campaign tags
+    # origin = Talkable.register_affiliate_member(campaign_tags: 'invite')
+    origin = Talkable.register_affiliate_member
     @invite_offer = origin.offer if origin
   end
 end

data/lib/talkable/integration.rb

@@ -1,40 +1,29 @@
 module Talkable
-  DEFAULT_CAMPAIGN_TAGS = {
-    Talkable::API::Origin::AFFILIATE_MEMBER => 'invite'.freeze,
-    Talkable::API::Origin::PURCHASE         => 'post-purchase'.freeze,
-    Talkable::API::Origin::EVENT            => nil,
-  }.freeze
-
   class << self
-    def register_affiliate_member(params)
+    def register_affiliate_member(params = {})
       register_origin(Talkable::API::Origin::AFFILIATE_MEMBER, params)
     end
 
-    def register_purchase(params)
+    def register_purchase(params = {})
       register_origin(Talkable::API::Origin::PURCHASE, params)
     end
 
-    def register_event(params)
+    def register_event(params = {})
       register_origin(Talkable::API::Origin::EVENT, params)
     end
 
     private
 
-    def register_origin(origin_type, params)
-      origin_params = default_params(origin_type).merge(params)
+    def register_origin(origin_type, params = {})
+      origin_params = default_params.merge(params)
       result = Talkable::API::Origin.create(origin_type, origin_params)
       origin = Talkable::Origin.parse(result)
-      if offer = origin.offer
-        # make sure that explicitly specified tags will be listed first
-        tags = Array(origin_params[:campaign_tags]) | Array(offer.campaign_tags)
-        offer.campaign_tags = tags.map(&:to_s).uniq
-      end
       origin
     end
 
-    def default_params(origin_type)
+    def default_params
       {
-        campaign_tags: DEFAULT_CAMPAIGN_TAGS[origin_type]
+        r: Talkable.current_url,
       }
     end
   end

data/lib/talkable/middleware.rb

@@ -8,9 +8,10 @@ module Talkable
     end
 
     def call(env)
-      uuid = talkable_visitor_uuid(env)
+      request = Rack::Request.new(env)
+      uuid = talkable_visitor_uuid(request)
 
-      result = Talkable.with_uuid(uuid) do
+      result = Talkable.with_uuid_and_url(uuid, request.url) do
         @app.call(env)
       end
 
@@ -24,9 +25,8 @@ module Talkable
 
     protected
 
-    def talkable_visitor_uuid(env)
-      req = Rack::Request.new(env)
-      req.params[UUID] || req.cookies[UUID] || Talkable.find_or_generate_uuid
+    def talkable_visitor_uuid(request)
+      request.params[UUID] || request.cookies[UUID] || Talkable.find_or_generate_uuid
     end
 
     def inject_uuid_in_cookie(uuid, result)

data/lib/talkable/resources/offer.rb

@@ -1,6 +1,7 @@
 module Talkable
   class Offer < Hashie::Mash
     def self.parse(result_hash)
+      return nil unless result_hash && result_hash[:offer] && result_hash[:offer].size > 0
       offer = self.new(result_hash[:offer])
       offer.claim_links ||= Hashie::Mash.new(result_hash[:claim_links])
       offer
@@ -8,8 +9,7 @@ module Talkable
 
     def advocate_share_iframe(options = {})
       show_trigger = !options[:ignore_trigger]
-      tag = campaign_tags.first
-      iframe_options = default_iframe_options(tag).merge(options[:iframe] || {})
+      iframe_options = default_iframe_options.merge(options[:iframe] || {})
       url = show_trigger ? Furi.merge(show_url, query: {trigger_enabled: 1}) : show_url
 
       snippets = []
@@ -26,10 +26,9 @@ module Talkable
 
     protected
 
-    def default_iframe_options(tag = nil)
-      tag ||= SecureRandom.hex(3)
+    def default_iframe_options
       {
-        container: "talkable-offer-#{tag}",
+        container: "talkable-offer",
       }
     end
 

data/lib/talkable/resources/origin.rb

@@ -3,6 +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
       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 = "0.9.0".freeze
+  VERSION = "1.0.0".freeze
 end

data/talkable.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name        = "talkable"
   s.version     = Talkable::VERSION
   s.date        = Date.today.to_s
-  s.summary     = "Talkable Referral Programe API"
+  s.summary     = "Talkable Referral Program API"
   s.description = "Talkable Ruby Gem to make your own referral program in Sinatra or Rails application"
   s.authors     = ["Talkable"]
   s.email       = "dev@talkable.com"
@@ -17,7 +17,11 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.3"
 
-  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1.0")
+    s.add_dependency "nokogiri", "< 1.7.0"
+  end
+
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2.2")
     s.add_dependency "rack", ">= 1.5.2", "< 2"
   else
     s.add_dependency "rack", ">= 1.5.2"
@@ -30,8 +34,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", "~> 11.2"
   s.add_development_dependency "rspec", "~> 3.4"
   s.add_development_dependency "simplecov", "~> 0.12"
-  s.add_development_dependency "json", "~> 1.8.3" if RUBY_VERSION < '2.0'
-  s.add_development_dependency "webmock", "~> 2.1"
+
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.0")
+    s.add_development_dependency "json", "~> 1.8.3"
+    s.add_development_dependency "webmock", ">= 2.1", "< 2.3"
+  else
+    s.add_development_dependency "webmock", ">= 2.1"
+  end
+
   s.add_development_dependency "ammeter" # specs for generators
-  s.add_development_dependency "haml" # check haml syntex in generators
+  s.add_development_dependency "haml" # check haml syntax in generators
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: talkable
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Talkable
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -132,16 +146,22 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +200,6 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -236,5 +255,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Talkable Referral Programe API
+summary: Talkable Referral Program API
 test_files: []

data/Gemfile.lock

@@ -1,126 +0,0 @@
-PATH
-  remote: .
-  specs:
-    talkable (0.9.0)
-      furi (~> 0.2)
-      hashie (~> 3.4)
-      rack (>= 1.5.2, < 2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (4.2.7.1)
-      actionview (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7.1)
-      activesupport (= 4.2.7.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activesupport (4.2.7.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.4.0)
-    ammeter (1.1.3)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-rails (>= 2.2)
-    builder (3.2.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    erubis (2.7.0)
-    furi (0.2.0)
-    haml (4.0.7)
-      tilt
-    hashdiff (0.3.0)
-    hashie (3.4.4)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mini_portile2 (2.1.0)
-    minitest (5.9.0)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    pkg-config (1.1.7)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.7.1)
-      actionpack (= 4.2.7.1)
-      activesupport (= 4.2.7.1)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.1)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    safe_yaml (1.0.4)
-    simplecov (0.12.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    webmock (2.1.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ammeter
-  bundler (~> 1.12)
-  haml
-  json (~> 1.8.3)
-  rake (~> 11.2)
-  rspec (~> 3.4)
-  simplecov (~> 0.12)
-  talkable!
-  webmock (~> 2.1)
-
-BUNDLED WITH
-   1.12.5