fluxapi 0.5.5 → 0.6

data/Manifest

@@ -1,4 +1,9 @@
 History.txt
+Manifest
+README.txt
+Rakefile
+fluxapi.gemspec
+lib/fluxapi.rb
 lib/fluxapi/account.rb
 lib/fluxapi/asset.rb
 lib/fluxapi/assets.rb
@@ -7,10 +12,6 @@ lib/fluxapi/tag.rb
 lib/fluxapi/tags.rb
 lib/fluxapi/user.rb
 lib/fluxapi/users.rb
-lib/fluxapi.rb
-Manifest
-Rakefile
-README.txt
 test/fixtures/account.xml
 test/fixtures/assets.xml
 test/fixtures/download_response

data/Rakefile

@@ -3,11 +3,11 @@ require 'rake'
 require 'rake/testtask'
 require 'echoe'
 
-Echoe.new('fluxapi', '0.5.5') do |p|
+Echoe.new('fluxapi', '0.6') do |p|
   p.description    = "A fluxiom api wrapper for ruby"
   p.url            = "http://fluxapi.rubyforge.org"
   p.author         = "Sebastian Gräßl"
   p.email          = "sebastian.graessl@gmail.com"
   p.project        = "fluxapi"
-  p.runtime_dependencies = ["httparty >= 0.4.3"]
+  p.runtime_dependencies = ["httparty >= 0.5.0"]
 end

data/fluxapi.gemspec

@@ -2,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fluxapi}
-  s.version = "0.5.5"
+  s.version = "0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sebastian Gr\303\244\303\237l"]
-  s.date = %q{2009-05-07}
+  s.date = %q{2010-01-14}
   s.description = %q{A fluxiom api wrapper for ruby}
   s.email = %q{sebastian.graessl@gmail.com}
-  s.extra_rdoc_files = ["lib/fluxapi/account.rb", "lib/fluxapi/asset.rb", "lib/fluxapi/assets.rb", "lib/fluxapi/base.rb", "lib/fluxapi/tag.rb", "lib/fluxapi/tags.rb", "lib/fluxapi/user.rb", "lib/fluxapi/users.rb", "lib/fluxapi.rb", "README.txt"]
-  s.files = ["History.txt", "lib/fluxapi/account.rb", "lib/fluxapi/asset.rb", "lib/fluxapi/assets.rb", "lib/fluxapi/base.rb", "lib/fluxapi/tag.rb", "lib/fluxapi/tags.rb", "lib/fluxapi/user.rb", "lib/fluxapi/users.rb", "lib/fluxapi.rb", "Manifest", "Rakefile", "README.txt", "test/fixtures/account.xml", "test/fixtures/assets.xml", "test/fixtures/download_response", "test/fixtures/tags.xml", "test/fixtures/users.xml", "test/fluxapi/account_test.rb", "test/fluxapi/asset_test.rb", "test/fluxapi/assets_test.rb", "test/fluxapi_test.rb", "test/test_helper.rb", "fluxapi.gemspec"]
+  s.extra_rdoc_files = ["README.txt", "lib/fluxapi.rb", "lib/fluxapi/account.rb", "lib/fluxapi/asset.rb", "lib/fluxapi/assets.rb", "lib/fluxapi/base.rb", "lib/fluxapi/tag.rb", "lib/fluxapi/tags.rb", "lib/fluxapi/user.rb", "lib/fluxapi/users.rb"]
+  s.files = ["History.txt", "Manifest", "README.txt", "Rakefile", "lib/fluxapi.rb", "lib/fluxapi/account.rb", "lib/fluxapi/asset.rb", "lib/fluxapi/assets.rb", "lib/fluxapi/base.rb", "lib/fluxapi/tag.rb", "lib/fluxapi/tags.rb", "lib/fluxapi/user.rb", "lib/fluxapi/users.rb", "test/fixtures/account.xml", "test/fixtures/assets.xml", "test/fixtures/download_response", "test/fixtures/tags.xml", "test/fixtures/users.xml", "test/fluxapi/account_test.rb", "test/fluxapi/asset_test.rb", "test/fluxapi/assets_test.rb", "test/fluxapi_test.rb", "test/test_helper.rb", "fluxapi.gemspec"]
   s.homepage = %q{http://fluxapi.rubyforge.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fluxapi", "--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fluxapi}
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{A fluxiom api wrapper for ruby}
   s.test_files = ["test/fluxapi/account_test.rb", "test/fluxapi/asset_test.rb", "test/fluxapi/assets_test.rb", "test/fluxapi_test.rb", "test/test_helper.rb"]
 
@@ -24,11 +24,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0", "= 0.4.3"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0", "= 0.5.0"])
     else
-      s.add_dependency(%q<httparty>, [">= 0", "= 0.4.3"])
+      s.add_dependency(%q<httparty>, [">= 0", "= 0.5.0"])
     end
   else
-    s.add_dependency(%q<httparty>, [">= 0", "= 0.4.3"])
+    s.add_dependency(%q<httparty>, [">= 0", "= 0.5.0"])
   end
 end

data/lib/fluxapi/asset.rb

@@ -3,14 +3,21 @@ class Fluxiom::Asset < Fluxiom
     data.each do |k, v|
       self.instance_variable_set("@#{k}", v)
       self.class.send(:define_method, k, proc{self.instance_variable_get("@#{k}")})
+      self.class.send(:define_method, "#{k}=", proc{|v| self.instance_variable_set("@#{k}", v)})
     end
   end
+  
+  def tag(t)
+    res = self.class.post_call("/api/assets/#{self.id}/tag", :body => {:tags => t.api_name})
+    self.tags = self.tags.to_s + ' ' + t.api_name
+  end
+  
   def download(path_to_file)
