vj-sdk 0.6.5 → 0.6.7

data/Gemfile

@@ -12,7 +12,7 @@ end
 gem "merb-core", "1.1.0.pre"
 gem "jeweler", ">= 1.4.0"
 gem "rake", ">= 0.8.7"
-gem "rspec", ">= 1.3.0"
+gem "rspec", "1.3.0"
 gem "mash"
 gem "randexp"
 gem "ruby-hmac"

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :build: 
 :minor: 6
-:patch: 5
+:patch: 7

data/lib/videojuicer/campaign.rb

@@ -3,13 +3,14 @@ module Videojuicer
     include Videojuicer::Resource
     include Videojuicer::Exceptions
     
-    property :name,         String
-    property :user_id,      Integer
-    property :insert_domain,  String
-    property :presentation_id,    Integer
-    property :disclosure,   String
-    property :created_at,   DateTime
-    property :updated_at,   DateTime
+    property :name,             String
+    property :user_id,          Integer
+    property :insert_domain,    String
+    property :presentation_id,  Integer
+    property :disclosure,       String
+    property :created_at,       DateTime
+    property :updated_at,       DateTime
+    property :tag_list,         String
     
     belongs_to :user, :class=>Videojuicer::User
     

data/lib/videojuicer/criterion/request.rb

@@ -6,9 +6,9 @@ module Videojuicer
       
       belongs_to :campaign, :class=>Videojuicer::Campaign
       
-      property :campaign_id,         Integer
-      property :referrer,           String, :nullable => false
-      property :exclude,            Boolean
+      property :campaign_id, Integer
+      property :referrer,    String, :nullable => false
+      property :exclude,     Boolean
       
       def self.singular_name
         "criterion"

data/lib/videojuicer/presentation.rb

@@ -10,6 +10,7 @@ module Videojuicer
     property :abstract,           String
     property :user_id,            Integer,  :writer=>:private
       belongs_to :user, :class=>Videojuicer::User
+    property :updater_id,         Integer
     property :callback_url,       String
 
     property :state,              String,   :default=>"ready" # see the STATES constant for values
@@ -62,7 +63,7 @@ module Videojuicer
         end
         define_method "#{type}_assets" do
           @assets ||= {}
-          @assets[sym_type] ||= Videojuicer::Asset.const_get(type.capitalize.to_sym).all :id => asset_ids[sym_type].join(',') rescue nil
+          @assets[sym_type] ||= Videojuicer::Asset.const_get(type.capitalize.to_sym).all :id => asset_ids[sym_type].join(',') rescue []
         end
     end
     

data/spec/helpers/spec_fixtures.rb

@@ -64,9 +64,11 @@ module Videojuicer
   class Insert
     include FixtureHelper
     set_attribute_proc {{
-      :campaign_id => (Campaign.first.id rescue Campaign.gen.id),
-      :asset_type => "com.videojuicer.core.asset.Audio",
-      :asset_id   => (Asset::Audio.first.id rescue Asset::Audio.gen.id)
+      :campaign_id  => (Campaign.first.id rescue Campaign.gen.id),
+      :asset_type   => "com.videojuicer.core.asset.Audio",
+      :asset_id     => (Asset::Audio.first.id rescue Asset::Audio.gen.id),
+      :role         => 'overlay',
+      :user_id      => (User.first.id rescue User.gen.id)
     }}
   end
   

data/spec/presentation_spec.rb

@@ -63,10 +63,11 @@ describe Videojuicer::Presentation do
       @presentation.video_assets.first.id.should == id
     end
     
-    it "should should return nil when there are not assets of that type" do
+    it "should should return an empty array when there are no assets of that type" do
       @presentation.document_content = "<img src=\"/my-image.png\"/>"
       @presentation.asset_ids
-      @presentation.video_assets.should == nil
+      @presentation.video_assets.should == []
+      @presentation.video_assets.length.should == 0
     end
     
     it "should return the image asset" do

data/vj-sdk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vj-sdk}
-  s.version = "0.6.5"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["danski", "thejohnny", "knowtheory", "sixones", "btab"]
-  s.date = %q{2010-08-24}
+  s.date = %q{2010-11-15}
   s.email = %q{dan@videojuicer.com}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vj-sdk
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - danski
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +01:00
+date: 2010-11-15 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency