npo_assets 0.3.2 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/npo_assets/asset.rb

@@ -1,9 +1,6 @@
 module NPO
   module Assets
     class Asset < ActiveRecord::Base
-      include HTTParty
-      format :xml
-      
       attr_accessor :file, :remote_url
       
       before_save   :post_to_media_server
@@ -11,8 +8,9 @@ module NPO
 
       class << self
         def list(account_name=nil, options={})
-          url  = "#{ NPO::Assets.base_url }/assets.xml#{ extract_list_options(options) }"
-          res  = get(url, :headers => headers(account_name))
+          url = "#{ NPO::Assets.base_url }/assets.xml#{ extract_list_options(options) }"
+          res = RestClient.get(url, :headers => headers(account_name))
+          res = Crack::XML.parse(res)
 
           if res && res['assets']
             res['assets']['asset'].map do |vars|
@@ -49,23 +47,32 @@ module NPO
           url = [NPO::Assets.base_url, 'assets']
           url << self.remote_id unless new_record?
       
-          attrs = @file ? {:file => @file} : {:url => @remote_url}
-          response = self.class.send(new_record? ? :post : :put, 
+          if @file
+            attrs = {:file => @file}
+          else
+            attrs = {:url => @remote_url}
+          end
+            
+          response = RestClient.send(new_record? ? :post : :put, 
                                      url.join('/'), 
-                                     :query => { :asset => attrs }, 
-                                     :headers => self.class.headers)
+                                     { :asset => attrs }, 
+                                     self.class.headers)
+          puts response
+          vars = Crack::XML.parse(response)
+          
           if response.code == 422
-            response['errors']['error'].each { |msg| errors.add_to_base(msg) }
+            vars['errors']['error'].each { |msg| errors.add_to_base(msg) }
             false
           else
-            self.url       = response['asset']['url']
-            self.remote_id = response['asset']['id']
+            self.url       = vars['asset']['url']
+            self.remote_id = vars['asset']['id']
             true
           end
         end
         
         def delete_from_media_server
-          HTTParty.delete("#{NPO::Assets.base_url}/assets/#{self.remote_id}", :headers => self.class.headers)
+          RestClient.delete("#{NPO::Assets.base_url}/assets/#{self.remote_id}", self.class.headers)
+        rescue RestClient::ResourceNotFound
         end
     end
   end

data/lib/npo_assets.rb

@@ -1,4 +1,5 @@
-require 'httparty'
+require 'rest-client'
+require 'crack'
 require 'npo_assets/asset'
 
 module NPO

data/npo_assets.gemspec

@@ -1,55 +1,52 @@
 # 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 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{npo_assets}
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bart Zonneveld"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2011-04-12}
   s.description = %q{Wrapper for media db}
   s.email = %q{loop@superinfinite.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "generators/npo_assets/npo_assets_generator.rb",
-     "generators/npo_assets/templates/initializer.rb",
-     "generators/npo_assets/templates/migration.rb",
-     "lib/npo_assets.rb",
-     "lib/npo_assets/asset.rb",
-     "npo_assets.gemspec",
-     "spec/npo_assets/asset_spec.rb",
-     "spec/npo_assets_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "generators/npo_assets/npo_assets_generator.rb",
+    "generators/npo_assets/templates/initializer.rb",
+    "generators/npo_assets/templates/migration.rb",
+    "lib/npo_assets.rb",
+    "lib/npo_assets/asset.rb",
+    "npo_assets.gemspec",
+    "spec/npo_assets/asset_spec.rb",
+    "spec/npo_assets_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/bartzon/npo_assets}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Wrapper for media db}
   s.test_files = [
     "spec/npo_assets/asset_spec.rb",
-     "spec/npo_assets_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/npo_assets_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<httparty>, [">= 0"])
     else

data/spec/npo_assets/asset_spec.rb

@@ -14,8 +14,8 @@ describe NPO::Assets::Asset do
   describe "posting to the server" do
     before(:each) do
       hash = {"asset" => {"url" => "url", "remote_id" => "2"}}
-      @response = HTTParty::Response.new(hash, hash, 200, nil)
-      NPO::Assets::Asset.stub!(:post).and_return @response
+      Crack::XML.stub!(:parse).and_return hash
+      RestClient.stub!(:post).and_return mock("Response", :code => 200)
       @asset = NPO::Assets::Asset.new(:file => "file")
     end
     
@@ -25,17 +25,17 @@ describe NPO::Assets::Asset do
       end
     
       it "should send the correct vars with a file upload" do
-        NPO::Assets::Asset.should_receive(:post).with("http://test.com/assets", 
-                                                      :query => {:asset => {:file => "file"}},
-                                                      :headers => {'X-Account' => 'account'})
+        RestClient.should_receive(:post).with("http://test.com/assets", 
+                                                      {:asset => {:file => "file"}},
+                                                      {'X-Account' => 'account'})
         do_create
       end
       
       it "should send the correct vars with a remote url" do
         asset = NPO::Assets::Asset.new(:remote_url => "remote_url")
-        NPO::Assets::Asset.should_receive(:post).with("http://test.com/assets", 
-                                                      :query => {:asset => {:url => "remote_url"}},
-                                                      :headers => {'X-Account' => 'account'})
+        RestClient.should_receive(:post).with("http://test.com/assets", 
+                                                      {:asset => {:url => "remote_url"}},
+                                                      {'X-Account' => 'account'})
         asset.save
       end
     
@@ -47,8 +47,8 @@ describe NPO::Assets::Asset do
                               "updated_at" => "2010-03-03T12:42:47Z",
                               "url" => "000/000/000.jpg",
                               "file_size" => "12645"} }
-          @response = HTTParty::Response.new(hash, hash, 201, nil)
-          NPO::Assets::Asset.stub!(:post).and_return @response
+          Crack::XML.stub!(:parse).and_return hash
+          RestClient.stub!(:post).and_return mock("Response", :code => 200)
         end
       
         it "should return true" do
@@ -74,8 +74,8 @@ describe NPO::Assets::Asset do
       describe "with failed save" do
         before(:each) do
           hash = {"errors"=>{"error"=>"File must be set."}}
-          @response = HTTParty::Response.new(hash, hash, 422, nil)
-          NPO::Assets::Asset.stub!(:post).and_return @response
+          Crack::XML.stub!(:parse).and_return hash
+          RestClient.stub!(:post).and_return mock("Response", :code => 422)
         end
       
         it "should return false" do
@@ -99,7 +99,9 @@ describe NPO::Assets::Asset do
         @asset.remote_id = 2
         @asset.save
         @asset.file = "new_file"
-        NPO::Assets::Asset.stub!(:put).and_return @response
+        Crack::XML.stub!(:parse).and_return({'asset' => {'url' => '', 'id' => ''}})
+        RestClient.stub!(:put).and_return mock("Response", :code => 200)
+        File.stub!(:new).and_return 'file'
       end
       
       def do_update
@@ -107,9 +109,9 @@ describe NPO::Assets::Asset do
       end
 
       it "should send the correct vars" do
-        NPO::Assets::Asset.should_receive(:put).with("http://test.com/assets/2", 
-                                                     :query => {:asset => {:file => "new_file"}},
-                                                     :headers => {'X-Account' => 'account'})
+        RestClient.should_receive(:put).with("http://test.com/assets/2", 
+                                                     {:asset => {:file => 'new_file'}},
+                                                     {'X-Account' => 'account'})
         do_update
       end
       
@@ -121,8 +123,8 @@ describe NPO::Assets::Asset do
                               "updated_at" => "2010-03-03T12:42:47Z",
                               "url" => "000/000/000.jpg",
                               "file_size" => "12645"} }
-          @response = HTTParty::Response.new(hash, hash, 201, nil)
-          NPO::Assets::Asset.stub!(:put).and_return @response
+          Crack::XML.stub!(:parse).and_return hash
+          RestClient.stub!(:put).and_return mock("Response", :code => 200)
         end
       
         it "should return true" do
@@ -138,8 +140,8 @@ describe NPO::Assets::Asset do
       describe "with failed save" do
         before(:each) do
           hash = {"errors"=>{"error"=>"File must be set."}}
-          @response = HTTParty::Response.new(hash, hash, 422, nil)
-          NPO::Assets::Asset.stub!(:put).and_return @response
+          Crack::XML.stub!(:parse).and_return hash
+          RestClient.stub!(:put).and_return mock("Response", :code => 422)
         end
       
         it "should return false" do
@@ -157,11 +159,11 @@ describe NPO::Assets::Asset do
       before(:each) do
         @asset.remote_id = 2
         @asset.save
-        HTTParty.stub!(:delete).and_return @response
+        RestClient.stub!(:delete).and_return @response
       end
       
       it "should send the correct vars" do
-        HTTParty.should_receive(:delete).with("http://test.com/assets/2", :headers => {'X-Account' => 'account'})
+        RestClient.should_receive(:delete).with("http://test.com/assets/2", {'X-Account' => 'account'})
         @asset.destroy
       end
     end
@@ -170,8 +172,8 @@ describe NPO::Assets::Asset do
   describe "when generating an url" do
     before(:each) do
       hash = {"asset" => {"url" => "1.jpg"}}
-      @response = HTTParty::Response.new(hash, hash, 200, nil)
-      NPO::Assets::Asset.stub!(:post).and_return @response
+      Crack::XML.stub!(:parse).and_return hash
+      RestClient.stub!(:post).and_return mock("Response", :code => 200)
 
       @asset = NPO::Assets::Asset.create!
     end
@@ -188,7 +190,8 @@ describe NPO::Assets::Asset do
   describe "when listing the assets" do
     describe "request" do
       before(:each) do
-        NPO::Assets::Asset.stub!(:get).and_return ""
+        Crack::XML.stub!(:parse)
+        RestClient.stub!(:get).and_return mock("Response", :code => 200)
       end
 
       def do_list(account='omroep_nl', options={})
@@ -196,7 +199,7 @@ describe NPO::Assets::Asset do
       end
     
       def should_get(url, options)
-        NPO::Assets::Asset.should_receive(:get).with(url, options)
+        RestClient.should_receive(:get).with(url, options)
       end
     
       it "should call the correct url with an explicit account name" do
@@ -233,7 +236,8 @@ describe NPO::Assets::Asset do
                        "asset"=>[{"name"=>"bach", "url"=>"000/000/001.jpg", "id"=>"10"}, 
                                  {"name"=>"bach", "url"=>"000/000/002.jpg", "id"=>"20"}]}}
         
-        NPO::Assets::Asset.stub!(:get).and_return @response
+        Crack::XML.stub!(:parse).and_return @response
+        RestClient.stub!(:get).and_return mock("Response")
       end
       
       def do_list
@@ -241,7 +245,7 @@ describe NPO::Assets::Asset do
       end
       
       it "should return [] if there are no items" do
-        NPO::Assets::Asset.stub!(:get).and_return("nil_classes" => nil)
+        Crack::XML.stub!(:parse).and_return("nil_classes" => nil)
         do_list.should == []
       end
       
@@ -252,8 +256,8 @@ describe NPO::Assets::Asset do
       end
       
       it "should not post to the server *again*" do
-        NPO::Assets::Asset.should_not_receive(:post)
-        NPO::Assets::Asset.should_not_receive(:put)
+        RestClient.should_not_receive(:post)
+        RestClient.should_not_receive(:put)
         do_list
       end
       

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: npo_assets
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Bart Zonneveld
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 +02:00
+date: 2011-04-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -35,9 +38,11 @@ dependencies:
   name: httparty
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +59,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -74,28 +78,32 @@ homepage: http://github.com/bartzon/npo_assets
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+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.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Wrapper for media db

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC