em-smsified 0.2.0 → 0.3.0

data/README.md

@@ -12,7 +12,7 @@ Installation
 
 	gem install em-smsified
  
-Example
+Client Example
 -------
 
 All of the API methods take an anonymous block which is the method called when the server returns. It yields the response so you can access the result of executing the API operation. The examples below illustrates this. If you don't care about the result of the operation, don't pass a block.
@@ -20,10 +20,10 @@ All of the API methods take an anonymous block which is the method called when t
 Send an SMS:
 
 	require 'rubygems'
-	require 'em-smsified'
 	require 'eventmachine'
+	require 'em-smsified'
 
-	oneapi = Smsified::OneAPI.new(:username => 'user', :password => 'bug.fungus24')
+	oneapi = EventMachine::Smsified::OneAPI.new(:username => 'user', :password => 'bug.fungus24')
 
 	EM.run do
 	       oneapi.send_sms :address => '14155551212', :message => 'Hi there!', :sender_address => '13035551212'
@@ -33,10 +33,10 @@ Send an SMS:
 Find a subscription:
 
 	require 'rubygems'
-	require 'smsified'
 	require 'eventmachine'
+	require 'em-smsified'
 
-	subscriptions = Smsified::Subscriptions.new(:username => 'user', :password => 'bug.fungus24')
+	subscriptions = EventMachine::Smsified::Subscriptions.new(:username => 'user', :password => 'bug.fungus24')
 
 	EM.run do
 		subscriptions.inbound_subscriptions('17177455076')
@@ -45,20 +45,51 @@ Find a subscription:
 Parse the JSON for a callback Incoming Message:
 
     require 'rubygems'
-    require 'smsified'
+    require 'em-smsified'
 
     # Also require your favorite web framework such as Rails or Sinatra
-    incoming_message = Smsified::IncomingMessage.new json_body
+    incoming_message = EventMachine::Smsified::IncomingMessage.new json_body
     puts incoming_message.date_time           # Wed May 11 18:05:54 UTC 2011
     puts incoming_message.destination_address # '16575550100'
     puts incoming_message.message             # 'Inbound test'
     puts incoming_message.message_id          # 'ef795d3dac56a62fef3ff1852b0c123a'
     puts incoming_message.sender_address      # '14075550100'
 
+Or use the built in server (see below).
+
+Server Example
+-------
+
+A simple server that just outputs whatever is passed to it from SMSified:
+
+    EM.run do
+  	 EM.start_server '0.0.0.0', 8080, EventMachine::Smsified::Server do |s|
+	 		 s.on_unknown do |content| 
+			 	      puts "Unknown received (#{content})"
+			 end
+
+			 s.on_delivery_notification do |msg|
+			 	      puts "Delivery Notification " + Time.now.to_s
+				      puts msg.inspect
+			 end
+      
+			 s.on_incoming_message do |msg|
+			 	      puts "Message received " + Time.now.to_s
+				      puts "#{msg.sender_address} says '#{msg.message}' to #{msg.destination_address}"
+				      puts msg.inspect
+			 end
+	 end
+    end
+
+Also see examples/pong_server.rb for another server example.
+
+If you want to test out the server on your local machine and you're machine isn't publicly available you can use http://localtunnel.com
+
 Documentation
 -------------
 
-May be found at http://kristiankristensen.github.com/em-smsified & http://smsified.com.
+May be found at http://kristiankristensen.github.com/em-smsified & http://smsified.com or by cloning the repository and running 
+    rake yard
 
 License
 -------

data/examples/pong_server.rb

