spark_api 1.4.34 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d372159752425b341adabf6fe1bf0361d28e4c1674f09f553b9e911f6294ac24
-  data.tar.gz: cad48a5f4871cb19982be6ba6fd01163957aaf4b552156066e7ed5ebe5581538
+  metadata.gz: 9a99d333efb4d06b28966e72fde3baa3b0576ca30249baa555a1dbb613616d78
+  data.tar.gz: 9b83e6b6d097af7a0bd559121ab9bc702154d1a8afd39f2f9c59474946436c48
 SHA512:
-  metadata.gz: ea1807cfe81a706d50eb70a59a9e831720d69c46318a414dbf1e2c0bc0e75d31f289d6686a21644224efde694993bccff0d0659d0ac8bd873754c6ccf1802963
-  data.tar.gz: 8a6a226f3883d1f2bc9cb60bdaddf328e2e027f7d26452c0a60299ddd2ac99045cb19d8b1e55c00a35b15d418361d28f2aecadd750508ab68612f3c0e435fb73
+  metadata.gz: 51f1a951daccd3cabed8ffb0fd3abbf3c7f0b2be7bdd55453e8a806341f0a4c06c0f5073cf5f2c1b07d3dcdd4bd265274d2441b91e268414eba4b52b01e72c51
+  data.tar.gz: 12b0fabf1ab8dab5d8871b4176ec6c2ec4b094a7713ab29e34f1c37f14a67e4aad69bb212a2bf94ff8d9d53298062010d13067054841a96b96a43bf268ff42b6

data/README.md

@@ -1,6 +1,6 @@
 Spark API
 =====================
-[![Build Status](https://travis-ci.org/sparkapi/spark_api.png?branch=master)](http://travis-ci.org/sparkapi/spark_api) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/sparkapi/spark_api)
+![CI](https://github.com/sparkapi/spark_api/workflows/CI/badge.svg) ![Code Climate](https://codeclimate.com/badge.png)
 
 A Ruby wrapper for the Spark REST API. Loosely based on ActiveResource to provide models to interact with remote services.
 

data/VERSION

@@ -1 +1 @@
-1.4.34
+1.5.3

data/lib/spark_api/authentication/api_auth.rb

@@ -62,7 +62,9 @@ module SparkApi
       
       # Perform an HTTP request (no data)
       def request(method, path, body, options)
-        escaped_path = URI.escape(path)
+        escaped_path = Addressable::URI.escape(path)
+        connection = @client.connection
+        connection.headers.merge!(options.delete(:override_headers) || {})
         request_opts = {
           :AuthToken => @session.auth_token
         }
@@ -76,10 +78,10 @@ module SparkApi
         request_path = "#{escaped_path}?#{build_url_parameters({"ApiSig"=>sig}.merge(request_opts))}"
         SparkApi.logger.debug { "Request: #{request_path}" }
         if body.nil?
-          response = @client.connection.send(method, request_path)
+          response = connection.send(method, request_path)
         else
           SparkApi.logger.debug { "Data: #{body}" }
-          response = @client.connection.send(method, request_path, body)
+          response = connection.send(method, request_path, body)
         end
         response
       end

data/lib/spark_api/authentication/oauth2.rb

@@ -40,8 +40,9 @@ module SparkApi
       
       # Perform an HTTP request (no data)
       def request(method, path, body, options={})
-        escaped_path = URI.escape(path)
+        escaped_path = Addressable::URI.escape(path)
         connection = @client.connection(true)  # SSL Only!
+        connection.headers.merge!(options.delete(:override_headers) || {})
         connection.headers.merge!(self.auth_header)
 
         unless (@client.api_user.nil? || options[:ApiUser])

data/lib/spark_api/authentication/oauth2_impl/grant_type_base.rb

@@ -45,7 +45,7 @@ module SparkApi
           response.expires_in = provider.session_timeout if response.expires_in.nil?
           SparkApi.logger.debug { "[oauth2] New session created #{response}" }
           response
-        rescue Faraday::Error::ConnectionFailed => e
+        rescue Faraday::ConnectionFailed => e
           if @client.ssl_verify && e.message =~ /certificate verify failed/
             SparkApi.logger.error { SparkApi::Errors.ssl_verification_error }
           end

data/lib/spark_api/client.rb

@@ -2,7 +2,7 @@ module SparkApi
   # =API Client
   # Main class to setup and run requests on the API.  A default client is accessible globally as 
   # SparkApi::client if the global configuration has been set as well.  Otherwise, this class may 
-  # be instanciated separately with the configuration information.
+  # be instantiated separately with the configuration information.
   class Client
     include Connection
     include Authentication
@@ -21,7 +21,7 @@ module SparkApi
       Configuration::VALID_OPTION_KEYS.each do |key|
         send("#{key}=", options[key])
       end
-      # Instanciate the authenication class passed in.
+      # Instantiate the authentication class passed in.
       @authenticator = authentication_mode.send("new", self)
     end
     

data/lib/spark_api/models/media.rb

@@ -0,0 +1,30 @@
+module SparkApi
+    module Models
+      module Media
+        # This module is effectively an interface and helper to combine common media
+        # actions and information. Media types (videos, virtual tours, etc)
+        # should include this module and implement the methods contained
+
+        def url
+            raise "Not Implemented"
+        end
+
+        def description
+            raise "Not Implemented"
+        end
+
+        def private?
+            attributes['Privacy'] == 'Private'
+        end
+          
+        def public?
+            attributes['Privacy'] == 'Public'
+        end
+          
+        def automatic?
+            attributes['Privacy'] == 'Automatic'
+        end
+
+      end
+    end
+end

data/lib/spark_api/models/video.rb

@@ -1,7 +1,12 @@
+require 'net/http'
 module SparkApi
   module Models
     class Video < Base
       extend Subresource
+      include Media
+      include Concerns::Savable,
+              Concerns::Destroyable
+
       self.element_name = 'videos'
 
       def branded?
@@ -11,6 +16,109 @@ module SparkApi
       def unbranded?
         attributes['Type'] == 'unbranded'
       end
+
+      def url
+        attributes['ObjectHtml']
+      end
+
+      def description
+        attributes['Name']
+      end
+
+      # Some youtube URLS are youtu.be instead of youtube
+      SUPPORTED_VIDEO_TYPES = %w[vimeo youtu].freeze
+
+      def is_supported_type?
+        # Unfortunately there are so many formats of vimeo videos that we canot support all vimeo videos
+        # Therefore, we need to do a little more checking here and validate that we can get video codes out of the urls
+        (self.ObjectHtml.include?('youtu') && youtube_video_code.present?) || (self.ObjectHtml.include?('vimeo') && vimeo_video_code.present?)
+      end
+
+      def is_valid_iframe?
+        self.ObjectHtml.include?('<iframe') && self.ObjectHtml.include?('</iframe>')
+      end
+
+      # gets the thumbnail to be shown on supported (Vimeo and Youtube) videos
+      # YouTube provides a predictable url for each video's images
+      # for Vimeo, a get request is necessary
+      def display_image
+        url = self.video_link
+        if url
+          if(url.include?('youtube'))
+            youtube_thumbnail_url
+          else 
+            vimeo_thumbnail_url
+          end
+        end
+      end
+
+      def video_link
+        return nil unless is_supported_type?
+
+        if self.ObjectHtml.include?('youtu')
+            youtube_link
+        elsif self.ObjectHtml.include?('vimeo')
+            vimeo_link
+        end
+      end
+
+      private
+
+      def vimeo_video_code
+        html = self.ObjectHtml
+        if html.match(/(src=)('|")((https:)?\/\/player\.vimeo\.com\/video\/)/)
+          new_url = html.split(/(src=')|(src=")/)
+          if new_url[2]
+            html = new_url[2].split(/("|')/)[0]
+          end
+        end
+        if html.match(/(?:.+?)?(player\.vimeo\.com|vimeo.com\/(?:channels\/(?:\w+\/)?|groups\/([^\/]*)\/videos\/|album\/(\d+)\/video\/|)(\d+)(?:$|\/|\?))/)
+          code = html.split('/').last.split('?').first
+          # Vimeo Ids are always numerical
+          code.to_i.to_s === code ? code : nil
+        else
+          nil
+        end
+      end
+
+      # This if correctly embedded by the user is an embed
+      # If not, it could be pretty much anything
+      def youtube_video_code
+        html = self.ObjectHtml
+        if html.match(/(?:.+?)?(?:\/v\/|watch\/|\?v=|\&v=|youtu\.be\/|\/v=|^youtu\.be\/|embed\/|watch\%3Fv\%3D)([a-zA-Z0-9_-]{11})/) || html.match(/(iframe)(.*)(src=)('|")(https:\/\/www\.youtube\.com\/embed)/)
+          html.split(/([a-zA-Z0-9_-]{11})/)[1]
+        else
+          nil
+        end
+      end
+
+      def youtube_link
+        normalize_youtube_url
+        code = youtube_video_code
+        code ? "https://www.youtube.com/watch?v=#{code}" : nil
+      end
+
+      def vimeo_link
+        code = vimeo_video_code
+        code ? "https://vimeo.com/#{code}" : nil
+      end
+
+      def youtube_thumbnail_url
+        code = youtube_video_code
+        code ? "https://i1.ytimg.com/vi/#{code}/hqdefault.jpg" : nil
+      end
+
+      def vimeo_thumbnail_url
+        # due to the rate limiting issue that surfaced shortly before launch,
+        # we will temporarily not return vimeo thumbnails until
+        # there is bandwidth to implement the solution in FLEX-9959
+        return nil
+      end
+
+      def normalize_youtube_url
+        self.ObjectHtml.sub!('-nocookie', '')
+      end
+      
     end
   end
 end

data/lib/spark_api/models/virtual_tour.rb

@@ -2,6 +2,10 @@ module SparkApi
   module Models
     class VirtualTour < Base
       extend Subresource
+      include Media
+      include Concerns::Savable,
+              Concerns::Destroyable
+
       self.element_name="virtualtours"
       
 
@@ -13,6 +17,18 @@ module SparkApi
         attributes["Type"] == "unbranded"
       end
 
+      def url
+        attributes['Uri']
+      end
+
+      def description
+        attributes['Name']
+      end
+
+      def display_image
+        # Currently we have no universally good mechanism to get images for virtual tours
+        return nil
+      end
     end
   end
 end

data/lib/spark_api/models.rb

@@ -25,6 +25,7 @@ require 'spark_api/models/listing'
 require 'spark_api/models/listing_cart'
 require 'spark_api/models/listing_meta_translations'
 require 'spark_api/models/market_statistics'
+require 'spark_api/models/media'
 require 'spark_api/models/message'
 require 'spark_api/models/news_feed_meta'
 require 'spark_api/models/newsfeed'

data/lib/spark_api/request.rb

@@ -61,6 +61,22 @@ module SparkApi
       unless authenticated?
         authenticate
       end
+
+      # Allow use of the X-HTTP-Method-Override header to disguise excessively
+      # large GET/DELETE/HEAD requests as POST requests.
+      if options[:http_method_override]
+        options = options.clone
+        options.delete(:http_method_override)
+        body = URI.encode_www_form(options)
+        options = {
+          override_headers: {
+            "X-HTTP-Method-Override" => method.to_s.upcase,
+            "Content-Type" => "application/x-www-form-urlencoded"
+          }
+        }
+        method = :post
+      end
+
       attempts = 0
       begin
         request_opts = {}
@@ -99,7 +115,7 @@ module SparkApi
       else
         return response.body
       end
-    rescue Faraday::Error::ConnectionFailed => e
+    rescue Faraday::ConnectionFailed => e
       if self.ssl_verify && e.message =~ /certificate verify failed/
         SparkApi.logger.error { SparkApi::Errors.ssl_verification_error }
       end

data/lib/spark_api.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'logger'
 require 'multi_json'
+require 'addressable'
 
 require 'spark_api/version'
 require 'spark_api/errors'

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ end
 
 require "rubygems"
 require "rspec"
-require 'rspec/autorun'
 require 'webmock/rspec'
 require "json"
 require 'multi_json'
@@ -22,6 +21,13 @@ require path + '/spark_api'
 
 require 'spark_api'
 
+if ENV['COVERAGE'] == "on"
+  require 'simplecov'
+  require 'simplecov-rcov'
+  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start { add_filter %w(/vendor /spec /test) }
+end
+
 FileUtils.mkdir 'log' unless File.exists? 'log'
 
 module SparkApi
@@ -48,17 +54,16 @@ end
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
   config.include WebMock::API
   config.include StubApiRequests
 
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.alias_example_to :on_get_it, :method => 'GET'
   config.alias_example_to :on_put_it, :method => 'PUT'
   config.alias_example_to :on_post_it, :method => 'POST'
   config.alias_example_to :on_delete_it, :method => 'DELETE'
   config.before(:all) { reset_config }
-  config.color_enabled = true
+  config.color = true
 end
 
 def jruby? 

data/spec/unit/spark_api/authentication/api_auth_spec.rb

@@ -4,15 +4,14 @@ describe SparkApi::Authentication::ApiAuth  do
   subject {SparkApi::Authentication::ApiAuth.new(nil) }
   describe "build_param_hash" do
     it "should return a blank string when passed nil" do
-      subject.build_param_string(nil).should be_empty
+      expect(subject.build_param_string(nil)).to be_empty
     end
     it "should return a correct param string for one item" do
-      subject.build_param_string({:foo => "bar"}).should match("foobar")
+      expect(subject.build_param_string({:foo => "bar"})).to match("foobar")
     end
     it "should alphabatize the param names by key first, then by value" do
-      subject.build_param_string({:zoo => "zar", :ooo => "car"}).should match("ooocarzoozar")
-      subject.build_param_string({:Akey => "aValue", :aNotherkey => "AnotherValue"}).should 
-           match "AkeyaValueaNotherkeyAnotherValue"
+      expect(subject.build_param_string({:zoo => "zar", :ooo => "car"})).to match("ooocarzoozar")
+      expect(subject.build_param_string({:Akey => "aValue", :aNotherkey => "AnotherValue"})).to match("AkeyaValueaNotherkeyAnotherValue")
     end
   end
   
@@ -33,7 +32,7 @@ describe SparkApi::Authentication::ApiAuth  do
       stub_request(:post, "https://api.sparkapi.com/#{SparkApi.version}/session").
                   with(:query => {:ApiKey => "my_key", :ApiSig => "c731cf2455fbc7a4ef937b2301108d7a"}).
                   to_return(:body => fixture("authentication_failure.json"), :status=>401)
-      expect {subject.authenticate()}.to raise_error(SparkApi::ClientError){ |e| e.status.should == 401 }
+      expect {subject.authenticate()}.to raise_error(SparkApi::ClientError){ |e| expect(e.status).to eq(401) }
     end
   end
 
@@ -41,16 +40,16 @@ describe SparkApi::Authentication::ApiAuth  do
     let(:session) { Object.new }
     it "should return true when session is active" do
       subject.session = session
-      session.stub(:expired?) { false }
-      subject.authenticated?.should eq(true)
+      allow(session).to receive(:expired?) { false }
+      expect(subject.authenticated?).to eq(true)
     end
     it "should return false when session is expired" do
       subject.session = session
-      session.stub(:expired?) { true }
-      subject.authenticated?.should eq(false)
+      allow(session).to receive(:expired?) { true }
+      expect(subject.authenticated?).to eq(false)
     end
     it "should return false when session is uninitialized" do
-      subject.authenticated?.should eq(false)
+      expect(subject.authenticated?).to eq(false)
     end
   end
 
@@ -61,14 +60,14 @@ describe SparkApi::Authentication::ApiAuth  do
     it "should logout when there is an active session" do
       logged_out = false
       subject.session = session
-      client.stub(:delete).with("/session/1234") { logged_out = true }
+      allow(client).to receive(:delete).with("/session/1234") { logged_out = true }
       subject.logout
-      subject.session.should eq(nil)
-      logged_out.should eq(true)
+      expect(subject.session).to eq(nil)
+      expect(logged_out).to eq(true)
     end
     it "should skip logging out when there is no active session information" do 
-      client.stub(:delete) { raise "Should not be called" }
-      subject.logout.should eq(nil)
+      allow(client).to receive(:delete) { raise "Should not be called" }
+      expect(subject.logout).to eq(nil)
     end
   end
   
@@ -98,7 +97,7 @@ describe SparkApi::Authentication::ApiAuth  do
           :AuthToken => "1234"}.merge(args)).
         to_return(:body => fixture("listings/no_subresources.json"))
       subject.session = session
-      subject.request(:get, "/#{SparkApi.version}/listings", nil, args).status.should eq(200)
+      expect(subject.request(:get, "/#{SparkApi.version}/listings", nil, args).status).to eq(200)
     end
     it "should handle a post request" do
       stub_auth_request
@@ -118,14 +117,33 @@ describe SparkApi::Authentication::ApiAuth  do
             }]}
           }', 
           :status=>201)
-      subject.request(:post, "/#{SparkApi.version}/contacts", contact, args).status.should eq(201)
+      expect(subject.request(:post, "/#{SparkApi.version}/contacts", contact, args).status).to eq(201)
+    end
+    it "should incorporate any override_headers it is given while excluding them from the resulting request" do
+      stub_auth_request
+      args = {
+        override_headers: {
+          "Some-Header" => "Some-Value"
+        },
+        ApiUser: "foobar",
+        some_other_param: "some_other_value"
+      }
+      body = "somerequestbodytext"
+      stub_request(:post, "https://api.sparkapi.com/v1/someservice?ApiSig=856f5c036137c0cef5d4d223cd0f42be&ApiUser=foobar&AuthToken=1234&some_other_param=some_other_value").
+        with(body: "somerequestbodytext", headers: args[:override_headers]).
+        to_return(body: '{"D": {
+          "Success": true,
+          "Results": []
+        }',
+        status: 200)
+        expect(subject.request(:post, "/#{SparkApi.version}/someservice", body, args).status).to eq(200)
     end
   end
   
   describe "sign" do
     it "should sign the auth parameters correctly" do
       sign_token = "my_secretApiKeymy_key"
-      subject.sign(sign_token).should eq("c731cf2455fbc7a4ef937b2301108d7a")
+      expect(subject.sign(sign_token)).to eq("c731cf2455fbc7a4ef937b2301108d7a")
     end
   end
   
@@ -134,7 +152,7 @@ describe SparkApi::Authentication::ApiAuth  do
     subject {SparkApi::Authentication::ApiAuth.new(client) }
     it "should fully sign the token" do
       parms = {:AuthToken => "1234", :ApiUser => "CoolAsIce"}
-      subject.sign_token("/test", parms).should eq("7bbe3384a8b64368357f8551cab271e3")
+      expect(subject.sign_token("/test", parms)).to eq("7bbe3384a8b64368357f8551cab271e3")
     end
   end
   
@@ -160,8 +178,8 @@ describe SparkApi::Authentication::ApiAuth  do
           to_return(:body => fixture('listings/with_documents.json'))
       l = Listing.find('1234', :_expand => "Documents")
       
-      count.should eq(2)
-      SparkApi.client.session.expired?.should eq(false)
+      expect(count).to eq(2)
+      expect(SparkApi.client.session.expired?).to eq(false)
     end
   end