Production fixes - 10/18/2013

Author: attdevsupport

RESTFul/ADS/Java/app1/src/main/webapp/WEB-INF/ADS.jsp

@@ -175,6 +175,14 @@ For more information contact developer.support@att.com
               ${content}
               </c:if>
             </c:if>
+
+            <c:if test="${not empty error}">
+              <div class="errorWide">
+                <strong>ERROR:</strong><br>
+                <c:out value="${error}" />
+              </div>
+            </c:if>
+
           <!-- SAMPLE APP CONTENT ENDS HERE! -->
           </div> <!-- end of formContainer -->
         </div> <!-- end of formBox -->

RESTFul/ADS/PHP/app1/lib/Controller/APIController.php

@@ -222,10 +222,10 @@ protected function __construct()
 
         // set any RESTFul environmental settings
         if (isset($proxy_host) && isset($proxy_port))
-            RestfulEnvironment::setProxy($proxyHost, $proxyPort);
+            RestfulEnvironment::setProxy($proxy_host, $proxy_port);
 
-        if (isset($trustAllCerts))
-            RestfulEnvironment::setAcceptAllCerts($trustAllCerts);
+        if (isset($accept_all_certs))
+            RestfulEnvironment::setAcceptAllCerts($accept_all_certs);
     }
 
     /**

RESTFul/ADS/Ruby/app1/Gemfile

@@ -0,0 +1,14 @@
+# include common source and gems
+source "https://rubygems.org"
+
+gem 'sinatra', '~>1.4'
+gem 'sinatra-contrib'
+gem 'json', '~>1.8'
+gem 'thin', '~>1.6'
+gem 'rack', '~>1.5'
+gem 'rest-client', '~>1.6'
+
+
+# include codekit source and gem
+source "http://ldev.code-api-att.com:8808"
+gem 'att-codekit', '~>3.0', :require => 'att/codekit'

RESTFul/ADS/Ruby/app1/Gemfile.lock

@@ -0,0 +1,53 @@
+GEM
+  remote: https://rubygems.org/
+  remote: http://ldev.code-api-att.com:8808/
+  specs:
+    att-codekit (3.0.2)
+      bundler (~> 1.3)
+      immutable_struct
+      json
+      rake
+      rest-client
+    backports (3.3.5)
+    daemons (1.1.9)
+    eventmachine (1.0.3)
+    immutable_struct (1.1.1)
+    json (1.8.0)
+    mime-types (1.25)
+    multi_json (1.8.1)
+    rack (1.5.2)
+    rack-protection (1.5.0)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.1.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    sinatra (1.4.3)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sinatra-contrib (1.4.1)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (~> 1.3)
+    thin (1.6.0)
+      daemons (>= 1.0.9)
+      eventmachine (>= 1.0.0)
+      rack (>= 1.5.0)
+    tilt (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  att-codekit (~> 3.0)
+  json (~> 1.8)
+  rack (~> 1.5)
+  rest-client (~> 1.6)
+  sinatra (~> 1.4)
+  sinatra-contrib
+  thin (~> 1.6)

RESTFul/ADS/Ruby/app1/README

@@ -83,23 +83,27 @@
       - rake: compiling tool used to make att-codekit
       - yard: documentation tool used by att-codekit
 
-  To install these gems open up a terminal window and invoke:
-  
-      gem install sinatra sinatra-contrib rest-client json rake yard
+  The easiest way to install the required gems is to use bundler.
+
+  First make sure you have bundler installed:
+    gem install bundler
+
+  Then inside the directory which this README resides run:
+    bundle install
 
   On a *nix based system you may need to raise your access privliges, such as 
   prefixing the command with sudo or logging in as root by running su.
 
 ** Installing the att-codekit library 
-Note: required for ruby 1.9+ and suggested for 1.8
+Note: this is only required if you are **not** using bundler and are using ruby 1.9+
 
     The code kit library can be installed by using our hosted gem file.
 
         gem sources --add http://ldev.code-api-att.com:8808
         gem install att-codekit
 
     Note that the codekit is under heavy development and is using a semantic
-    versioning scheme. Non-backwards compatible changes _will_ increase the
+    versioning scheme. Non-backwards compatible changes **will** increase the
     major version number.
 
 

RESTFul/ADS/Ruby/app1/ads.rb

@@ -33,16 +33,18 @@
     OAuth = Auth::ClientCred.new(settings.FQDN,
                                  settings.api_key,
                                  settings.secret_key)
-
-    @@token = OAuth.createToken(SCOPE)
+    @@token = nil
   rescue Exception => e
     @error = e.message
   end
 end
 
-# Setup filter for refreshing the token
+# Setup filter for token handling
 [ '/getAds' ].each do |action|
   before action do
+    if @@token.nil?
+      @@token = OAuth.createToken(SCOPE)
+    end
     if @@token.expired?
       @@token = OAuth.refreshToken(@@token) 
     end
@@ -63,7 +65,7 @@
       optional[p] = params[p].strip unless params[p].nil? or params[p].strip.empty?
     end
 
-    category = params[:category]
+    category = params[:Category]
     user_agent = @env["HTTP_USER_AGENT"].to_s
     udid = "012266005922565000000000000000"
 

RESTFul/ADS/Ruby/app1/att/codekit/model/mms.rb

@@ -31,7 +31,7 @@ def self.createFromParsedJson(json)
 
           id = root["messageId"]
           ref = root["resourceReference"]
-          url = ref["resourceURL"]
+          url = ref["resourceURL"] rescue nil
 
           new(id, url)
         end

RESTFul/ADS/Ruby/app1/att/codekit/model/sms.rb

@@ -31,7 +31,7 @@ def self.createFromParsedJson(json)
 
           id = root["messageId"]
           ref = root["resourceReference"]
-          url = ref["resourceURL"]
+          url = ref["resourceURL"] rescue nil
 
           new(id, url)
         end

RESTFul/ADS/Ruby/app1/att/codekit/service/speech.rb

@@ -96,7 +96,7 @@ def customSpeechToText(audio_file, dictionary, grammar, opts={})
           filename = File.basename(audio_file)
 
           dheaders = {
-            "Content-Disposition" => %(form-data; name="x-dictionary"; filename="#{dictionary}"),
+            "Content-Disposition" => %(form-data; name="x-dictionary"; filename="#{dictionary_name}"),
             "Content-Type" => "application/pls+xml"
           }
           dict_part = {
@@ -132,7 +132,7 @@ def customSpeechToText(audio_file, dictionary, grammar, opts={})
 
           headers = {
             :X_arg => "#{x_arg_val}", 
-            :X_SpeechContext => "#{context}, 
+            :X_SpeechContext => "#{context}", 
             :Content_Type => %(multipart/x-srgs-audio; boundary="#{boundary}"),
           }
 

RESTFul/ADS/Ruby/app1/att/codekit/version.rb

@@ -1,5 +1,5 @@
 module Att
   module Codekit
-    VERSION = "3.0.0"
+    VERSION = "3.0.2"
   end
 end