upnp_content_explorer 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab6a03172ad6faf495e4a04e7759640aea563d1f
-  data.tar.gz: c3511a497b1dcb9c1eb1d595fc27acd6c77f5336
+  metadata.gz: 8dad4e9e6f0e15f60e68da4211f9a4fafa6f2664
+  data.tar.gz: 7d6f4bebfc9121071f0ffd016e841dc7f7b6dde3
 SHA512:
-  metadata.gz: 06ea6df8eabc42005accde92cfd74bf276784bdbb374d2b14cd159b69cb7304403d2b0d0710ce6c585f40446c826aa235fd6a53bd6e90f21c84a0a1ee4becb9d
-  data.tar.gz: fb640564b9274545fe4497d942d8e7280345df1dd3d798b39296d4ae187f8f8722c7380a160b78fd1b147d80d3df000cb71452c89ae7861bed408e494cfc93f9
+  metadata.gz: ba264790a78cda569421a5619cdb7cd49f840357da1345908b3f4aa3c1be889f45bd37f7274fdc6c8de6d5b48be972beea3e872caf84021c16dab95976288339
+  data.tar.gz: c20dfd6806f82f75cf1f621b88061a7d02c644a599405443de8b6fae1f5b5e68c9b556e62ef826bf1c400bb03a778d128817c04c40105336a17a4768892d2c55

data/README.md

@@ -34,7 +34,7 @@ You can then do the following:
 ### Get the contents of a directory
 
 ```ruby
-node = explorer.node_at('/Movies')
+node = explorer.get('/Movies')
 
 node.children.map(&:title)
 # => ["Comedy", "Horror", "Suspense"]
@@ -45,7 +45,7 @@ node.items.map(&:title)
 
 ### List the children of a directory
 ```ruby
-children = explorer.children_of('/Movies')
+children = explorer.get('/Movies').children
 
 children.map(&:title)
 # => ["Comedy", "Horror", "Suspense"]
@@ -53,7 +53,7 @@ children.map(&:title)
 
 ### List the files inside of a directory
 ```ruby
-items = explorer.items_of('/Movies')
+items = explorer.get('/Movies').items
 
 items.map(&:title)
 # => ["Inside Out (2015).mkv"]
@@ -63,10 +63,21 @@ items.map(&:title)
 ```ruby
 movies = explorer.scrape('/Movies')
 
-items.map(&:title)
+movies.map(&:title)
 # => ["Inside Out (2015).mkv", "Exorcist, The (1973).mkv", "Seven (1995).mkv", "Airplane (1980).mkv"]
 ```
 
+### Mounting at non-root directory
+```ruby
+explorer.root_path
+#=> "/"
+
+movies = explorer.get('/Movies')
+explorer = UpnpContentExplorer::Explorer.new(service, root_id: movies.id)
+explorer.root_path
+#=> "/Movies"
+```
+
 ## Extracting metadata
 
 To extract DIDL Lite metadata for an item, you should generally call `Browse` with the `BrowseFlag` parameter equal to `'BrowseMetadata'`, passing the `ObjectID` of the item in question. For example:

data/lib/upnp_content_explorer/explorer.rb

@@ -97,8 +97,10 @@ module UpnpContentExplorer
             RequestedCount: '0'
         )
 
-        node_data = response[:Result].gsub('xmlns=', 'xmlns:didl=')
-        content   = Nokogiri::XML(node_data)
+        node_data = response[:Result]
+          .gsub('xmlns=', 'xmlns:didl=')
+        content = Nokogiri::XML(node_data)
+        content.remove_namespaces!
 
         children = content.xpath('/DIDL-Lite/container').map do |child|
           node_data = parse_nori_node(child)
@@ -106,8 +108,7 @@ module UpnpContentExplorer
         end
 
         items = content.xpath('/DIDL-Lite/item').map do |item|
-          item_data = parse_nori_node(item)
-          Item.new(item_data)
+          Item.new(item)
         end
 
         children = Hash[ children.map { |x| [x.title, x] } ]

data/lib/upnp_content_explorer/item.rb

@@ -1,16 +1,30 @@
 module UpnpContentExplorer
   class Item
-    def initialize(data)
-      @data = data
-    end
+    def initialize(xml_node)
+      @xml_node = xml_node
+      @props = {}
 
-    def item_class
-      @data[:class]
-    end
+      %w{id parentID restricted}.each do |m|
+        define_singleton_method(m) { extract_xpath("@#{m}") }
+      end
+
+      %w{title class date}.each do |m|
+        define_singleton_method(m) { extract_xpath("#{m}") }
+      end
 
-    def method_missing(key)
-      return @data[key] if @data.has_key?(key)
-      super
+      %w{
+        size duration bitrate sampleFrequency nrAudioChannels resolution
+        protocolInfo
+      }.each do |m|
+        define_singleton_method(m) { extract_xpath("res/@#{m}") }
+      end
+
+      define_singleton_method('url') { extract_xpath("res") }
     end
+
+    private
+      def extract_xpath(xpath)
+        @xml_node.xpath(xpath).text
+      end
   end
 end

data/lib/upnp_content_explorer/version.rb

@@ -1,3 +1,3 @@
 module UpnpContentExplorer
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upnp_content_explorer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori