streamio 0.5.1 → 0.6.0

data/HISTORY

@@ -1,3 +1,11 @@
+== 0.6.0 2011-06-17
+
+* Model.create
+* Model.destroy
+* Model#reload
+* Video #add_transcoding and #delete_transcoding now reloads the video instance
+* Some refactoring behind the scenes
+
 == 0.5.1 2011-06-16
 
 * Added lots of (YARD style) documentation and updated README

data/lib/streamio/encoding_profile.rb

@@ -1,23 +1,7 @@
 module Streamio
   class EncodingProfile < Model
-    def self.resource
-      RestClient::Resource.new("#{Streamio.authenticated_api_base}/encoding_profiles", :headers => {:accept => :json})
-    end
-    
-    CREATEABLE_ATTRIBUTES = []
-    ACCESSABLE_ATTRIBUTES = %w(title tags width desired_video_bitrate frame_rate audio_bitrate audio_sample_rate audio_channels)
-    READABLE_ATTRIBUTES = %w(id created_at updated_at account_id)
-    
-    (CREATEABLE_ATTRIBUTES + ACCESSABLE_ATTRIBUTES + READABLE_ATTRIBUTES - CASTED_ATTRIBUTES).each do |attribute|
-      define_method(attribute) do
-        @attributes[attribute]
-      end
-    end
-    
-    (CREATEABLE_ATTRIBUTES + ACCESSABLE_ATTRIBUTES).each do |attribute|
-      define_method("#{attribute}=") do |value|
-        @attributes[attribute] = value
-      end
-    end
+    resource_name "encoding_profiles"
+    accessable_attributes %w(title tags width desired_video_bitrate frame_rate audio_bitrate audio_sample_rate audio_channels)
+    readable_attributes %w(id created_at updated_at account_id)
   end
 end

data/lib/streamio/image.rb

@@ -1,23 +1,8 @@
 module Streamio
   class Image < Model
-    def self.resource
-      RestClient::Resource.new("#{Streamio.authenticated_api_base}/images", :headers => {:accept => :json})
-    end
-    
-    CREATEABLE_ATTRIBUTES = %w(file)
-    ACCESSABLE_ATTRIBUTES = %w(title tags)
-    READABLE_ATTRIBUTES = %w(id created_at updated_at account_id transcodings)
-    
-    (CREATEABLE_ATTRIBUTES + ACCESSABLE_ATTRIBUTES + READABLE_ATTRIBUTES - CASTED_ATTRIBUTES).each do |attribute|
-      define_method(attribute) do
-        @attributes[attribute]
-      end
-    end
-    
-    (CREATEABLE_ATTRIBUTES + ACCESSABLE_ATTRIBUTES).each do |attribute|
-      define_method("#{attribute}=") do |value|
-        @attributes[attribute] = value
-      end
-    end    
+    resource_name "images"
+    creatable_attributes %w(file)
+    accessable_attributes %w(title tags)
+    readable_attributes %w(id created_at updated_at account_id transcodings)  
   end
 end

data/lib/streamio/model.rb

@@ -22,7 +22,74 @@ module Streamio
         parse_response(resource.get(:params => parameters))
       end
       
+      # Deletes model with the given id. Raises exception if failing to do so.
+      #
+      # @param [String] id The id of the model to delete.
+      #
+      # @return [Boolean] True if the delete request is successful.
+      def destroy(id)
+        resource[id].delete
+        true
+      end
+      
+      # Initializes a new model instance with the given attributes, saves it
+      # and returns it.
+      #
+      # @param [Hash] attributes The attributes to initialize the model with.
+      #
+      # @return [Model] The model after save has been called on it.
+      def create(attributes = {})
+        model = new(attributes)
+        model.save
+        model
+      end
+      
+      def resource_name(name)
+        define_singleton_method(:resource) do
+          RestClient::Resource.new("#{Streamio.authenticated_api_base}/#{name}", :headers => {:accept => :json})
+        end
+      end
+      
+      def creatable_attributes(attributes = nil)
+        return @creatable_attributes ||= [] if attributes.nil?
+        
+        @creatable_attributes = attributes
+        create_getters(attributes)
+        create_setters(attributes)
+      end
+      
+      def accessable_attributes(attributes = nil)
+        return @accessable_attributes ||= [] if attributes.nil?
+        
+        @accessable_attributes = attributes
+        create_getters(attributes)
+        create_setters(attributes)
+      end
+      
+      def readable_attributes(attributes = nil)
+        return @readable_attributes ||= [] if attributes.nil?
+        
+        @readable_attributes = attributes
+        create_getters(attributes)
+      end
+      
       protected
