refinerycms-vimeo-videos 0.1.9.rc3 → 0.2.rc2

data/README.markdown

@@ -40,7 +40,7 @@ In your _form.html.erb insert this:
 
     <div class='field'>
       <%= f.label "Test Video" -%>
-      <%= render :partial => "/shared/admin/vimeo_picker", :locals => {
+      <%= render :partial => "/refinery/admin/vimeo_picker", :locals => {
             :f => f,
             :field => :test_video_id,
             :vimeo_video => @project.test_video

data/Rakefile

@@ -1,2 +1 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'

data/app/controllers/refinery/admin/vimeo_account_controller.rb

@@ -0,0 +1,56 @@
+module ::Refinery
+  module Admin
+    class VimeoAccountController < ::Refinery::AdminController
+
+      include ::Refinery::VimeoVideos::Account
+    
+      def authorization
+      
+        if not authorized? and ready_to_authorize?
+        
+          # begin authorization process
+          base = ::Vimeo::Advanced::Base.new(
+            account[:consumer_key],
+            account[:consumer_secret])
+          request_token = base.get_request_token
+          session[:oauth_secret] = request_token.secret
+        
+          redirect_to base.authorize_url
+        
+        elsif ready_to_authorize?
+        
+          # already authorized
+          flash.notice = "You have already authorized your account."
+          redirect_to refinery_root_path
+        
+        else
+        
+          # not ready to authorize
+          flash.alert = "You are not ready to authorize. Type in consumer_key and consumer_secret."
+          redirect_to refinery_root_path
+      
+        end
+      end
+  
+      def callback
+      
+        # vimeo will redirect us here upon successful authorization
+        base = ::Vimeo::Advanced::Base.new(
+          account[:consumer_key],
+          account[:consumer_secret])
+        access_token = base.get_access_token(params[:oauth_token], session[:oauth_secret], params[:oauth_verifier])
+        ::Refinery::Setting.find_by_name('vimeo_token').update_attribute(:value, access_token.token)
+        ::Refinery::Setting.find_by_name('vimeo_secret').update_attribute(:value, access_token.secret)
+        flash.notice = "You successfully authorized your vimeo account for integration in your backend. You can now start using it."
+        redirect_to main_app.refinery_admin_root_path
+    
+      end
+    
+      protected
+    
+        def restrict_controller
+        end
+
+    end
+  end
+end

data/app/controllers/refinery/admin/vimeo_videos_controller.rb

@@ -0,0 +1,87 @@
+class VimeoAuthorizationError < StandardError; end
+
+module ::Refinery
+  module Admin
+    class VimeoVideosController < ::Refinery::AdminController
+    
+      include ::Refinery::VimeoVideos::Account
+    
+      before_filter :ensure_authorized!
+      before_filter :init_dialog
+    
+      def index
+        get_videos_on_vimeo_account
+      end
+    
+      def new
+        @vimeo_video = VimeoVideo.new
+      end
+    
+      def create
+      
+      end
+    
+      def insert
+        self.new if @vimeo_video.nil?
+
+        @url_override = main_app.refinery_admin_vimeo_videos_path(request.query_parameters.merge(:insert => true))
+
+        if params[:conditions].present?
+          extra_condition = params[:conditions].split(',')
+
+          extra_condition[1] = true if extra_condition[1] == "true"
+          extra_condition[1] = false if extra_condition[1] == "false"
+          extra_condition[1] = nil if extra_condition[1] == "nil"
+          paginate_vimeo_videos({extra_condition[0].to_sym => extra_condition[1]})
+        else
+          paginate_vimeo_videos
+        end
+        render :action => "insert"
+      end
+    
+      protected
+        def get_videos_on_vimeo_account
+          video = ::Vimeo::Advanced::Video.new(
+            account[:consumer_key],
+            account[:consumer_secret],
+            :token => account[:token],
+            :secret => account[:secret])
+          @vimeo_videos = video.get_all(account[:username], {:full_response => true, :sort => 'upload_date'})["videos"]["video"]
+        end
+      
+        def init_dialog
+          @app_dialog = params[:app_dialog].present?
+          @field = params[:field]
+          @update_vimeo_video = params[:update_vimeo_video]
+          @update_text = params[:update_text]
+          @thumbnail = params[:thumbnail]
+          @callback = params[:callback]
+          @conditions = params[:conditions]
+          @current_link = params[:current_link]
+        end
+
+        def restrict_controller
+          super unless action_name == 'insert'
+        end
+
+        def paginate_vimeo_videos
+          @vimeo_videos = get_videos_on_vimeo_account.paginate(:page => (@paginate_page_number ||= params[:page]), :per_page => ::Refinery::VimeoVideo.per_page(from_dialog?))
+        end
+      
+        def ensure_authorized!
+          begin
+          
+            raise VimeoAuthorizationError unless authorized?
+        
+          rescue VimeoAuthorizationError => exception
+          
+            message = 'You have not authorized your vimeo account with this application.'
+            render :partial => 'error_message', :locals => {
+              :message => message
+            }
+          
+          end
+        end
+    end
+  end
+end

data/app/models/refinery/vimeo_embed_cache.rb

@@ -0,0 +1,67 @@
+require 'httparty'
+module Refinery
+  class VimeoEmbedCache < ActiveRecord::Base
+  
+    set_table_name "refinery_vimeo_embed_cache"
+  
+    belongs_to :vimeo_video
+    
+    before_save :cache
+  
+    serialize :configuration, Hash
+    
+    validates_presence_of :configuration
+    validates_presence_of :vid
+  
+    def self.embed vid, geometry, configuration = {}
+      configuration.stringify_keys!
+      configuration.merge!(geometry_hash(geometry))
+        
+      static = configuration.delete("static") if configuration.has_key?("static")
+      if static
+        geometry =~ FIXED_GEOMETRY ?
+          static_embed_code(vid, geometry).html_safe : raise(ArgumentError, "Must use fixed geometry string for static embeds (e.g. 100x240)")
+      else
+        find_or_create_by_vid_and_configuration(vid, :configuration => ::YAML.dump(configuration)).code.html_safe
+      end
+    end
+  
+    def update_cache
+      cache true
+      self.save
+    end
+  
+    FIXED_WIDTH_GEOMETRY    = /^(\d+)$/ # e.g. '300'
+    FIXED_HEIGHT_GEOMETRY   = /^x(\d+)$/ # e.g. 'x200'
+    FIXED_GEOMETRY          = /^(\d+)x(\d+)$/ # e.g. '300x200'
+    VIMEO_GEOMETRY = ::Regexp.union FIXED_GEOMETRY, FIXED_HEIGHT_GEOMETRY, FIXED_WIDTH_GEOMETRY
+  
+    def self.geometry_hash geometry
+      case geometry
+      when FIXED_WIDTH_GEOMETRY
+        {:width => $1}
+      when FIXED_HEIGHT_GEOMETRY
+        {:height => $1}
+      when FIXED_GEOMETRY
+        {:width => $1, :height => $2}
+      else raise ArgumentError, "Didn't recognise the geometry string #{geometry}"
+      end
+    end
+    
+    private
+    
+      def self.static_embed_code vid, geometry
+        width, height = geometry.split('x')
+        "<iframe src=\"http://player.vimeo.com/video/#{vid}?portrait=0\" width=\"#{width}\" height=\"#{height}\" frameborder=\"0\"></iframe>"
+      end
+  
+      def cache force = false
+        if self.code.blank? or force  
+          # Escape vimeo url and request oembed code
+          url = ::CGI::escape("http://vimeo.com/#{self.vid}")
+          response = ::HTTParty.get "http://vimeo.com/api/oembed.xml?url=#{url}&#{YAML.load(self.configuration).to_query}"
+          self.code = response["oembed"]["html"]
+        end
+      end
+  end
+end

data/app/models/refinery/vimeo_meta_cache.rb

@@ -0,0 +1,66 @@
+module Refinery
+  class VimeoMetaCache < ActiveRecord::Base
+  
+    include ::Refinery::VimeoVideos::Account
+  
+    set_table_name "refinery_vimeo_meta_cache"
+  
+    has_many :vimeo_embed_caches, :dependent => :destroy
+  
+    belongs_to :image, :class_name => '::Refinery::Image'
+  
+    before_save :cache
+  
+    validates_presence_of :vid
+  
+    def embed geometry, options = {}
+      ::Refinery::VimeoEmbedCache.embed(self.vid, geometry, options)
+    end
+  
+    def url
+      "http://www.vimeo.com/#{self.vid}"
+    end
+  
+    def update_cache images = false
+      cache true, images
+      self.save
+    end
+  
+    private
+    
+      def cache force = false, images = false
+        if !self.title? or !self.image_id? or !self.description? or force
+        
+          video_info_request = ::Vimeo::Advanced::Video.new(
+            account[:consumer_key],
+            account[:consumer_secret],
+            :token => account[:token],
+            :secret => account[:secret])
+        
+          video_info = video_info_request.get_info(self.vid)["video"].first
+        
+          # By default omitt image if we already have one.
+          # If we force an update, we need to specifically force images as well by
+          # calling this method with force and images true.
+        
+          if images or !image_id?
+            # Save fetched image url
+            vimeo_thumb_url = ""
+            (thumbs = video_info["thumbnails"]["thumbnail"]).each_with_index do |thumb, i|
+              vimeo_thumb_url = thumbs[thumbs.size-1-i]["_content"]
+              break unless vimeo_thumb_url =~ /\/defaults\//
+            end
+          
+            self.create_image(:image => ::Refinery::VimeoVideos::URLTempfile.new(vimeo_thumb_url))
+          end
+        
+          # Save fetched title
+          self.title = video_info["title"] if !self.title? or force
+        
+          # Save fetched description
+          self.description = "<p>#{video_info['description']}</p>" if !self.description? or force
+        end
+      end
+    
+  end
+end

data/app/models/refinery/vimeo_video.rb

@@ -0,0 +1,23 @@
+# This model acts as a wrapper for uploaded videos only
+# Everything else happens directly with the advanced vimeo api
+
+module Refinery
+  class VimeoVideo < ActiveRecord::Base
+  
+    # What is the max resource size a user can upload
+    MAX_SIZE_IN_MB = 1000
+  
+    # when a dialog pops up with resources, how many resources per page should there be
+    PAGES_PER_DIALOG = 18
+
+    # when listing resources out in the admin area, how many resources should show per page
+    PAGES_PER_ADMIN_INDEX = 20
+  
+    class << self
+      # How many resources per page should be displayed?
+      def per_page(dialog = false)
+        dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
+      end
+    end
+  end
+end

data/app/views/{shared → refinery}/admin/_vimeo_picker.html.erb

@@ -7,8 +7,7 @@
   thumbnail ||= 'medium'
   toggle_vimeo_video_display ||= false
   randomiser = rand(Time.now.yesterday.to_i * Time.now.to_i)
-  current_vimeo_video_link_href = insert_admin_vimeo_videos_url(:dialog => true, :callback => "vimeo_video_picker_#{randomiser}_changed",
-                                                    :width => 866, :height => 510)
+  current_vimeo_video_link_href = main_app.insert_refinery_admin_vimeo_videos_path(:dialog => true, :callback => "vimeo_video_picker_#{randomiser}_changed")
   current_vimeo_video_title = t('.change', :what =>  description.titleize)
 -%>
 <div id='vimeo_video_picker_container_<%= randomiser %>'>
@@ -16,9 +15,11 @@
   <%= f.hidden_field field, :class => "current_vimeo_video_id" -%>
 
   <div class='current_vimeo_video_container'<%= " style='display: none'" if toggle_vimeo_video_display %> style="margin-top: 10px;">
-    <a class='current_vimeo_video_link dialog' href="<%= current_vimeo_video_link_href %>" style='border: 0px' title='<%= current_vimeo_video_title  %>' name='<%= current_vimeo_video_title %>'>
+    <a class='current_vimeo_video_link dialog' href="<%= current_vimeo_video_link_href %>"
+        data-dialog-width='866' data-dialog-height='510' data-dialog-title='Pick a video...'
+        style='border: 0px' title='<%= current_vimeo_video_title  %>'>
       <% unless vimeo_video.nil? -%>
-        <%= image_fu vimeo_video.image, ::Image.user_image_sizes[thumbnail.to_sym], :class => "brown_border",
+        <%= image_fu vimeo_video.image, ::Refinery::Image.user_image_sizes[thumbnail.to_sym], :class => "brown_border",
                      :class => "current_picked_vimeo_video" %>
       <% else -%>
         <img class="current_picked_vimeo_video" src="" alt="" style='display: none' />

data/app/views/{admin → refinery/admin}/vimeo_videos/_existing_vimeo_video.html.erb

@@ -17,8 +17,10 @@
       </ul>
     </div>
   </div>
+  
+  <%= will_paginate @vimeo_videos %>
 
-  <%= render :partial => "/shared/admin/form_actions",
+  <%= render :partial => "/refinery/admin/form_actions",
              :locals => {
                :f => nil,
                :cancel_url => '',

data/app/views/{admin → refinery/admin}/vimeo_videos/_form.html.erb

@@ -1,6 +1,6 @@
 <%= form_for [:admin, @vimeo_video], :url => @url_override || @url, :html => {:multipart => true} do |f| %>
 
-  <%= render :partial => "/shared/admin/error_messages",
+  <%= render :partial => "/refinery/admin/error_messages",
              :locals => {
                :object => @vimeo_video,
                :include_object_name => false
@@ -22,12 +22,12 @@
   </div>
 
   <div class='field'>
-    <label><%= t('.maximum_vimeo_video_size', :megabytes => VimeoVideo::MAX_SIZE_IN_MB) %></label>
+    <label><%= t('.maximum_vimeo_video_size', :megabytes => ::Refinery::VimeoVideo::MAX_SIZE_IN_MB) %></label>
   </div>
 
   <input type='hidden' name='wymeditor' value='<%= params[:wymeditor] %>'>
 
-  <%= render :partial => "/shared/admin/form_actions",
+  <%= render :partial => "/refinery/admin/form_actions",
              :locals => {
                :f => f,
                :continue_editing => false,

data/app/views/{admin → refinery/admin}/vimeo_videos/insert.html.erb

@@ -1,5 +1,5 @@
 <% content_for :stylesheets do %>
-  <%= stylesheet_link_tag "admin/vimeo_videos" %>
+  <%= stylesheet_link_tag "refinery/vimeo_videos" %>
 <% end %>
 <% content_for :javascripts do %>
   <%= javascript_include_tag "refinery/vimeo_videos" %>
@@ -37,7 +37,7 @@
       <% end %>
     <% else %>
       <% flash.now[:error] = t('.no_files') %>
-      <%= render :partial => "/shared/admin/form_actions",
+      <%= render :partial => "/refinery/admin/form_actions",
                  :locals => {
                    :f => nil,
                    :cancel_url => '',

data/config/locales/en.yml

@@ -1,5 +1,5 @@
 en:
-  shared:
+  refinery:
     admin:
       vimeo_video_picker:
         vimeo_video: vimeo_video

data/config/routes.rb

@@ -1,11 +1,13 @@
 Refinery::Application.routes.draw do
-  scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
-    get 'vimeo_videos/authorization', :to => 'vimeo_account#authorization'
-    get 'vimeo_videos/callback', :to => 'vimeo_account#callback'
+  scope(:module => 'refinery') do
+    scope(:module => 'admin', :path => 'refinery', :as => 'refinery_admin') do
+      get 'vimeo_videos/authorization', :to => 'vimeo_account#authorization'
+      get 'vimeo_videos/callback', :to => 'vimeo_account#callback'
     
-    resources :vimeo_videos, :except => :show do
-      collection do
-        get :insert
+      resources :vimeo_videos, :except => :show do
+        collection do
+          get :insert
+        end
       end
     end
   end

data/db/migrate/create_vimeo_embed_cache.rb

@@ -1,7 +1,7 @@
 class CreateVimeoEmbedCache < ActiveRecord::Migration
 
   def self.up
-    create_table :vimeo_embed_cache do |t|
+    create_table Refinery::VimeoEmbedCache do |t|
       t.string :vid
       t.string :code
       t.text :configuration
@@ -12,7 +12,11 @@ class CreateVimeoEmbedCache < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :vimeo_embed_cache
+    [::VimeoEmbedCache].reject{|m|
+      !(defined?(m) and m.respond_to?(:table_name))
+    }.each do |model|
+      drop_table model.table_name
+    end
   end
 
 end

data/db/migrate/create_vimeo_meta_cache.rb

@@ -1,7 +1,7 @@
 class CreateVimeoMetaCache < ActiveRecord::Migration
 
   def self.up
-    create_table :vimeo_meta_cache do |t|
+    create_table Refinery::VimeoMetaCache do |t|
       t.string :vid, :unique => true
       t.string :title
       t.text :description
@@ -16,11 +16,11 @@ class CreateVimeoMetaCache < ActiveRecord::Migration
   end
 
   def self.down
-    UserPlugin.destroy_all({:name => "vimeo_videos"})
-
-    Page.delete_all({:link_url => "/vimeo_videos"})
-
-    drop_table :vimeo_meta_cache
+    [::VimeoMetaCache].reject{|m|
+      !(defined?(m) and m.respond_to?(:table_name))
+    }.each do |model|
+      drop_table model.table_name
+    end
   end
 
 end

data/db/migrate/create_vimeo_videos.rb

@@ -1,7 +1,7 @@
 class CreateVimeoVideos < ActiveRecord::Migration
 
   def self.up
-    create_table :vimeo_videos do |t|
+    create_table Refinery::VimeoVideo.table_name do |t|
       t.string :vid, :unique => true
       t.string :title
       t.text :description
@@ -12,7 +12,11 @@ class CreateVimeoVideos < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :vimeo_videos
+    [::VimeoVideo].reject{|m|
+      !(defined?(m) and m.respond_to?(:table_name))
+    }.each do |model|
+      drop_table model.table_name
+    end
   end
 
 end

data/lib/generators/vimeo_videos_generator.rb

@@ -0,0 +1,10 @@
+require 'refinery/generators'
+
+module Refinery
+  class VimeoVideosGenerator < ::Refinery::Generators::EngineInstaller
+
+    source_root File.expand_path('../../../', __FILE__)
+    engine_name "vimeo_videos"
+
+  end
+end

data/lib/{refinerycms-vimeo-videos → refinery/vimeo-videos}/account.rb

@@ -21,11 +21,11 @@ module Refinery
     
         def account
           @account ||= {
-            :username => RefinerySetting.find_or_set(:vimeo_username, :value => "Username"),
-            :consumer_key => RefinerySetting.find_or_set(:vimeo_consumer_key, :value => "Consumer Key"),
-            :consumer_secret => RefinerySetting.find_or_set(:vimeo_consumer_secret, :value => "Consumer Secret"),
-            :token => RefinerySetting.find_or_set(:vimeo_token, :value => 'Token'),
-            :secret => RefinerySetting.find_or_set(:vimeo_secret, :value => 'Secret')}
+            :username => ::Refinery::Setting.find_or_set(:vimeo_username, :value => "Username"),
+            :consumer_key => ::Refinery::Setting.find_or_set(:vimeo_consumer_key, :value => "Consumer Key"),
+            :consumer_secret => ::Refinery::Setting.find_or_set(:vimeo_consumer_secret, :value => "Consumer Secret"),
+            :token => ::Refinery::Setting.find_or_set(:vimeo_token, :value => 'Token'),
+            :secret => ::Refinery::Setting.find_or_set(:vimeo_secret, :value => 'Secret')}
         end
       
     end

data/lib/{refinerycms-vimeo-videos → refinery/vimeo-videos}/active_record.rb

@@ -9,7 +9,7 @@ module Refinery
             if self.new_record?
               self.#{field}_id
             else
-              self.#{field}_id? ? VimeoMetaCache.find_or_create_by_vid(self.#{field}_id) : nil
+              self.#{field}_id? ? ::Refinery::VimeoMetaCache.find_or_create_by_vid(self.#{field}_id) : nil
             end
           end
       
@@ -17,7 +17,7 @@ module Refinery
       
           def cache_vimeo_meta_for_#{field}
             if self.#{field}_id? and self.#{field}_id_changed?
-              VimeoMetaCache.find_or_create_by_vid(self.#{field}_id)
+              ::Refinery::VimeoMetaCache.find_or_create_by_vid(self.#{field}_id)
             end
           end
           protected :cache_vimeo_meta_for_#{field}

data/lib/{refinerycms-vimeo-videos → refinery/vimeo-videos}/version.rb

@@ -1,5 +1,5 @@
 module Refinery
   module VimeoVideos
-    VERSION = "0.1.9.rc3"
+    VERSION = "0.2.rc2"
   end
 end

data/lib/refinerycms-vimeo-videos.rb

@@ -1,21 +1,26 @@
 require 'vimeo'
-require 'refinerycms-vimeo-videos/version'
+require 'will_paginate/array'
+require File.expand_path('../refinery/vimeo-videos/version', __FILE__)
+require File.expand_path('../generators/vimeo_videos_generator', __FILE__)
 
 module Refinery
   module VimeoVideos
     
-    autoload :URLTempfile,            'refinerycms-vimeo-videos/url_tempfile.rb'
-    autoload :Account,                'refinerycms-vimeo-videos/account.rb'
+    class << self
+      attr_accessor :root
+      def root
+        @root ||= Pathname.new(File.expand_path('../../', __FILE__))
+      end
+    end
+    
+    autoload :URLTempfile,            File.expand_path('../refinery/vimeo-videos/url_tempfile', __FILE__)
+    autoload :Account,                File.expand_path('../refinery/vimeo-videos/account', __FILE__)
     
     class Engine < Rails::Engine
-      initializer 'serve static assets' do |app|
-        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
-      end
-            
-      config.after_initialize do
-        Refinery::Plugin.register do |plugin|
+      initializer "init plugin", :after => :set_routes_reloader do |app|
+        ::Refinery::Plugin.register do |plugin|
           plugin.pathname = root
-          plugin.version = Refinery::VimeoVideos::VERSION
+          plugin.version = ::Refinery::VimeoVideos::VERSION
           plugin.name = "vimeo_videos"
           plugin.hide_from_menu = true
         end
@@ -24,10 +29,12 @@ module Refinery
   end
 end
 
-require 'refinerycms-vimeo-videos/active_record.rb'
+require File.expand_path('../refinery/vimeo-videos/active_record', __FILE__)
 
 module ActiveRecord
   class Base
     extend ::Refinery::VimeoVideos::ActiveRecord
   end
-end
+end
+
+::Refinery.engines << 'vimeo_videos'

data/refinerycms-vimeo-videos.gemspec

@@ -1,5 +1,6 @@
+# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require "refinerycms-vimeo-videos/version"
+require "refinery/vimeo-videos/version"
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-vimeo-videos}
@@ -14,9 +15,9 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib", "config", "app", "public"]
+  s.require_paths = ["lib"]
   
-  s.add_dependency    'vimeo', '~> 1.3.0'
+  s.add_dependency    'vimeo', '~> 1.4'
   s.add_development_dependency    'fakeweb', '~> 1.2.6'
   
 end

data/spec/controllers/admin/vimeo_account_controller_spec.rb

@@ -9,7 +9,7 @@ describe Admin::VimeoAccountController do
 
   def reset(options = {})
     FakeWeb.clean_registry
-    RefinerySetting.delete_all
+    ::Refinery::Setting.delete_all
     login_user
   end
   
@@ -31,8 +31,8 @@ describe Admin::VimeoAccountController do
   end
   
   it "should redirect if ready to authorize" do
-    RefinerySetting.set(:vimeo_consumer_key, '0fdb4f200cc52ae06cd3dfa74e680feb')
-    RefinerySetting.set(:vimeo_consumer_secret, 'e6cdebf36a8cdd6b')
+    ::Refinery::Setting.set(:vimeo_consumer_key, '0fdb4f200cc52ae06cd3dfa74e680feb')
+    ::Refinery::Setting.set(:vimeo_consumer_secret, 'e6cdebf36a8cdd6b')
     
     stub_custom_get("/oauth/request_token", "advanced/auth/request_token.txt")
     
@@ -42,10 +42,10 @@ describe Admin::VimeoAccountController do
   end
   
   it "should redirect to /refinery if already authorized" do
-    RefinerySetting.set(:vimeo_consumer_key, '0fdb4f200cc52ae06cd3dfa74e680feb')
-    RefinerySetting.set(:vimeo_consumer_secret, 'e6cdebf36a8cdd6b')
-    RefinerySetting.set(:vimeo_token, '0ea53d3415ce2c60625ddc649730e1b9')
-    RefinerySetting.set(:vimeo_secret, '97ce681f949aadb4e56e764b897a6e4463df0a7b')
+    ::Refinery::Setting.set(:vimeo_consumer_key, '0fdb4f200cc52ae06cd3dfa74e680feb')
+    ::Refinery::Setting.set(:vimeo_consumer_secret, 'e6cdebf36a8cdd6b')
+    ::Refinery::Setting.set(:vimeo_token, '0ea53d3415ce2c60625ddc649730e1b9')
+    ::Refinery::Setting.set(:vimeo_secret, '97ce681f949aadb4e56e764b897a6e4463df0a7b')
     
     get :authorization
 
@@ -54,8 +54,8 @@ describe Admin::VimeoAccountController do
   end
   
   #it "should successfully authorize on callback" do
-  #  RefinerySetting.set(:vimeo_consumer_key, '0fdb4f200cc52ae06cd3dfa74e680feb')
-  #  RefinerySetting.set(:vimeo_consumer_secret, 'e6cdebf36a8cdd6b')
+  #  ::Refinery::Setting.set(:vimeo_consumer_key, '0fdb4f200cc52ae06cd3dfa74e680feb')
+  #  ::Refinery::Setting.set(:vimeo_consumer_secret, 'e6cdebf36a8cdd6b')
   #  
   #  #stub_custom_get("/oauth/access_token", "advanced/auth/access_token.txt")
   #  

data/spec/models/active_record_extension_spec.rb

@@ -23,10 +23,10 @@ CreateModels.up
 describe "RefinerycmsVimeoVideos ActiveRecord extension" do
 
   before(:each) do
-    RefinerySetting.set(:vimeo_consumer_key, '12345')
-    RefinerySetting.set(:vimeo_consumer_secret, 'secret')
-    RefinerySetting.set(:vimeo_token, 'token')
-    RefinerySetting.set(:vimeo_secret, 'secret')
+    ::Refinery::Setting.set(:vimeo_consumer_key, '12345')
+    ::Refinery::Setting.set(:vimeo_consumer_secret, 'secret')
+    ::Refinery::Setting.set(:vimeo_token, 'token')
+    ::Refinery::Setting.set(:vimeo_secret, 'secret')
   end
   
   it "should return nil if new record" do

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-vimeo-videos
 version: !ruby/object:Gem::Version
-  version: 0.1.9.rc3
-  prerelease: 6
+  version: 0.2.rc2
+  prerelease: 4
 platform: ruby
 authors:
 - Marian Andre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-30 00:00:00.000000000Z
+date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vimeo
-  requirement: &2156902740 !ruby/object:Gem::Requirement
+  requirement: &70147903603280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2156902740
+  version_requirements: *70147903603280
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2156902120 !ruby/object:Gem::Requirement
+  requirement: &70147903602780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,30 +32,36 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *2156902120
+  version_requirements: *70147903602780
 description: Ruby on Rails Vimeo Videos engine for Refinery CMS
 email: mail@bitflut.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
 - Gemfile
 - Gemfile.lock
 - README.markdown
 - Rakefile
-- app/controllers/admin/vimeo_account_controller.rb
-- app/controllers/admin/vimeo_videos_controller.rb
-- app/models/vimeo_embed_cache.rb
-- app/models/vimeo_meta_cache.rb
-- app/models/vimeo_video.rb
-- app/views/admin/vimeo_videos/_error_message.html.erb
-- app/views/admin/vimeo_videos/_existing_vimeo_video.html.erb
-- app/views/admin/vimeo_videos/_form.html.erb
-- app/views/admin/vimeo_videos/_vimeo_video.html.haml
-- app/views/admin/vimeo_videos/index.js.erb
-- app/views/admin/vimeo_videos/insert.html.erb
-- app/views/shared/admin/_vimeo_picker.html.erb
+- app/.DS_Store
+- app/assets/javascripts/refinery/vimeo_videos.js
+- app/assets/stylesheets/refinery/vimeo_videos.css
+- app/controllers/.DS_Store
+- app/controllers/refinery/admin/vimeo_account_controller.rb
+- app/controllers/refinery/admin/vimeo_videos_controller.rb
+- app/models/refinery/vimeo_embed_cache.rb
+- app/models/refinery/vimeo_meta_cache.rb
+- app/models/refinery/vimeo_video.rb
+- app/views/.DS_Store
+- app/views/refinery/admin/_vimeo_picker.html.erb
+- app/views/refinery/admin/vimeo_videos/_error_message.html.erb
+- app/views/refinery/admin/vimeo_videos/_existing_vimeo_video.html.erb
+- app/views/refinery/admin/vimeo_videos/_form.html.erb
+- app/views/refinery/admin/vimeo_videos/_vimeo_video.html.haml
+- app/views/refinery/admin/vimeo_videos/index.js.erb
+- app/views/refinery/admin/vimeo_videos/insert.html.erb
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/lolcat.yml
@@ -65,16 +71,13 @@ files:
 - db/migrate/create_vimeo_embed_cache.rb
 - db/migrate/create_vimeo_meta_cache.rb
 - db/migrate/create_vimeo_videos.rb
-- db/seeds/vimeo_videos.rb
-- lib/generators/refinerycms_vimeo_videos_generator.rb
+- lib/generators/vimeo_videos_generator.rb
+- lib/refinery/vimeo-videos/account.rb
+- lib/refinery/vimeo-videos/active_record.rb
+- lib/refinery/vimeo-videos/url_tempfile.rb
+- lib/refinery/vimeo-videos/version.rb
 - lib/refinerycms-vimeo-videos.rb
-- lib/refinerycms-vimeo-videos/account.rb
-- lib/refinerycms-vimeo-videos/active_record.rb
-- lib/refinerycms-vimeo-videos/url_tempfile.rb
-- lib/refinerycms-vimeo-videos/version.rb
 - lib/tasks/vimeo_videos.rake
-- public/javascripts/refinery/vimeo_videos.js
-- public/stylesheets/admin/vimeo_videos.css
 - refinerycms-vimeo-videos.gemspec
 - spec/controllers/admin/vimeo_account_controller_spec.rb
 - spec/fixtures/advanced/album/add_video.json
@@ -201,9 +204,6 @@ post_install_message:
 rdoc_options: []
 require_paths:
 - lib
-- config
-- app
-- public
 required_ruby_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Vimeo Videos engine for Refinery CMS

data/app/controllers/admin/vimeo_account_controller.rb

@@ -1,54 +0,0 @@
-module Admin
-  class VimeoAccountController < Admin::BaseController
-
-    include ::Refinery::VimeoVideos::Account
-    
-    def authorization
-      
-      if not authorized? and ready_to_authorize?
-        
-        # begin authorization process
-        base = ::Vimeo::Advanced::Base.new(
-          account[:consumer_key],
-          account[:consumer_secret])
-        request_token = base.get_request_token
-        session[:oauth_secret] = request_token.secret
-        
-        redirect_to base.authorize_url
-        
-      elsif ready_to_authorize?
-        
-        # already authorized
-        flash.notice = "You have already authorized your account."
-        redirect_to refinery_root_path
-        
-      else
-        
-        # not ready to authorize
-        flash.alert = "You are not ready to authorize. Type in consumer_key and consumer_secret."
-        redirect_to refinery_root_path
-      
-      end
-    end
-  
-    def callback
-      
-      # vimeo will redirect us here upon successful authorization
-      base = ::Vimeo::Advanced::Base.new(
-        account[:consumer_key],
-        account[:consumer_secret])
-      access_token = base.get_access_token(params[:oauth_token], session[:oauth_secret], params[:oauth_verifier])
-      RefinerySetting.find_by_name('vimeo_token').update_attribute(:value, access_token.token)
-      RefinerySetting.find_by_name('vimeo_secret').update_attribute(:value, access_token.secret)
-      flash.notice = "You successfully authorized your vimeo account for integration in your backend. You can now start using it."
-      redirect_to refinery_root_path
-    
-    end
-    
-    protected
-    
-      def restrict_controller
-      end
-
-  end
-end

data/app/controllers/admin/vimeo_videos_controller.rb

@@ -1,87 +0,0 @@
-class VimeoAuthorizationError < StandardError; end
-module Admin
-  class VimeoVideosController < Admin::BaseController
-    
-    include ::Refinery::VimeoVideos::Account
-    
-    before_filter :ensure_authorized!
-    before_filter :init_dialog
-    
-    def index
-      get_videos_on_vimeo_account
-    end
-    
-    def new
-      @vimeo_video = VimeoVideo.new
-    end
-    
-    def create
-      
-    end
-    
-    def insert
-      self.new if @vimeo_video.nil?
-
-      @url_override = admin_vimeo_videos_url(:dialog => from_dialog?, :insert => true)
-
-      if params[:conditions].present?
-        extra_condition = params[:conditions].split(',')
-
-        extra_condition[1] = true if extra_condition[1] == "true"
-        extra_condition[1] = false if extra_condition[1] == "false"
-        extra_condition[1] = nil if extra_condition[1] == "nil"
-        paginate_vimeo_videos({extra_condition[0].to_sym => extra_condition[1]})
-      else
-        paginate_vimeo_videos
-      end
-      render :action => "insert"
-    end
-    
-    protected
-      def get_videos_on_vimeo_account
-        video = ::Vimeo::Advanced::Video.new(
-          account[:consumer_key],
-          account[:consumer_secret],
-          :token => account[:token],
-          :secret => account[:secret])
-        @vimeo_videos = video.get_all(account[:username], {:full_response => true, :sort => 'upload_date'})["videos"]["video"]
-      end
-      
-      def init_dialog
-        @app_dialog = params[:app_dialog].present?
-        @field = params[:field]
-        @update_vimeo_video = params[:update_vimeo_video]
-        @update_text = params[:update_text]
-        @thumbnail = params[:thumbnail]
-        @callback = params[:callback]
-        @conditions = params[:conditions]
-        @current_link = params[:current_link]
-      end
-
-      def restrict_controller
-        super unless action_name == 'insert'
-      end
-
-      def paginate_vimeo_videos(conditions={})
-        @vimeo_videos = get_videos_on_vimeo_account.paginate   :page => (@paginate_page_number ||= params[:page]),
-                                         :conditions => conditions,
-                                         :order => 'created_at DESC',
-                                         :per_page => VimeoVideo.per_page(from_dialog?)
-      end
-      
-      def ensure_authorized!
-        begin
-          
-          raise VimeoAuthorizationError unless authorized?
-        
-        rescue VimeoAuthorizationError => exception
-          
-          message = 'You have not authorized your vimeo account with this application.'
-          render :partial => 'error_message', :locals => {
-            :message => message
-          }
-          
-        end
-      end
-  end
-end

data/app/models/vimeo_embed_cache.rb

@@ -1,67 +0,0 @@
-require 'httparty'
-
-class VimeoEmbedCache < ActiveRecord::Base
-  
-  set_table_name "vimeo_embed_cache"
-  
-  belongs_to :vimeo_video
-    
-  before_save :cache
-  
-  serialize :configuration, Hash
-    
-  validates_presence_of :configuration
-  validates_presence_of :vid
-  
-  def self.embed vid, geometry, configuration = {}
-    configuration.stringify_keys!
-    configuration.merge!(geometry_hash(geometry))
-        
-    static = configuration.delete("static") if configuration.has_key?("static")
-    if static
-      geometry =~ FIXED_GEOMETRY ?
-        static_embed_code(vid, geometry).html_safe : raise(ArgumentError, "Must use fixed geometry string for static embeds (e.g. 100x240)")
-    else
-      find_or_create_by_vid_and_configuration(vid, :configuration => ::YAML.dump(configuration)).code.html_safe
-    end
-  end
-  
-  def update_cache
-    cache true
-    self.save
-  end
-  
-  FIXED_WIDTH_GEOMETRY    = /^(\d+)$/ # e.g. '300'
-  FIXED_HEIGHT_GEOMETRY   = /^x(\d+)$/ # e.g. 'x200'
-  FIXED_GEOMETRY          = /^(\d+)x(\d+)$/ # e.g. '300x200'
-  VIMEO_GEOMETRY = ::Regexp.union FIXED_GEOMETRY, FIXED_HEIGHT_GEOMETRY, FIXED_WIDTH_GEOMETRY
-  
-  def self.geometry_hash geometry
-    case geometry
-    when FIXED_WIDTH_GEOMETRY
-      {:width => $1}
-    when FIXED_HEIGHT_GEOMETRY
-      {:height => $1}
-    when FIXED_GEOMETRY
-      {:width => $1, :height => $2}
-    else raise ArgumentError, "Didn't recognise the geometry string #{geometry}"
-    end
-  end
-    
-  private
-    
-    def self.static_embed_code vid, geometry
-      width, height = geometry.split('x')
-      "<iframe src=\"http://player.vimeo.com/video/#{vid}?portrait=0\" width=\"#{width}\" height=\"#{height}\" frameborder=\"0\"></iframe>"
-    end
-  
-    def cache force = false
-      if self.code.blank? or force  
-        # Escape vimeo url and request oembed code
-        url = ::CGI::escape("http://vimeo.com/#{self.vid}")
-        
-        response = ::HTTParty.get "http://vimeo.com/api/oembed.xml?url=#{url}&#{self.configuration.to_query}"
-        self.code = response["oembed"]["html"]
-      end
-    end
-end

data/app/models/vimeo_meta_cache.rb

@@ -1,59 +0,0 @@
-class VimeoMetaCache < ActiveRecord::Base
-  
-  include ::Refinery::VimeoVideos::Account
-  
-  set_table_name "vimeo_meta_cache"
-  
-  has_many :vimeo_embed_caches, :dependent => :destroy
-  
-  belongs_to :image, :class_name => 'Image'
-  
-  before_save :cache
-  
-  validates_presence_of :vid
-  
-  def embed geometry, options = {}
-    VimeoEmbedCache.embed(self.vid, geometry, options)
-  end
-  
-  def url
-    "http://www.vimeo.com/#{self.vid}"
-  end
-  
-  def update_cache images = false
-    cache true, images
-    self.save
-  end
-  
-  private
-    
-    def cache force = false, images = false
-      if !self.title? or !self.image_id? or !self.description? or force
-        
-        video_info_request = ::Vimeo::Advanced::Video.new(
-          account[:consumer_key],
-          account[:consumer_secret],
-          :token => account[:token],
-          :secret => account[:secret])
-        
-        video_info = video_info_request.get_info(self.vid)["video"].first
-        
-        # By default omitt image if we already have one.
-        # If we force an update, we need to specifically force images as well by
-        # calling this method with force and images true.
-        
-        if images or !image_id?
-          # Save fetched image url
-          vimeo_thumb_url = video_info["thumbnails"]["thumbnail"].last["_content"]
-          self.create_image(:image => ::Refinery::VimeoVideos::URLTempfile.new(vimeo_thumb_url))
-        end
-        
-        # Save fetched title
-        self.title = video_info["title"] if !self.title? or force
-        
-        # Save fetched description
-        self.description = "<p>#{video_info['description']}</p>" if !self.description? or force
-      end
-    end
-    
-end

data/app/models/vimeo_video.rb

@@ -1,21 +0,0 @@
-# This model acts as a wrapper for uploaded videos only
-# Everything else happens directly with the advanced vimeo api
-
-class VimeoVideo < ActiveRecord::Base
-  
-  # What is the max resource size a user can upload
-  MAX_SIZE_IN_MB = 1000
-  
-  # when a dialog pops up with resources, how many resources per page should there be
-  PAGES_PER_DIALOG = 18
-
-  # when listing resources out in the admin area, how many resources should show per page
-  PAGES_PER_ADMIN_INDEX = 20
-  
-  class << self
-    # How many resources per page should be displayed?
-    def per_page(dialog = false)
-      dialog ? PAGES_PER_DIALOG : PAGES_PER_ADMIN_INDEX
-    end
-  end
-end

data/db/seeds/vimeo_videos.rb

@@ -1,6 +0,0 @@
-User.find(:all).each do |user|
-  if user.plugins.find_by_name('vimeo_videos').nil?
-    user.plugins.create(:name => 'vimeo_videos',
-                        :position => (user.plugins.maximum(:position) || -1) +1)
-  end
-end

data/lib/generators/refinerycms_vimeo_videos_generator.rb

@@ -1,6 +0,0 @@
-class RefinerycmsVimeoVideos < Refinery::Generators::EngineInstaller
-
-  source_root File.expand_path('../../../', __FILE__)
-  engine_name "vimeo_videos"
-
-end