vj-sdk 0.6.9 → 0.7.0

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.summary = "Videojuicer core-sdk"
     gem.email = "dan@videojuicer.com"
     gem.homepage = "http://github.com/videojuicer/vj-sdk"
-    gem.authors = ["danski", "thejohnny", "knowtheory", "sixones", "btab"]
+    gem.authors = ["danski", "thejohnny", "knowtheory", "sixones", "btab", "lamp"]
     
     # Declare dependencies
     gem.add_dependency "json", ">= 1.0"

data/VERSION.yml

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

data/lib/videojuicer.rb

@@ -37,7 +37,7 @@ require 'videojuicer/user'
 require 'videojuicer/campaign'
 require 'videojuicer/insert'
 require 'videojuicer/presentation'
-require 'videojuicer/assets'
+require 'videojuicer/asset/all'
 require 'videojuicer/asset/audio'
 require 'videojuicer/asset/document'
 require 'videojuicer/asset/flash'
@@ -47,7 +47,6 @@ require 'videojuicer/asset/video'
 require 'videojuicer/criterion/date_range'
 require 'videojuicer/criterion/geolocation'
 require 'videojuicer/criterion/request'
-require 'videojuicer/criterion/time'
 require 'videojuicer/criterion/week_day'
 require 'videojuicer/preset'
 

data/lib/videojuicer/asset/all.rb

@@ -0,0 +1,45 @@
+module Videojuicer
+  module Asset
+    class All
+    
+      include Videojuicer::Resource
+      include Videojuicer::Exceptions
+    
+      property :name,          String
+      property :friendly_name, String
+      property :type,          String
+      property :http_url,      String
+      property :created_at,    DateTime
+      property :updated_at,    DateTime
+    
+      def self.singular_name
+        "asset"
+      end
+    
+      def self.base_path(options={})
+        "/assets"
+      end
+    
+      def derive(preset)
+        response = proxy_for(config).post(resource_path, :preset_id => preset.id)
+        self.class.new(JSON.parse(response.body))
+      end
+    
+      def returnable_attributes
+        attrs = super
+        attrs.delete(:file) unless new_record?
+        attrs
+      end
+    
+      def set_derived(from_asset, preset)
+        params = {
+          :original_asset_type => from_asset.class.to_s.split("::").last,
+          :original_asset_id => from_asset.id,
+          :preset_id => preset.id
+        }
+        response = proxy_for(config).post(resource_path(:set_derived), params)
+        self.attributes = JSON.parse(response.body)
+      end
+    end 
+  end
+end

data/spec/assets/all.rb

@@ -0,0 +1,41 @@
+require File.join(File.dirname(__FILE__), "..", "helpers",  "spec_helper")
+
+describe Videojuicer::Asset::All do
+  
+  before :all do
+    configure_test_settings
+    5.of do
+      Videojuicer::Asset::Video.gen :friendly_name => "test"
+    end
+    @klass = Videojuicer::Asset::All
+  end
+  
+  describe "instantiation" do
+    it_should_behave_like "a configurable"
+  end
+  
+  describe "listing assets of all types" do
+    
+    it "should list assets" do
+      @assets = @klass.all
+      @assets.should_not == nil
+      @assets.class.should == Videojuicer::Resource::Collection
+    end
+    
+    it "should paginate" do
+      @assets = @klass.all :page => 1, :limit => 5
+      @assets.length.should == 5
+    end
+    
+  end
+  
+  describe "searching" do
+    it "should search" do
+      @assets = @klass.all({"friendly_name.like" => "test"})
+      @assets.should_not == nil
+      @assets.class.should == Videojuicer::Resource::Collection
+      @assets.first.friendly_name.should =~ /test/
+    end
+  end
+  
+end

data/spec/presentation_spec.rb

@@ -100,7 +100,7 @@ describe Videojuicer::Presentation do
         @presentation.has_default_content?.should == false
       end
       
-      it "should return false if there is any xml in the string" do
+      it "should return false if there is any markup in the document_content" do
         @presentation.document_content = "{% image %}{% id 1 %}{% endimage %} <br/>"
         @presentation.has_default_content?.should == false
       end

data/vj-sdk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vj-sdk}
-  s.version = "0.6.9"
+  s.version = "0.7.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-11-24}
+  s.authors = ["danski", "thejohnny", "knowtheory", "sixones", "btab", "lamp"]
+  s.date = %q{2010-12-14}
   s.email = %q{dan@videojuicer.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/core_ext/object.rb",
      "lib/core_ext/string.rb",
      "lib/videojuicer.rb",
+     "lib/videojuicer/asset/all.rb",
      "lib/videojuicer/asset/audio.rb",
      "lib/videojuicer/asset/base.rb",
      "lib/videojuicer/asset/document.rb",
@@ -35,12 +36,10 @@ Gem::Specification.new do |s|
      "lib/videojuicer/asset/image.rb",
      "lib/videojuicer/asset/text.rb",
      "lib/videojuicer/asset/video.rb",
-     "lib/videojuicer/assets.rb",
      "lib/videojuicer/campaign.rb",
      "lib/videojuicer/criterion/date_range.rb",
      "lib/videojuicer/criterion/geolocation.rb",
      "lib/videojuicer/criterion/request.rb",
-     "lib/videojuicer/criterion/time.rb",
      "lib/videojuicer/criterion/week_day.rb",
      "lib/videojuicer/insert.rb",
      "lib/videojuicer/oauth/multipart_helper.rb",
@@ -63,20 +62,19 @@ Gem::Specification.new do |s|
      "lib/videojuicer/shared/exceptions.rb",
      "lib/videojuicer/shared/liquid_helper.rb",
      "lib/videojuicer/user.rb",
+     "spec/assets/all.rb",
      "spec/assets/audio_spec.rb",
      "spec/assets/document_spec.rb",
      "spec/assets/flash_spec.rb",
      "spec/assets/image_spec.rb",
      "spec/assets/text_spec.rb",
      "spec/assets/video_spec.rb",
-     "spec/assets_spec.rb",
      "spec/belongs_to_spec.rb",
      "spec/campaign_spec.rb",
      "spec/collection_spec.rb",
      "spec/criterion/date_range_spec.rb",
      "spec/criterion/geolocation_spec.rb",
      "spec/criterion/request_spec.rb",
-     "spec/criterion/time_spec.rb",
      "spec/criterion/week_day_spec.rb",
      "spec/files/audio.mp3",
      "spec/files/document.js",
@@ -113,20 +111,19 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Videojuicer core-sdk}
   s.test_files = [
-    "spec/assets/audio_spec.rb",
+    "spec/assets/all.rb",
+     "spec/assets/audio_spec.rb",
      "spec/assets/document_spec.rb",
      "spec/assets/flash_spec.rb",
      "spec/assets/image_spec.rb",
      "spec/assets/text_spec.rb",
      "spec/assets/video_spec.rb",
-     "spec/assets_spec.rb",
      "spec/belongs_to_spec.rb",
      "spec/campaign_spec.rb",
      "spec/collection_spec.rb",
      "spec/criterion/date_range_spec.rb",
      "spec/criterion/geolocation_spec.rb",
      "spec/criterion/request_spec.rb",
-     "spec/criterion/time_spec.rb",
      "spec/criterion/week_day_spec.rb",
      "spec/has_spec.rb",
      "spec/helpers/be_equal_to.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vj-sdk
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 3
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 9
-  version: 0.6.9
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - danski
@@ -15,11 +15,12 @@ authors:
 - knowtheory
 - sixones
 - btab
+- lamp
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +00:00
+date: 2010-12-14 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,6 +108,7 @@ files:
 - lib/core_ext/object.rb
 - lib/core_ext/string.rb
 - lib/videojuicer.rb
+- lib/videojuicer/asset/all.rb
 - lib/videojuicer/asset/audio.rb
 - lib/videojuicer/asset/base.rb
 - lib/videojuicer/asset/document.rb
@@ -114,12 +116,10 @@ files:
 - lib/videojuicer/asset/image.rb
 - lib/videojuicer/asset/text.rb
 - lib/videojuicer/asset/video.rb
-- lib/videojuicer/assets.rb
 - lib/videojuicer/campaign.rb
 - lib/videojuicer/criterion/date_range.rb
 - lib/videojuicer/criterion/geolocation.rb
 - lib/videojuicer/criterion/request.rb
-- lib/videojuicer/criterion/time.rb
 - lib/videojuicer/criterion/week_day.rb
 - lib/videojuicer/insert.rb
 - lib/videojuicer/oauth/multipart_helper.rb
@@ -142,20 +142,19 @@ files:
 - lib/videojuicer/shared/exceptions.rb
 - lib/videojuicer/shared/liquid_helper.rb
 - lib/videojuicer/user.rb
+- spec/assets/all.rb
 - spec/assets/audio_spec.rb
 - spec/assets/document_spec.rb
 - spec/assets/flash_spec.rb
 - spec/assets/image_spec.rb
 - spec/assets/text_spec.rb
 - spec/assets/video_spec.rb
-- spec/assets_spec.rb
 - spec/belongs_to_spec.rb
 - spec/campaign_spec.rb
 - spec/collection_spec.rb
 - spec/criterion/date_range_spec.rb
 - spec/criterion/geolocation_spec.rb
 - spec/criterion/request_spec.rb
-- spec/criterion/time_spec.rb
 - spec/criterion/week_day_spec.rb
 - spec/files/audio.mp3
 - spec/files/document.js
@@ -220,20 +219,19 @@ signing_key:
 specification_version: 3
 summary: Videojuicer core-sdk
 test_files: 
+- spec/assets/all.rb
 - spec/assets/audio_spec.rb
 - spec/assets/document_spec.rb
 - spec/assets/flash_spec.rb
 - spec/assets/image_spec.rb
 - spec/assets/text_spec.rb
 - spec/assets/video_spec.rb
-- spec/assets_spec.rb
 - spec/belongs_to_spec.rb
 - spec/campaign_spec.rb
 - spec/collection_spec.rb
 - spec/criterion/date_range_spec.rb
 - spec/criterion/geolocation_spec.rb
 - spec/criterion/request_spec.rb
-- spec/criterion/time_spec.rb
 - spec/criterion/week_day_spec.rb
 - spec/has_spec.rb
 - spec/helpers/be_equal_to.rb

data/lib/videojuicer/assets.rb

@@ -1,46 +0,0 @@
-module Videojuicer
-  class Assets
-    
-    include Videojuicer::Resource
-    include Videojuicer::Exceptions
-    
-    property :name,       String
-    property :type,       String
-    property :created_at, DateTime
-    property :updated_at, DateTime
-    
-    def self.singular_name
-      "asset"
-    end
-    
-    def self.base_path(options={})
-      "/assets"
-    end
-    
-    def derive(preset)
-      response = proxy_for(config).post(resource_path, :preset_id => preset.id)
-      self.class.new(JSON.parse(response.body))
-    end
-    
-    def file
-      raise "use the value of #{self.class}#url to download a copy of the asset"
-    end
-    
-    def returnable_attributes
-      attrs = super
-      attrs.delete(:file) unless new_record?
-      attrs
-    end
-    
-    def set_derived(from_asset, preset)
-      params = {
-        :original_asset_type => from_asset.class.to_s.split("::").last,
-        :original_asset_id => from_asset.id,
-        :preset_id => preset.id
-      }
-      response = proxy_for(config).post(resource_path(:set_derived), params)
-      self.attributes = JSON.parse(response.body)
-    end
-    
-  end
-end

data/lib/videojuicer/criterion/time.rb

@@ -1,26 +0,0 @@
-module Videojuicer
-  module Criterion
-    class Time
-      
-      include Videojuicer::Resource
-      
-      belongs_to :campaign, :class=>Videojuicer::Campaign
-      
-      property :campaign_id, Integer
-      property :until, DateTime
-      property :from, DateTime
-      
-      def self.singular_name
-        "criterion"
-      end
-      
-      def self.base_path(options={})
-        "/criteria/#{self.to_s.split("::").last.snake_case}"
-      end
-      
-      def matcher_keys
-        [:until, :from]
-      end
-    end
-  end
-end

data/spec/assets_spec.rb

@@ -1,24 +0,0 @@
-require File.join(File.dirname(__FILE__), "helpers",  "spec_helper")
-
-describe Videojuicer::Assets do
-  
-  before :each do
-    @klass = Videojuicer::Assets
-    @preset_params = {:derived_type => "Audio", :file_format => "mp3"}
-    configure_test_settings
-  end
-  
-  describe "instantiation" do
-    it_should_behave_like "a configurable"
-  end
-  
-  describe "listing assets of all types" do
-    
-    it "should list assets" do
-      @assets = Videojuicer::Assets.all
-      p @assets
-      @assets.class.should == Array
-    end
-  end
-  
-end

data/spec/criterion/time_spec.rb

@@ -1,23 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "helpers", "spec_helper")
-
-describe Videojuicer::Criterion::Time do
-
-   before(:all) do
-    @klass = Videojuicer::Criterion::Time
-    configure_test_settings
-  end
-
-  describe "instantiation" do
-    it_should_behave_like "a configurable"
-  end
-  
-  describe "general interface:" do
-    before(:all) do
-      @singular_name = "criterion"
-      @plural_name = "criteria/time"
-    end
-    
-    it_should_behave_like "a RESTFUL resource model"
-  end
-
-end