360_services 0.0.2 → 0.0.3

data/360_services.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{360_services}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sorenson Media"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-02-24}
   s.description = %q{Ruby bindings for Sorenson 360}
   s.email = %q{video@sorensonmedia.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/sorenson/services.rb", "lib/sorenson/services/account.rb", "lib/sorenson/services/array.rb", "lib/sorenson/services/asset.rb", "lib/sorenson/services/base.rb", "lib/sorenson/services/category.rb", "lib/sorenson/services/core_ext.rb", "lib/sorenson/services/core_ext/attribute_accessors.rb", "lib/sorenson/services/core_ext/hash.rb", "lib/sorenson/services/core_ext/object.rb", "lib/sorenson/services/event.rb", "lib/sorenson/services/flag.rb", "lib/sorenson/services/group.rb", "lib/sorenson/services/metric.rb", "lib/sorenson/services/rate_plan.rb", "lib/sorenson/services/site.rb", "lib/sorenson/services/tag.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "fakeweb_cache", "features/manage_accounts.feature", "features/manage_assets.feature", "features/manage_categories.feature", "features/manage_flags.feature", "features/manage_group_assets.feature", "features/manage_groups.feature", "features/manage_metadata.feature", "features/manage_metrics.feature", "features/manage_sites.feature", "features/manage_tags.feature", "features/mange_rate_plan.feature", "features/step_definitions/manage_accounts_steps.rb", "features/step_definitions/manage_assets_steps.rb", "features/step_definitions/manage_categories_steps.rb", "features/step_definitions/manage_flags_steps.rb", "features/step_definitions/manage_group_assets_steps.rb", "features/step_definitions/manage_groups_steps.rb", "features/step_definitions/manage_metadata_steps.rb", "features/step_definitions/manage_metrics_steps.rb", "features/step_definitions/manage_sites_steps.rb", "features/step_definitions/manage_tags_steps.rb", "features/step_definitions/mange_rate_plan_steps.rb", "features/step_definitions/utility_steps.rb", "features/step_definitions/web_steps.rb", "features/support/document_steps.rb", "features/support/env.rb", "features/support/netrecorder.rb", "features/support/paths.rb", "lib/sorenson/services.rb", "lib/sorenson/services/account.rb", "lib/sorenson/services/array.rb", "lib/sorenson/services/asset.rb", "lib/sorenson/services/base.rb", "lib/sorenson/services/category.rb", "lib/sorenson/services/core_ext.rb", "lib/sorenson/services/core_ext/attribute_accessors.rb", "lib/sorenson/services/core_ext/hash.rb", "lib/sorenson/services/core_ext/object.rb", "lib/sorenson/services/event.rb", "lib/sorenson/services/flag.rb", "lib/sorenson/services/group.rb", "lib/sorenson/services/metric.rb", "lib/sorenson/services/rate_plan.rb", "lib/sorenson/services/site.rb", "lib/sorenson/services/tag.rb", "360_services.gemspec"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "features/manage_accounts.feature", "features/manage_assets.feature", "features/manage_categories.feature", "features/manage_flags.feature", "features/manage_group_assets.feature", "features/manage_groups.feature", "features/manage_metadata.feature", "features/manage_metrics.feature", "features/manage_sites.feature", "features/manage_tags.feature", "features/mange_rate_plan.feature", "features/step_definitions/manage_accounts_steps.rb", "features/step_definitions/manage_assets_steps.rb", "features/step_definitions/manage_categories_steps.rb", "features/step_definitions/manage_flags_steps.rb", "features/step_definitions/manage_group_assets_steps.rb", "features/step_definitions/manage_groups_steps.rb", "features/step_definitions/manage_metadata_steps.rb", "features/step_definitions/manage_metrics_steps.rb", "features/step_definitions/manage_sites_steps.rb", "features/step_definitions/manage_tags_steps.rb", "features/step_definitions/mange_rate_plan_steps.rb", "features/step_definitions/utility_steps.rb", "features/step_definitions/web_steps.rb", "features/support/document_steps.rb", "features/support/env.rb", "features/support/netrecorder.rb", "features/support/paths.rb", "lib/sorenson/services.rb", "lib/sorenson/services/account.rb", "lib/sorenson/services/array.rb", "lib/sorenson/services/asset.rb", "lib/sorenson/services/base.rb", "lib/sorenson/services/category.rb", "lib/sorenson/services/core_ext.rb", "lib/sorenson/services/core_ext/attribute_accessors.rb", "lib/sorenson/services/core_ext/hash.rb", "lib/sorenson/services/core_ext/object.rb", "lib/sorenson/services/event.rb", "lib/sorenson/services/flag.rb", "lib/sorenson/services/group.rb", "lib/sorenson/services/metric.rb", "lib/sorenson/services/rate_plan.rb", "lib/sorenson/services/site.rb", "lib/sorenson/services/tag.rb", "360_services.gemspec"]
   s.homepage = %q{http://github.com/sorensonmedia/360_services}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "360_services", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/Manifest

@@ -1,7 +1,6 @@
 Manifest
 README.rdoc
 Rakefile
-fakeweb_cache
 features/manage_accounts.feature
 features/manage_assets.feature
 features/manage_categories.feature

data/Rakefile

@@ -3,7 +3,7 @@ require 'cucumber'
 require 'cucumber/rake/task'
 require 'echoe'
 
-Echoe.new('360_services', '0.0.2') do |p|
+Echoe.new('360_services', '0.0.3') do |p|
   p.description    = "Ruby bindings for Sorenson 360"
   p.url            = "http://github.com/sorensonmedia/360_services"
   p.author         = "Sorenson Media"

data/features/manage_assets.feature

@@ -25,7 +25,7 @@ Scenario: Get asset
 
 Scenario: Get asset count
   Given I am logged in
-  Then the asset count should be "67"
+  Then the asset count should be "1"
   
 Scenario: Get asset presets
   Given I am logged in

data/features/manage_flags.feature

@@ -16,10 +16,6 @@ Scenario: List flagged assets
   And I assign the flags "red blue green" to the asset
   When I get all flags
   Then the flags list should contain "red"
-
-Scenario: Count flags
-  Given I am logged in
-  Then the flag count should be "4"
   
 Scenario: Add flags to asset
   Given I am logged in
@@ -34,7 +30,7 @@ Scenario: Find all assets by flag
   And I get the first asset
   And I assign the flag "red" to the asset
   And I find all assets with the flag "red"
-  Then the assets list should contain "a5ef53eb-032e-4983-9828-ee72ee6c6bc2"
+  Then the assets list should contain "6913b8ae-9b47-4487-87b2-d1d4d103f4de"
 
 Scenario: Get asset flags
   Given I am logged in
@@ -42,3 +38,7 @@ Scenario: Get asset flags
   And I assign the flag "pear" to the asset
   And I get the flags for the asset
   Then the flags list should contain "pear"
+
+Scenario: Count flags
+  Given I am logged in
+  Then the flag count should be "4"

data/features/manage_group_assets.feature

@@ -28,6 +28,4 @@ Scenario: Get group assets
   And I add the asset to the group
   And I reload the group
   Then the group should have the asset
-  
-  
-  
+

data/features/manage_metrics.feature

@@ -5,18 +5,14 @@ Feature: Manage Metrics
 
 Scenario: See Total Plays
   Given I am logged in
-  Then the total plays should be "39"
+  Then the total plays should be "1"
 
 Scenario: See Storage Used
   Given I am logged in
-  Then the storage used should be "42581251.0"
+  Then the storage used should be "13255511.0"
   
 Scenario: See all metrics
   Given I am logged in
   And I get all metrics
-  Then the events list should contain an event with a day of "2009-12-17"
-
-
-
-
+  Then the events list should contain an event with a day of "2010-02-24"
 

data/features/step_definitions/manage_accounts_steps.rb

@@ -3,7 +3,7 @@ Given /^I (?:am logged|should be able to log) in with "([^\"]*)" and "([^\"]*)"$
 end
 
 Given "I am logged in" do
-  @account = Sorenson::Services::Account.login("integrum@integrumtech.com", "integrum")
+  @account = Sorenson::Services::Account.login("360services@sorensonmedia.com", "S0r3ns0n")
 end
 
 And /^I get an account$/ do

data/features/step_definitions/manage_group_assets_steps.rb

@@ -7,7 +7,8 @@ Then /^the asset should be in the group$/ do
 end
 
 Then /^the asset should have the group$/ do
-  @asset.group.should == @group
+  @asset.group.guid.should == @group.guid
+  @asset.group.name.should == @group.name
 end
 
 Then /^the group should have the asset$/ do

data/features/support/env.rb

@@ -3,8 +3,8 @@ require 'rubygems'
 require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
 require 'webrat'
 require 'webrat/core/matchers'
-require 'fakeweb'
-require 'netrecorder'
+# require 'fakeweb'
+# require 'netrecorder'
 require "#{File.dirname(__FILE__)}/../../lib/sorenson/services.rb"
 
 Webrat.configure do |config|

data/features/support/netrecorder.rb

@@ -1,20 +1,20 @@
-NetRecorder.config do |config|
-  config.cache_file = "fakeweb_cache"   
-  if ENV['RECORD_WEB']
-    config.record_net_calls = true
-  else
-    config.fakeweb = true
-    FakeWeb.allow_net_connect = false
-  end
-end 
-
-at_exit {NetRecorder.cache! if NetRecorder.recording?}
-
-Before do |scenario|
-  if NetRecorder.recording?
-    NetRecorder.scope = scenario.name
-  else
-    FakeWeb.clean_registry
-    NetRecorder.register_scope(scenario.name)
-  end
-end
+# NetRecorder.config do |config|
+#   config.cache_file = "fakeweb_cache"   
+#   if ENV['RECORD_WEB']
+#     config.record_net_calls = true
+#   else
+#     config.fakeweb = true
+#     FakeWeb.allow_net_connect = false
+#   end
+# end 
+# 
+# at_exit {NetRecorder.cache! if NetRecorder.recording?}
+# 
+# Before do |scenario|
+#   if NetRecorder.recording?
+#     NetRecorder.scope = scenario.name
+#   else
+#     FakeWeb.clean_registry
+#     NetRecorder.register_scope(scenario.name)
+#   end
+# end

data/lib/sorenson/services/asset.rb

@@ -11,7 +11,7 @@ module Sorenson
                     :permalink_location, :status, :description, :video_duration, :abstract_file_id, :version_id,
                     :date_retrieved, :audio_data_rate, :audio_bitrate_mode, :video_codec, :display_name, :name,
                     :video_data_rate, :author_id, :width, :file_size, :thumbnail_image_url, :direct_asset_url, 
-                    :password, :metadata, :groups, :embed_list
+                    :password, :metadata, :groups, :embed_list, :group_id
       
       # Get all of the assets as a list of guids.  Use offset and quantity to return subsets.
       #   Sorenson::Services::Account.login('username', 'password')
@@ -25,11 +25,12 @@ module Sorenson
       
       # Get a list of asset guids by passing a tag name
       def self.find_all_by_tag(tag_name)
-        get_from("/tags/#{tag_name}/assets")
+        p account_id
+        get_from("/tags/#{tag_name}/assets", :account_id => account_id)
       end
       
       def self.find_all_by_flag(flag_name)
-        get_from("/flags/#{flag_name}/assets")
+        get_from("/flags/#{flag_name}/assets?account_id=#{account_id}")
       end
       
       def tags
@@ -114,7 +115,8 @@ module Sorenson
       end
       
       def group
-        Group.new(Base.get_from("/groups/#{@group_id}")) if @group_id
+        return nil if @group_id.nil?
+        Group.new(Base.get_from("/groups/#{group_id}")['group'])
       end
       
       def initialize(data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: 360_services
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Sorenson Media
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -07:00
+date: 2010-02-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -81,7 +81,6 @@ files:
 - Manifest
 - README.rdoc
 - Rakefile
-- fakeweb_cache
 - features/manage_accounts.feature
 - features/manage_assets.feature
 - features/manage_categories.feature