360_services 0.0.1 → 0.0.2

data/features/manage_assets.feature

@@ -6,20 +6,30 @@ Feature: Manage Assets
 Scenario: Get a list of asset guids by passing a tag name
   Given I am logged in
   And I get all assets
-  Then the assets list should contain "e036f43c-2a9f-407f-bc26-19af2b89d222"
+  # Then the assets list should contain a asset with a id of "e036f43c-2a9f-407f-bc26-19af2b89d222"
+  
+Scenario: Save an asset
+  Given I am logged in
+  And I get the asset with id "e036f43c-2a9f-407f-bc26-19af2b89d222"
+  When I change the asset attribute "description" to "new description"
+  And I save the asset
+  And I reload the asset
+  Then the asset's description should be "new description"
+  Then I change the asset attribute "description" to "description"
+  And I save the asset
   
 Scenario: Get asset
   Given I am logged in
-  And I get the first asset
-  Then the asset attribute "name" should be "capture-4851742166757112347.mp4"
+  And I get the asset with id "e036f43c-2a9f-407f-bc26-19af2b89d222"
+  Then the asset attribute "name" should be "test.mp4"
 
 Scenario: Get asset count
   Given I am logged in
-  Then the asset count should be "14"
+  Then the asset count should be "67"
   
 Scenario: Get asset presets
   Given I am logged in
-  And I get the first asset
+  And I get the asset with id "e036f43c-2a9f-407f-bc26-19af2b89d222"
   Then the preset xml should contain "MP4-squish-007.xss"
   
 Scenario: Activate and Deactivate
@@ -30,7 +40,7 @@ Scenario: Activate and Deactivate
   Then the assets list should not contain the asset id
   When I activate the asset
   And I get all assets
-  Then the assets list should contain the asset id
+  Then the assets list should contain a asset with a id of "e036f43c-2a9f-407f-bc26-19af2b89d222"
   
 Scenario: Delete an asset
   Given I am logged in
@@ -40,19 +50,11 @@ Scenario: Delete an asset
   Then the assets list should not contain the asset id
   When I undelete the asset
   And I get all assets
-  Then the assets list should contain the asset id
+  Then the assets list should contain a asset with a id of "e036f43c-2a9f-407f-bc26-19af2b89d222"
   
-Scenario: Save an asset
-  Given I am logged in
-  And I get the first asset
-  When I change the asset attribute "description" to "new description"
-  And I save the asset
-  And I reload the asset
-  Then the asset attribute "description" should be "new description"
-  Then I change the asset attribute "description" to "description"
-  And I save the asset
+
 
 Scenario: Get asset embed codes
   Given I am logged in
-  And I get the first asset
+  And I get the asset with id "e036f43c-2a9f-407f-bc26-19af2b89d222"
   Then the asset embed codes should contain "flash_media_loader.swf"

data/features/manage_flags.feature

@@ -19,7 +19,7 @@ Scenario: List flagged assets
 
 Scenario: Count flags
   Given I am logged in
-  Then the flag count should be 4
+  Then the flag count should be "4"
   
 Scenario: Add flags to asset
   Given I am logged in
@@ -34,7 +34,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 "c67f1fdb-8199-4b5c-921f-d864cf2d903f"
+  Then the assets list should contain "a5ef53eb-032e-4983-9828-ee72ee6c6bc2"
 
 Scenario: Get asset flags
   Given I am logged in

data/features/manage_groups.feature

@@ -10,7 +10,7 @@ Background:
 
 Scenario: Create a group
   When I create a group named "my group"
-  Then the group attribute "name" should be "my group"
+  Then the group's name should be "my group"
 
 Scenario: Find a group by id
   When I create a group named "my group"
@@ -19,7 +19,7 @@ Scenario: Find a group by id
 Scenario: Get all groups
   And I create a group named "my group"
   And I get all groups
-  Then the groups list should contain the group id
+  Then the group list should contain the group
   
 Scenario: Delete a group
   When I create a group named "delete me"

data/features/manage_metrics.feature

@@ -5,11 +5,11 @@ Feature: Manage Metrics
 
 Scenario: See Total Plays
   Given I am logged in
-  Then the total plays should be "12"
+  Then the total plays should be "39"
 
 Scenario: See Storage Used
   Given I am logged in
-  Then the storage used should be "-12290471.0"
+  Then the storage used should be "42581251.0"
   
 Scenario: See all metrics
   Given I am logged in

data/features/manage_sites.feature

@@ -13,5 +13,5 @@ Scenario: Get a site by name
   Given I am logged in
   When I create a new site with the name "new site name" and the description "new site description"
   And I get the site named "new site name"
-  Then the site attribute "id" should be "b4b866a0-d7d8-012c-1ba4-00254b9d9628"
+  Then the site attribute "id" should be "b8453bf0-fe23-012c-3e4c-0026bb5241fa"
   

data/features/manage_tags.feature

@@ -27,7 +27,7 @@ Scenario: Get asset tags
 
 Scenario: Get tag count
   Given I am logged in
-  Then the tag count should be "7"
+  Then the tag count should be "4"
   
 Scenario: Get all tags
   Given I am logged in

data/features/step_definitions/manage_assets_steps.rb

@@ -7,10 +7,18 @@ And /^I get the asset with id "([^\"]*)"$/ do |arg1|
 end
 
 And "I get the first asset" do
-  @asset = Sorenson::Services::Asset.find(Sorenson::Services::Asset.all.first)
+  @asset = Sorenson::Services::Asset.find(Sorenson::Services::Asset.all.first.id)
   @asset.should_not be_nil
 end
 
+Then /^the asset's description should be "(.*)"/ do |value|
+  @asset.description.should == value
+end
+
+Then /the assets list should contain a asset with a id of "(.*)"/ do |guid|
+  @assets.map(&:id).include?(guid)
+end
+
 Then /^the asset count should be "([^\"]*)"$/ do |arg1|
   Sorenson::Services::Asset.count.should == arg1.to_i
 end

data/features/step_definitions/manage_flags_steps.rb

@@ -2,7 +2,7 @@ When /^I get all flags$/ do
   @flags = Sorenson::Services::Flag.all
 end
 
-Then /^the flag count should be ([^\"]*)$/ do |count|
+Then /^the flag count should be "(.*)"$/ do |count|
   Sorenson::Services::Flag.count.should == count.to_i
 end
 

data/features/step_definitions/manage_group_assets_steps.rb

@@ -3,13 +3,13 @@ When /^I add the asset to the group$/ do
 end
 
 Then /^the asset should be in the group$/ do
-  @group.assets.should include(@asset.id)
+  @group.assets.map(&:id).should include(@asset.id)
 end
 
 Then /^the asset should have the group$/ do
-  @asset.groups.should include(@group.id)
+  @asset.group.should == @group
 end
 
 Then /^the group should have the asset$/ do
-  @group.assets.should include(@asset.id) # express the regexp above with the code you wish you had
+  @group.assets.map(&:id).should include(@asset.id)
 end

data/features/step_definitions/manage_groups_steps.rb

@@ -11,7 +11,11 @@ When /^I reload the group$/ do
 end
 
 Then /^I should be able to find the group$/ do
-  @group = Sorenson::Services::Group.find(Sorenson::Services::Group.all.first)
+  @group = Sorenson::Services::Group.find(@group.id)
+end
+
+Then /^the group's name should be "(.*)"/ do |name|
+  @group.name.should == name
 end
 
 And /^I get all groups$/ do
@@ -19,9 +23,13 @@ And /^I get all groups$/ do
 end
 
 Then /^I delete the group if it was found$/ do
-  @group.destroy if @group
+  @group.delete if @group
 end
 
 Then /^I delete the group$/ do
-  @group.destroy
+  @group.delete
+end
+
+Then /^the group list should contain the group$/ do
+  @groups.include?(@group)
 end

data/features/support/env.rb

@@ -1,4 +1,4 @@
-ENV['SORENSON_ENV'] = "cucumber"
+ENV['RAILS_ENV'] = "cucumber"
 require 'rubygems'
 require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
 require 'webrat'
@@ -10,4 +10,4 @@ require "#{File.dirname(__FILE__)}/../../lib/sorenson/services.rb"
 Webrat.configure do |config|
   config.mode = :rails
   config.open_error_files = false # Set to true if you want error pages to pop up in the browser
-end
+end

data/lib/sorenson/services/account.rb

@@ -3,6 +3,7 @@ module Sorenson
     class Account < Base
       attr_accessor :rate_plan, :username, :status, :customer_id, :id, :rate_plan_expiration_date, :date_last_modified, 
                     :last_login_time, :date_retrieved, :total_asset_count, :token
+      cattr_accessor :account_token, :account_id
       
       def self.login(username, password)
         account = Account.new(JSON.parse(login_no_resource(username, password)))

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
+                    :password, :metadata, :groups, :embed_list
       
       # Get all of the assets as a list of guids.  Use offset and quantity to return subsets.
       #   Sorenson::Services::Account.login('username', 'password')
@@ -19,7 +19,8 @@ module Sorenson
       #   names  = assets.collect {|asset| asset.name}
       #   => names = ["name1", "name2"]
       def self.all(offset = nil, quantity = nil)
-        get_from("/assets", :offset => offset, :quantity => quantity)["asset_list"]
+        list = get_from("/assets", :offset => offset, :quantity => quantity)["asset_list"]
+        list.collect {|a| new(a) }
       end
       
       # Get a list of asset guids by passing a tag name
@@ -40,7 +41,7 @@ module Sorenson
       end
                 
       def self.find(id)
-        new(get_from("/assets/#{id}"), id)
+        new(get_from("/assets/#{id}"))
       end
       
       def preset_xml
@@ -113,17 +114,17 @@ module Sorenson
       end
       
       def group
-        Group.new(Base.get_from("/groups/#{@group_id}")) if group_id
-      end          
-                        
-      def initialize(data, id)
+        Group.new(Base.get_from("/groups/#{@group_id}")) if @group_id
+      end
+      
+      def initialize(data)
         @encode_date         = data['encode_date']
         @frame_rate          = data['frame_rate']
         @height              = data['height']
         @date_last_modified  = data['date_last_modified']
         @video_bitrate_mode  = data['video_bitrate_mode']
         @media_type          = data['media_type']
-        @id                  = data['account_id']
+        @id                  = data['id']
         @account_id          = data['account_id']
         @number_of_views     = data['number_of_views']
         @application         = data['application']
@@ -146,9 +147,8 @@ module Sorenson
         @file_size           = data['file_size']
         @thumbnail_image_url = data['thumbnail_image_url']
         @direct_asset_url    = data['direct_asset_url']
-        @groups              = data['groups']
-        @id = id
-        @metadata = id
+        @group_id            = data['group_id']
+        @embed_list          = data['embed_list']
       end
     end
   end

data/lib/sorenson/services/base.rb

@@ -18,12 +18,12 @@ module Sorenson
         end        
       end
             
-      def self.login_no_resource(username, password)        
+      def self.login_no_resource(username, password)
         RestClient.post(host + "/sessions", :username => username, :password => password)
       end
 
       def self.host
-        host = ENV['SORENSON_ENV'].eql?('cucumber') ? 'http://localhost:3001' : 'http://360services.sorensonmedia.com' 
+        host = ['development', 'test', 'cucumber'].include?(ENV['RAILS_ENV'])  ? 'http://localhost:3001' : 'http://360services.sorensonmedia.com' 
         host
       end
 

data/lib/sorenson/services/category.rb

@@ -2,6 +2,7 @@ module Sorenson
   module Services
     class Category < Base
       attr_accessor :description, :name, :parent_id, :parent, :id
+      
       def self.all
         get_from("/categories").map{|c| c["name"]}
       end

data/lib/sorenson/services/group.rb

@@ -1,40 +1,56 @@
 module Sorenson
   module Services
     class Group < Base
-      attr_accessor :name, :description, :account_id, :id, :assets
+      attr_accessor :name, :description, :account_id, :id, :guid
 
       def self.create(name, attributes={})
-        new(post_to("/groups", :group => attributes.merge(:name => name)))
-      end
-
-      def add_asset(asset)
-        self.assets = Base.put_to("/groups/#{id}/assets/#{asset.id}")
+        data = post_to("/groups", :group => attributes.merge(:name => name))
+        new(data['group'])
       end
       
       def self.all
-        Base.get_from("/groups")
+        collection = Base.get_from("/groups")
+        collection.collect { |data| new(data['group'])}
       end
       
       def self.find(id)
         data = Base.get_from("/groups/#{id}")
-        new(data) if data['group']
+        return new(data['group']) if data['group']
+        nil
       end
       
       def self.find_by_name(name)
         data = Base.get_from("/groups/find_by_name", :name => name)
-        new(data) if data['group']
+        return new(data['group']) if data['group']
+        nil
+      end
+      
+      def add_asset(asset)
+        Base.put_to("/groups/#{id}/assets/#{asset.id}")
+      end
+      
+      def add_user(user_id)
+        Base.put_to("/groups/#{id}/users/#{user_id}")
+      end
+      
+      def assets
+        collection = Base.get_from("/groups/#{id}/assets")
+        collection.collect { |data| Sorenson::Services::Asset.new(data) }
+      end
+      
+      def users
+        Base.get_from("/groups/#{id}/users")
       end
       
-      def destroy
+      def delete
         Base.delete_from("/groups/#{id}")
       end
         
       def initialize(attributes)
-        @name = attributes['group']["name"]
-        @description = attributes['group']["description"]
-        @account_id = attributes['group']["account_id"]
-        @id = attributes['group']["guid"]
-        @assets = attributes['group']["asset_ids"]
+        @name        = attributes["name"]
+        @description = attributes["description"]
+        @account_id  = attributes["account_id"]
+        @id          = attributes["guid"]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: 360_services
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Sorenson Media
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -07:00
+date: 2010-02-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- README.rdoc
 - lib/sorenson/services.rb
 - lib/sorenson/services/account.rb
 - lib/sorenson/services/array.rb
@@ -78,6 +79,7 @@ extra_rdoc_files:
 - lib/sorenson/services/tag.rb
 files: 
 - Manifest
+- README.rdoc
 - Rakefile
 - fakeweb_cache
 - features/manage_accounts.feature
@@ -136,6 +138,8 @@ rdoc_options:
 - --inline-source
 - --title
 - 360_services
+- --main
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement