npo_assets 0.1.2 → 0.1.3

data/VERSION

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

data/lib/npo_assets/asset.rb

@@ -11,11 +11,11 @@ module NPO
       
       class << self
         def list(account_name=nil, options={})
-          url  = "#{ NPO::Assets.base_url }.xml#{ extract_list_options(options) }"
+          url  = "#{ NPO::Assets.base_url }/assets.xml#{ extract_list_options(options) }"
           res  = get(url, :headers => headers(account_name))
 
           if res && res['assets']
-            res['assets']['asset'].each do |vars|
+            res['assets']['asset'].map do |vars|
               create(:url => vars['url'], :remote_id => vars['id'])
             end
           else
@@ -37,7 +37,7 @@ module NPO
       end
       
       def url(size='')
-        File.join(NPO::Assets.base_url, size, attributes['url'])
+        File.join(NPO::Assets.base_url, 'assets', size, attributes['url'])
       end
       
       private
@@ -46,7 +46,7 @@ module NPO
           # run due to saving an imported asset
           return true if self.remote_id && new_record?
           
-          url = [NPO::Assets.base_url]
+          url = [NPO::Assets.base_url, 'assets']
           url << self.remote_id unless new_record?
       
           response = self.class.send(new_record? ? :post : :put, 
@@ -63,7 +63,7 @@ module NPO
         end
         
         def delete_from_media_server
-          HTTParty.delete("#{NPO::Assets.base_url}/#{self.remote_id}", :headers => self.class.headers)
+          HTTParty.delete("#{NPO::Assets.base_url}/assets/#{self.remote_id}", :headers => self.class.headers)
         end
     end
   end

data/npo_assets.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{npo_assets}
-  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 = ["Bart Zonneveld"]

data/spec/npo_assets/asset_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 describe NPO::Assets::Asset do
   before(:all) do
     setup_db
-    NPO::Assets.base_url = 'http://test.com/assets'
+    NPO::Assets.base_url = 'http://test.com'
     NPO::Assets.account_name = 'account'
   end
   
@@ -220,6 +220,11 @@ describe NPO::Assets::Asset do
                        "asset"=>[{"name"=>"bach", "url"=>"000/000/001.jpg", "id"=>"1"}, 
                                  {"name"=>"bach", "url"=>"000/000/002.jpg", "id"=>"2"}]}}
         
+        @object1 = mock("Asset")
+        @object2 = mock("Asset")
+        NPO::Assets::Asset.stub!(:create).with(:url => "000/000/001.jpg", :remote_id => "1").and_return @object1
+        NPO::Assets::Asset.stub!(:create).with(:url => "000/000/002.jpg", :remote_id => "2").and_return @object2
+        
         NPO::Assets::Asset.stub!(:get).and_return @response
       end
       
@@ -243,6 +248,10 @@ describe NPO::Assets::Asset do
         NPO::Assets::Asset.should_not_receive(:put)
         do_list
       end
+      
+      it "should return the created objects" do
+        do_list.should == [@object1, @object2]
+      end
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Bart Zonneveld