instedd-pigeon 0.2.2 → 0.3.0

data/app/assets/javascripts/pigeon/twilio-twizard.js.coffee

@@ -0,0 +1,60 @@
+#= require pigeon/template
+
+class TwilioTemplate extends PigeonTemplate
+  checkCredentials: =>
+    account_sid = @attribute('configuration[account_sid]').val()
+    auth_token = @attribute('configuration[auth_token]').val()
+
+    if account_sid != @account_sid || auth_token != @auth_token
+      @account_sid = account_sid
+      @auth_token = auth_token
+
+      if $.trim(@account_sid).length > 0 && $.trim(@auth_token).length > 0
+        client = new TwilioClient(@div, @account_sid, @auth_token)
+
+        phones_div = $('#twilio-phone-number-div')
+        phones_div.hide()
+
+        feedback = $('#twilio-feedback-div')
+        feedback.text("Fetching phone numbers from your account, please wait...")
+        feedback.show()
+
+        client.get_incoming_phone_numbers
+          success: (data) =>
+            @phone_numbers = data
+            if @phone_numbers.length == 0
+              feedback.text("It seems you don't have any phone number in your twilio account. Please buy one and then come back to this page.")
+            else
+              phone_select = $('#twilio-phone-number')
+              options = ""
+              for phone in @phone_numbers
+                options += "<option name=\"#{phone.phone_number}\">#{phone.friendly_name}</option>"
+              phone_select.html(options)
+
+              phones_div.show()
+              feedback.hide()
+          error: =>
+            feedback.text("Couldn't authenticate with Twilio.\nPlease check that you account sid and auth token are correct.")
+
+  run: ->
+    setInterval @checkCredentials, 500
+
+    password_field = @attribute('configuration[incoming_password]')
+    if password_field.val() == ''
+      password_field.val(@generatePassword())
+
+  class TwilioClient
+    constructor: (@div, @account_sid, @auth_token) ->
+
+    get_incoming_phone_numbers: (options) ->
+      url = $(@div).data('twilio-get-incoming-numbers-path')
+      $.ajax
+        url: url
+        type: "GET"
+        data:
+          account_sid: @account_sid
+          auth_token: @auth_token
+        success: options.success
+        error: options.error
+
+PigeonTemplate.registerClass 'twilio', TwilioTemplate

data/app/controllers/pigeon/twilio_controller.rb

@@ -0,0 +1,23 @@
+require 'twilio-ruby'
+
+module Pigeon
+  class TwilioController < ActionController::Base
+    def get_incoming_phone_numbers
+      account_sid = params[:account_sid].strip
+      auth_token = params[:auth_token].strip
+
+      client = Twilio::REST::Client.new account_sid, auth_token
+      incoming_phones = client.account.incoming_phone_numbers.list
+      json = incoming_phones.map do |phone|
+        {
+          sid: phone.sid,
+          phone_number: phone.phone_number,
+          friendly_name: phone.friendly_name,
+        }
+      end
+      render json: json
+    rescue Twilio::REST::RequestError => ex
+      head :unauthorized
+    end
+  end
+end

data/app/helpers/pigeon/renderer/base.rb

@@ -121,6 +121,7 @@ module Pigeon
         if %w(@template @wizard).include?(command)
           options["data-application-name"] ||= Pigeon.config.application_name
           options["data-twitter-path"] = Pigeon::Engine.routes.url_helpers.twitter_path
+          options["data-twilio-get-incoming-numbers-path"] = Pigeon::Engine.routes.url_helpers.twilio_get_incoming_phone_numbers_path
         end
 
         case command

data/app/models/pigeon/nuntium_channel.rb

@@ -4,8 +4,14 @@ module Pigeon
     class << self
       def type() :nuntium end
 
-      def schemas
-        @schemas ||= load_schemas
+      if Rails.env.development?
+        def schemas
+          load_schemas
+        end
+      else
+        def schemas
+          @schemas ||= load_schemas
+        end
       end
 
       def list
@@ -26,7 +32,7 @@ module Pigeon
 
       def load_schemas
         if Pigeon.config.nuntium_configured?
-          Pigeon::ChannelSchema.list_from_hash(:nuntium, PigeonConfig::NuntiumChannelSchemas).reject do |schema|
+          Pigeon::ChannelSchema.list_from_hash(:nuntium, PigeonConfig.nuntium_channel_schemas).reject do |schema|
             schema.kind == 'twitter' && !Pigeon.config.twitter_configured?
           end
         else
@@ -40,7 +46,7 @@ module Pigeon
 
     validates_numericality_of :priority, only_integer: true
     validates_presence_of :protocol
-    validates_inclusion_of :direction, 
+    validates_inclusion_of :direction,
       :in => %w(incoming outgoing bidirectional),
       :message => "must be incoming, outgoing or bidirectional"
 

data/app/models/pigeon/verboice_channel.rb

@@ -4,8 +4,14 @@ module Pigeon
     class << self
       def type() :verboice end
 
-      def schemas
-        @schemas ||= load_schemas
+      if Rails.env.development?
+        def schemas
+          load_schemas
+        end
+      else
+        def schemas
+          @schemas ||= load_schemas
+        end
       end
 
       def list
@@ -24,7 +30,7 @@ module Pigeon
 
       def load_schemas
         if Pigeon.config.verboice_configured?
