vj-sdk 0.5.4 → 0.5.5

data/VERSION.yml

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

data/lib/bundler_runtime_patch.rb

@@ -16,7 +16,11 @@ module Bundler
     
       # NEW METHOD
       ordered_deps = []
-      spec_names = specs_for(*groups).map { |s| s.name }
+      begin # this is done because of an api change between 0.9.10 and 0.9.15
+        spec_names = specs_for(*groups).map { |s| s.name }
+      rescue
+        spec_names = specs_for(groups).map { |s| s.name }
+      end
       @definition.dependencies.each do |dep|
         ordered_deps << dep if spec_names.include?(dep.name) && !ordered_deps.include?(dep)
       end

data/lib/videojuicer.rb

@@ -22,6 +22,7 @@ require 'videojuicer/oauth/proxy_factory'
 require 'videojuicer/resource/embeddable'
 require 'videojuicer/resource/types'
 require 'videojuicer/resource/relationships/belongs_to'
+require 'videojuicer/resource/relationships/has'
 require 'videojuicer/resource/errors'
 require 'videojuicer/resource/collection'
 require 'videojuicer/resource/inferrable'
@@ -32,7 +33,7 @@ require 'videojuicer/session'
 require 'videojuicer/seed'
 require 'videojuicer/user'
 require 'videojuicer/campaign'
-require 'videojuicer/campaign_policy'
+require 'videojuicer/insert'
 require 'videojuicer/presentation'
 require 'videojuicer/asset/audio'
 require 'videojuicer/asset/document'
@@ -40,13 +41,11 @@ require 'videojuicer/asset/flash'
 require 'videojuicer/asset/image'
 require 'videojuicer/asset/text'
 require 'videojuicer/asset/video'
-require 'videojuicer/promo/base'
 require 'videojuicer/criterion/date_range'
 require 'videojuicer/criterion/geolocation'
 require 'videojuicer/criterion/request'
 require 'videojuicer/criterion/time'
 require 'videojuicer/criterion/week_day'
-require 'videojuicer/promo/base'
 require 'videojuicer/preset'
 
 module Videojuicer

data/lib/videojuicer/campaign.rb

@@ -3,17 +3,18 @@ module Videojuicer
     include Videojuicer::Resource
     include Videojuicer::Exceptions
     
-    property :name,     String
-    property :user_id,  Integer
-    property :created_at, DateTime
-    property :updated_at, DateTime
+    property :name,         String
+    property :user_id,      Integer
+    property :target_type,  String
+    property :target_id,    Integer
+    property :disclosure,   String
+    property :created_at,   DateTime
+    property :updated_at,   DateTime
+
     belongs_to :user, :class=>Videojuicer::User
     
-    attr_accessor :campaign_policies
-    def campaign_policies=(arg)
-      # Loop over and make objects or something
-      @campaign_policies=(arg)
-    end
-    
+    attr_accessor :criteria
+    attr_accessor :targets
+    attr_accessor :inserts
   end
 end

data/lib/videojuicer/criterion/date_range.rb

@@ -1,12 +1,23 @@
-require File.join(File.dirname(__FILE__), "base")
-
 module Videojuicer
   module Criterion
-    class DateRange < Base
+    class DateRange
       
+      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

data/lib/videojuicer/criterion/geolocation.rb

@@ -1,14 +1,25 @@
-require File.join(File.dirname(__FILE__), "base")
-
 module Videojuicer
   module Criterion
-    class Geolocation < Base
+    class Geolocation
+      
+      include Videojuicer::Resource
       
+      belongs_to :campaign, :class=>Videojuicer::Campaign
+      
+      property :campaign_id,        Integer
       property :country,            String
       property :region,             String
       property :city,               String
       property :exclude,            Boolean
       
+      def self.singular_name
+        "criterion"
+      end
+      
+      def self.base_path(options={})
+        "/criteria/#{self.to_s.split("::").last.snake_case}"
+      end
+      
       def matcher_keys
         [:country, :region, :city, :exclude]
       end

data/lib/videojuicer/criterion/request.rb

@@ -1,12 +1,23 @@
-require File.join(File.dirname(__FILE__), "base")
-
 module Videojuicer
   module Criterion
-    class Request < Base
+    class Request
       
+      include Videojuicer::Resource
+      
+      belongs_to :campaign, :class=>Videojuicer::Campaign
+      
+      property :campaign_id,         Integer
       property :referrer,           String, :nullable => false
       property :exclude,            Boolean
       
