zapier_ruby 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9077d7bdc94f0cd5e7cf80325a5f915beca8c73
-  data.tar.gz: 5dd2f60022922e9ab87da9f65dbcb96d01994097
+  metadata.gz: ab71df7244490a7bc808fd94be2d51afbfef6c02
+  data.tar.gz: 69eadf046f9d11a12800e0f53ffd6a9bcd8e9568
 SHA512:
-  metadata.gz: a865b86cc4d45f6fbf2541001bdd58fb999a7430afb94f27608937fbc80c8b10d20630c6ab2a61c3fd438998f3463855119b2ddd09885f3e872ca1a1b3113782
-  data.tar.gz: ae5184e84b117221186237abd0b1b618efa6ed0ddc39ff3afb9bdb770f983963130f051e0d812f219cf88cd0f428e7006920fc3afaebb41877301e481389e069
+  metadata.gz: 648c46940aed13ce97170a67dc577ad18de7565845542014a33d677f0c5d5c317d89783e1e0bac0e5717b7e93062b1c672a67fa6a340656e75fdbfbb70f4dfbf
+  data.tar.gz: 6f53cc1282d72f9678890ef53f277892760866a265690a02c11081d429f643a7a8787bad091254819a8b91d08fe0439220069160622ba6d0aae3a79fe00b97a0

data/.zapier_ruby.yml.example

@@ -1,3 +1,9 @@
 web_hooks:
   :test_zap: "xxxxxx"
 enable_logging: false
+
+# for new zaps, grab you account id from your webhook uri
+account_id: 1234
+
+# for older zaps, use this base uri
+base_uri: https://zapier.com/hooks/catch/

data/README.md

@@ -30,8 +30,13 @@ require 'rubygems'
 require 'zapier_ruby'
 
 ZapierRuby.configure do |c|
-  c.web_hooks = {example_zap: "webhook_id"}
+  c.web_hooks = { example_zap: "webhook_id" }
   c.enable_logging = false
+  # For new web hooks, you must provide this param
+  c.account_id = "1234" # Get this from the first part of your webhook URI
+
+  # For older webhooks, you should override the base uri to the old uri
+  c.base_uri = "https://hooks.zapier.com/hooks/catch/"
 end
 
 zapper = ZapierRuby::Zapper.new(:example_zap)
@@ -42,8 +47,7 @@ else
  puts "it remains unzapped"
 end
 
-standard_url = 'https://hooks.zapier.com/hooks/standard/123456/xxxxxx/'
-zapper = ZapierRuby::ZapperHook.new(url: standard_url)
+zapper = ZapierRuby::Zapper.new(url: standard_url)
 
 if zapper.zap({hello: "world"})
   puts "zapped it"
@@ -53,7 +57,7 @@ end
 
 ```
 
-You can find the value to fill in for "webhook id" in the location highlighted below ('xxxxxx' in the green box) when configuring your Zap:
+You can find the value to fill in for "webhook id" and "account id" in the location highlighted below ('xxxxxx' in the green box) when configuring your Zap:
 
 ![](https://github.com/pete2786/pete2786.github.io/blob/master/images/finding_webhook.png)
 
@@ -74,8 +78,15 @@ To use this gem from the command line, you can leverage the `bin/zap` Ruby execu
 
 ```yaml
 web_hooks:
-  :example_zap: "xxxxxx"
+  :test_zap: "xxxxxx"
 enable_logging: false
+
+# for new zaps, grab you account id from your webhook uri
+account_id: 1234
+
+# for older zaps, use this base uri
+base_uri: https://zapier.com/hooks/catch/
+
 ```
 
 You must pass `zap [zap_name] [Message]` to the executable. For example:

data/bin/zap

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby 
+#!/usr/bin/env ruby
 require_relative '../lib/zapier_ruby'
 
 FILE_NAME = ".zapier_ruby.yml"
@@ -12,4 +12,4 @@ end
 zap_name = ARGV[0].nil? ? raise("Must supply a zap name") : ARGV[0].to_sym
 message = ARGV[1] || "No message supplied."
 
-ZapierRuby::Zapper.new(zap_name).zap({Message: message})
+puts ZapierRuby::Zapper.new(zap_name).zap({Message: message})

data/lib/zapier_ruby.rb

@@ -1,4 +1,6 @@
-require 'rest_client'
+require 'net/http'
+require 'uri'
+require 'json'
 require 'yaml'
 require 'delegate'
 require 'logger'
@@ -9,7 +11,6 @@ require 'zapier_ruby/logger_decorator'
 require 'zapier_ruby/config'
 require 'zapier_ruby/base'
 require 'zapier_ruby/zapper'
-require 'zapier_ruby/zapper_hook'
 
 module ZapierRuby
   class << self

data/lib/zapier_ruby/base.rb

@@ -5,15 +5,17 @@ module ZapierRuby
     private
 
     def post_zap(params)
-      rest_client.post(params, zap_headers)
-    rescue RestClient::ExceptionWithResponse => err
+      uri = URI.parse(zap_url)
+      logger.debug(uri)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      request = Net::HTTP::Post.new(uri.request_uri, zap_headers)
+      request.body = params.to_json
+      http.request(request)
+    rescue StandardError => err
       raise ZapierServerError, err
     end
 
-    def rest_client
-      @rest_client ||= RestClient::Resource.new(zap_url, ssl_version: 'TLSv1')
-    end
-
     def zap_web_hook_id
       @zap_web_hook ||= config.web_hooks[zap_name]
     end
@@ -26,7 +28,11 @@ module ZapierRuby
     end
 
     def zap_url
-      "#{config.base_uri}#{zap_web_hook_id}/"
+      if config.account_id
+        "#{config.base_uri}/#{config.account_id}/#{zap_web_hook_id}/"
+      else
+        "#{config.base_uri}/#{zap_web_hook_id}/"
+      end
     end
 
     def config

data/lib/zapier_ruby/config.rb

@@ -1,12 +1,13 @@
 module ZapierRuby
   class Config
-    attr_accessor :base_uri, :web_hooks, :enable_logging, :logger
+    attr_accessor :base_uri, :web_hooks, :enable_logging, :logger, :account_id
 
     def initialize
-      self.base_uri = "https://zapier.com/hooks/catch/"
+      self.base_uri = "https://hooks.zapier.com/hooks/catch"
       self.web_hooks = { example_webhook: "webhook_id" }
       self.enable_logging = true
       self.logger = Logger.new(STDOUT)
+      self.account_id = nil
     end
 
     def configure_with(path_to_yaml_file)

data/lib/zapier_ruby/version.rb

@@ -1,3 +1,3 @@
 module ZapierRuby
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/spec_helper.rb

@@ -10,5 +10,6 @@ ZapierRuby.configure do |c|
   c.enable_logging = false
 end
 
- RSpec.configure do |config|
+RSpec.configure do |config|
+
 end

data/spec/zapier_ruby_spec.rb

@@ -13,7 +13,7 @@ require 'spec_helper'
 
   describe 'Zapper' do
     let(:zapper) { ZapierRuby::Zapper }
-    let(:catch_url) { 'https://zapier.com/hooks/catch/webhook_id/' }
+    let(:catch_url) { 'https://hooks.zapier.com/hooks/catch/webhook_id/' }
     let(:instance) { zapper.new(:example_zap) }
 
     describe '#zap_url' do
@@ -22,12 +22,12 @@ require 'spec_helper'
       it 'web_hook_id has val' do
         url = zapper.new(:nil, 'webhook_id/uuiq').send(:zap_url)
 
-        expect(url).to eq 'https://zapier.com/hooks/catch/webhook_id/uuiq/'
+        expect(url).to eq 'https://hooks.zapier.com/hooks/catch/webhook_id/uuiq/'
       end
     end
 
     it '.base_uri' do
-      expect(ZapierRuby.config.base_uri).to eq "https://zapier.com/hooks/catch/"
+      expect(ZapierRuby.config.base_uri).to eq "https://hooks.zapier.com/hooks/catch"
     end
 
     describe '#zap' do
@@ -41,27 +41,27 @@ require 'spec_helper'
         stub_request(:post, catch_url).with(body: body).to_return(body: result.to_json)
         response = instance.zap(body)
 
-        expect(response.code).to eq 200
-        expect(JSON.parse(response)['status']).to eq 'success'
+        expect(response.code).to eq "200"
+        expect(JSON.parse(response.body)['status']).to eq 'success'
       end
     end
-  end
-
-  describe 'ZapperHook' do
-    let(:zapper_hook) { ZapierRuby::ZapperHook }
-    let(:hookurl) { 'https://hooks.zapier.com/hooks/standard/1234/uuiq/' }
-    let(:instance) { zapper_hook.new(url: hookurl) }
 
-    it '#zap_url' do
-      expect(instance.send('zap_url')).to eq hookurl
+    describe 'with account id' do
+      it 'has account id in url' do
+        ZapierRuby.configure { |c| c.account_id = "12345" }
+        url = zapper.new(:nil, 'uuiq').send(:zap_url)
+        expect(url).to eq 'https://hooks.zapier.com/hooks/catch/12345/uuiq/'
+        ZapierRuby.configure { |c| c.account_id = nil }
+      end
     end
 
-    it '#zap' do
-      stub_request(:post, hookurl).with(body: body).to_return(body: result.to_json)
-      response = instance.zap(body)
-
-      expect(response.code).to eq 200
-      expect(JSON.parse(response)['status']).to eq 'success'
+    describe 'with base uri configured' do
+      it 'has account id in url' do
+        ZapierRuby.configure { |c| c.base_uri = "https://test.com" }
+        url = zapper.new(:nil, 'uuiq').send(:zap_url)
+        expect(url).to eq 'https://test.com/uuiq/'
+        ZapierRuby.configure { |c| c.base_uri = nil }
+      end
     end
   end
 end

data/zapier_ruby.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rest-client"
-
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zapier_ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - David Peterson
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +102,6 @@ files:
 - lib/zapier_ruby/logger_decorator.rb
 - lib/zapier_ruby/version.rb
 - lib/zapier_ruby/zapper.rb
-- lib/zapier_ruby/zapper_hook.rb
 - spec/spec_helper.rb
 - spec/zapier_ruby_spec.rb
 - zapier_ruby.gemspec

data/lib/zapier_ruby/zapper_hook.rb

@@ -1,21 +0,0 @@
-module ZapierRuby
-  class ZapperHook < Base
-    attr_accessor :opt_hash
-
-    def initialize(opt_hash={})
-      self.opt_hash = opt_hash
-      self.logger = LoggerDecorator.new(config.enable_logging)
-    end
-
-    def zap(params={})
-      logger.debug "Zapping #{zap_url} with params: #{params.inspect}"
-      post_zap(params)
-    end
-
-    private
-
-    def zap_url
-      "#{opt_hash[:url]}"
-    end
-  end
-end