npo_assets 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/npo_assets/asset.rb

@@ -4,11 +4,11 @@ module NPO
       include HTTParty
       format :xml
       
-      attr_accessor :file, :url
+      attr_accessor :file, :remote_url
       
       before_save   :post_to_media_server
       after_destroy :delete_from_media_server
-      
+
       class << self
         def list(account_name=nil, options={})
           url  = "#{ NPO::Assets.base_url }/assets.xml#{ extract_list_options(options) }"
@@ -16,7 +16,7 @@ module NPO
 
           if res && res['assets']
             res['assets']['asset'].map do |vars|
-              find_or_create_by_url_and_remote_id(vars['url'], vars['id'].to_i)
+              find_or_create_by_url_and_remote_id(vars['url'], vars['id'])
             end
           else
             []
@@ -49,13 +49,13 @@ module NPO
           url = [NPO::Assets.base_url, 'assets']
           url << self.remote_id unless new_record?
       
-          attrs = @file ? {:file => @file} : {:url => @url}
+          attrs = @file ? {:file => @file} : {:url => @remote_url}
           response = self.class.send(new_record? ? :post : :put, 
                                      url.join('/'), 
                                      :query => { :asset => attrs }, 
                                      :headers => self.class.headers)
           if response.code == 422
-            response['errors']['error'].each { |msg| errors[:base] << msg }
+            response['errors']['error'].each { |msg| errors.add_to_base(msg) }
             false
           else
             self.url = response['asset']['url']

data/npo_assets.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{npo_assets}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   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

@@ -32,7 +32,7 @@ describe NPO::Assets::Asset do
       end
       
       it "should send the correct vars with a remote url" do
-        asset = NPO::Assets::Asset.new(:url => "remote_url")
+        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'})
@@ -84,7 +84,7 @@ describe NPO::Assets::Asset do
       
         it "should add the error to the asset" do
           do_create
-          @asset.errors[:base].should == ["File must be set."]
+          @asset.errors[:base].should == "File must be set."
         end
       end
     end
@@ -143,7 +143,7 @@ describe NPO::Assets::Asset do
       
         it "should add the error to the asset" do
           do_update
-          @asset.errors[:base].should == ["File must be set."]
+          @asset.errors[:base].should == "File must be set."
         end
       end
     end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Bart Zonneveld