-          Pigeon::ChannelSchema.list_from_hash(:verboice, PigeonConfig::VerboiceChannelSchemas)
+          Pigeon::ChannelSchema.list_from_hash(:verboice, PigeonConfig::verboice_channel_schemas)
         else
           []
         end

data/config/routes.rb

@@ -1,4 +1,6 @@
 Pigeon::Engine.routes.draw do
   get 'twitter' => 'twitter#begin'
   get 'twitter/callback' => 'twitter#callback'
+
+  get 'twilio/get_incoming_phone_numbers' => 'twilio#get_incoming_phone_numbers'
 end

data/config/schemas/nuntium/nuntium.yml

@@ -161,21 +161,6 @@ smtp:
           type: boolean
           label: "Use SSL?"
 
-twilio:
-  humanized_name: 'Twilio channel'
-  attributes:
-    - name: protocol
-      value: sms
-      user: false
-    - name: configuration
-      attributes:
-        - name: account_sid
-        - name: auth_token
-        - name: from
-        - name: incoming_password
-          type: password
-          label: Incoming password (to use for the callback URLs)
-
 xmpp:
   humanized_name: 'XMPP channel'
   attributes:

data/config/schemas/nuntium/twilio.yml

@@ -0,0 +1,49 @@
+twilio:
+  humanized_name: 'Twilio channel'
+  attributes:
+    - name: protocol
+      value: sms
+      user: false
+    - name: configuration
+      attributes:
+        - name: account_sid
+        - name: auth_token
+        - name: from
+        - name: incoming_password
+          type: password
+          label: Incoming password (to use for the callback URLs)
+  template:
+    - "@template"
+    - type: twilio
+    -
+      - div
+      - "Open your "
+      -
+        - a
+        - href: https://www.twilio.com/
+        - Twilio
+      - " account and copy/paste your AccountSID and AuthToken. You will find that information on the top of the Dashboard page."
+    -
+      - "@attr"
+      - configuration[account_sid]
+    -
+      - "@attr"
+      - configuration[auth_token]
+    -
+      - div
+      - id: twilio-feedback-div
+        style: "display:none"
+      -
+        - p
+        - "Fetching phone numbers from your account, please wait..."
+    -
+      - div
+      - id: twilio-phone-number-div
+        style: "display:none"
+      -
+        - p
+        - "Select a phone number to use for this channel:"
+      -
+        - select
+        - id: twilio-phone-number
+          name: "channel_data[configuration][from]"

data/lib/pigeon/initializer.rb

@@ -1,4 +1,12 @@
 module PigeonConfig
+  @@nuntium_channel_schemas = {}
+  @@verboice_channel_schemas = {}
+
+  def self.reload_schemas()
+    @@nuntium_channel_schemas.replace load_schemas(File.join Pigeon.root, 'config/schemas/nuntium')
+    @@verboice_channel_schemas.replace load_schemas(File.join Pigeon.root, 'config/schemas/verboice')
+  end
+
   def self.load_schemas(path)
     schemas = {}
     Dir.glob(File.join(path, '*.yml')).each do |f|
@@ -7,7 +15,26 @@ module PigeonConfig
     schemas
   end
 
-  NuntiumChannelSchemas = load_schemas(File.join Pigeon.root, 'config/schemas/nuntium')
-  VerboiceChannelSchemas = load_schemas(File.join Pigeon.root, 'config/schemas/verboice')
+  if Rails.env.development?
+    def self.nuntium_channel_schemas
+      reload_schemas
+      @@nuntium_channel_schemas
+    end
+
+    def self.verboice_channel_schemas
+      reload_schemas
+      @@verboice_channel_schemas
+    end
+  else
+    def self.nuntium_channel_schemas
+      @@nuntium_channel_schemas
+    end
+
+    def self.verboice_channel_schemas
+      @@verboice_channel_schemas
+    end
+
+    reload_schemas()
+  end
 end
 

data/lib/pigeon/version.rb

@@ -1,3 +1,3 @@
 module Pigeon
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end

data/pigeon.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'rails', '~> 3.2'
   gem.add_dependency 'twitter_oauth'
+  gem.add_dependency 'twilio-ruby'
   gem.add_dependency 'rest-client'
   gem.add_dependency 'json'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instedd-pigeon
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,6 +44,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: twilio-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -97,9 +113,11 @@ files:
 - app/assets/javascripts/pigeon.js
 - app/assets/javascripts/pigeon/qst-server-wizard.js.coffee
 - app/assets/javascripts/pigeon/template.js.coffee
+- app/assets/javascripts/pigeon/twilio-twizard.js.coffee
 - app/assets/javascripts/pigeon/twitter-template.js.coffee
 - app/assets/javascripts/pigeon/wizard.js.coffee
 - app/assets/stylesheets/pigeon.css.sass
+- app/controllers/pigeon/twilio_controller.rb
 - app/controllers/pigeon/twitter_controller.rb
 - app/helpers/.gitkeep
 - app/helpers/pigeon/channel_helper.rb
@@ -123,6 +141,7 @@ files:
 - config/schemas/nuntium/nuntium.yml
 - config/schemas/nuntium/qst-server.yml
 - config/schemas/nuntium/smpp.yml
+- config/schemas/nuntium/twilio.yml
 - config/schemas/nuntium/twitter.yml
 - config/schemas/verboice/verboice.yml
 - lib/pigeon.rb
@@ -196,18 +215,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4020436503618818902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4020436503618818902
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23