+      def create_getters(attributes)
+        (attributes - CASTED_ATTRIBUTES).each do |attribute|
+          define_method(attribute) do
+            @attributes[attribute]
+          end
+        end
+      end
+      
+      def create_setters(attributes)
+        attributes.each do |attribute|
+          define_method("#{attribute}=") do |value|
+            @attributes[attribute] = value
+          end
+        end
+      end
+      
       def parse_response(response)
         response = JSON.parse(response.body)
         if response.instance_of?(Array)
@@ -88,6 +155,15 @@ module Streamio
       true
     end
     
+    # Update the model instance with the current state on the remote.
+    #
+    # @return [Model] Returns itself.
+    def reload
+      remote = self.class.find(id)
+      @attributes = remote.attributes
+      self
+    end
+    
     # @return [Boolean] True if the record is persisted.
     def persisted?
       !destroyed? && !id.nil?
@@ -119,7 +195,7 @@ module Streamio
     private
     def update
       parameters = {}
-      (self.class::ACCESSABLE_ATTRIBUTES).each do |key|
+      (self.class.accessable_attributes).each do |key|
         parameters[key] = @attributes[key] if @attributes.has_key?(key)
       end
 
@@ -129,13 +205,13 @@ module Streamio
     
     def persist
       parameters = {}
-      (self.class::CREATEABLE_ATTRIBUTES + self.class::ACCESSABLE_ATTRIBUTES).each do |key|
+      (self.class.creatable_attributes + self.class.accessable_attributes).each do |key|
         parameters[key] = @attributes[key] if @attributes.has_key?(key)
       end
 
       new_attributes = JSON.parse(self.class.resource.post(attributes).body)
 
-      (self.class::ACCESSABLE_ATTRIBUTES + self.class::READABLE_ATTRIBUTES).each do |attribute|
+      (self.class.accessable_attributes + self.class.readable_attributes).each do |attribute|
         @attributes[attribute] = new_attributes[attribute]
       end
       true

data/lib/streamio/version.rb

@@ -1,3 +1,3 @@
 module Streamio
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/lib/streamio/video.rb

@@ -1,26 +1,12 @@
 module Streamio
   class Video < Model
-    def self.resource
-      RestClient::Resource.new("#{Streamio.authenticated_api_base}/videos", :headers => {:accept => :json})
-    end
-
-    CREATEABLE_ATTRIBUTES = %w(file encoding_profile_ids encoding_profile_tags skip_default_encoding_profiles use_original_as_transcoding)
-    ACCESSABLE_ATTRIBUTES = %w(title description tags image_id)
-    READABLE_ATTRIBUTES = %w(id state progress aspect_ratio_multiplier plays duration created_at updated_at account_id transcodings)
-    
-    (CREATEABLE_ATTRIBUTES + ACCESSABLE_ATTRIBUTES + READABLE_ATTRIBUTES - CASTED_ATTRIBUTES).each do |attribute|
-      define_method(attribute) do
-        @attributes[attribute]
-      end
-    end
-    
-    (CREATEABLE_ATTRIBUTES + ACCESSABLE_ATTRIBUTES).each do |attribute|
-      define_method("#{attribute}=") do |value|
-        @attributes[attribute] = value
-      end
-    end
+    resource_name "videos"
+    creatable_attributes %w(file encoding_profile_ids encoding_profile_tags skip_default_encoding_profiles use_original_as_transcoding)
+    accessable_attributes %w(title description tags image_id)
+    readable_attributes %w(id state progress aspect_ratio_multiplier plays duration created_at updated_at account_id transcodings)
     
-    # Adds a transcoding to the video instance.
+    # Adds a transcoding to the video instance and reloads itself to
+    # reflect the changed transcodings array.
     #
     # @param [Hash] parameters The parameters to pass in when creating the transcoding.
     #
@@ -29,18 +15,21 @@ module Streamio
     # @return [Boolean] Indicating wether the transcoding was successfully created.
     def add_transcoding(parameters)
       self.class.resource["#{id}/transcodings"].post(parameters)
+      reload
       true
     rescue RestClient::Exception
       false
     end
     
-    # Deletes a transcoding from the video.
+    # Deletes a transcoding from the video and reloads itself to
+    # reflect the changed transcodings array.
     #
     # @param [String] transcoding_id The id of the transcoding to be deleted.
     #
     # @return [Boolean] Indicating wether the transcoding was successfully deleted.
     def delete_transcoding(transcoding_id)
       self.class.resource["#{id}/transcodings/#{transcoding_id}"].delete
+      reload
       true
     rescue RestClient::Exception
       false

metadata

@@ -2,7 +2,7 @@
 name: streamio
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors: 
 - David Backeus
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 Z
+date: 2011-06-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client