@@ -0,0 +1,47 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__), '..', 'lib')
+require 'rubygems'
+require 'yaml'
+require 'em-smsified'
+require 'eventmachine'
+require 'evma_httpserver'
+
+config = YAML.load(File.open('examples/config.yml'))
+
+smsified = EventMachine::Smsified::OneAPI.new(:username => config['smsified']['username'],
+                                              :password => config['smsified']['password'])
+
+EM.run do
+  Signal.trap("INT") { EM.stop }
+
+  Signal.trap("TRAP") { EM.stop }
+    
+    puts "Hit CTRL-C to stop"
+    puts "=================="
+    puts "Server started at " + Time.now.to_s
+
+    puts "Starting incoming SMSified callback server"
+
+    EM.start_server '0.0.0.0', 8080, EventMachine::Smsified::Server do |s|
+    s.on_unknown do |content| 
+      puts "Unknown received (#{content})"
+    end
+
+    s.on_delivery_notification do |msg|
+      puts "Delivery Notification " + Time.now.to_s
+      puts msg.inspect
+    end
+      
+    s.on_incoming_message do |msg|
+      puts "Message received " + Time.now.to_s
+      puts "#{msg.sender_address} says '#{msg.message}' to #{msg.destination_address}"
+      puts msg.inspect
+      smsified.send_sms( :message        => 'Pong', 
+                         :address        => msg.sender_address,
+                         :notify_url     => config['postbin'],
+                         :sender_address => msg.destination_address) do |result|
+        puts "Pong sent " + Time.now.to_s
+        puts result.data.inspect
+      end     
+    end
+  end
+end

data/lib/em-smsified.rb