+      def self.singular_name
+        "criterion"
+      end
+      
+      def self.base_path(options={})
+        "/criteria/#{self.to_s.split("::").last.snake_case}"
+      end
+      
       def matcher_keys
         [:referrer, :exclude]
       end

data/lib/videojuicer/criterion/time.rb

@@ -1,12 +1,23 @@
-require File.join(File.dirname(__FILE__), "base")
-
 module Videojuicer
   module Criterion
-    class Time < Base
+    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

data/lib/videojuicer/criterion/week_day.rb

@@ -1,8 +1,12 @@
-require File.join(File.dirname(__FILE__), "base")
-
 module Videojuicer
   module Criterion
-    class WeekDay < Base
+    class WeekDay
+      
+      include Videojuicer::Resource
+      
+      belongs_to :campaign, :class=>Videojuicer::Campaign
+      
+      property :campaign_id,        Integer
       property :monday,             Boolean
       property :tuesday,            Boolean
       property :wednesday,          Boolean
@@ -12,6 +16,14 @@ module Videojuicer
       property :sunday,             Boolean
       property :exclude,            Boolean
       
+      def self.singular_name
+        "criterion"
+      end
+      
+      def self.base_path(options={})
+        "/criteria/#{self.to_s.split("::").last.snake_case}"
+      end
+      
       def matcher_keys
         [:monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday, :exclude]
       end

data/lib/videojuicer/insert.rb

@@ -0,0 +1,22 @@
+module Videojuicer
+  class Insert
+    include Videojuicer::Resource
+    include Videojuicer::Exceptions
+    
+    property :campaign_id,  Integer
+    property :role,         String
+    property :offset_time,  Integer
+    property :offset_x,     Integer
+    property :offset_y,     Integer
+    property :anchor_x,     String
+    property :anchor_y,     String
+    property :click_href,   String
+    property :click_target, String
+    property :asset_type,   String
+    property :asset_id,     Integer
+    property :created_at,   DateTime
+    property :updated_at,   DateTime
+    
+    belongs_to :campaign, :class=>Videojuicer::Campaign
+  end
+end

data/lib/videojuicer/resource/relationships/has.rb

@@ -0,0 +1,53 @@
+module Videojuicer
+  module Resource
+    module Relationships
+      module Has
+   
+        def self.included(base)
+          base.extend(ClassMethods)
+          base.include(InstanceMethods)
+        end
+        
+        module ClassMethods
+          
+          # Returns a :many quantifier for the ##has method.
+          def n
+            :many
+          end
+          
+          def has(quantifier, name, options={})
+            options = {
+              :class=>name.to_s.capitalize,
+              :foreign_key=>"#{name}_id"
+            }.merge(options)
+            
+            define_method name do
+              id = self.send(options[:foreign_key])
+              klass = (options[:class].is_a?(String))? Videojuicer.const_get(options[:class]) : options[:class]
+              return nil unless id
+              begin
+                return klass.get(id)
+              rescue Videojuicer::Exceptions::NoResource
+                return nil
+              end
+            end
+            
+            define_method "#{name}=" do |arg|
+              self.send("#{options[:foreign_key]}=", arg.id)
+            end
+          end
+          
+        end
+        
+        module InstanceMethods
+          
+          private
+          def write_has_one_object(object)
+          end
+          
+        end
+        
+      end
+    end
+  end
+end

data/spec/criterion/date_range_spec.rb

@@ -17,7 +17,7 @@ describe Videojuicer::Criterion::DateRange do
       @plural_name = "criteria/date_range"
     end
     
-    it_should_behave_like "a dependent non-resource object"
+    it_should_behave_like "a RESTFUL resource model"
   end
 
 end

data/spec/criterion/geolocation_spec.rb

@@ -17,7 +17,7 @@ describe Videojuicer::Criterion::Geolocation do
       @plural_name = "criteria/geolocation"
     end
     
-    it_should_behave_like "a dependent non-resource object"
+    it_should_behave_like "a RESTFUL resource model"
   end
 
 end

data/spec/criterion/request_spec.rb

@@ -17,7 +17,7 @@ describe Videojuicer::Criterion::Request do
       @plural_name = "criteria/request"
     end
     
-    it_should_behave_like "a dependent non-resource object"
+    it_should_behave_like "a RESTFUL resource model"
   end
 
 end

data/spec/criterion/time_spec.rb

@@ -17,7 +17,7 @@ describe Videojuicer::Criterion::Time do
       @plural_name = "criteria/time"
     end
     
-    it_should_behave_like "a dependent non-resource object"
+    it_should_behave_like "a RESTFUL resource model"
   end
 
 end

data/spec/criterion/week_day_spec.rb

@@ -17,7 +17,7 @@ describe Videojuicer::Criterion::WeekDay do
       @plural_name = "criteria/week_day"
     end
     
-    it_should_behave_like "a dependent non-resource object"
+    it_should_behave_like "a RESTFUL resource model"
   end
 
 end

data/spec/has_spec.rb

@@ -0,0 +1,7 @@
+require File.join(File.dirname(__FILE__), "helpers", "spec_helper")
+
+describe Videojuicer::Resource::Relationships::Has do
+  
+  
+  
+end

data/spec/helpers/spec_fixtures.rb

@@ -61,24 +61,27 @@ module Videojuicer
     }}
   end
   
-  class Campaign
+  class Insert
     include FixtureHelper
     set_attribute_proc {{
-      :name => /\w+/.gen
+      :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)
     }}
   end
   
-  class Campaign::CampaignPolicy
+  class Campaign
     include FixtureHelper
     set_attribute_proc {{
-	    :campaign_id => Campaign.gen.id,
-	    :presentation_id => (Presentation.first.id rescue Presentation.gen.id)
+      :name => /\w+/.gen,
+      :target_type => "com.videojuicer.core.Presentation"
     }}
   end
   
   class Criterion::DateRange
     include FixtureHelper
     set_attribute_proc {{
+      :campaign_id => 1,
       :until => DateTime.send(:today) + 1,
       :from => DateTime.send(:today) - 1
     }}
@@ -87,6 +90,7 @@ module Videojuicer
   class Criterion::Geolocation
     include FixtureHelper
     set_attribute_proc {{
+      :campaign_id => 1,
       :city => "Columbus", 
       :region => "OH",
       :country => "United States"
@@ -96,13 +100,16 @@ module Videojuicer
   class Criterion::Request
     include FixtureHelper
     set_attribute_proc {{
-      :referrer => "http://www.google.com"
+      :campaign_id => 1,
+      :referrer => "http://www.google.com",
+      :exclude => false
     }}
   end
   
   class Criterion::Time
     include FixtureHelper
     set_attribute_proc {{
+      :campaign_id => 1,
       :from => (Time.now - 3600).strftime("%H:%M"),
       :until => (Time.now + 3600).strftime("%H:%M")
     }}
@@ -111,43 +118,9 @@ module Videojuicer
   class Criterion::WeekDay
     include FixtureHelper
     set_attribute_proc {{
-      :monday => true
-    }}
-  end
-  
-  class Promo::Image
-    include FixtureHelper
-    set_attribute_proc {{
-      :role => "Thumbnail",
-      :href => "http://www.videojuicer.com",
-      :asset_id => 1
-    }}
-  end
-  
-  class Promo::Audio
-    include FixtureHelper
-    set_attribute_proc {{
-      :role => "Voice Over",
-      :href => "http://www.videojuicer.com",
-      :asset_id => 1
-    }}
-  end
-  
-  class Promo::Video
-    include FixtureHelper
-    set_attribute_proc {{
-      :role => "preroll",
-      :href => "http://www.videojuicer.com",
-      :asset_id => 1
-    }}
-  end
-  
-  class Promo::Text
-    include FixtureHelper
-    set_attribute_proc {{
-      :role => "Description",
-      :href => "http://www.videojuicer.com",
-      :asset_id => 1
+      :campaign_id => 1,
+      :monday => true,
+      :exclude => false
     }}
   end
   

data/spec/insert_spec.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__), "helpers", "spec_helper")
+
+describe Videojuicer::Insert do
+  
+  before(:all) do
+    @klass = Videojuicer::Insert
+    configure_test_settings
+  end
+  
+  describe "instantiation" do
+    it_should_behave_like "a configurable"
+  end
+  
+  describe "general interface:" do
+    before(:all) do
+      @singular_name = "insert"
+      @plural_name = "inserts"
+    end
+    
+    it_should_behave_like "a RESTFUL resource model"
+  end
+  
+  
+end

data/vj-sdk.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vj-sdk}
-  s.version = "0.5.4"
+  s.version = "0.5.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-05-11}
+  s.date = %q{2010-05-19}
   s.email = %q{dan@videojuicer.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -36,19 +36,17 @@ Gem::Specification.new do |s|
      "lib/videojuicer/asset/text.rb",
      "lib/videojuicer/asset/video.rb",
      "lib/videojuicer/campaign.rb",
-     "lib/videojuicer/campaign_policy.rb",
-     "lib/videojuicer/criterion/base.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",
      "lib/videojuicer/oauth/proxy_factory.rb",
      "lib/videojuicer/oauth/request_proxy.rb",
      "lib/videojuicer/presentation.rb",
      "lib/videojuicer/preset.rb",
-     "lib/videojuicer/promo/base.rb",
      "lib/videojuicer/resource/base.rb",
      "lib/videojuicer/resource/collection.rb",
      "lib/videojuicer/resource/embeddable.rb",
@@ -56,6 +54,7 @@ Gem::Specification.new do |s|
      "lib/videojuicer/resource/inferrable.rb",
      "lib/videojuicer/resource/property_registry.rb",
      "lib/videojuicer/resource/relationships/belongs_to.rb",
+     "lib/videojuicer/resource/relationships/has.rb",
      "lib/videojuicer/resource/types.rb",
      "lib/videojuicer/seed.rb",
      "lib/videojuicer/session.rb",
@@ -69,7 +68,6 @@ Gem::Specification.new do |s|
      "spec/assets/text_spec.rb",
      "spec/assets/video_spec.rb",
      "spec/belongs_to_spec.rb",
-     "spec/campaign_policy_spec.rb",
      "spec/campaign_spec.rb",
      "spec/collection_spec.rb",
      "spec/criterion/date_range_spec.rb",
@@ -84,15 +82,13 @@ Gem::Specification.new do |s|
      "spec/files/image.jpg",
      "spec/files/text.txt",
      "spec/files/video.mov",
+     "spec/has_spec.rb",
      "spec/helpers/be_equal_to.rb",
      "spec/helpers/spec_fixtures.rb",
      "spec/helpers/spec_helper.rb",
+     "spec/insert_spec.rb",
      "spec/presentation_spec.rb",
      "spec/preset_spec.rb",
-     "spec/promos/audio_spec.rb",
-     "spec/promos/image_spec.rb",
-     "spec/promos/text_spec.rb",
-     "spec/promos/video_spec.rb",
      "spec/property_registry_spec.rb",
      "spec/request_proxy_spec.rb",
      "spec/seed_spec.rb",
@@ -111,7 +107,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",
@@ -121,7 +117,6 @@ Gem::Specification.new do |s|
      "spec/assets/text_spec.rb",
      "spec/assets/video_spec.rb",
      "spec/belongs_to_spec.rb",
-     "spec/campaign_policy_spec.rb",
      "spec/campaign_spec.rb",
      "spec/collection_spec.rb",
      "spec/criterion/date_range_spec.rb",
@@ -129,15 +124,13 @@ Gem::Specification.new do |s|
      "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",
      "spec/helpers/spec_fixtures.rb",
      "spec/helpers/spec_helper.rb",
+     "spec/insert_spec.rb",
      "spec/presentation_spec.rb",
      "spec/preset_spec.rb",
-     "spec/promos/audio_spec.rb",
-     "spec/promos/image_spec.rb",
-     "spec/promos/text_spec.rb",
-     "spec/promos/video_spec.rb",
      "spec/property_registry_spec.rb",
      "spec/request_proxy_spec.rb",
      "spec/seed_spec.rb",
@@ -156,7 +149,7 @@ 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"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vj-sdk
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - danski
@@ -18,16 +19,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-11 00:00:00 +01:00
+date: 2010-05-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -38,9 +41,11 @@ dependencies:
   name: ruby-hmac
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 3
@@ -52,9 +57,11 @@ dependencies:
   name: mash
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 0
@@ -92,19 +99,17 @@ files:
 - lib/videojuicer/asset/text.rb
 - lib/videojuicer/asset/video.rb
 - lib/videojuicer/campaign.rb
-- lib/videojuicer/campaign_policy.rb
-- lib/videojuicer/criterion/base.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
 - lib/videojuicer/oauth/proxy_factory.rb
 - lib/videojuicer/oauth/request_proxy.rb
 - lib/videojuicer/presentation.rb
 - lib/videojuicer/preset.rb
-- lib/videojuicer/promo/base.rb
 - lib/videojuicer/resource/base.rb
 - lib/videojuicer/resource/collection.rb
 - lib/videojuicer/resource/embeddable.rb
@@ -112,6 +117,7 @@ files:
 - lib/videojuicer/resource/inferrable.rb
 - lib/videojuicer/resource/property_registry.rb
 - lib/videojuicer/resource/relationships/belongs_to.rb
+- lib/videojuicer/resource/relationships/has.rb
 - lib/videojuicer/resource/types.rb
 - lib/videojuicer/seed.rb
 - lib/videojuicer/session.rb
@@ -125,7 +131,6 @@ files:
 - spec/assets/text_spec.rb
 - spec/assets/video_spec.rb
 - spec/belongs_to_spec.rb
-- spec/campaign_policy_spec.rb
 - spec/campaign_spec.rb
 - spec/collection_spec.rb
 - spec/criterion/date_range_spec.rb
@@ -140,15 +145,13 @@ files:
 - spec/files/image.jpg
 - spec/files/text.txt
 - spec/files/video.mov
+- spec/has_spec.rb
 - spec/helpers/be_equal_to.rb
 - spec/helpers/spec_fixtures.rb
 - spec/helpers/spec_helper.rb
+- spec/insert_spec.rb
 - spec/presentation_spec.rb
 - spec/preset_spec.rb
-- spec/promos/audio_spec.rb
-- spec/promos/image_spec.rb
-- spec/promos/text_spec.rb
-- spec/promos/video_spec.rb
 - spec/property_registry_spec.rb
 - spec/request_proxy_spec.rb
 - spec/seed_spec.rb
@@ -173,23 +176,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
@@ -201,7 +208,6 @@ test_files:
 - spec/assets/text_spec.rb
 - spec/assets/video_spec.rb
 - spec/belongs_to_spec.rb
-- spec/campaign_policy_spec.rb
 - spec/campaign_spec.rb
 - spec/collection_spec.rb
 - spec/criterion/date_range_spec.rb
@@ -209,15 +215,13 @@ test_files:
 - 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
 - spec/helpers/spec_fixtures.rb
 - spec/helpers/spec_helper.rb
+- spec/insert_spec.rb
 - spec/presentation_spec.rb
 - spec/preset_spec.rb
-- spec/promos/audio_spec.rb
-- spec/promos/image_spec.rb
-- spec/promos/text_spec.rb
-- spec/promos/video_spec.rb
 - spec/property_registry_spec.rb
 - spec/request_proxy_spec.rb
 - spec/seed_spec.rb

data/lib/videojuicer/campaign_policy.rb

@@ -1,116 +0,0 @@
-module Videojuicer
-  class Campaign
-    class CampaignPolicy
-      include Videojuicer::Resource
-    
-      # Resource should note that this is a class within a class
-      # Should treat parent class as parent resource
-      
-      property :presentation_id,  Integer
-      property :campaign_id,      Integer
-      property :created_at,       DateTime
-      property :updated_at,       DateTime
-      
-      belongs_to :campaign
-      
-      attr_accessor :criteria
-      def criteria=(object_hash)
-        # TODO instantiate criteria in a useful object of some sort
-        
-        # Fail unless arg is an array
-        # Loop over array do |mem|
-          # if mem is a hash
-            # instantiate as a criterion
-            
-            
-          # if criterion object already on this policy
-            # leave be
-          # else
-            # add_criteria(mem)
-          # end
-        # end
-        
-        # what you want to be able to do is:
-        # policy.criteria.include?(some_criterion)
-        @criteria = {}
-        object_hash.map do |type_sym, criteria|
-          @criteria[type_sym.to_sym] = 
-          criteria.map do |criterion|
-            Videojuicer::Criterion.model_map[type_sym.to_sym].new(criterion) #rescue raise("No criteria class found for #{type_sym} in #{Videojuicer::Criterion.model_map.inspect}")
-          end
-        end
-      end
-      
-      def criteria
-        @criteria.values.flatten
-      end
-      
-      %w(date_criteria geolocation_criteria request_criteria time_criteria week_day_criteria).each do |key|
-        class_eval <<-DEF
-          def #{key}
-            @criteria[:#{key}]
-          end
-        DEF
-      end
-      
-      
-      def add_criteria(*criteria)
-        responses = criteria.map do |criterion|
-          proxy_for(config).post("#{path_for_dependents}#{criterion.class.base_path}", {:criterion => criterion.attributes})
-        end
-        self.reload
-        responses
-      end
-      
-      def remove_criteria(*criteria)
-        responses = criteria.map do |criterion|
-          proxy_for(config).delete("#{path_for_dependents}#{criterion.class.base_path}", {:criterion => criterion.attributes})
-        end
-        self.reload
-        responses
-      end
-      
-      def promos=(object_hash={})
-        @promos = {}
-        object_hash.map do |type_sym, promos|
-          @promos[type_sym.to_sym] = 
-          promos.map do |promo|
-            Videojuicer::Promo.model_map[type_sym.to_sym].new(promo)
-          end
-        end
-      end
-      
-      def promos
-        @promos.values.flatten
-      end
-
-      %w(audio images texts videos).each do |key|
-        class_eval <<-DEF
-          def #{key}
-            @promos[:#{key}]
-          end
-        DEF
-      end
-
-      def add_promo(*promos)
-        responses = promos.map do |promo|
-          proxy_for(config).post("#{path_for_dependents}#{promo.class.base_path}", {:promo => promo.attributes})
-        end
-        self.reload
-        responses
-      end
-      
-      def remove_promo(*promos)
-        responses = promos.map do |promo|
-          proxy_for(config).delete("#{path_for_dependents}#{promo.class.base_path}", {:promo => promo.attributes})
-        end
-        self.reload
-        responses
-      end
-      
-      def path_for_dependents
-        self.class.compile_route(self.class.nesting_route,{:campaign_policy_id => self.id, :campaign_id => self.campaign_id})
-      end
-    end
-  end
-end

data/lib/videojuicer/criterion/base.rb

@@ -1,56 +0,0 @@
-module Videojuicer
-  module Criterion
-    def self.model_map
-      { :date_criteria        => Videojuicer::Criterion::DateRange,
-        :geolocation_criteria => Videojuicer::Criterion::Geolocation,
-        :request_criteria     => Videojuicer::Criterion::Request,
-        :time_criteria        => Videojuicer::Criterion::Time,
-        :week_day_criteria    => Videojuicer::Criterion::WeekDay
-      }
-    end
-    
-    class Base
-      def self.inherited(base)
-        base.send(:include, Videojuicer::Resource)
-        base.send(:extend, Videojuicer::Criterion::Base::ClassMethods)
-        base.send(:include, Videojuicer::Criterion::Base::InstanceMethods)
-      end
-      
-      module ClassMethods
-        def singular_name
-          "criterion"
-        end
-        
-        def base_path(options={})
-          "/criteria/#{self.to_s.split("::").last.snake_case}"
-        end
-        
-        def get(*args); raise NoMethodError; end
-        def all(*args); raise NoMethodError; end
-        def first(*args); raise NoMethodError; end
-      end
-      
-      module InstanceMethods
-        def save(*args); raise NoMethodError; end
-        def destroy(*args); raise NoMethodError; end
-        def ==(other); self.attributes == other.attributes; end
-        def eql?(other); self.attributes.eql?(other.attributes) end
-        def matcher_attributes;  end
-        
-        def matcher_attributes
-          result = {}
-          self.matcher_keys.each do |key|
-            result[key] = self.send(key)
-          end
-          return result
-        end
-        
-        def matcher_keys
-          raise NoMethodError, "Matcher Attributes needs to be implemented for #{self.class}";
-        end
-
-      end
-            
-    end
-  end
-end

data/lib/videojuicer/promo/base.rb

@@ -1,72 +0,0 @@
-module Videojuicer
-  module Promo
-    def self.model_map
-      { :audio  => Videojuicer::Promo::Audio,
-        :images => Videojuicer::Promo::Image,
-        :texts  => Videojuicer::Promo::Text,
-        :videos => Videojuicer::Promo::Video
-      }
-    end
-    
-    class Base
-      
-      def self.inherited(base)
-        base.send(:include, Videojuicer::Resource)
-        base.send(:extend, Videojuicer::Promo::Base::ClassMethods)
-        base.send(:include, Videojuicer::Promo::Base::InstanceMethods)
-        
-        base.property :campaign_policy_id,  Integer
-        base.property :asset_id,            Integer
-        base.property :role,                String
-        base.property :href,                String
-      end
-      
-      module ClassMethods
-        def singular_name
-          "promo"
-        end
-        
-        def base_path(options={})
-          "/promos/#{self.to_s.split("::").last.snake_case}"
-        end
-        
-        def get(*args); raise NoMethodError; end
-        def all(*args); raise NoMethodError; end
-        def first(*args); raise NoMethodError; end
-      end
-      
-      module InstanceMethods
-        def save(*args); raise NoMethodError; end
-        def destroy(*args); raise NoMethodError; end
-        def asset
-          Videojuicer::Asset.const_get(self.class.to_s.split("::").last).get(asset_id)
-        end
-        def matcher_keys
-          [:campaign_policy_id, :asset_id, :role, :href]
-        end
-        def matcher_attributes
-          matcher_keys.inject({}) do |memo, attr|
-            memo.update(attr => self.send(attr))
-          end
-        end
-      end
-            
-    end
-    
-    class Audio < Base
-    end
-
-    class Image < Base
-    end
-
-    class Text < Base
-    end
-    
-    class Video < Base
-    end
-    
-    class Heart < Base
-    end
-    
-  end
-end

data/spec/campaign_policy_spec.rb

@@ -1,41 +0,0 @@
-require File.join(File.dirname(__FILE__), "helpers", "spec_helper")
-
-describe Videojuicer::Campaign::CampaignPolicy do
-  
-  before(:all) do
-    @klass = Videojuicer::Campaign::CampaignPolicy
-    configure_test_settings
-  end
-  
-  describe "instantiation" do
-    it_should_behave_like "a configurable"
-  end
-  
-  describe "general interface:" do
-    before(:all) do
-      @singular_name = "campaign_policy"
-      @plural_name = "campaign_policies"
-      @fixed_attributes = [:campaign_id]
-    end
-    
-    it_should_behave_like "a RESTFUL resource model"
-  end
-  
-  describe "adding policies" do
-  
-  end
-  
-  describe "removing policies" do
-  
-  end
-  
-  describe "adding promos" do
-  
-  end
-  
-  describe "removing promos" do
-  
-  end
-  
-  
-end

data/spec/promos/audio_spec.rb

@@ -1,23 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "helpers",  "spec_helper")
-
-describe Videojuicer::Promo::Audio do
-
-   before(:all) do
-    @klass = Videojuicer::Promo::Audio
-    configure_test_settings
-  end
-  
-  describe "instantiation" do
-    it_should_behave_like "a configurable"
-  end
-  
-  describe "general interface:" do
-    before(:all) do
-      @singular_name = "promo"
-      @plural_name = "promos/audio"
-    end
-    
-    it_should_behave_like "a dependent non-resource object"
-  end
-
-end

data/spec/promos/image_spec.rb

@@ -1,24 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "helpers",  "spec_helper")
-
-describe Videojuicer::Promo::Image do
-
-   before(:all) do
-    @klass = Videojuicer::Promo::Image
-    configure_test_settings
-  end
-  
-  describe "instantiation" do
-    it_should_behave_like "a configurable"
-  end
-  
-  describe "general interface:" do
-    before(:all) do
-      @singular_name = "promo"
-      @plural_name = "promos/image"
-    end
-    
-    it_should_behave_like "a dependent non-resource object"
-  end
-
-end
-  

data/spec/promos/text_spec.rb

@@ -1,23 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "helpers",  "spec_helper")
-
-describe Videojuicer::Promo::Text do
-
-   before(:all) do
-    @klass = Videojuicer::Promo::Text
-    configure_test_settings
-  end
-  
-  describe "instantiation" do
-    it_should_behave_like "a configurable"
-  end
-  
-  describe "general interface:" do
-    before(:all) do
-      @singular_name = "promo"
-      @plural_name = "promos/text"
-    end
-    
-    it_should_behave_like "a dependent non-resource object"
-  end
-
-end

data/spec/promos/video_spec.rb

@@ -1,23 +0,0 @@
-require File.join(File.dirname(__FILE__), "..", "helpers",  "spec_helper")
-
-describe Videojuicer::Promo::Video do
-
-   before(:all) do
-    @klass = Videojuicer::Promo::Video
-    configure_test_settings
-  end
-  
-  describe "instantiation" do
-    it_should_behave_like "a configurable"
-  end
-  
-  describe "general interface:" do
-    before(:all) do
-      @singular_name = "promo"
-      @plural_name = "promos/video"
-    end
-    
-    it_should_behave_like "a dependent non-resource object"
-  end
-
-end