vj-sdk 0.7.9 → 0.7.10

data/Gemfile

@@ -10,13 +10,13 @@ end
 
 # DataObjects, DataMapper and Merb
 gem "addressable"
-gem "jeweler", ">= 1.4.0"
+gem "jeweler", "~> 1.8.3"
 gem "rake", ">= 0.8.7"
 gem "mash", ">= 0.0.3"
 gem "randexp"
 gem "ruby-hmac", ">= 0.3.2"
 gem "liquid", "2.0.0"
-gem "json", "1.4.6"
+gem "json"
 gem "multipart-post", "~> 1.1.0"
 gem "mime-types", "~> 1.16"
 

data/README.markdown

@@ -102,4 +102,13 @@ You may also do one-off setup of the SDK as follows:
 								:token=>@access_token["oauth_token"],
 								:token_secret=>@access_token["oauth_token_secret"]
 							)
-	Videojuicer::User.all #=> [<Videojuicer::User ................. >]
+	Videojuicer::User.all #=> [<Videojuicer::User ................. >]
+	
+	
+To deploy new versions
+----------------------
+
+rake version:bump:(patch|minor|major)
+rake gemspec
+rake build
+gem push pkg/new_gem_file.gem

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
+---
 :major: 0
-:build: 
 :minor: 7
-:patch: 9
+:patch: 10
+:build: !!null 

data/lib/videojuicer/oauth/request_proxy.rb

@@ -22,6 +22,9 @@ module Videojuicer
       # See OAuth spec 1.0a section 9.1.2 for details.
       EXCLUDED_BASE_STRING_PORTS = [80, 443].freeze
       
+      # allow Net::HTTP requests to take up to 5 minutes
+      TIMEOUT = 60 * 5
+      
       include Videojuicer::Exceptions
       include Videojuicer::Configurable
             
@@ -96,6 +99,7 @@ module Videojuicer
         end
 
         response = Net::HTTP.start(uri.host, uri.port) do |http|
+          http.read_timeout = TIMEOUT
           http.request(request)
         end
 
@@ -152,7 +156,7 @@ module Videojuicer
         begin
           e = JSON.parse(response.body)
           e = e["error"]
-          raise exception_klass, "#{e["message"]} \n #{(e["backtrace"] || []).join("\n")}"
+          raise exception_klass, "#{e["message"]} || 'an error has occurred, vj-core did not provide sufficient data to handle it properly' \n #{(e["backtrace"] || []).join("\n")}"
         rescue JSON::ParserError
           raise exception_klass, "#{exception_klass.to_s} : Response code was #{response.code} for request: #{request.path}"
         end

data/lib/videojuicer/presentation.rb

@@ -15,7 +15,7 @@ module Videojuicer
     property :callback_url,       String
 
     property :state,              String,   :default=>"ready" # see the STATES constant for values
-    property :disclosure,         String,   :default=>"public" # see DISCLOSURES constant for values
+    property :disclosure,         String,   :default=>"public" # can be 'public' or 'private'
     property :publish_from,       DateTime
     property :publish_until,      DateTime
 

data/lib/videojuicer/resource/property_registry.rb

@@ -124,7 +124,7 @@ module Videojuicer
         return value unless value
         klass = self.class.attributes[key][:class]
         
-        if value.is_a?(String) and value.any?
+        if value.is_a?(String) and !value.empty?
           # In-built types
           if klass.kind_of?(Videojuicer::Resource::Types::Base)
             return klass.new(value).dump

data/spec/asset_spec.rb

@@ -6,12 +6,18 @@ describe Videojuicer::Asset do
     
     @klass = Videojuicer::Asset
     @assets = @klass.types.map do |t|
-      4.of { t.gen } << t.gen(:friendly_name => "to_filter")
+      
+      t.all.each { |a| a.destroy }
+      
+      10.of { t.gen } << t.gen(:friendly_name => "to_filter")
     end.flatten
   end
   
   after :all do
-    @assets.each { |a| a.destroy }
+    begin
+      @assets.each { |a| a.destroy }
+    rescue
+    end
   end
   
   describe "listing assets of all types" do

data/spec/helpers/spec_helper.rb

@@ -2,6 +2,9 @@ require 'rubygems'
 require 'spec'
 require 'yaml'
 
+
+Bundler.require :development
+
 unless defined?(Mash)
   # Don't require Mash twice. It causes cranial trauma.
   require 'mash'

data/vj-sdk.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{vj-sdk}
-  s.version = "0.7.9"
+  s.name = "vj-sdk"
+  s.version = "0.7.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["danski", "thejohnny", "knowtheory", "sixones", "btab", "lamp"]
-  s.date = %q{2011-04-12}
-  s.email = %q{dan@videojuicer.com}
+  s.date = "2012-05-09"
+  s.email = "dan@videojuicer.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.markdown"
@@ -107,85 +107,48 @@ Gem::Specification.new do |s|
     "spec/videojuicer_spec.rb",
     "vj-sdk.gemspec"
   ]