-    session = Net::HTTP.new(self.class.base_uri.gsub('https://', ''), 443)
+    session = Net::HTTP.new(@@base_url.gsub('https://', ''), 443)
     session.use_ssl = true
     session.start {|http|
-      req = Net::HTTP::Get.new("/api/assets/download/#{self.id}")
-      req.basic_auth self.class.default_options[:basic_auth][:username], self.class.default_options[:basic_auth][:password]
+      req = Net::HTTP::Get.new("/api/assets/#{self.id}/download")
+      req.basic_auth @@user, @@password
       resp = http.request(req)
       open(File.join(path_to_file, self.filename), 'wb') do |file|
         file.write(resp.body)

data/lib/fluxapi/base.rb

@@ -1,12 +1,20 @@
 class Fluxiom
   include HTTParty
   format :xml
+  attr_accessor :base_url
   def initialize(sub, u, p)
-    self.class.base_uri 'https://'+ sub + '.fluxiom.com'
-    self.class.basic_auth u, p
+    @@base_url = 'https://'+ sub + '.fluxiom.com'
+    @@user, @@password = u, p
   end
   def self.call(url)
-    get(url)
+    base_uri @@base_url
+    basic_auth @@user, @@password
+    get(@@base_url + url)
+  end
+  def self.post_call(url, post_data)
+    base_uri @@base_url
+    basic_auth @@user, @@password
+    post(@@base_url + url, post_data)
   end
   def account
     Fluxiom::Account.new

data/lib/fluxapi/tag.rb

@@ -4,5 +4,8 @@ class Fluxiom::Tag < Fluxiom
       self.instance_variable_set("@#{k}", v)
       self.class.send(:define_method, k, proc{self.instance_variable_get("@#{k}")})
     end
-  end 
+  end
+  def api_name
+    self.tag.downcase.gsub(' ', '_')
+  end
 end

data/lib/fluxapi/tags.rb

@@ -1,12 +1,15 @@
 class Fluxiom::Tags < Fluxiom
   include Enumerable
   def initialize
-    @users = []
+    @tags = []
     self.class.call('/api/tags.xml')['tags'].each do |v|
-      @users << Fluxiom::Tag.new(v)
+      @tags << Fluxiom::Tag.new(v)
     end
   end
   def each
-    @users.each {|pt| yield pt} 
+    @tags.each {|pt| yield pt} 
+  end
+  def first
+    @tags.first
   end
 end

data/test/fluxapi/asset_test.rb

@@ -14,6 +14,12 @@ class Fluxiom::AssetTest < Test::Unit::TestCase
     assert File.exists?(File.join(@tmp_dir, @asset.filename))
   end
 
+  def test_tagging
+    prev_size = !@asset.tags.nil? ? @asset.tags.split(' ').length : 0
+    @asset.tag(@fluxiom.tags.first)
+    assert_equal prev_size+1, @asset.tags.split(' ').length
+  end
+
   def teardown
     FileUtils.rm_r @tmp_dir
   end

data/test/test_helper.rb

@@ -17,7 +17,7 @@ def fixture(filename)
 end
 
 def stub_get(url, file)
-  FakeWeb.register_uri(:get, "https://user:password@account.fluxiom.com:443#{url}", :string => fixture(file))
+  FakeWeb.register_uri(:get, "https://user:password@account.fluxiom.com:443#{url}", :body => fixture(file))
 end
 
 def register_requests
@@ -25,7 +25,8 @@ def register_requests
     next if file == '.' || file == '..' || !file.include?('.xml')
     stub_get('/api/' + file, file)
   end
-  FakeWeb.register_uri(:get, "https://user:password@account.fluxiom.com:443/api/assets/download/182535", :response => File.expand_path(File.dirname(__FILE__) + '/fixtures/download_response'))
+  FakeWeb.register_uri(:get, "https://user:password@account.fluxiom.com:443/api/assets/182535/download", :response => File.expand_path(File.dirname(__FILE__) + '/fixtures/download_response'))
+  FakeWeb.register_uri(:post, "https://user:password@account.fluxiom.com:443/api/assets/182535/tag", :body => "", :status => [201, "Created"])
 end
 
 def set_account

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fluxapi
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: "0.6"
 platform: ruby
 authors: 
 - "Sebastian Gr\xC3\xA4\xC3\x9Fl"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 +02:00
+date: 2010-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,7 +23,7 @@ dependencies:
         version: "0"
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.4.3
+        version: 0.5.0
     version: 
 description: A fluxiom api wrapper for ruby
 email: sebastian.graessl@gmail.com
@@ -32,6 +32,8 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- README.txt
+- lib/fluxapi.rb
 - lib/fluxapi/account.rb
 - lib/fluxapi/asset.rb
 - lib/fluxapi/assets.rb
@@ -40,10 +42,12 @@ extra_rdoc_files:
 - lib/fluxapi/tags.rb
 - lib/fluxapi/user.rb
 - lib/fluxapi/users.rb
-- lib/fluxapi.rb
-- README.txt
 files: 
 - History.txt
+- Manifest
+- README.txt
+- Rakefile
+- lib/fluxapi.rb
 - lib/fluxapi/account.rb
 - lib/fluxapi/asset.rb
 - lib/fluxapi/assets.rb
@@ -52,10 +56,6 @@ files:
 - lib/fluxapi/tags.rb
 - lib/fluxapi/user.rb
 - lib/fluxapi/users.rb
-- lib/fluxapi.rb
-- Manifest
-- Rakefile
-- README.txt
 - test/fixtures/account.xml
 - test/fixtures/assets.xml
 - test/fixtures/download_response
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fluxapi
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A fluxiom api wrapper for ruby