divshare 0.1.0 → 0.3.0

data/spec/divshare_file_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 require 'divshare/divshare_file'
 include Divshare
 

data/spec/encoder_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+require 'divshare/client'
+require 'divshare/encoder'
+include Divshare
+
+module EncoderSpecHelper
+  def basic_args(to_merge={})
+    {'api_key' => 'api_key', "api_session_key" => 'api_session_key'}.merge(to_merge)
+  end
+  
+  def login_args(to_merge={})
+    args = basic_args(to_merge).reject { |k,v| %w(api_session_key).include? k }
+    args.merge({'method' => 'login'})
+  end
+  
+  def logout_args(to_merge={})
+    basic_args.merge({'method' => 'logout'})
+  end
+  
+  def excluding_sig(hash)
+    return hash.reject {|k,v| k == 'api_sig'}
+  end
+  
+  def common_setup
+    @key = 'api_key'
+    @secret = 'api_secret'
+    @encoder = Encoder.new(@key, @secret)
+    # @client = mock('client')
+    # @client.should_receive(:api_key).and_return('api_key')
+    @login = {'user_email' => 'email', 'user_password' => 'password'}
+    @login_as_symbols = {:user_email => :email, :user_password => :password}
+  end
+end
+
+describe "An Encoder" do
+  include EncoderSpecHelper
+  
+  before(:each) do
+    common_setup
+  end
+  
+  it "should record key" do
+    @encoder.key.should == @key
+  end
+  
+  it "should record secret" do
+    @encoder.secret.should == @secret
+  end
+  
+  it "should generate appropriate arguments for login" do
+    @encoder.encode(:login, @login).should == login_args(@login)
+  end
+  
+  it "should stringify keys and values for login" do
+    @encoder.encode(:login, @login_as_symbols).should == login_args(@login)
+  end
+  
+end
+
+describe "An Encoder, after client login" do
+  include EncoderSpecHelper
+  
+  before(:each) do
+    common_setup
+    # Simulates login
+    @session_key = 'api_session_key'
+    @encoder.session_key = @session_key
+  end
+  
+  it "should generate appropriate arguments for logout" do
+    result = @encoder.encode(:logout,{})
+    excluding_sig(result).should == basic_args({'method' => 'logout'})
+  end
+  
+  it "should work without additional hash of arguments" do
+    result = @encoder.encode(:logout)
+    excluding_sig(result).should == basic_args({'method' => 'logout'})    
+  end
+  
+  it "should convert symbol keys and values to strings" do
+    args_as_symbols = {:file_id => :abc123}
+    args_as_strings = {'file_id' => 'abc123'}
+    result = @encoder.encode(:get_files, args_as_symbols)
+    expected = basic_args.merge(args_as_strings)
+    expected.merge!("method" => "get_files")
+    excluding_sig(result).should == expected
+  end
+  
+  it "should generate proper arguments for post request" do
+    method = :get_user_files
+    args = {:offset => 3, :limit => 10}
+    # api_sig is the md5 digest of 'api_secretapi_session_keylimit10offset3'
+    @encoder.encode(method, args).should == {'method' => 'get_user_files',
+                                             'api_sig' => '1bfa96cc8e92807f96f5694d641d810b',
+                                             'offset' => '3',
+                                             'limit' => '10',
+                                             'api_key' => @key,
+                                             'api_session_key' => @session_key}
+  end  
+end

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-lib_path = File.join(File.dirname(__FILE__), '..', 'lib')
-$:.unshift(lib_path) unless $:.include?(lib_path)
-
 # From http://www.divshare.com/integrate/api
 module DivshareMockXML
   def get_user_info_xml
@@ -129,6 +126,15 @@ module DivshareMockXML
     EOS
   end
   
+  def unsuccessful_logout_xml
+    <<-EOS
+    <?xml version="1.0" encoding="UTF-8"?>
+    <response status="0">
+        <logged_out>false</logged_out>
+    </response>
+    EOS
+  end
+  
   def error_xml(message)
     <<-EOS
     <?xml version="1.0" encoding="UTF-8"?>

data/spec/user_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 require 'divshare/user'
 include Divshare
 
@@ -13,6 +13,4 @@ describe "A basic User" do
     user.name.should == 'Rob'
     user.email.should == 'support@divshare.com'
   end
-
-    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: divshare
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Eric Watson
@@ -9,10 +9,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-19 00:00:00 -05:00
+date: 2009-11-10 00:00:00 -06:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mime-types
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A Ruby interface to the DivShare file hosting service
 email: wasnotrice@gmail.com
 executables: []
@@ -20,53 +39,27 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
-- website/index.txt
+- LICENSE
+- README
 files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
+- LICENSE
+- README
 - Rakefile
