mediafire 1.2.1 → 1.3.0

data/lib/mediafire/connection.rb

@@ -31,6 +31,7 @@ module Mediafire
           request.set_form_data(options)
         end
       end
+      request['User-Agent'] = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_2) AppleWebKit/535.2 (KHTML, like Gecko) Chrome/15.0.874.120 Safari/535.2'
       request['Cookie'] = cookie
 
       if has_multipart? options

data/lib/mediafire/store_object.rb

@@ -1,144 +1,176 @@
 module Mediafire
   class StoreObject
-    L = {
-      # ??? => 0,
-      :objecttype => 1,
-      :filetype => 2,
-      :quickkey => 3,
-      :folderkey => 4,
-      :filename => 5,
-      :filesize => 6,
-      :readable_filesize => 7,
-      :readable_filesize_unit => 8,
-      :downloads => 9,
-      :upload_date => 10,
-      :access_type => 11,
-      :tags => 12,
-      :description => 13,
-      :password => 14,
-      :imagekey => 15, :folder_quickkey => 15,
-      :dropbox_enabled => 16,
-      :image_rotation => 17, :custom_url => 17,
-      # ??? => 0,
-      :note_subject => 19,
-      :note_description => 20,
-    }
-
     def initialize(d)
       data(d)
     end
 
     def data(d)
-      if d.is_a?(Array) && d.size == 21
-        @data = d
+      @created     = d['created'] || ''
+      @tags        = d['tags']    || ''
+      @description = d['desc']    || ''
+      @privacy     = d['privacy'] || ''
+    end
+
+    def is_folder?
+      if @data.key?('folder_key')
+        true
+      else
+        false
       end
     end
 
-    def objecttype
-      @data[L[:objecttype]]
+    def date
+      @created
     end
 
-    def is_folder?
-      if objecttype == '2'
-        return true
-      end
-      return false
+    def tags
+      @tags
     end
 
-    def filetype
-      # 1 : picture
-      # 9 : compress file
-      # 0 : other
-      @data[L[:filetype]]
+    def description
+      @description
     end
 
-    def is_picture?
-      if filetype == '1'
-        return true
+    def is_public?
+      if @privacy == 'public'
+        true
+      else
+        false
       end
-      return false
+    end
+  end
+
+  class StoreFolder < StoreObject
+    def data(d)
+      super(d)
+
+      folders = []
+      files = []
+
+      if d.key?('folders')
+        d['folders'].each do |f|
+          folders << StoreFolder.new(f)
+        end
+      end
+
+      if d.key?('files')
+        d['files'].each do |f|
+          files << StoreFile.new(f)
+        end
+      end
+
+      @folders         = folders
+      @files           = files
+
+      @name            = d['name']            || ''
+      @key             = d['folderkey']       || ''
+      @dropbox_enabled = d['dropbox_enabled'] || ''
+      @custom_url      = d['custom_url']      || ''
+      @revision        = d['revision'].to_i
+      @file_count      = d['file_count'].to_i
     end
 
-    def quickkey
-      @data[L[:quickkey]]
+    def is_folder?
+      true
     end
 
-    def folderkey
-      @data[L[:folderkey]]
+    def folder_key
+      @key
     end
+    alias :folderkey :folder_key
+    alias :key :folder_key
 
     def name
-      @data[L[:filename]]
+      @name
     end
 
-    def size
-      "#{@data[L[:readable_filesize]]}#{@data[L[:readable_filesize_unit]]}"
+    def dropbox_enabled?
+      if @dropbox_enabled == 'yes'
+        true
+      else
+        false
+      end
     end
 
-    def downloads
-      @data[L[:downloads]].to_i
+    def revision
+      @revision
     end
 
-    def date
-      @data[L[:upload_date]]
+    def file_count
+      @file_count
     end
 
-    def tags
-      @data[L[:tags]]
+    def custom_url
+      @custom_url
     end
 
-    def description
-      @data[L[:description]]
+    def folders
+      @folders
     end
 
-    def password
-      @data[L[:password]]
+    def files
+      @files
+    end
+  end
+
+  class StoreFile < StoreObject
+    def data(d)
+      super(d)
+
+      @filetype           = d['filetype']           || ''
+      @key                = d['quickkey']           || ''
+      @name               = d['filename']           || ''
+      @password_protected = d['password_protected'] || ''
+      @hash               = d['hash']               || ''
+      @size               = d['size'].to_i
+      @downloads          = d['downloads'].to_i
     end
 
-    def imagekey
-      @data[L[:imagekey]]
+    def filetype
+      @filetype
     end
 
-    def folder_quickkey
-      @data[L[:folder_quickkey]]
+    def is_folder?
+      false
     end
 
-    def dropbox_enabled
-      if @data[L[:dropbox_enabled]] == '1'
-        return true
+    def is_picture?
+      if @filetype == 'image'
+        true
+      else
+        false
       end
-      return false
     end
 
-    def access_type
-      @data[L[:access_type]]
+    def quick_key
+      @key
     end
+    alias :quickkey :quick_key
+    alias :key :quick_key
 
-    def is_public?
-      if access_type == '0'
-        return true
-      end
-      return false
+    def name
+      @name
     end
 
-    def image_rotation
-      # 0
-      # 90
-      # 180
-      # 270
-      @data[L[:image_rotation]]
+    def size
+      @size
     end
 
-    def folder_quickkey
-      @data[L[:folder_quickkey]]
+    def downloads
+      @downloads
     end
 
-    def note_subject
-      @data[L[:note_subject]]
+    def protected?
+      if @password_protected == 'yes'
+        true
+      else
+        false
+      end
     end
 
-    def note_description
-      @data[L[:note_description]]
+    def hash
+      @hash
     end
+    alias :imagekey :hash
   end
 end

data/lib/mediafire/version.rb

@@ -1,3 +1,3 @@
 module Mediafire
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/mediafire.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "nokogiri", ">= 1.5.0"
+  s.add_runtime_dependency "json", ">= 1.6.1"
   s.add_runtime_dependency "multipart-post", ">= 1.1.3"
   s.add_runtime_dependency "net-http-uploadprogress", ">= 1.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediafire
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-25 00:00:00.000000000Z
+date: 2011-11-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70179447300800 !ruby/object:Gem::Requirement
+  requirement: &70193817921980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70179447300800
+  version_requirements: *70193817921980
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70193817921480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *70193817921480
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70179447300300 !ruby/object:Gem::Requirement
+  requirement: &70193817951980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70179447300300
+  version_requirements: *70193817951980
 - !ruby/object:Gem::Dependency
   name: net-http-uploadprogress
-  requirement: &70179447299840 !ruby/object:Gem::Requirement
+  requirement: &70193817951520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70179447299840
+  version_requirements: *70193817951520
 description: A Ruby wrapper for the unofficial Mediafire API
 email:
 - m@skahack.com
@@ -56,7 +67,6 @@ files:
 - MIT_LICENSE
 - README.md
 - Rakefile
-- examples/common.rb
 - examples/create_folder.rb
 - examples/delete_file.rb
 - examples/download.rb
@@ -66,7 +76,6 @@ files:
 - examples/dropbox_setup_option.rb
 - examples/dropbox_upload.rb
 - examples/edit_fileoption.rb
-- examples/edit_note.rb
 - examples/get_myfile_list.rb
 - examples/image_rotation.rb
 - examples/move_file.rb

data/examples/common.rb

@@ -1,27 +0,0 @@
-require '../lib/mediafire'
-require 'uuidtools'
-
-def login
-  account = ''
-  password = ''
-
-  m = Mediafire.new
-  m.login(account, password)
-  return m
-end
-
-def pritty_format_datafile(f)
-  out = "filename:#{f.name} "
-  out << "size:#{f.size} "
-  out << "link:http://www.mediafire.com/download.php?#{f.quickkey}"
-end
-
-def root_folder
-  key = 'b37807725fe86791'
-  data = ['1', '2', '0', key, key, 'myfiles', '0'].fill('', 7..20)
-  Mediafire::StoreObject.new(data)
-end
-
-def create_uuid
-  UUIDTools::UUID.random_create.to_s
-end

data/examples/edit_note.rb

@@ -1,16 +0,0 @@
-require './common'
-
-uuid = create_uuid
-File.open(uuid, "w") do |f|
-  f.write(uuid)
-end
-
-m = login
-file = m.upload(uuid)
-note = {
-  :subject => 'edited',
-  :description=> 'edited',
-}
-m.edit_note(file, note)
-
-File.delete(uuid)