framey 1.2.2 → 1.2.3

data/README.md

@@ -5,7 +5,7 @@ This gem can be used for easy Rails integration with the Framey video recording
 # Dependencies:
 
 * httparty (ruby gem)
-* will_paginate (ruby gem)
+
 
 # Installation
 
@@ -51,16 +51,16 @@ Edit the default configuration options in config/framey.rb:
 
 Create a framey initializer at config/framey.rb and modify the following code to use your API keys
 	
-	module Framey
+	module Framey  
 	  API_HOST = "http://framey.com"
 	  RUN_ENV = "production"
 	  API_KEY = "API_KEY_VALUE"
 	  SECRET = "API_SECRET_VALUE"
 	  API_TIMEOUT = 15
 	  MAX_TIME = 30
+	  FLASH_RECORDER_URL = 'http://framey.com/recorder.swf'
+	  FLASH_PLAYER_URL = 'http://framey.com/player.swf'
 	end
-	
-
 
 # User / Development Flow
 
@@ -123,7 +123,7 @@ To get updated stats information about a given video, do:
     
 This returns a simple Framey::Video object, like so:
 
-    #<Framey::Video:0x1037b4450 @state="uploaded", @filesize=123456, @name="c96323e0-54b1-012e-9d34-7c6d628c53d4", @large_thumbnail_url="http://framey.com/thumbnails/c96323e0-54b1-012e-9d34-7c6d628c53d4.jpg", @medium_thumbnail_url="http://framey.com/thumbnails/c96323e0-54b1-012e-9d34-7c6d628c53d4.jpg", @small_thumbnail_url="http://framey.com/thumbnails/c96323e0-54b1-012e-9d34-7c6d628c53d4.jpg", @data={"user_id" => 1}, @flv_url="http://framey.com/videos/source/c96323e0-54b1-012e-9d34-7c6d628c53d4/source.flv", @mp4_url="http://framey.com/videos/source/c96323e0-54b1-012e-9d34-7c6d628c53d4/source.mp4", @views=12, @duration=15.62>
+    #<Framey::Video:0x1037b4450 @state="uploaded", @filesize=123456, @name="c96323e0-54b1-012e-9d34-7c6d628c53d4", 	@large_thumbnail_url="http://framey.com/thumbnails/c96323e0-54b1-012e-9d34-7c6d628c53d4.jpg", @medium_thumbnail_url="http://framey.com/thumbnails/c96323e0-54b1-012e-9d34-7c6d628c53d4.jpg", @small_thumbnail_url="http://framey.com/thumbnails/c96323e0-54b1-012e-9d34-7c6d628c53d4.jpg", @data={"user_id" => 1}, @flv_url="http://framey.com/videos/source/c96323e0-54b1-012e-9d34-7c6d628c53d4/source.flv", @mp4_url="http://framey.com/videos/source/c96323e0-54b1-012e-9d34-7c6d628c53d4/source.mp4", @views=12, @duration=15.62>
     
 To delete a video on Framey, do:
 

data/lib/rails/generators/framey/framey_generator.rb

@@ -9,7 +9,6 @@ class FrameyGenerator < Rails::Generators::Base
 
   def self.source_root
     sources = File.join(File.dirname(__FILE__), 'templates')
-    
   end
    
   def self.next_migration_number(dirname) #:nodoc:
@@ -66,22 +65,35 @@ class FrameyGenerator < Rails::Generators::Base
   end
   
   def copy_views
-    copy_file '../../../../../app/views/framey/videos/index.html.erb', 'app/views/framey/videos/index.html.erb'
-    copy_file '../../../../../app/views/framey/videos/new.html.erb', 'app/views/framey/videos/new.html.erb'
-    copy_file '../../../../../app/views/framey/videos/show.html.erb', 'app/views/framey/videos/show.html.erb'
-    copy_file '../../../../../app/views/layouts/framey.html.erb', 'app/views/layouts/framey.html.erb'
+    copy_file 'index.html.erb', 'app/views/framey/videos/index.html.erb'
+    copy_file 'new.html.erb', 'app/views/framey/videos/new.html.erb'
+    copy_file 'show.html.erb', 'app/views/framey/videos/show.html.erb'
+    copy_file 'framey.html.erb', 'app/views/layouts/framey.html.erb'
   end
   
   def copy_controllers
-    copy_file '../../../../../app/controllers/framey/videos_controller.rb', 'app/controllers/framey/videos_controller.rb'
+    copy_file 'videos_controller.rb', 'app/controllers/framey/videos_controller.rb'
   end
   
   def copy_models
-    copy_file '../../../../../app/models/framey/video.rb', 'app/models/framey/video.rb'
+    copy_file 'video.rb', 'app/models/framey/video.rb'
   end
   
+  def copy_public_files
+    copy_file 'javascripts/swfobject.js', 'public/javascripts/swfobject.js'
+    copy_file 'stylesheets/framey.css', 'public/stylesheets/framey.css'
+  end
   
   
+  def add_route
+    
+    videos_text = 'namespace :framey do resources :videos, :only => [ :index, :show, :new], :controller => "videos" end' 
+    callback_test = 'post "/framey/callback" => "framey/videos#callback"'
+
+    route(videos_text)
+    route(callback_test)
+    
+  end
   
   
 end

data/{app/views/framey/videos → lib/rails/generators/framey/templates}/index.html.erb

@@ -31,4 +31,3 @@
 <% else %>
 	<h3>No videos were recorded, yet </h3>
 <% end %>
-<%= will_paginate @videos %>

data/lib/rails/generators/framey/templates/initializer.rb

@@ -1,16 +1,11 @@
-module Framey
-  class Engine < Rails::Engine
-
-    config.mount_at = '/framey'
-    config.video_factory_name = 'Framey Factory'
-        
-  end
-  
+module Framey  
   API_HOST = "http://framey.com"
   RUN_ENV = "production"
   API_KEY = "API_KEY_VALUE"
   SECRET = "API_SECRET_VALUE"
   API_TIMEOUT = 15
   MAX_TIME = 30
+  FLASH_RECORDER_URL = 'http://framey.com/recorder.swf'
+  FLASH_PLAYER_URL = 'http://framey.com/player.swf'
 end
 

data/{app/controllers/framey → lib/rails/generators/framey/templates}/videos_controller.rb

@@ -1,7 +1,5 @@
 module Framey
   class VideosController < ApplicationController
-
-    unloadable
     
     layout 'framey'  # this allows you to have a gem-wide layout
     
@@ -30,7 +28,7 @@ module Framey
     end
     
     def index
-      @videos = Framey::Video.paginate(:page => params[:page], :per_page => 10).order('created_at DESC')
+      @videos = Framey::Video.all
       
     end
     

data/lib/view_helpers.rb

@@ -39,7 +39,7 @@ raw <<END_RECORDER
     'id': "#{objid}",
     'name': "#{objid}"
   };
-  swfobject.embedSWF("/recorder.swf", "#{divid}", "340", "340", "8", "", flashvars, params, attributes);
+  swfobject.embedSWF('#{Framey::FLASH_RECORDER_URL}', "#{divid}", "340", "340", "8", "", flashvars, params, attributes);
   </script>
 END_RECORDER
     end
@@ -87,7 +87,7 @@ raw <<END_PLAYER
         'name': "#{objid}"
       };
 
-      swfobject.embedSWF("/player.swf", "#{divid}", '340', '290', '9', 'false', flashvars, params, attributes);
+      swfobject.embedSWF('#{Framey::FLASH_PLAYER_URL}', "#{divid}", '340', '290', '9', 'false', flashvars, params, attributes);
       </script>
 END_PLAYER
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: framey
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-08 00:00:00.000000000Z
+date: 2011-09-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2153424500 !ruby/object:Gem::Requirement
+  requirement: &2156334060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153424500
+  version_requirements: *2156334060
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &2153423140 !ruby/object:Gem::Requirement
+  requirement: &2156332800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153423140
+  version_requirements: *2156332800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153421820 !ruby/object:Gem::Requirement
+  requirement: &2156330860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153421820
+  version_requirements: *2156330860
 description: A gem for easy Rails integration with the Framey video recording service.
 email: david@qlabs.com
 executables: []
@@ -51,32 +51,20 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- app/controllers/framey/videos_controller.rb
-- app/helpers/application_helper.rb
-- app/helpers/framey/videos_helper.rb
-- app/models/framey/video.rb
-- app/views/framey/videos/index.html.erb
-- app/views/framey/videos/new.html.erb
-- app/views/framey/videos/show.html.erb
-- app/views/layouts/framey.html.erb
-- config/routes.rb
-- lib/acts_as_video/base.rb
 - lib/api.rb