@@ -2,12 +2,15 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 %w(
  cgi 
  time
+json
 eventmachine
 em-http-request
+evma_httpserver
 yajl
  em-smsified/helpers 
  em-smsified/response 
  em-smsified/base
+ em-smsified/server
  em-smsified/subscriptions 
  em-smsified/reporting 
  em-smsified/oneapi 

data/lib/em-smsified/incoming_message.rb

@@ -1,5 +1,42 @@
 module EventMachine
   module Smsified
+
+    class MessageError < StandardError; end
+
+    class DeliveryInfoNotification
+      attr_reader :delivery_status, :code, :message_id, :sender_address, :address, :created_date_time, :sent_date_time, :parts, :direction, :message
+
+      ##
+      # Intantiate a new object to provide convenience methods on a Delivery Info Notification. 
+      # Note: This class only pulls the first delivery info object from the notification. There can be more as per the spec.
+      # http://smsified.com/sms-api-documentation/sending#checking_status
+      # 
+      # @param [required, String] valid JSON for an Delivery Info Notifcation to be parsed
+      # @return [Object] the parsed delivery info notification
+      # @raise [ArgumentError] if json is not valid JSON or an Delivery Info Notifcation type
+      # @example 
+      #   del = DeliveryInfoNotification.new(json)
+      #   puts del.message # foobar
+      def initialize(json)
+        begin
+          @json = JSON.parse json
+          contents = @json['deliveryInfoNotification']['deliveryInfo']
+
+          @delivery_status = contents['deliveryStatus']
+          @code = contents['code']
+          @message_id = contents['messageId']
+          @sender_address = contents['senderAddress']
+          @address = contents['address']
+          @created_date_time = Time.parse contents['createdDateTime']
+          @sent_date_time = Time.parse contents['sentDateTime']
+          @parts = contents['parts']
+          @direction = contents['direction']
+          @message = contents['message']
+        rescue => error
+          raise EventMachine::Smsified::MessageError, "Not valid JSON or DeliveryInfoNotification"
+        end          
+      end
+    end
     class IncomingMessage
       attr_reader :date_time, :destination_address, :message, :message_id, :sender_address, :json
       
@@ -25,11 +62,9 @@ module EventMachine
           @message_id          = contents['messageId']
           @sender_address      = contents['senderAddress']
         rescue => error
-          raise MessageError, "Not valid JSON or IncomingMessage"
+          raise EventMachine::Smsified::MessageError, "Not valid JSON or IncomingMessage"
         end
       end
-      
-      class MessageError < StandardError; end
     end
   end
 end

data/lib/em-smsified/server.rb

@@ -0,0 +1,126 @@
+module EventMachine
+  module Smsified
+    ##
+    # Does the actual handling of the incoming notifications from SMSified. Factored out to ease in testing.
+    #
+    module ServerHandler
+      ##
+      # Sets the block to call when an incoming message arrives
+      #
+      def on_incoming_message(&blk)
+        @on_incoming_message = blk
+      end
+      
+      ##
+      # Sets the block to call when a delivery notification arrives
+      #
+      def on_delivery_notification(&blk)
+        @on_delivery_notification = blk
+      end
+
+      ##
+      # Sets the block to call when an unknown message arrives
+      #
+      def on_unknown(&blk)
+        @on_unknown = blk
+      end      
+
+      def trigger_on_incoming_message(msg)
+        @on_incoming_message.call(msg) if @on_incoming_message
+      end
+
+      def trigger_on_delivery_notification(msg)
+        @on_delivery_notification.call(msg) if @on_delivery_notification
+      end
+
+      def trigger_on_unknown(request)
+        @on_unknown.call(request) if @on_unknown
+      end
+
+
+      ##
+      # Inspects the method and contents of the incoming request and handles it.
+      # @param [required, String] the HTTP method of the request
+      # @param [optional, String] the POST'ed content of the request
+      # @return [bool] true if request was handled, false if not
+      def handle(method, content)
+        if is_post? method
+          return handle_incoming_message(content) || handle_delivery_notification(content) || handle_unknown(content)
+        end
+        return false
+      end
+
+      private
+
+      def is_post?(method)
+        return method == "POST"
+      end
+
+      def handle_unknown(content)
+        trigger_on_unknown(content)
+        return true
+      end
+
+      def handle_delivery_notification(content)
+        begin
+          msg = EventMachine::Smsified::DeliveryInfoNotification.new(content)
+          trigger_on_delivery_notification(msg)
+          return true
+        rescue
+        end
+        return false
+      end
+
+      def handle_incoming_message(content)
+        begin
+          msg = EventMachine::Smsified::IncomingMessage.new(content)
+          trigger_on_incoming_message(msg)
+          return true
+        rescue
+        end
+        return false
+      end
+
+    end
+
+    ##
+    # Allows you to set up a server for incoming SMSified callbacks.
+    # @example
+    #  see examples/pong_server.rb
+    class Server < EM::Connection
+      include EM::HttpServer, ServerHandler
+
+      def post_init
+        super
+        no_environment_strings
+      end
+
+      ##
+      # Does processing of incoming HTTP requests.
+      #
+      def process_http_request
+        # the http request details are available via the following instance variables:
+        #   @http_protocol
+        #   @http_request_method
+        #   @http_cookie
+        #   @http_if_none_match
+        #   @http_content_type
+        #   @http_path_info
+        #   @http_request_uri
+        #   @http_query_string
+        #   @http_post_content
+        #   @http_headers
+        handle(@http_request_method, @http_post_content)
+
+        send_ok()
+      end
+
+      private
+      def send_ok
+        response = EM::DelegatedHttpResponse.new(self)
+        response.status = 200
+        response.send_response        
+      end
+    end
+  end
+end

data/lib/em-smsified/subscriptions.rb

@@ -59,8 +59,8 @@ module EventMachine
       # @return [Object] A Response Object with http and data instance methods
       # @example
       #   subscriptions.delete_outbound_subscription('89edd71c1c7f3d349f9a3a4d5d2d410c')
-      def delete_outbound_subscription(sender_address, &blk)
-        delete("/smsmessaging/outbound/subscriptions/#{sender_address}", SMSIFIED_HTTP_HEADERS, &blk)
+      def delete_outbound_subscription(subscription_id, &blk)
+        delete("/smsmessaging/outbound/subscriptions/#{subscription_id}", SMSIFIED_HTTP_HEADERS, &blk)
       end
       
       ##

data/spec/em-smsified_spec.rb

@@ -549,11 +549,47 @@ describe "Smsified" do
     end
     
     it "Should raise an error if JSON not passed" do
-      lambda { EventMachine::Smsified::IncomingMessage.new 'foobar' }.should raise_error(EventMachine::Smsified::IncomingMessage::MessageError)
+      lambda { EventMachine::Smsified::IncomingMessage.new 'foobar' }.should raise_error(EventMachine::Smsified::MessageError)
     end
     
     it "Should raise an error if a different type than an IncomingMessage is passed" do
-      lambda { EventMachine::Smsified::IncomingMessage.new "{ 'foo': 'bar'}" }.should raise_error(EventMachine::Smsified::IncomingMessage::MessageError)
+      lambda { EventMachine::Smsified::IncomingMessage.new "{ 'foo': 'bar'}" }.should raise_error(EventMachine::Smsified::MessageError)
+    end
+  end
+  describe 'DeliveryInfoNotifaction' do
+    it 'Should parse an incoming delivery info notification from SMSified' do
+        json = '{ "deliveryInfoNotification": {
+                  "deliveryInfo": {
+                       "deliveryStatus":"DeliveredToNetwork",
+                       "code":"0",
+                       "messageId":"2e0b8d79f1084190d50b1c8c1188ad0d",
+                       "senderAddress":"tel:+12223334455",
+                       "address":"tel:+11112223344",
+                       "createdDateTime":"2011-11-22T18:19:51.584Z",
+                       "sentDateTime":"2011-11-22T18:19:58.848Z",
+                       "parts":"1",
+                       "direction":"outbound",
+                       "message":"Pong"
+                   }
+                 }
+               }'
+
+        del = EventMachine::Smsified::DeliveryInfoNotification.new json
+        del.message_id.should eql '2e0b8d79f1084190d50b1c8c1188ad0d'
+        del.message.should eql 'Pong'
+        del.direction.should eql 'outbound'
+        del.delivery_status.should eql 'DeliveredToNetwork'
+        del.sender_address.should eql 'tel:+12223334455'
+        del.address.should eql 'tel:+11112223344'
+        del.created_date_time.should eql Time.parse '2011-11-22T18:19:51.584Z'
+      end
+
+      it "Should raise an error if JSON not passed" do
+        lambda { EventMachine::Smsified::DeliveryInfoNotification.new 'foobar' }.should raise_error(EventMachine::Smsified::MessageError)
+      end
+      
+      it "Should raise an error if a different type than a DeliveryInfoNotification is passed" do
+        lambda { EventMachine::Smsified::DeliveryInfoNotification.new "{ 'foo': 'bar'}" }.should raise_error(EventMachine::Smsified::MessageError)
+      end
     end
   end
-end

data/spec/server_spec.rb

@@ -0,0 +1,109 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+class TestServerHandler
+  include EventMachine::Smsified::ServerHandler
+end
+
+describe "Smsified Server" do
+  before (:each) do
+    @sut = TestServerHandler.new
+  end
+
+  it "should set the on_incoming callback block" do
+    @sut.on_incoming_message do |msg|
+    end
+
+  end
+
+  it "should set the on_delivery_notification block" do
+    @sut.on_delivery_notification do |msg|
+    end
+  end
+
+  it "should trigger the on_incoming_message callback block" do
+    called = false
+    @sut.on_incoming_message do |msg|
+      called = true
+    end
+    @sut.trigger_on_incoming_message(nil)
+    called.should be true
+  end
+
+  describe "handle" do
+    it "should never handle 'GET' requests" do
+      @sut.handle("GET", nil).should be false
+    end
+
+    it "should not handle invalid string" do
+      @sut.handle("GET", "foobar").should be false
+    end
+
+    it "should handle 'POST' request with invalid string" do
+      @sut.handle("POST", "foobar").should be true
+    end
+
+    describe "Incoming Message" do
+      before (:all) do
+        @json_msg = '{
+                "inboundSMSMessageNotification": {
+                  "inboundSMSMessage": {
+                    "dateTime": "2011-05-11T18:05:54.546Z", 
+                    "destinationAddress": "16575550100", 
+                    "message": "Inbound test", 
+                    "messageId": "ef795d3dac56a62fef3ff1852b0c123a", 
+                    "senderAddress": "14075550100"
+                  }
+                }
+              }'
+      end
+      
+      it "should handle POST with content" do
+        @sut.handle("POST", @json_msg).should be true
+      end
+
+      it "should call a set block with the parsed object" do
+        called = false
+        @sut.on_incoming_message do |msg|
+          msg.instance_of?(EventMachine::Smsified::IncomingMessage).should be true
+          called = true
+        end
+        @sut.handle("POST", @json_msg)
+        called.should be true
+      end
+    end
+    describe "Delivery Notification" do
+      before (:all) do
+        @json_msg = '{ "deliveryInfoNotification": {
+                  "deliveryInfo": {
+                       "deliveryStatus":"DeliveredToNetwork",
+                       "code":"0",
+                       "messageId":"2e0b8d79f1084190d50b1c8c1188ad0d",
+                       "senderAddress":"tel:+12223334455",
+                       "address":"tel:+11112223344",
+                       "createdDateTime":"2011-11-22T18:19:51.584Z",
+                       "sentDateTime":"2011-11-22T18:19:58.848Z",
+                       "parts":"1",
+                       "direction":"outbound",
+                       "message":"Pong"
+                   }
+                 }
+               }'
+      end
+      
+      it "should handle POST with content" do
+        @sut.handle("POST", @json_msg).should be true
+      end
+
+      it "should call a set block with the parsed object" do
+        called = false
+        @sut.on_delivery_notification do |msg|
+          msg.instance_of?(EventMachine::Smsified::DeliveryInfoNotification).should be true
+          called = true
+        end
+        @sut.handle("POST", @json_msg)
+        called.should be true
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-smsified
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000Z
+date: 2011-11-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &81912970 !ruby/object:Gem::Requirement
+  requirement: &74738640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *81912970
+  version_requirements: *74738640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &81912730 !ruby/object:Gem::Requirement
+  requirement: &74738360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *81912730
+  version_requirements: *74738360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &81912410 !ruby/object:Gem::Requirement
+  requirement: &74738080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *81912410
+  version_requirements: *74738080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &81912120 !ruby/object:Gem::Requirement
+  requirement: &74737820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *81912120
+  version_requirements: *74737820
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &81911850 !ruby/object:Gem::Requirement
+  requirement: &74737510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81911850
+  version_requirements: *74737510
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &81911530 !ruby/object:Gem::Requirement
+  requirement: &74737230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81911530
+  version_requirements: *74737230
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &81911290 !ruby/object:Gem::Requirement
+  requirement: &74736930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81911290
+  version_requirements: *74736930
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &81911000 !ruby/object:Gem::Requirement
+  requirement: &74736660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81911000
+  version_requirements: *74736660
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &81910720 !ruby/object:Gem::Requirement
+  requirement: &74736380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *81910720
+  version_requirements: *74736380
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &81910440 !ruby/object:Gem::Requirement
+  requirement: &74736090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81910440
+  version_requirements: *74736090
+- !ruby/object:Gem::Dependency
+  name: eventmachine_httpserver
+  requirement: &74735840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *74735840
 description: Gem for consuming the SMSified OneAPI w EventMachine
 email:
 - jsgoecke@voxeo.com
