vj-sdk 0.6.1 → 0.6.3

data/Gemfile

@@ -2,7 +2,7 @@ source :gemcutter
 
 # http://github.com/carlhuda/bundler/issues/#issue/107
 # - do not change unless lib/bundler_runtime_patch tested / defunct
-gem "bundler", "0.9.26"
+#gem "bundler", "0.9.26"
 
 def gems(names, version)
   names.each { |n| gem(n, version) }

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:build: 
 :major: 0
+:build: 
 :minor: 6
-:patch: 1
+:patch: 3

data/lib/videojuicer/asset/base.rb

@@ -21,6 +21,7 @@ module Videojuicer
         # - generic file handling
         base.property :file,                File
         base.property :file_name,           String
+        base.property :friendly_name,       String
         base.property :file_size,           Integer,  :writer => :private # bytes
         base.property :source_uri,          String
         

data/lib/videojuicer/campaign.rb

@@ -10,7 +10,7 @@ module Videojuicer
     property :disclosure,   String
     property :created_at,   DateTime
     property :updated_at,   DateTime
-
+    
     belongs_to :user, :class=>Videojuicer::User
     
     attr_accessor :criteria

data/lib/videojuicer/insert.rb

@@ -14,6 +14,7 @@ module Videojuicer
     property :click_target, String
     property :asset_type,   String
     property :asset_id,     Integer
+    property :duration,     Integer    
     property :created_at,   DateTime
     property :updated_at,   DateTime
     

data/lib/videojuicer/presentation.rb

@@ -50,8 +50,11 @@ module Videojuicer
     #get the thumbnail image associated with the presentation
     def image_asset
       @image_asset ||= Videojuicer::Asset::Image.get(image_asset_id)
+      return @image_asset unless block_given?
+      yield @image_asset if block_given?
     end
     
+    #video_asset_ids and video_assets methods
     @@asset_types.each do |type|
         sym_type = type.to_sym
         define_method "#{type}_asset_ids" do

data/spec/presentation_spec.rb

@@ -25,8 +25,8 @@ describe Videojuicer::Presentation do
     
     before :each do
       @presentation = @klass.gen
-      Videojuicer::Asset::Video.create :file_name => 'foo.mp4'
-      Videojuicer::Asset::Image.create :file_name => 'foo.png'
+      5.of { Videojuicer::Asset::Video.create :file_name => 'foo.mp4' }
+      5.of { Videojuicer::Asset::Image.create :file_name => 'foo.png' }
     end
     
     it "should fetch asset ids" do
@@ -55,7 +55,7 @@ describe Videojuicer::Presentation do
       @presentation.asset_ids[:image].first.should == '200'
     end
     
-    it "should fetch assets too" do
+    it "should also fetch assets" do
       @presentation.document_content = "{% video %}{% id 1 %}{% endvideo %}"
       @presentation.asset_ids
       @presentation.video_assets.first.should_not == nil
@@ -63,11 +63,18 @@ describe Videojuicer::Presentation do
     end
     
     it "should return the image asset" do
-      @presentation.image_asset_id = 1
+      @presentation.image_asset_id = Videojuicer::Asset::Image.first.id
       @presentation.image_asset.should_not == nil
       @presentation.image_asset.class.should == Videojuicer::Asset::Image
     end
     
+    it "should also take a block and pass the image_asset to that block" do
+      @presentation.image_asset_id = Videojuicer::Asset::Image.first.id
+      @presentation.image_asset do |image|
+        image.id.should == 1
+      end
+    end
+    
   end
   
   

data/vj-sdk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vj-sdk}
-  s.version = "0.6.1"
+  s.version = "0.6.3"
 
   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-07-27}
+  s.date = %q{2010-08-05}
   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: 5
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - danski
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +01:00
+date: 2010-08-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency