npo_assets 0.1.3 → 0.1.5

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/bartzon/npo_assets"
     gem.authors = ["Bart Zonneveld"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "httparty", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.5

data/generators/npo_assets/templates/initializer.rb

@@ -1,2 +1,2 @@
-NPO::Assets.base_url     = 'http://media.omroep.nl'
+NPO::Assets.base_url     = 'http://mediadb.omroep.nl'
 NPO::Assets.account_name = ''

data/generators/npo_assets/templates/migration.rb

@@ -7,6 +7,6 @@ class CreateAssets < ActiveRecord::Migration
   end
   
   def self.down
-    drop_table :blacklists
+    drop_table :assets
   end
 end

data/lib/npo_assets/asset.rb

@@ -16,7 +16,7 @@ module NPO
 
           if res && res['assets']
             res['assets']['asset'].map do |vars|
-              create(:url => vars['url'], :remote_id => vars['id'])
+              find_or_create_by_url_and_remote_id(vars['url'], vars['id'])
             end
           else
             []

data/npo_assets.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{npo_assets}
-  s.version = "0.1.3"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bart Zonneveld"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-03-29}
   s.description = %q{Wrapper for media db}
   s.email = %q{loop@superinfinite.com}
   s.extra_rdoc_files = [
@@ -51,11 +51,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<httparty>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<httparty>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<httparty>, [">= 0"])
   end
 end
 

data/spec/npo_assets/asset_spec.rb

@@ -222,8 +222,8 @@ describe NPO::Assets::Asset do
         
         @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!(: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
         
         NPO::Assets::Asset.stub!(:get).and_return @response
       end
@@ -238,8 +238,8 @@ describe NPO::Assets::Asset do
       end
       
       it "should generate new assets for each returned asset" do
-        NPO::Assets::Asset.should_receive(:create).with(:url => "000/000/001.jpg", :remote_id => "1").once
-        NPO::Assets::Asset.should_receive(:create).with(:url => "000/000/002.jpg", :remote_id => "2").once
+        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
         do_list
       end
       

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Bart Zonneveld
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +01:00
+date: 2010-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,6 +31,18 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Wrapper for media db
 email: loop@superinfinite.com
 executables: []