@@ -142,11 +153,13 @@ files:
 - lib/em-smsified/oneapi.rb
 - lib/em-smsified/reporting.rb
 - lib/em-smsified/response.rb
+- lib/em-smsified/server.rb
 - lib/em-smsified/subscriptions.rb
 - LICENSE.txt
-- examples/local_test.rb
+- examples/pong_server.rb
 - examples/sending_and_subscribing.rb
 - spec/em-smsified_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/kristiankristensen/em-smsified
 licenses:
@@ -163,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -874026291
+      hash: 57821651
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +190,8 @@ signing_key:
 specification_version: 3
 summary: Gem for consuming the SMSified OneAPI w EventMachine
 test_files:
-- examples/local_test.rb
+- examples/pong_server.rb
 - examples/sending_and_subscribing.rb
 - spec/em-smsified_spec.rb
+- spec/server_spec.rb
 - spec/spec_helper.rb

data/examples/local_test.rb

@@ -1,40 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__), '..', 'lib')
-require 'rubygems'
-require 'smsified'
-require 'yaml'
-require 'eventmachine'
-
-config = YAML.load(File.open('examples/config.yml'))
-
-
-EM.run do
-  Signal.trap("INT") { EM.stop}
-  Signal.trap("TRAP") { EM.stop}
-  
-  puts "Hit CTRL-C to stop"
-  puts "=================="
-  puts "Server started at " + Time.now.to_s
-
-  smsified = Smsified::OneAPI.new( :username       => config['smsified']['username'],
-                                   :password       => config['smsified']['password'],
-                                   :sender_address => '12892050134'
-                                   )
-
-
-  puts "Send SMS started " + Time.now.to_s
-
-#  smsified.send_sms(:message => 'Hello there!', 
-#               :address        => '19179712649',
-               #:notify_url     => config['postbin'],
-#               :sender_address => '12892050134') do |http|
-#    puts "Response returned " + Time.now.to_s
-#    puts http.data
-#    puts http.http
-#  end
-
-  puts "Reporting Request started " + Time.now.to_s
-    smsified.delivery_status(:request_id => 'e7e12f5d6870447a8599bb420e5e9a0d') do |resp|
-    puts "Response returned " + Time.now.to_s
-    puts resp.data
-  end
-end