kaltura_fu 0.2.0 → 0.2.1

data/README.markdown

@@ -23,7 +23,7 @@ Install the gem with the command:
     gem install kaltura_fu
 Run: 
   
-    script/generate kaltura_fu_install
+    rails g kaltura_fu:install
     
 This will install the kaltura.yml file into your application's config directory and the kaltura_upload.js into the application's public/javascripts directory.
 	

data/Rakefile

@@ -54,15 +54,9 @@ task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION.yml')
-    config = YAML.load(File.read('VERSION.yml'))
-    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
-  else
-    version = ""
-  end
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "kaltura-ruby #{version}"
+  rdoc.title = "kaltura-ruby"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/kaltura_fu.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require 'kaltura_fu/version'
 
 Gem::Specification.new do |s|
   s.name = %q{kaltura_fu}
-  s.version = "0.2.0"
+  s.version = KalturaFu::Version.dup
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrick Robertson"]
-  s.date = %q{2010-11-06}
+  s.date = %q{2011-04-20}
   s.email = %q{patrick.robertson@velir.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -20,11 +22,11 @@ Gem::Specification.new do |s|
      "README.markdown",
      "Rakefile",
      "VERSION.yml",
-     "generators/kaltura_fu_install/kaltura_fu_install_generator.rb",
-     "generators/kaltura_fu_install/templates/kaltura.yml",
-     "generators/kaltura_fu_install/templates/kaltura_upload.js",
      "install.rb",
      "kaltura_fu.gemspec",
+     "lib/generators/kaltura_fu/install_generator.rb",
+     "lib/generators/templates/kaltura.yml",
+     "lib/generators/templates/kaltura_upload.js",
      "lib/kaltura_fu.rb",
      "lib/kaltura_fu/configuration.rb",
      "lib/kaltura_fu/entry.rb",
@@ -35,6 +37,7 @@ Gem::Specification.new do |s|
      "lib/kaltura_fu/entry/metadata/class_and_instance_methods.rb",
      "lib/kaltura_fu/entry/metadata/class_methods.rb",
      "lib/kaltura_fu/railtie.rb",
+     "lib/kaltura_fu/version.rb",
      "lib/kaltura_fu/view_helpers.rb",
      "rails/init.rb",
      "spec/debug.log",

data/lib/generators/kaltura_fu/install_generator.rb

@@ -0,0 +1,16 @@
+module KalturaFu
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("../../templates",__FILE__)
+      desc "Copies the Kaltura config file and upload JS to your app."
+            
+      def copy_config
+        copy_file "kaltura.yml", "config/kaltura.yml"
+      end
+      
+      def copy_javascript
+        copy_file "kaltura_upload.js", "public/javascripts/kaltura_upload.js"
+      end
+    end
+  end
+end

data/lib/kaltura_fu/entry/class_methods.rb

@@ -5,13 +5,12 @@ module KalturaFu
     # Class level methods for the Entry module.  
     ##
     module ClassMethods
-      #extend KalturaFu::Entry::Metadata
       ##
       # Allows you to upload some variety of media into Kaltura.  
       # This isn't going to be as great to use as one of their flash widgets, and 
       # should likely be used "off" the web process to not slow the application down.
       #
-      # @param upload_object The object to upload.  Currently, it only works with a File.
+      # @param [File] upload_object The object to upload.  Currently, it only works with a File.
       # @param [Hash] options An options hash of Kaltura Media Entry attributes to add & the
       #   upload_object source.
       # @option options [Symbol] :source(nil) Currently only accepts :file

data/lib/kaltura_fu/entry/metadata.rb

@@ -93,6 +93,21 @@ module KalturaFu
         
       end
       
+      ##
+      # Sets multiple Kaltura::MediaEntry attributes in one convienant method.
+      #
+      # @param [String] entry_id The Kaltura entry ID.
+      # @param [Hash] attributes
+      # @option attributes [String] :attribute A Kaltura::MediaEntry attribute to set
+      ##
+      def set(entry_id, attributes={})
+        KalturaFu.check_for_client_session
+        
+        attributes.each do |key,value|
+          attribute = key.to_s
+          set_attribute(attribute,entry_id,value) if valid_entry_attribute?(key)
+        end
+      end
       ##
       # @private
       ##

data/lib/kaltura_fu/railtie.rb

@@ -9,20 +9,20 @@ module KalturaFu
     
       ActionView::Base.send :include, KalturaFu::ViewHelpers
 
-      kaltura_yml = File.join(RAILS_ROOT,'config','kaltura.yml')
+      kaltura_yml = File.join(Rails.root,'config','kaltura.yml')
 
-      unless File.exists?(kaltura_yml)
-        raise RuntimeError, "Unable to find \"config/kaltura.yml\" file."
-      end
-
-      config_file = YAML.load_file(kaltura_yml)[Rails.env]
-      KalturaFu.config = config_file.symbolize_keys
-
-
-      unless[:partner_id,:subpartner_id,:administrator_secret].all? {|key| KalturaFu.config.key?(key)}
-        raise RuntimeError, "Kaltura config requires :partner_id, :subpartner_id,"+
-      		      "and :administrator_secret keys"
+      if File.exists?(kaltura_yml)
+        config_file = YAML.load_file(kaltura_yml)[Rails.env]
+        KalturaFu.config = config_file.symbolize_keys        
+        
+        unless[:partner_id,:subpartner_id,:administrator_secret].all? {|key| KalturaFu.config.key?(key)}
+          warn "Kaltura config requires :partner_id, :subpartner_id, and :administrator_secret keys"
+        end
+      else 
+        #raise RuntimeError, "Unable to find \"config/kaltura.yml\" file."
+        warn "Unable to find \"config/kaltura.yml\" file.  Please run kaltura_fu:install generator."
       end
+        
     end
   end
 end

data/lib/kaltura_fu/version.rb

@@ -0,0 +1,3 @@
+module KalturaFu
+  Version = '0.2.1'
+end

data/lib/kaltura_fu/view_helpers.rb

@@ -54,7 +54,7 @@ module KalturaFu
         seconds_parameter = "/vid_sec/5"
       end
       
-      image_tag("http://www.kaltura.com/p/#{KalturaFu.config[:partner_id]}" +
+      image_tag("#{KalturaFu.cofing[:service_url]}/p/#{KalturaFu.config[:partner_id]}" +
 		"/thumbnail/entry_id/#{entry_id}" + 
 		seconds_parameter + 
 		size_parameters)
@@ -119,7 +119,7 @@ module KalturaFu
           name: \"#{options[:div_id]}\"
       	};
 
-      	swfobject.embedSWF(\"http://www.kaltura.com/kwidget/wid/_#{KalturaFu.config[:partner_id]}" + player_conf_parameter + "\",\"#{options[:div_id]}\",\"#{width}\",\"#{height}\",\"10.0.0\",\"http://ttv.mit.edu/swfs/expressinstall.swf\",flashVars,params,attributes);
+      	swfobject.embedSWF(\"#{KalturaFu.config[:service_url]}/kwidget/wid/_#{KalturaFu.config[:partner_id]}" + player_conf_parameter + "\",\"#{options[:div_id]}\",\"#{width}\",\"#{height}\",\"10.0.0\",\"http://ttv.mit.edu/swfs/expressinstall.swf\",flashVars,params,attributes);
       </script>"
     end
     
@@ -155,7 +155,7 @@ module KalturaFu
     			maxTotalSize: \"999999999\"
     		};
 
-        swfobject.embedSWF(\"http://www.kaltura.com/kupload/ui_conf_id/1103\", \"uploader\", \"160\", \"26\", \"9.0.0\", \"expressInstall.swf\", flashVars, params,attributes);
+        swfobject.embedSWF(\"#{KalturaFu.config[:service_url]}/kupload/ui_conf_id/1103\", \"uploader\", \"160\", \"26\", \"9.0.0\", \"expressInstall.swf\", flashVars, params,attributes);
 
     	</script>"
     end

data/spec/metadata_spec.rb

@@ -268,4 +268,16 @@ describe "Actions on an entries metadata" do
       end
     end
   end
+  
+  it "should let you set multiple fields at once with set()" do
+    test = MetadataSpecTester.new
+    
+    name = "Mr Peanut's wild ride"
+    description = "Man this is a random name"
+    waffles = "Man waffles isn't an attribute"
+    test.set(@entry_id,:name=>name,:description=>description,:waffles=>waffles)
+    
+    test.get_name(@entry_id).should == name
+    test.get_description(@entry_id).should == description
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaltura_fu
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Patrick Robertson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 -04:00
+date: 2011-04-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,11 +78,11 @@ files:
 - README.markdown
 - Rakefile
 - VERSION.yml
-- generators/kaltura_fu_install/kaltura_fu_install_generator.rb
-- generators/kaltura_fu_install/templates/kaltura.yml
-- generators/kaltura_fu_install/templates/kaltura_upload.js
 - install.rb
 - kaltura_fu.gemspec
+- lib/generators/kaltura_fu/install_generator.rb
+- lib/generators/templates/kaltura.yml
+- lib/generators/templates/kaltura_upload.js
 - lib/kaltura_fu.rb
 - lib/kaltura_fu/configuration.rb
 - lib/kaltura_fu/entry.rb
@@ -93,6 +93,7 @@ files:
 - lib/kaltura_fu/entry/metadata/class_and_instance_methods.rb
 - lib/kaltura_fu/entry/metadata/class_methods.rb
 - lib/kaltura_fu/railtie.rb
+- lib/kaltura_fu/version.rb
 - lib/kaltura_fu/view_helpers.rb
 - rails/init.rb
 - spec/debug.log

data/generators/kaltura_fu_install/kaltura_fu_install_generator.rb

@@ -1,11 +0,0 @@
-class KalturaFuInstallGenerator < Rails::Generator::Base
-  def manifest
-    record do |m|
-      m.directory "config"
-      m.file "kaltura.yml", "config/kaltura.yml"
-      
-      m.directory "public/javascripts"
-      m.file "kaltura_upload.js" , "public/javascripts/kaltura_upload.js"
-    end
-  end
-end