vj-sdk 0.6.4 → 0.6.5

data/VERSION.yml

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

data/lib/videojuicer/presentation.rb

@@ -62,7 +62,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(',')
+          @assets[sym_type] ||= Videojuicer::Asset.const_get(type.capitalize.to_sym).all :id => asset_ids[sym_type].join(',') rescue nil
         end
     end
     

data/lib/videojuicer/resource/property_registry.rb

@@ -45,7 +45,8 @@ module Videojuicer
       def attributes=(arg)
         raise ArgumentError, "Attributes must be set as a Hash" unless arg.is_a?(Hash)
         arg.each do |key, value|
-          self.send("#{key}=", value)
+          #set any attributes, ignoring all those that are invalid  
+          self.send("#{key}=", value) rescue invalid_attributes[key] = value
         end
       end
       
@@ -122,6 +123,7 @@ module Videojuicer
       def coerce_value(key, value)
         return value unless value
         klass = self.class.attributes[key][:class]
+        
         if value.is_a?(String) and value.any?
           # In-built types
           if klass.kind_of?(Videojuicer::Resource::Types::Base)
@@ -160,6 +162,10 @@ module Videojuicer
         attrs
       end
       
+      def invalid_attributes
+        @invalid_attributes ||= {}
+      end
+      
       module SingletonMethods
         
         # Registers an attribute using a datamapper-style syntax.

data/spec/helpers/spec_fixtures.rb

@@ -74,7 +74,7 @@ module Videojuicer
     include FixtureHelper
     set_attribute_proc {{
       :name => /\w+/.gen,
-      :target_type => "com.videojuicer.core.Presentation"
+      :insert_domain => "com.videojuicer.asset"
     }}
   end
   

data/spec/presentation_spec.rb

@@ -56,10 +56,17 @@ describe Videojuicer::Presentation do
     end
     
     it "should also fetch assets" do
-      @presentation.document_content = "{% video %}{% id 1 %}{% endvideo %}"
+      id = Videojuicer::Asset::Video.first.id
+      @presentation.document_content = "{% video %}{% id #{id} %}{% endvideo %}"
       @presentation.asset_ids
       @presentation.video_assets.first.should_not == nil
-      @presentation.video_assets.first.id.should == 1
+      @presentation.video_assets.first.id.should == id
+    end
+    
+    it "should should return nil when there are not assets of that type" do
+      @presentation.document_content = "<img src=\"/my-image.png\"/>"
+      @presentation.asset_ids
+      @presentation.video_assets.should == nil
     end
     
     it "should return the image asset" do
@@ -69,9 +76,10 @@ describe Videojuicer::Presentation do
     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
+      id = Videojuicer::Asset::Image.first.id
+      @presentation.image_asset_id = id
       @presentation.image_asset do |image|
-        image.id.should == 1
+        image.id.should == id
       end
     end
     

data/spec/property_registry_spec.rb

@@ -37,11 +37,20 @@ describe Videojuicer::Resource::PropertyRegistry do
         
         property :date, DateTime
       end
+      
+      class ::InvalidAttributeRegistry
+        
+        include Videojuicer::Resource::PropertyRegistry
+        
+        property :foo, String
+      end
+      
     end
     before(:each) do
       @example_registry = ::FooAttributeRegistry.new
       @example_private_prop_registry = ::PrivatePropertyRegistry.new
       @date_registry = ::DateRegistry.new
+      
     end
   
     it "registers an attribute with a type at the class scope" do
@@ -150,5 +159,15 @@ describe Videojuicer::Resource::PropertyRegistry do
       created.name.should == "name set"
       created.email.should == "gooooo"
     end
+    
+    it "allows you to set arbitrary attributes" do
+      lambda { ::InvalidAttributeRegistry.new({:bar => 'bar'}) }.should_not raise_error(NoMethodError)
+    end
+    
+    it "should store invalid attributes in a separate hash" do
+      invalid = ::InvalidAttributeRegistry.new({:bar => 'bar'})
+      invalid.invalid_attributes.should_not == {}
+    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.4"
+  s.version = "0.6.5"
 
   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-13}
+  s.date = %q{2010-08-24}
   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: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - danski
@@ -19,12 +19,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-13 00:00:00 +01:00
+date: 2010-08-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: json
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,11 +34,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  name: json
   requirement: *id001
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: ruby-hmac
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -51,11 +50,11 @@ dependencies:
         - 3
         - 2
         version: 0.3.2
+  name: ruby-hmac
   requirement: *id002
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: mash
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -67,11 +66,11 @@ dependencies:
         - 0
         - 3
         version: 0.0.3
+  name: mash
   requirement: *id003
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: liquid
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -83,6 +82,7 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
+  name: liquid
   requirement: *id004
   type: :runtime
 description: