add basic search support

.travis.yml

@@ -1,3 +1,4 @@
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.1

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.5.3
+* The player name is now escaped correctly in the URI (@jodyalbritton)
+
+## 1.5.2
+* Added support for authentication token via `Plex.configure`
+
 ## 1.5.1
 * `Plex::Video` now supports multiple media entries (`@media` renamed to `@medias`)
 

lib/plex-ruby.rb

@@ -22,10 +22,10 @@ def self.configure
   # Custom open func which adds the required headers configured by
   # <tt>Plex.configure</tt>
   def self.open(url)
-    headers = {}
+    headers = {:ssl_verify_mode => 0}
     headers["X-Plex-Token"] = config.auth_token if config.auth_token
 
-    super(url, headers)
+    URI.open(url, headers)
   end
 
   # Converts camel case names that are commonly found in the Plex APIs into
@@ -62,10 +62,15 @@ def self.camelize(string, first_letter_uppercase = false)
 require 'plex-ruby/video'
 require 'plex-ruby/media'
 require 'plex-ruby/part'
+require 'plex-ruby/player'
 require 'plex-ruby/stream'
+require 'plex-ruby/status'
 require 'plex-ruby/tags'
 require 'plex-ruby/show'
 require 'plex-ruby/season'
 require 'plex-ruby/episode'
 require 'plex-ruby/movie'
+require 'plex-ruby/artist'
+require 'plex-ruby/album'
+require 'plex-ruby/track'
 

lib/plex-ruby/album.rb

@@ -0,0 +1,85 @@
+module Plex
+  class Album
+
+    ATTRIBUTES = %w(ratingKey guid title summary index thumb year addedAt updatedAt)
+
+    attr_reader :section, :key, :attribute_hash
+
+    # @param [Artist] Artist this album belongs to
+    # @param [String] key to use to later grab this Album
+    def initialize(section, key)
+      @section = section
+      @key = key
+      @attribute_hash = {}
+
+      directory.attributes.each do |method, val|
+        @attribute_hash[Plex.underscore(method)] = val.value
+        define_singleton_method(Plex.underscore(method).to_sym) do
+          val.value
+        end
+      end
+
+      @attribute_hash.merge({'key' => @key})
+    end
+
+    # The list of Tracks in the library that belong to this Album
+    #
+    # @return [Array] list of Tracks that appear on this Album
+    def tracks
+      search_children children
+    end
+
+    # @private
+    def url #:nodoc:
+      section.url
+    end
+
+    # @private
+    def ==(other) #:nodoc:
+      if other.is_a? Plex::Album
+        key == other.key
+      else
+        super
+      end
+    end
+
+    # @private
+    def inspect #:nodoc:
+      "#<Plex::Album: key=\"#{key}\" title=\"#{title}\">"
+    end
+
+    private
+
+    def base_doc
+      Nokogiri::XML( open(url+key) )
+    end
+
+    def children_base
+      Nokogiri::XML( open(url+key+'/children') )
+    end
+
+    def xml_doc
+      @xml_doc ||= base_doc
+    end
+
+    def children
+      @children ||= children_base
+    end
+
+    def directory
+      @directory ||= xml_doc.search('Directory').first
+    end
+
+    def search_children(node)
+      node.search('Track').map do |track|
+        plex_track.new(self, track.attr('key'), track.search('Media'))
+      end
+    end
+
+    def plex_track
+      @plex_track ||= Plex::Track
+    end
+
+  end
+
+end

lib/plex-ruby/artist.rb

@@ -0,0 +1,85 @@
+module Plex
+  class Artist
+
+    ATTRIBUTES = %w(ratingKey guid title summary index thumb addedAt updatedAt)
+
+    attr_reader :section, :key, :attribute_hash
+
+    # @param [Section] section this artist belongs to
+    # @param [String] key to use to later grab this Artist
+    def initialize(section, key)
+      @section = section
+      @key = key
+      @attribute_hash = {}
+
+      directory.attributes.each do |method, val|
+        @attribute_hash[Plex.underscore(method)] = val.value
+        define_singleton_method(Plex.underscore(method).to_sym) do
+          val.value
+        end
+      end
+
+      @attribute_hash.merge({'key' => @key})
+    end
+
+    # The list of Albums in the library that belong to this Artist
+    #
+    # @return [Array] list of Albums that are credited to this Artist
+    def albums
+      @albums ||= search_children children
+    end
+
+    # @private
+    def url #:nodoc:
+      section.url
+    end
+
+    # @private
+    def ==(other) #:nodoc:
+      if other.is_a? Plex::Artist
+        key == other.key
+      else
+        super
+      end
+    end
+
+    # @private
+    def inspect #:nodoc:
+      "#<Plex::Artist: key=\"#{key}\" title=\"#{title}\">"
+    end
+
+    private
+
+    def base_doc
+      Nokogiri::XML( open(url+key) )
+    end
+
+    def children_base
+      Nokogiri::XML( open(url+key+'/children') )
+    end
+
+    def xml_doc
+      @xml_doc ||= base_doc
+    end
+
+    def children
+      @children ||= children_base
+    end
+
+    def directory
+      @directory ||= xml_doc.search('Directory').first
+    end
+
+    def search_children(node)
+      node.search('Directory[type="album"]').map do |album|
+        plex_album.new(self, album.attr('key')[0..-10]) # Remove /children
+      end
+    end
+
+    def plex_album
+      @plex_album ||= Plex::Album
+    end
+
+  end
+
+end

lib/plex-ruby/client.rb

@@ -133,7 +133,7 @@ def inspect #:nodoc:
     private
 
     def player_url
-      url+"/system/players/#{name}"
+      URI.escape(url+"/system/players/#{name}")
     end
 
     def ping(url)

lib/plex-ruby/library.rb

@@ -3,6 +3,9 @@ class Library
 
     attr_reader :server
 
+    WATCHED_LINK = "/:/scrobble?identifier=com.plexapp.plugins.library&key="
+    UNWATCHED_LINK = "/:/unscrobble?identifier=com.plexapp.plugins.library&key="
+
     # @param [Server] server this libary belongs to
     def initialize(server)
       @server = server
@@ -33,6 +36,20 @@ def sections!
       @sections = search_sections(xml_doc!)
     end
 
+    # Set the video as watched
+    #
+    # @param [Video] video to be set as watched
+    def watched(video)
+      open(url+WATCHED_LINK+video.rating_key)
+    end
+
+    # Set the video as unwatched
+    #
+    # @param [Video] video to be set as unwatched
+    def unwatched(video)
+      open(url+UNWATCHED_LINK+video.rating_key)
+    end
+
     # @private
     def key #:nodoc:
       "/library/sections"

lib/plex-ruby/parser.rb

@@ -63,6 +63,10 @@ def parse_directory
       case node.attr('type')
       when 'show'
         Plex::Show.new( parent, node.attr('key')[0..-10] ) # Remove /children
+      when 'artist'
+        Plex::Artist.new( parent, node.attr('key')[0..-10] )
+      when 'album'
+        Plex::Album.new( parent, node.attr('key')[0..-10] )
       else
         raise "Unsupported Directory type #{node.attr('type')}"
       end

lib/plex-ruby/player.rb

@@ -0,0 +1,27 @@
+module Plex
+  class Player
+
+    ATTRIBUTES = %w(machineIdentifier platform product state title)
+
+    attr_reader :parts
+
+    # @param [Nokogiri::XML::Element] nokogiri element that represents this
+    #   Media
+    def initialize(node)
+      node.attributes.each do |method, val|
+        define_singleton_method(Plex.underscore(method).to_sym) do
+          val.value
+        end
+      end
+    end
+
+    def ==(other)
+      if other.is_a? Media
+        id == other.id
+      else
+        super
+      end
+    end
+
+  end
+end

lib/plex-ruby/section.rb

@@ -20,8 +20,8 @@ def initialize(library, node)
       }
     end
 
-    # NOT IMPLEMENTED
-    def refresh(deep = false, force = false)
+    def refresh
+      Plex.open(url + key + '/refresh')
     end
 
 
@@ -35,13 +35,14 @@ def refresh(deep = false, force = false)
     # on_deck - videos that are "on deck" in this Section
     #
     # @return [Array] list of Shows or Movies in that group
-    GROUPS.each { |method|
-      class_eval %(
-        def #{Plex.underscore(method)}
-          Plex::Parser.new( self, Nokogiri::XML(Plex.open(url+key+'/#{method}')) ).parse
-        end
-      )
-    }
+    GROUPS.each do |method|
+      define_method(Plex.underscore(method).to_sym) do |options = {}|
+        path = '/' + method + '?'
+        path += "title=#{CGI::escape(options[:title])}" if options[:title]
+        path += "type=4" if options[:episodes]
+        Plex::Parser.new( self, Nokogiri::XML(Plex.open(url+key+path )) ).parse
+      end
+    end
 
     # Find TV Shows / Episodes by categories
     #

lib/plex-ruby/server.rb

@@ -14,6 +14,13 @@ def initialize(host, port)
     def library
       @library ||= Plex::Library.new(self)
     end
+
+    # The current status of this server
+    #
+    # @return [Status] this Servers status
+    def status
+      @status ||= Plex::Status.new(self)
+    end
 
     # The Plex clients that are connected to this Server
     #
@@ -29,7 +36,7 @@ def clients!
 
     # @private
     def url #:nodoc:
-      "http://#{host}:#{port}"
+      "https://#{host}:#{port}"
     end
 
     # @private