vj-sdk 0.5.6 → 0.6.0

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.10"
+gem "bundler", "0.9.26"
 
 def gems(names, version)
   names.each { |n| gem(n, version) }
@@ -15,4 +15,5 @@ gem "rake", ">= 0.8.7"
 gem "rspec", ">= 1.3.0"
 gem "mash"
 gem "randexp"
-gem "ruby-hmac"
+gem "ruby-hmac"
+gem "liquid", "2.0.0"

data/Rakefile

@@ -19,6 +19,7 @@ begin
     gem.add_dependency "json", ">= 1.0"
     gem.add_dependency "ruby-hmac", ">= 0.3.2"
     gem.add_dependency "mash", ">= 0.0.3"
+    gem.add_dependency "liquid", "2.0.0"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION.yml

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

data/lib/videojuicer.rb

@@ -6,6 +6,7 @@ require 'cgi'
 require 'json'
 require 'hmac-sha1'
 require 'net/http'
+require 'liquid'
 
 # Core ext
 require 'core_ext/hash'
@@ -15,6 +16,7 @@ require 'core_ext/cgi'
 # Core mixins
 require 'videojuicer/shared/exceptions'
 require 'videojuicer/shared/configurable'
+require 'videojuicer/shared/liquid_helper'
 # Authentication and authorisation
 require 'videojuicer/oauth/request_proxy'
 require 'videojuicer/oauth/proxy_factory'

data/lib/videojuicer/presentation.rb

@@ -4,7 +4,6 @@ module Videojuicer
     include Videojuicer::Resource::Embeddable
     include Videojuicer::Exceptions
     
-    property :slug,               String
     property :title,              String
     property :author,             String
     property :author_url,         String
@@ -30,10 +29,34 @@ module Videojuicer
 
     property :tag_list,           String
    
+    
+    @@asset_types = %w(video flash image document audio)
+    
     def permalink
       proxy = proxy_for(config)
       "#{proxy.host_stub}/presentations/#{id}.html?seed_name=#{seed_name}".gsub(":80/","/")
     end
-   
+    
+    def asset_ids
+      Videojuicer::SDKLiquidHelper::Filters::AssetBlock.reset!
+      @@asset_types.each do |type|
+        Liquid::Template.register_tag type, Videojuicer::SDKLiquidHelper::Filters::AssetBlock
+      end
+      @template = Liquid::Template.parse(document_content)
+      @template.render
+      return Videojuicer::SDKLiquidHelper::Filters::AssetBlock.asset_ids
+    end
+    
+    @@asset_types.each do |type|
+        sym_type = type.to_sym
+        define_method "#{type}_asset_ids" do
+            asset_ids[sym_type]
+        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(',')
+        end
+    end
+    
   end 
 end

data/lib/videojuicer/resource/base.rb

@@ -131,6 +131,8 @@ module Videojuicer
         # > "id.lt" => "9" #=> Returns only records with ID less than 9
         # > "id.gte" => "9" #=> Returns only records with ID greater than or equal to 9
         # > "id.lte" => "9" #=> Returns only records with ID less than or equal to than 9
+        # Range operations are also supported e.g.
+        # > :id => '1,2,3'
         def all(options={})
           # Get a proxy
           options = (options.empty?)? {} : {parameter_name=>options} # FIXME this is a hacky workaround for singleton scope.

data/lib/videojuicer/shared/liquid_helper.rb

@@ -0,0 +1,30 @@
+module Videojuicer
+  module SDKLiquidHelper
+    module Filters
+      
+      class AssetBlock < ::Liquid::Block
+        
+        @@asset_ids = {}
+        
+        def self.reset!
+          @@asset_ids = {}
+        end
+        
+        def self.asset_ids
+          @@asset_ids.deep_symbolize
+        end
+        
+        def initialize tag_name, args, tokens
+          @@asset_ids[tag_name] ||= []
+          @@asset_ids[tag_name] << tokens.to_s.gsub(/\{% id ([0-9]+){1,10} %\}.*/, "\\1").strip
+          super
+        end
+        
+        def render; nil; end;
+        
+        def unknown_tag tag_name, args, tokens; nil; end;
+        
+      end#end class
+    end
+  end
+end

data/lib/videojuicer/user.rb

@@ -10,6 +10,7 @@ module Videojuicer
     property :password_confirmation, String
     property :created_at, DateTime
     property :updated_at, DateTime
+    property :roles, Array, :writer => :readonly
     
     # Authenticates the given login and password and returns
     # a user if the details are correct. Requires a Master token.

data/spec/presentation_spec.rb

@@ -21,5 +21,48 @@ describe Videojuicer::Presentation do
     it_should_behave_like "an embeddable"
   end
   
+  describe "fetching asset ids" do
+    
+    before :each do
+      @presentation = @klass.gen
+      Videojuicer::Asset::Video.create :file_name => 'foo.mp4'
+    end
+    
+    it "should fetch asset ids" do
+      @presentation.document_content = "{% video %}{% id 1 %}{% endvideo %}"
+      @presentation.asset_ids.should_not == nil
+      @presentation.asset_ids[:video].first.should == '1'
+    end
+  
+    it "should fetch longer asset ids" do
+        @presentation.document_content = "{% video %}{% id 8003 %}{% endvideo %}"
+        @presentation.asset_ids.should_not == nil
+        @presentation.asset_ids[:video].first.should == '8003'
+    end
+    
+    it "should deal with non-standard document_content" do
+      @presentation.document_content = "{% video %}         {% id 200 %}         {% endvideo %} {% audio %} {% id 122 %} {% endaudio %}" 
+      @presentation.asset_ids.should_not == nil
+      @presentation.asset_ids[:video].first.should == '200'
+      @presentation.asset_ids[:audio].first.should == '122'
+    end
+    
+    it "should deal with xml too" do
+      @presentation.document_content = '<seq><par>{% video %}         {% id 200 %}         {% endvideo %}{% image %}         {% id 200 %}         {% endimage %}</par><par>{% video %}         {% id 200 %}         {% endvideo %}</par></seq>'
+      @presentation.asset_ids.should_not == nil
+      @presentation.asset_ids[:video].first.should == '200'
+      @presentation.asset_ids[:image].first.should == '200'
+    end
+    
+    it "should fetch assets too" do
+      @presentation.document_content = "{% video %}{% id 1 %}{% endvideo %}"
+      @presentation.asset_ids
+      @presentation.video_assets.first.should_not == nil
+      @presentation.video_assets.first.id.should == 1
+    end
+    
+  end
+  
+  
   
 end

data/spec/shared/resource_spec.rb

@@ -119,6 +119,7 @@ shared_examples_for "a RESTFUL resource model" do
     describe "an existing record" do
       before(:all) do
         @record = @klass.gen
+        @record.valid?.should be_true
         @record.save.should be_true
       end
       

data/vj-sdk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vj-sdk}
-  s.version = "0.5.6"
+  s.version = "0.6.0"
 
   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-08}
+  s.date = %q{2010-07-27}
   s.email = %q{dan@videojuicer.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -60,6 +60,7 @@ Gem::Specification.new do |s|
      "lib/videojuicer/session.rb",
      "lib/videojuicer/shared/configurable.rb",
      "lib/videojuicer/shared/exceptions.rb",
+     "lib/videojuicer/shared/liquid_helper.rb",
      "lib/videojuicer/user.rb",
      "spec/assets/audio_spec.rb",
      "spec/assets/document_spec.rb",
@@ -107,7 +108,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/videojuicer/vj-sdk}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Videojuicer core-sdk}
   s.test_files = [
     "spec/assets/audio_spec.rb",
@@ -149,19 +150,22 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 1.0"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<mash>, [">= 0.0.3"])
+      s.add_runtime_dependency(%q<liquid>, ["= 2.0.0"])
     else
       s.add_dependency(%q<json>, [">= 1.0"])
       s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
       s.add_dependency(%q<mash>, [">= 0.0.3"])
+      s.add_dependency(%q<liquid>, ["= 2.0.0"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.0"])
     s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
     s.add_dependency(%q<mash>, [">= 0.0.3"])
+    s.add_dependency(%q<liquid>, ["= 2.0.0"])
   end
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vj-sdk
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
   - 6
-  version: 0.5.6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - danski
@@ -18,50 +19,72 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-08 00:00:00 +01:00
+date: 2010-07-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
         version: "1.0"
+  name: json
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ruby-hmac
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 3
         - 2
         version: 0.3.2
+  name: ruby-hmac
+  requirement: *id002
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mash
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 0
         - 3
         version: 0.0.3
+  name: mash
+  requirement: *id003
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  name: liquid
+  requirement: *id004
   type: :runtime
-  version_requirements: *id003
 description: 
 email: dan@videojuicer.com
 executables: []
@@ -116,6 +139,7 @@ files:
 - lib/videojuicer/session.rb
 - lib/videojuicer/shared/configurable.rb
 - lib/videojuicer/shared/exceptions.rb
+- lib/videojuicer/shared/liquid_helper.rb
 - lib/videojuicer/user.rb
 - spec/assets/audio_spec.rb
 - spec/assets/document_spec.rb
@@ -169,23 +193,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Videojuicer core-sdk