stashboxr 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/stashboxr.rb

@@ -44,6 +44,14 @@ class Stashboxr
     @@username
   end
   
+  def self.autosave=(pref)
+    @@autosave = (pref == true)
+  end
+  
+  def self.autosave?
+    @@autosave rescue true
+  end
+  
   # Search stashbox.org - the site has this advice for formatting searches:
   #
   # You can use any number of terms in your search, all of which will be required in the results. You can also use the following search types (using "type:*the_type*" format): archives, audio, code, documents, images, movies
@@ -78,30 +86,32 @@ class Stashboxr
       # Upload the file
       res = Agent.post('http://stashbox.org/upload.php',{
         :upload_type => "local_file",
-        :wants_rss => 1,
         :file => open(local_file),
         :is_public => is_public
       })
-      body = Nokogiri::XML(res.body)
       
-      reason = body.search('//error').inner_text rescue nil
+      reason = res.search('//div[@class=\'error\']').inner_text
       
-      if reason.nil?
-        new(body.search('//url').inner_text)
+      if reason.empty?
+        new(res)
       else
         raise RuntimeError, "The upload wasn't allowed"<<((reason.nil?) ? "" : " because '#{reason}'")
       end
     end
     
     def initialize(url)
-      if (url =~ /(?:http:\/\/)?(?:stashbox\.org)?(?:\/v)?\/?([0-9]+\/(.+))$/)
+      
+      if (url.is_a? Mechanize::Page)
+        # We're being initialized with an information page (ie. an upload) make use of it!
+        refresh(url)
+      elsif (url =~ /(?:http:\/\/)?(?:stashbox\.org)?(?:\/v)?\/?([0-9]+\/(.+))$/)
         @stashboxid = $1
         @filename = $2
       else
         raise RuntimeError, "That isn't a valid stashbox URL"
       end
       
-      @autosave = true
+      @autosave = Stashboxr.autosave?
       @saved = true
     end
     
@@ -208,13 +218,16 @@ class Stashboxr
     end
     
     # Grab metadata from stashbox.org
-    def refresh
+    def refresh(doc = nil)
       # Get extended information
-      doc = Agent.get "http://stashbox.org/v/"<<@stashboxid
+      doc ||= Agent.get "http://stashbox.org/v/"<<@stashboxid
       
       doc.search("//div[@class='subsection']").each do |sub|
         value = sub.search("div[@class='value']").inner_text.strip
         case sub.search("div[@class='label']").inner_text
+        when "Filename"
+          @filename = value
+          @stashboxid = URI.parse(sub.search("div[@class='value']/a")[0]['href']).path[1..-1]
         when "Size"
           @size = value[/^(\d+\.\d+)\ ([K|M]?)B$/,1].to_f * SIZES[$2]
         when "Uploaded On"
@@ -252,8 +265,9 @@ class Stashboxr
     private
     def parse_tags(new_tags)
       [new_tags].flatten.collect do |tag|
-        tag.downcase.gsub(/[^a-z0-9_-]+/,"_")
+        tag = tag.downcase.gsub(/[^a-z0-9_-]+/,"_")
         tag = nil if tag.empty?
+        tag
       end.compact.uniq
     end
   end

data/stashboxr.gemspec

@@ -1,11 +1,11 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{stashboxr}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["JP Hastings-Spital"]
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jphastings/StashboxR}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A ruby api for the stashbox.org website}
   s.test_files = [
     "test/helper.rb",
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mechanize>, [">= 1.0.0"])
       s.add_development_dependency(%q<Shoulda>, [">= 0"])
     else

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: stashboxr
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - JP Hastings-Spital
@@ -22,11 +21,9 @@ dependencies:
   name: mechanize
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -38,11 +35,9 @@ dependencies:
   name: Shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -62,8 +57,6 @@ files:
 - VERSION
 - lib/stashboxr.rb
 - stashboxr.gemspec
-- test/helper.rb
-- test/test_stashboxr.rb
 has_rdoc: true
 homepage: http://github.com/jphastings/StashboxR
 licenses: []
@@ -74,27 +67,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A ruby api for the stashbox.org website