-- lib/application_controller.rb
-- lib/application_helper.rb
-- lib/engine.rb
-- lib/framey.rb
 - lib/rails/generators/framey/framey_generator.rb
+- lib/rails/generators/framey/templates/framey.html.erb
+- lib/rails/generators/framey/templates/index.html.erb
 - lib/rails/generators/framey/templates/initializer.rb
+- lib/rails/generators/framey/templates/javascripts/swfobject.js
 - lib/rails/generators/framey/templates/migration.rb
+- lib/rails/generators/framey/templates/new.html.erb
 - lib/rails/generators/framey/templates/schema.rb
-- lib/rails/railties/tasks.rake
+- lib/rails/generators/framey/templates/show.html.erb
+- lib/rails/generators/framey/templates/stylesheets/framey.css
+- lib/rails/generators/framey/templates/video.rb
+- lib/rails/generators/framey/templates/videos_controller.rb
 - lib/view_helpers.rb
-- public/images/cheese.jpg
-- public/javascripts/swfobject.js
-- public/player.swf
-- public/recorder.swf
-- public/stylesheets/framey.css
 - README.md
 homepage: http://framey.com
 licenses: []

data/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-## Look in lib/application_helper.rb
-## I can't figure out how to get it included unless I put it that directory

data/app/helpers/framey/videos_helper.rb

@@ -1,4 +0,0 @@
-module Framey
-  module VideosHelper
-  end
-end

data/config/routes.rb

@@ -1,13 +0,0 @@
-Rails.application.routes.draw do |map|
-
-  mount_at = Framey::Engine.config.mount_at
-
-  match mount_at => 'framey/videos#index'
-  
-  map.resources :videos, :only => [ :index, :show, :new],
-                          :controller => "framey/videos",
-                          :path_prefix => mount_at,
-                          :name_prefix => "framey_"
-  post "/framey/callback" => "framey/videos#callback"
-
-end

data/lib/acts_as_video/base.rb

@@ -1,28 +0,0 @@
-module Framey
-  module ActsAsVideo
-
-    ## Define ModelMethods
-    module Base
-      def self.included(klass)
-        klass.class_eval do
-          extend Config
-        end
-      end
-      
-      module Config
-        def acts_as_video
-        
-          # This is where arbitrary code goes that you want to 
-          # add to the class that declared "acts_as_widget"
-          
-          has_many :videos,  :class_name => 'Framey::Video'
-
-          include Framey::ActsAsVideo::Base::InstanceMethods
-        end
-      end
-    end
-
-  end
-end
-
-::ActiveRecord::Base.send :include, Framey::ActsAsVideo::Base

data/lib/application_controller.rb

@@ -1,12 +0,0 @@
-module Framey
-  ## Define ControllerMethods
-  module Controller
-  	## this one manages the usual self.included, klass_eval stuff
-    extend ActiveSupport::Concern
-
-  end
-end
-
-::ActionController::Base.send :include, Framey::Controller
-
-

data/lib/application_helper.rb

@@ -1,3 +0,0 @@
-module ApplicationHelper
-  
-end

data/lib/engine.rb

@@ -1,30 +0,0 @@
-require 'framey'
-require 'rails'
-require 'action_controller'
-require 'application_helper'
-
-module Framey
-  class Engine < Rails::Engine
-
-    # Config defaults
-    config.video_factory_name = "default factory name"
-    config.mount_at = '/framey'
-    
-    # Load rake tasks
-    rake_tasks do
-      load File.join(File.dirname(__FILE__), 'rails/railties/tasks.rake')
-    end
-    
-    # Check the gem config
-    initializer "check config" do |app|
-
-      # make sure mount_at ends with trailing slash
-      config.mount_at += '/'  unless config.mount_at.last == '/'
-    end
-    
-    initializer "static assets" do |app|
-      app.middleware.use ::ActionDispatch::Static, "#{root}/public"
-    end
-    
-  end
-end

data/lib/framey.rb

@@ -1,9 +0,0 @@
-module Framey
-  require 'engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
-  require 'acts_as_video/base'
-  require 'application_controller'
-  require 'httparty'
-  require 'will_paginate'
-  require 'api'
-  require 'view_helpers'
-end

data/lib/rails/railties/tasks.rake

@@ -1,4 +0,0 @@
-namespace :framey do
-
-
-end