-- config/hoe.rb
-- config/requirements.rb
+- VERSION
 - lib/divshare.rb
 - lib/divshare/client.rb
 - lib/divshare/divshare_file.rb
+- lib/divshare/encoder.rb
 - lib/divshare/errors.rb
-- lib/divshare/post_args.rb
+- lib/divshare/multipart.rb
 - lib/divshare/user.rb
-- lib/divshare/version.rb
-- log/debug.log
-- script/destroy
-- script/generate
-- script/test_run_client
-- script/txt2html
-- setup.rb
-- spec/client_spec.rb
-- spec/divshare_file_spec.rb
-- spec/fixtures/divshare_mock_valid_audio.html
-- spec/fixtures/divshare_mock_valid_video.html
-- spec/post_args_spec.rb
-- spec/spec_helper.rb
-- spec/user_spec.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/website.rake
-- website/index.html
-- website/index.txt
-- website/javascripts/rounded_corners_lite.inc.js
-- website/stylesheets/screen.css
-- website/template.rhtml
 has_rdoc: true
-homepage: http://divshare.rubyforge.org
+homepage: http://github.com/wasnotrice/divshare
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -84,9 +77,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: divshare
-rubygems_version: 1.0.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A Ruby interface to the DivShare file hosting service
-test_files: []
-
+test_files: 
+- spec/client_spec.rb
+- spec/divshare_file_spec.rb
+- spec/encoder_spec.rb
+- spec/spec_helper.rb
+- spec/user_spec.rb

data/History.txt

@@ -1,4 +0,0 @@
-== 0.1.0 2008-03-19
-
-* 1 major enhancement:
-  * Initial release

data/Manifest.txt

@@ -1,35 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-config/hoe.rb
-config/requirements.rb
-lib/divshare.rb
-lib/divshare/client.rb
-lib/divshare/divshare_file.rb
-lib/divshare/errors.rb
-lib/divshare/post_args.rb
-lib/divshare/user.rb
-lib/divshare/version.rb
-log/debug.log
-script/destroy
-script/generate
-script/test_run_client
-script/txt2html
-setup.rb
-spec/client_spec.rb
-spec/divshare_file_spec.rb
-spec/fixtures/divshare_mock_valid_audio.html
-spec/fixtures/divshare_mock_valid_video.html
-spec/post_args_spec.rb
-spec/spec_helper.rb
-spec/user_spec.rb
-tasks/deployment.rake
-tasks/environment.rake
-tasks/website.rake
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/stylesheets/screen.css
-website/template.rhtml

data/config/hoe.rb

@@ -1,72 +0,0 @@
-require 'divshare/version'
-
-AUTHOR = 'Eric Watson'  # can also be an array of Authors
-EMAIL = "wasnotrice@gmail.com"
-DESCRIPTION = "A Ruby interface to the DivShare file hosting service"
-GEM_NAME = 'divshare' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'divshare' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil 
-# UNCOMMENT IF REQUIRED: 
-# REV = `svn info`.each {|line| if line =~ /^Revision:/ then k,v = line.split(': '); break v.chomp; else next; end} rescue nil
-VERS = Divshare::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'divshare documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' } 
-    @extra_deps
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-  p.remote_rdoc_dir = '' # Release to root
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\\n\\n")
-  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  
-end
-
-CHANGES = hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-hoe.rsync_args = '-av --delete --ignore-errors'

data/config/requirements.rb

@@ -1,17 +0,0 @@
-require 'fileutils'
-include FileUtils
-
-require 'rubygems'
-%w[rake hoe newgem rubigen].each do |req_gem|
-  begin
-    require req_gem
-  rescue LoadError
-    puts "This Rakefile requires the '#{req_gem}' RubyGem."
-    puts "Installation: gem install #{req_gem} -y"
-    exit
-  end
-end
-
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
-
-require 'divshare'

data/lib/divshare/post_args.rb

@@ -1,16 +0,0 @@
-module Divshare
-  # This is a simple hash that initializes itself in a state appropriate to
-  # the request. Converts all keys and values to strings.
-  class PostArgs < Hash
-    def initialize(client, method, args)
-      post_args = args.merge({'method' => method, 'api_key' => client.api_key})
-      if client.api_session_key #&& method.to_sym != :logout
-        api_sig = client.sign(method, post_args)
-        post_args.merge!({'api_session_key' => client.api_session_key, 'api_sig' => api_sig})
-      end
-      post_args.each { |k,v| self[k.to_s] = v.to_s }
-    end
-
-    
-  end
-end

data/lib/divshare/version.rb

@@ -1,9 +0,0 @@
-module Divshare #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 1
-    TINY  = 0
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end

data/script/destroy

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-APP_ROOT = File.join(File.dirname(__FILE__), '..')
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)