npo_assets 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/lib/npo_assets/asset.rb

@@ -58,7 +58,8 @@ module NPO
             response['errors']['error'].each { |msg| errors.add_to_base(msg) }
             false
           else
-            self.url = response['asset']['url']
+            self.url       = response['asset']['url']
+            self.remote_id = response['asset']['id']
             true
           end
         end

data/npo_assets.gemspec

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

@@ -59,6 +59,11 @@ describe NPO::Assets::Asset do
           do_create
           @asset.attributes['url'].should == '000/000/000.jpg'
         end
+        
+        it "should assign the id as remote id to the asset" do
+          do_create
+          @asset.attributes['remote_id'].should == 1
+        end
       
         it "should save the asset" do
           do_create
@@ -225,13 +230,8 @@ describe NPO::Assets::Asset do
     describe "response" do
       before(:each) do
         @response = {"assets"=>{"results"=>"2", "total_pages"=>"1", 
-                       "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!(:find_or_create_by_url_and_remote_id).with("000/000/001.jpg", 1).and_return @object1
-        NPO::Assets::Asset.stub!(:find_or_create_by_url_and_remote_id).with("000/000/002.jpg", 2).and_return @object2
+                       "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
       end
@@ -246,8 +246,8 @@ describe NPO::Assets::Asset do
       end
       
       it "should generate new assets for each returned asset" do
-        NPO::Assets::Asset.should_receive(:find_or_create_by_url_and_remote_id).with("000/000/001.jpg", 1).once
-        NPO::Assets::Asset.should_receive(:find_or_create_by_url_and_remote_id).with("000/000/002.jpg", 2).once
+        NPO::Assets::Asset.should_receive(:find_or_create_by_url_and_remote_id).with("000/000/001.jpg", 10).once
+        NPO::Assets::Asset.should_receive(:find_or_create_by_url_and_remote_id).with("000/000/002.jpg", 20).once
         do_list
       end
       
@@ -257,8 +257,14 @@ describe NPO::Assets::Asset do
         do_list
       end
       
+      it "should save the assets with the correct attributes" do
+        do_list
+        NPO::Assets::Asset.first.attributes.should == {"remote_id" => 10, "url" => "000/000/001.jpg", "id" => 1}
+        NPO::Assets::Asset.last.attributes.should ==  {"remote_id" => 20, "url" => "000/000/002.jpg", "id" => 2}
+      end
+      
       it "should return the created objects" do
-        do_list.should == [@object1, @object2]
+        do_list.should == NPO::Assets::Asset.all
       end
     end
   end

metadata

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