factory.rb in rmega-0.2.6

- old
+ new
@@ -14,31 +14,41 @@
 module Rmega
   module Nodes
     module Factory
       extend self
 
-      URL_REGEXP = /(http.:\/\/[w\.]*mega\.[a-z\.]+\/\#[A-Z0-9\_\-\!\=]+)/i
+      URL_REGEXP = /(https{0,1}:\/\/[w\.]*mega\.[a-z\.]+\/\#[A-Z0-9\_\-\!\=]+)/i
+      URL_REGEXP_NEW = /(https{0,1}:\/\/[w\.]*mega\.[a-z\.]+\/[a-z]{4,6}\/[a-z0-9\_\-\=]+\#[a-z0-9\_\-\=]+)/i
 
-      FOLDER_URL_REGEXP = /\#\F/
+      def public_handle_and_key_from_url(string)
+        if string.to_s =~ URL_REGEXP
+          public_handle, key = string.strip.split('!')[1, 2]
+          return [] if key and (Utils.base64urldecode(key) rescue nil).nil?
+          return [public_handle, key]
+        elsif string.to_s =~ URL_REGEXP_NEW
+          public_handle, key = *string.scan(/\/([^\/]+)\#(.+)$/).flatten
+          return [] if key and (Utils.base64urldecode(key) rescue nil).nil?
+          return [public_handle, key]
+        else
+          return []
+        end
+      end
 
       def url?(string)
-        return false unless string.to_s =~ URL_REGEXP
-        public_handle, key = string.strip.split('!')[1, 2]
-        return false if key and (Utils.base64urldecode(key) rescue nil).nil?
-        return true
+        public_handle_and_key_from_url(string).any?
       end
 
       def build(session, data)
         type = Node::TYPES[data['t']].to_s
         return Nodes.const_get(type.capitalize).new(session, data)
       end
 
       def build_from_url(url, session = Session.new)
-        public_handle, key = url.strip.split('!')[1, 2]
+        public_handle, key = *public_handle_and_key_from_url(url)
 
         raise "Invalid url or missing file key" unless key
 
-        node = if url =~ FOLDER_URL_REGEXP
+        node = if url.include?("/folder/") or url.include?("/#F!")
           nodes_data = session.request({a: 'f', c: 1, r: 1}, {n: public_handle})
           session.master_key = Utils.base64urldecode(key)
           session.storage.nodes = nodes_data['f'].map do |data|
             data["__n"] = public_handle
             Nodes::Factory.build(session, data)