koala 0.9.0 → 0.9.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+v0.9.1
+-- Tests are now compatible with Ruby 1.9.2
+-- Added JSON to runtime dependencies
+-- Removed examples directory (referenced from github instead)
+
 v0.9.0
 -- Added parse_signed_request to handle Facebook's new authentication scheme
   -- note: creates dependency on OpenSSL (OpenSSL::HMAC) for decryption

data/Manifest

@@ -2,20 +2,6 @@ CHANGELOG
 LICENSE
 Manifest
 Rakefile
-examples/oauth_playground/Capfile
-examples/oauth_playground/LICENSE
-examples/oauth_playground/Rakefile
-examples/oauth_playground/config.ru
-examples/oauth_playground/config/deploy.rb
-examples/oauth_playground/config/facebook.yml
-examples/oauth_playground/lib/load_facebook.rb
-examples/oauth_playground/lib/oauth_playground.rb
-examples/oauth_playground/readme.md
-examples/oauth_playground/spec/oauth_playground_spec.rb
-examples/oauth_playground/spec/spec_helper.rb
-examples/oauth_playground/tmp/restart.txt
-examples/oauth_playground/views/index.erb
-examples/oauth_playground/views/layout.erb
 init.rb
 koala.gemspec
 lib/koala.rb

data/Rakefile

@@ -4,13 +4,14 @@ require 'rake'
 require 'echoe'
 
 # gem management
-Echoe.new('koala', '0.9.0') do |p|
+Echoe.new('koala', '0.9.1') do |p|
   p.summary    = "A lightweight, flexible library for Facebook with support for the Graph API, the old REST API, realtime updates, and OAuth validation."
   p.description = "Koala is a lightweight, flexible Ruby SDK for Facebook.  It allows read/write access to the social graph via the Graph API and the older REST API, as well as support for realtime updates and OAuth and Facebook Connect authentication.  Koala is fully tested and supports Net::HTTP and Typhoeus connections out of the box and can accept custom modules for other services."
   p.url            = "http://github.com/arsduo/koala"
   p.author         = ["Alex Koppel", "Chris Baclig", "Rafi Jacoby", "Context Optional"]
   p.email          = "alex@alexkoppel.com"
   p.ignore_pattern = ["tmp/*", "script/*", "pkg/*"]
+  p.runtime_dependencies = ["json"]
   p.development_dependencies = []
   p.retain_gemspec = true
 end

data/koala.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{koala}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Koppel, Chris Baclig, Rafi Jacoby, Context Optional"]
-  s.date = %q{2010-09-30}
+  s.date = %q{2010-10-13}
   s.description = %q{Koala is a lightweight, flexible Ruby SDK for Facebook.  It allows read/write access to the social graph via the Graph API and the older REST API, as well as support for realtime updates and OAuth and Facebook Connect authentication.  Koala is fully tested and supports Net::HTTP and Typhoeus connections out of the box and can accept custom modules for other services.}
   s.email = %q{alex@alexkoppel.com}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "lib/koala.rb", "lib/koala/graph_api.rb", "lib/koala/http_services.rb", "lib/koala/realtime_updates.rb", "lib/koala/rest_api.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "Rakefile", "examples/oauth_playground/Capfile", "examples/oauth_playground/LICENSE", "examples/oauth_playground/Rakefile", "examples/oauth_playground/config.ru", "examples/oauth_playground/config/deploy.rb", "examples/oauth_playground/config/facebook.yml", "examples/oauth_playground/lib/load_facebook.rb", "examples/oauth_playground/lib/oauth_playground.rb", "examples/oauth_playground/readme.md", "examples/oauth_playground/spec/oauth_playground_spec.rb", "examples/oauth_playground/spec/spec_helper.rb", "examples/oauth_playground/tmp/restart.txt", "examples/oauth_playground/views/index.erb", "examples/oauth_playground/views/layout.erb", "init.rb", "koala.gemspec", "lib/koala.rb", "lib/koala/graph_api.rb", "lib/koala/http_services.rb", "lib/koala/realtime_updates.rb", "lib/koala/rest_api.rb", "readme.md", "spec/facebook_data.yml", "spec/koala/api_base_tests.rb", "spec/koala/graph_and_rest_api/graph_and_rest_api_no_token_tests.rb", "spec/koala/graph_and_rest_api/graph_and_rest_api_with_token_tests.rb", "spec/koala/graph_api/graph_api_no_access_token_tests.rb", "spec/koala/graph_api/graph_api_with_access_token_tests.rb", "spec/koala/graph_api/graph_collection_tests.rb", "spec/koala/live_testing_data_helper.rb", "spec/koala/net_http_service_tests.rb", "spec/koala/oauth/oauth_tests.rb", "spec/koala/realtime_updates/realtime_updates_tests.rb", "spec/koala/rest_api/rest_api_no_access_token_tests.rb", "spec/koala/rest_api/rest_api_with_access_token_tests.rb", "spec/koala_spec.rb", "spec/koala_spec_helper.rb", "spec/koala_spec_without_mocks.rb", "spec/mock_facebook_responses.yml", "spec/mock_http_service.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "Rakefile", "init.rb", "koala.gemspec", "lib/koala.rb", "lib/koala/graph_api.rb", "lib/koala/http_services.rb", "lib/koala/realtime_updates.rb", "lib/koala/rest_api.rb", "readme.md", "spec/facebook_data.yml", "spec/koala/api_base_tests.rb", "spec/koala/graph_and_rest_api/graph_and_rest_api_no_token_tests.rb", "spec/koala/graph_and_rest_api/graph_and_rest_api_with_token_tests.rb", "spec/koala/graph_api/graph_api_no_access_token_tests.rb", "spec/koala/graph_api/graph_api_with_access_token_tests.rb", "spec/koala/graph_api/graph_collection_tests.rb", "spec/koala/live_testing_data_helper.rb", "spec/koala/net_http_service_tests.rb", "spec/koala/oauth/oauth_tests.rb", "spec/koala/realtime_updates/realtime_updates_tests.rb", "spec/koala/rest_api/rest_api_no_access_token_tests.rb", "spec/koala/rest_api/rest_api_with_access_token_tests.rb", "spec/koala_spec.rb", "spec/koala_spec_helper.rb", "spec/koala_spec_without_mocks.rb", "spec/mock_facebook_responses.yml", "spec/mock_http_service.rb"]
   s.homepage = %q{http://github.com/arsduo/koala}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Koala", "--main", "readme.md"]
   s.require_paths = ["lib"]
@@ -23,8 +23,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end

data/spec/facebook_data.yml

@@ -5,18 +5,18 @@
  
 # You must supply this value yourself to test the GraphAPI class.
 # Your OAuth token should have publish_stream and read_stream permissions.
-oauth_token: 119908831367602|2.K0IVdhrRngS7VQM4Z_s6_g__.3600.1285844400-2905623|Q3VNUb9haS3s29X4SYPk6VL1f9A 
+oauth_token: 119908831367602|2.5GL0_XdFnxzqsiXeHxJ_FQ__.3600.1286535600-2905623|24AaBQnKkMvvMlNNKdJn4GxRWWQ
 
 # for testing the OAuth class    
 # baseline app
 oauth_test_data: 
   # You must supply this value yourself, since they will expire.
-  code: 2.K0IVdhrRngS7VQM4Z_s6_g__.3600.1285844400-2905623|b5PCXOhEMe2FJXPHAg_mY3Psl6M
+  code: 2.5GL0_XdFnxzqsiXeHxJ_FQ__.3600.1286535600-2905623|Hae8o6zcuXr9E_UXm0LdoCN4ML8
   # easiest way to get session keys: use multiple test accounts with the Javascript login at http://oauth.twoalex.com
-  session_key: 2.K0IVdhrRngS7VQM4Z_s6_g__.3600.1285844400-2905623
+  session_key: 2.5GL0_XdFnxzqsiXeHxJ_FQ__.3600.1286535600-2905623
   multiple_session_keys:
-    - 2.K0IVdhrRngS7VQM4Z_s6_g__.3600.1285844400-2905623
-    - 2.K0IVdhrRngS7VQM4Z_s6_g__.3600.1285844400-2905623
+    - 2.5GL0_XdFnxzqsiXeHxJ_FQ__.3600.1286535600-2905623
+    - 2.5GL0_XdFnxzqsiXeHxJ_FQ__.3600.1286535600-2905623
   
   # These values will work out of the box
   app_id: 119908831367602

data/spec/koala/api_base_tests.rb

@@ -1,4 +1,5 @@
 class ApiBaseTests < Test::Unit::TestCase
+
   describe "Koala API base class" do
     before(:each) do
       @service = Koala::Facebook::API.new  

data/spec/koala/graph_and_rest_api/graph_and_rest_api_with_token_tests.rb

@@ -1,6 +1,6 @@
 class GraphAndRestAPIWithTokenTests < Test::Unit::TestCase
   describe "Koala GraphAndRestAPI without an access token" do
-    it_should_behave_like "live testing examples"
+    include LiveTestingDataHelper
     it_should_behave_like "Koala RestAPI with an access token"
     it_should_behave_like "Koala GraphAPI with an access token"
     

data/spec/koala/graph_api/graph_api_with_access_token_tests.rb

@@ -140,7 +140,7 @@ end
 
 class FacebookWithAccessTokenTests < Test::Unit::TestCase
   describe "Koala GraphAPI with an access token" do
-    it_should_behave_like "live testing examples"
+    include LiveTestingDataHelper
     it_should_behave_like "Koala GraphAPI with an access token"
     
     before :each do

data/spec/koala/graph_api/graph_collection_tests.rb

@@ -65,7 +65,7 @@ shared_examples_for "Koala GraphAPI with GraphCollection" do
           @api.should_receive(:graph_call).with(@base, @args).and_return(@second_page)
           Koala::Facebook::GraphCollection.should_receive(:new).with(@second_page, @api).and_return(@page_of_results)
       
-          @result.previous_page(@api).should == @page_of_results
+          @result.previous_page.should == @page_of_results
         end
     
         it "should return the next page of results" do
@@ -79,7 +79,7 @@ shared_examples_for "Koala GraphAPI with GraphCollection" do
         it "should return nil it there are no other pages" do
           %w{next previous}.each do |this|
             @result.should_receive("#{this}_page_params".to_sym).and_return(nil)
-            @result.send("#{this}_page", @api).should == nil
+            @result.send("#{this}_page").should == nil
           end
         end
       end

data/spec/koala/live_testing_data_helper.rb

@@ -1,15 +1,23 @@
-shared_examples_for "live testing examples" do
-    before :each do
-      @token = $testing_data["oauth_token"]
-      raise Exception, "Must supply access token to run FacebookWithAccessTokenTests!" unless @token
-    end
-    
-    after :each do 
-      # clean up any temporary objects
-      if @temporary_object_id
-        puts "\nCleaning up temporary object #{@temporary_object_id.to_s}"
-        result = @api.delete_object(@temporary_object_id)
-        raise "Unable to clean up temporary Graph object #{@temporary_object_id}!" unless result
+module LiveTestingDataHelper
+  # in RSpec 2, included example groups no longer share any hooks or state with outside examples 
+  # even if in the same block
+  # so we have to use a module to provide setup and teardown hooks for live testing
+  
+  def self.included(base)
+    base.class_eval do
+      before :each do
+        @token = $testing_data["oauth_token"]
+        raise Exception, "Must supply access token to run FacebookWithAccessTokenTests!" unless @token
+      end
+  
+      after :each do 
+        # clean up any temporary objects
+        if @temporary_object_id
+          puts "\nCleaning up temporary object #{@temporary_object_id.to_s}"
+          result = @api.delete_object(@temporary_object_id)
+          raise "Unable to clean up temporary Graph object #{@temporary_object_id}!" unless result
+        end
       end
     end
+  end
 end

data/spec/koala/net_http_service_tests.rb

@@ -1,180 +1,185 @@
 require 'koala/http_services'
-  
 class NetHTTPServiceTests < Test::Unit::TestCase
   module Bear
     include Koala::NetHTTPService
   end
-  
-  it "should define a make_request static module method" do
-    Bear.respond_to?(:make_request).should be_true
-  end
 
-  describe "when making a request" do
-    before(:each) do
-      # Setup stubs for make_request to execute without exceptions
-      @mock_http_response = stub('Net::HTTPResponse', :code => 1)
-      @mock_body = stub('Net::HTTPResponse body')
-      @http_request_result = [@mock_http_response, @mock_body]
-      
-      @http_yield_mock = mock('Net::HTTP start yielded object')
-      
-      @http_yield_mock.stub(:post).and_return(@http_request_result)
-      @http_yield_mock.stub(:get).and_return(@http_request_result)
-      
-      @http_mock = stub('Net::HTTP object', 'use_ssl=' => true, 'verify_mode=' => true)
-      @http_mock.stub(:start).and_yield(@http_yield_mock)
-      
-      Net::HTTP.stub(:new).and_return(@http_mock)
-    end
-  
-    it "should use POST if verb is not GET" do
-      @http_yield_mock.should_receive(:post).and_return(@mock_http_response)
-      @http_mock.should_receive(:start).and_yield(@http_yield_mock)
-      
-      Bear.make_request('anything', {}, 'anything')
-    end
-    
-    it "should use port 443" do
-      Net::HTTP.should_receive(:new).with(anything, 443).and_return(@http_mock)
-      
-      Bear.make_request('anything', {}, 'anything')  
-    end
-    
-    it "should use SSL" do
-      @http_mock.should_receive('use_ssl=').with(true)
-      
-      Bear.make_request('anything', {}, 'anything')  
-    end
-    
-    it "should use the graph server by default" do
-      Net::HTTP.should_receive(:new).with(Koala::Facebook::GRAPH_SERVER, anything).and_return(@http_mock)
-      Bear.make_request('anything', {}, 'anything')  
-    end
-    
-    it "should use the REST server if the :rest_api option is true" do
-      Net::HTTP.should_receive(:new).with(Koala::Facebook::REST_SERVER, anything).and_return(@http_mock)
-      Bear.make_request('anything', {}, 'anything', :rest_api => true)  
-    end
-    
-    it "should turn off vertificate validaiton warnings" do
-      @http_mock.should_receive('verify_mode=').with(OpenSSL::SSL::VERIFY_NONE)
-      
-      Bear.make_request('anything', {}, 'anything')
-    end
-    
-    it "should start an HTTP connection" do
-      @http_mock.should_receive(:start).and_yield(@http_yield_mock)
-      Bear.make_request('anything', {}, 'anything')
+  describe "NetHTTPService module holder class Bear" do
+    it "should define a make_request static module method" do
+      Bear.respond_to?(:make_request).should be_true
     end
-    
-    describe "via POST" do
-      it "should use Net::HTTP to make a POST request" do
-        @http_yield_mock.should_receive(:post).and_return(@http_request_result)
-        
-        Bear.make_request('anything', {}, 'post')
+
+    describe "when making a request" do
+      before(:each) do
+        # Setup stubs for make_request to execute without exceptions
+        @mock_http_response = stub('Net::HTTPResponse', :code => 1)
+        @mock_body = stub('Net::HTTPResponse body')
+        @http_request_result = [@mock_http_response, @mock_body]
+
+        # to_ary is called in Ruby 1.9 to provide backwards compatibility 
+        # with the response, body = http.get() syntax we use
+        @mock_http_response.stub!(:to_ary).and_return(@http_request_result)
+
+        @http_yield_mock = mock('Net::HTTP start yielded object')
+
+        @http_yield_mock.stub(:post).and_return(@http_request_result)
+        @http_yield_mock.stub(:get).and_return(@http_request_result)
+
+        @http_mock = stub('Net::HTTP object', 'use_ssl=' => true, 'verify_mode=' => true)
+        @http_mock.stub(:start).and_yield(@http_yield_mock)
+
+        Net::HTTP.stub(:new).and_return(@http_mock)
       end
-      
-      it "should go to the specified path adding a / if it doesn't exist" do
-        path = mock('Path')
-        @http_yield_mock.should_receive(:post).with(path, anything).and_return(@http_request_result)
-        
-        Bear.make_request(path, {}, 'post')        
+
+      it "should use POST if verb is not GET" do
+        @http_yield_mock.should_receive(:post).and_return(@mock_http_response)
+        @http_mock.should_receive(:start).and_yield(@http_yield_mock)
+
+        Bear.make_request('anything', {}, 'anything')
       end
-      
-      it "should use encoded parameters" do
-        args = {}
-        params = mock('Encoded parameters')
-        Bear.should_receive(:encode_params).with(args).and_return(params)
-        
-        @http_yield_mock.should_receive(:post).with(anything, params).and_return(@http_request_result)
-        
-        Bear.make_request('anything', args, 'post')
+
+      it "should use port 443" do
+        Net::HTTP.should_receive(:new).with(anything, 443).and_return(@http_mock)
+
+        Bear.make_request('anything', {}, 'anything')  
       end
-    end
-    
-    describe "via GET" do
-      it "should use Net::HTTP to make a GET request" do
-        @http_yield_mock.should_receive(:get).and_return(@http_request_result)
-        
-        Bear.make_request('anything', {}, 'get')
+
+      it "should use SSL" do
+        @http_mock.should_receive('use_ssl=').with(true)
+
+        Bear.make_request('anything', {}, 'anything')  
       end
-      
-      it "should use the correct path, including arguments" do
-        path = mock('Path')
-        params = mock('Encoded parameters')
-        args = {}
-        
-        Bear.should_receive(:encode_params).with(args).and_return(params)
-        @http_yield_mock.should_receive(:get).with("#{path}?#{params}").and_return(@http_request_result)
-        
-        Bear.make_request(path, args, 'get')
+
+      it "should use the graph server by default" do
+        Net::HTTP.should_receive(:new).with(Koala::Facebook::GRAPH_SERVER, anything).and_return(@http_mock)
+        Bear.make_request('anything', {}, 'anything')  
       end
-    end
-    
-    describe "the returned value" do
-      before(:each) do
-        @response = Bear.make_request('anything', {}, 'anything')
+
+      it "should use the REST server if the :rest_api option is true" do
+        Net::HTTP.should_receive(:new).with(Koala::Facebook::REST_SERVER, anything).and_return(@http_mock)
+        Bear.make_request('anything', {}, 'anything', :rest_api => true)  
+      end
+
+      it "should turn off vertificate validaiton warnings" do
+        @http_mock.should_receive('verify_mode=').with(OpenSSL::SSL::VERIFY_NONE)
+
+        Bear.make_request('anything', {}, 'anything')
+      end
+
+      it "should start an HTTP connection" do
+        @http_mock.should_receive(:start).and_yield(@http_yield_mock)
+        Bear.make_request('anything', {}, 'anything')
       end
-      
-      it "should return a Koala::Response object" do
-        @response.class.should == Koala::Response
+
+      describe "via POST" do
+        it "should use Net::HTTP to make a POST request" do
+          @http_yield_mock.should_receive(:post).and_return(@http_request_result)
+
+          Bear.make_request('anything', {}, 'post')
+        end
+
+        it "should go to the specified path adding a / if it doesn't exist" do
+          path = mock('Path')
+          @http_yield_mock.should_receive(:post).with(path, anything).and_return(@http_request_result)
+
+          Bear.make_request(path, {}, 'post')        
+        end
+
+        it "should use encoded parameters" do
+          args = {}
+          params = mock('Encoded parameters')
+          Bear.should_receive(:encode_params).with(args).and_return(params)
+
+          @http_yield_mock.should_receive(:post).with(anything, params).and_return(@http_request_result)
+
+          Bear.make_request('anything', args, 'post')
+        end
       end
-      
-      it "should return a Koala::Response with the right status" do
-        @response.status.should == @mock_http_response.code  
+
+      describe "via GET" do
+        it "should use Net::HTTP to make a GET request" do
+          @http_yield_mock.should_receive(:get).and_return(@http_request_result)
+
+          Bear.make_request('anything', {}, 'get')
+        end
+
+        it "should use the correct path, including arguments" do
+          path = mock('Path')
+          params = mock('Encoded parameters')
+          args = {}
+
+          Bear.should_receive(:encode_params).with(args).and_return(params)
+          @http_yield_mock.should_receive(:get).with("#{path}?#{params}").and_return(@http_request_result)
+
+          Bear.make_request(path, args, 'get')
+        end
       end
-      
-      it "should reutrn a Koala::Response with the right body" do
-        @response.body.should == @mock_body
+
+      describe "the returned value" do
+        before(:each) do
+          @response = Bear.make_request('anything', {}, 'anything')
+        end
+
+        it "should return a Koala::Response object" do
+          @response.class.should == Koala::Response
+        end
+
+        it "should return a Koala::Response with the right status" do
+          @response.status.should == @mock_http_response.code  
+        end
+
+        it "should reutrn a Koala::Response with the right body" do
+          @response.body.should == @mock_body
+        end
+
+        it "should return a Koala::Response with the Net::HTTPResponse object as headers" do
+          @response.headers.should == @mock_http_response
+        end
+      end # describe return value
+    end # describe when making a request
+
+    describe "when encoding parameters" do
+      it "should return an empty string if param_hash evaluates to false" do
+        Bear.encode_params(nil).should == ''
       end
-      
-      it "should return a Koala::Response with the Net::HTTPResponse object as headers" do
-        @response.headers.should == @mock_http_response
+
+      it "should convert values to JSON if the value is not a String" do
+        val = 'json_value'
+        not_a_string = 'not_a_string'
+        not_a_string.stub(:class).and_return('NotAString')
+        not_a_string.should_receive(:to_json).and_return(val)
+
+        string = "hi"
+
+        args = {
+          not_a_string => not_a_string,
+          string => string
+        }
+
+        result = Bear.encode_params(args)
+        result.split('&').find do |key_and_val|
+          key_and_val.match("#{not_a_string}=#{val}")
+        end.should be_true
       end
-    end # describe return value
-  end # describe when making a request
-  
-  describe "when encoding parameters" do
-    it "should return an empty string if param_hash evaluates to false" do
-      Bear.encode_params(nil).should == ''
-    end
-    
-    it "should convert values to JSON if the value is not a String" do
-      val = 'json_value'
-      not_a_string = 'not_a_string'
-      not_a_string.stub(:class).and_return('NotAString')
-      not_a_string.should_receive(:to_json).and_return(val)
-      
-      string = "hi"
-      
-      args = {
-        not_a_string => not_a_string,
-        string => string
-      }
-      
-      result = Bear.encode_params(args)
-      result.split('&').find do |key_and_val|
-        key_and_val.match("#{not_a_string}=#{val}")
-      end.should be_true
-    end
-    
-    it "should escape all values" do
-      args = Hash[*(1..4).map {|i| [i.to_s, "Value #{i}($"]}.flatten]
-      
-      result = Bear.encode_params(args)
-      result.split('&').each do |key_val|
-        key, val = key_val.split('=')
-        val.should == CGI.escape(args[key])
+
+      it "should escape all values" do
+        args = Hash[*(1..4).map {|i| [i.to_s, "Value #{i}($"]}.flatten]
+
+        result = Bear.encode_params(args)
+        result.split('&').each do |key_val|
+          key, val = key_val.split('=')
+          val.should == CGI.escape(args[key])
+        end
       end
-    end
-    
-    it "should convert all keys to Strings" do
-      args = Hash[*(1..4).map {|i| [i, "val#{i}"]}.flatten]
-      
-      result = Bear.encode_params(args)
-      result.split('&').each do |key_val|
-        key, val = key_val.split('=')
-        key.should == args.find{|key_val_arr| key_val_arr.last == val}.first.to_s
+
+      it "should convert all keys to Strings" do
+        args = Hash[*(1..4).map {|i| [i, "val#{i}"]}.flatten]
+
+        result = Bear.encode_params(args)
+        result.split('&').each do |key_val|
+          key, val = key_val.split('=')
+          key.should == args.find{|key_val_arr| key_val_arr.last == val}.first.to_s
+        end
       end
     end
   end