-  s.homepage = %q{http://github.com/videojuicer/vj-sdk}
+  s.homepage = "http://github.com/videojuicer/vj-sdk"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Videojuicer core-sdk}
-  s.test_files = [
-    "spec/asset_spec.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/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/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/multipart_spec.rb",
-    "spec/presentation_spec.rb",
-    "spec/preset_spec.rb",
-    "spec/property_registry_spec.rb",
-    "spec/request_proxy_spec.rb",
-    "spec/seed_spec.rb",
-    "spec/session_spec.rb",
-    "spec/shared/asset_spec.rb",
-    "spec/shared/configurable_spec.rb",
-    "spec/shared/dependent_spec.rb",
-    "spec/shared/embeddable_spec.rb",
-    "spec/shared/model_spec.rb",
-    "spec/shared/resource_spec.rb",
-    "spec/shared/taggable_spec.rb",
-    "spec/user_spec.rb",
-    "spec/videojuicer_spec.rb"
-  ]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Videojuicer core-sdk"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<addressable>, [">= 0"])
-      s.add_runtime_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_runtime_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
       s.add_runtime_dependency(%q<mash>, [">= 0.0.3"])
       s.add_runtime_dependency(%q<randexp>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-hmac>, [">= 0.3.2"])
       s.add_runtime_dependency(%q<liquid>, ["= 2.0.0"])
-      s.add_runtime_dependency(%q<json>, ["= 1.4.6"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<multipart-post>, ["~> 1.1.0"])
       s.add_runtime_dependency(%q<mime-types>, ["~> 1.16"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
     else
       s.add_dependency(%q<addressable>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<rake>, [">= 0.8.7"])
       s.add_dependency(%q<mash>, [">= 0.0.3"])
       s.add_dependency(%q<randexp>, [">= 0"])
       s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
       s.add_dependency(%q<liquid>, ["= 2.0.0"])
-      s.add_dependency(%q<json>, ["= 1.4.6"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<multipart-post>, ["~> 1.1.0"])
       s.add_dependency(%q<mime-types>, ["~> 1.16"])
       s.add_dependency(%q<rspec>, ["~> 1.3.0"])
     end
   else
     s.add_dependency(%q<addressable>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<rake>, [">= 0.8.7"])
     s.add_dependency(%q<mash>, [">= 0.0.3"])
     s.add_dependency(%q<randexp>, [">= 0"])
     s.add_dependency(%q<ruby-hmac>, [">= 0.3.2"])
     s.add_dependency(%q<liquid>, ["= 2.0.0"])
-    s.add_dependency(%q<json>, ["= 1.4.6"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<multipart-post>, ["~> 1.1.0"])
     s.add_dependency(%q<mime-types>, ["~> 1.16"])
     s.add_dependency(%q<rspec>, ["~> 1.3.0"])

metadata

@@ -1,15 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vj-sdk
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.7.10
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 9
-  version: 0.7.9
 platform: ruby
-authors: 
+authors:
 - danski
 - thejohnny
 - knowtheory
@@ -19,191 +14,192 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-12 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  type: :runtime
-  requirement: *id001
+date: 2012-05-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: addressable
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  prerelease: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
   type: :runtime
-  requirement: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
-        version: 0.0.3
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :runtime
-  requirement: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
   name: mash
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
   type: :runtime
-  requirement: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+- !ruby/object:Gem::Dependency
   name: randexp
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
-        version: 0.3.2
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: ruby-hmac
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
-  requirement: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
   name: liquid
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
-  prerelease: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
-  requirement: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
   name: json
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: multipart-post
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
-        version: "1.16"
-  prerelease: false
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-  requirement: *id010
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: mime-types
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :runtime
   prerelease: false
-  type: :development
-  requirement: *id011
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.16'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: 
 email: dan@videojuicer.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - Gemfile
 - LICENSE
 - README.markdown
@@ -294,73 +290,31 @@ files:
 - spec/user_spec.rb
 - spec/videojuicer_spec.rb
 - vj-sdk.gemspec
-has_rdoc: true
 homepage: http://github.com/videojuicer/vj-sdk
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2976334485759186682
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Videojuicer core-sdk
-test_files: 
-- spec/asset_spec.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/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/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/multipart_spec.rb
-- spec/presentation_spec.rb
-- spec/preset_spec.rb
-- spec/property_registry_spec.rb
-- spec/request_proxy_spec.rb
-- spec/seed_spec.rb
-- spec/session_spec.rb
-- spec/shared/asset_spec.rb
-- spec/shared/configurable_spec.rb
-- spec/shared/dependent_spec.rb
-- spec/shared/embeddable_spec.rb
-- spec/shared/model_spec.rb
-- spec/shared/resource_spec.rb
-- spec/shared/taggable_spec.rb
-- spec/user_spec.rb
-- spec/videojuicer_spec.rb
+test_files: []