refinerycms-vimeo-videos 0.1.6 → 0.1.7

data/README.markdown

@@ -1,8 +1,67 @@
 Refinerycms-Vimeo-Videos
 ========================
 
-This gem makes it easy for refinerycms sites to add vimeo videos to models.
+This gem makes it easy for refinerycms sites to add vimeo videos to models. It is still in a very experimental phase of development, but already used in production. Use only if you are sure about what the code does.
 
-Usage
------
+Setup and Authorization
+-----------------------
 
+Add the gem to your Gemfile and bundle install it
+
+    gem 'refinerycms-vimeo-videos'
+    
+Run the generator and migrate your database
+
+    rails generate refinerycms_vimeo_videos
+    rake db:migrate
+
+Create an api-application for your vimeo account under http://vimeo.com/api/applications with a callback url of
+
+    http://yourapp.com/admin/vimeo_videos/callback
+
+Copy/paste the consumer\_key and consumer\_secret of your vimeo api-application to the related Refinery Settings (:vimeo\_consumer\_key and :vimeo\_consumer\_secret). Then access the following url:
+
+    http://yourapp.com/admin/vimeo_videos/authorization
+    
+After this, your app should be setup to use your vimeo account.
+
+Adding a vimeo video
+--------------------
+
+Add a field to the table:
+
+    add_column :projects, :test_video_id, :string
+
+Call _vimeo\_video_ in your model with the corresponding field as attribute:
+
+    vimeo_video :test_video
+    
+In your _form.html.erb insert this:
+
+    <div class='field'>
+      <%= f.label "Test Video" -%>
+      <%= render :partial => "/shared/admin/vimeo_picker", :locals => {
+            :f => f,
+            :field => :test_video_id,
+            :vimeo_video => @project.test_video
+          } %>
+    </div>
+    
+Now embed the video (with a width of 750px):
+
+    <%= @project.test_video.embed '750' -%>
+    
+Invalidating Caches
+-------------------
+
+If you need to invalidate the whole cache, simply call delete\_all on VimeoEmbedCache and VimeoMetaCache.
+
+In case you want to just pull in changes, you can do:
+
+    VimeoEmbedCache.update_cache
+    VimeoMetaCache.update_cache
+
+TODO
+----
+
+Alot!

data/app/controllers/admin/vimeo_account_controller.rb

@@ -25,7 +25,8 @@ module Admin
       else
         
         # not ready to authorize
-        raise ArgumentError, 'Not ready to authorize. Type in consumer_key and consumer_secret.'
+        flash.alert = "You are not ready to authorize. Type in consumer_key and consumer_secret."
+        redirect_to "/admin"
       
       end
     end

data/app/models/vimeo_embed_cache.rb

@@ -20,9 +20,9 @@ class VimeoEmbedCache < ActiveRecord::Base
     static = configuration.delete("static") if configuration.has_key?("static")
     if static
       geometry =~ FIXED_GEOMETRY ?
-        static_embed_code(vid, geometry) : raise(ArgumentError, "Must use fixed geometry string for static embeds (e.g. 100x240)")
+        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))
+      find_or_create_by_vid_and_configuration(vid, :configuration => YAML.dump(configuration)).code.html_safe
     end
   end
   

data/app/models/vimeo_meta_cache.rb

@@ -13,7 +13,7 @@ class VimeoMetaCache < ActiveRecord::Base
   validates_presence_of :vid
   
   def embed geometry, options = {}
-    VimeoEmbedCache.embed(self.vid, geometry, options).code
+    VimeoEmbedCache.embed(self.vid, geometry, options)
   end
   
   def url
@@ -30,12 +30,13 @@ class VimeoMetaCache < ActiveRecord::Base
     def cache force = false, images = false
       if !self.title? or !self.image_id? or !self.description? or force
         
-        video = Vimeo::Advanced::Video.new(
+        video_info_request = Vimeo::Advanced::Video.new(
           account[:consumer_key],
           account[:consumer_secret],
           :token => account[:token],
           :secret => account[:secret])
-        video_info = video.get_info(self.vid)["video"].first
+        
+        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
@@ -44,7 +45,7 @@ class VimeoMetaCache < ActiveRecord::Base
         if images or !image_id?
           # Save fetched image url
           vimeo_thumb_url = video_info["thumbnails"]["thumbnail"].last["_content"]
-          self.create_image(:image => URLTempfile.new(vimeo_thumb_url))
+          self.create_image(:image => RefinerycmsVimeoVideos::URLTempfile.new(vimeo_thumb_url))
         end
         
         # Save fetched title

data/db/migrate/create_vimeo_embed_cache.rb

@@ -2,7 +2,7 @@ class CreateVimeoEmbedCache < ActiveRecord::Migration
 
   def self.up
     create_table :vimeo_embed_cache do |t|
-      t.integer :vid
+      t.string :vid
       t.string :code
       t.text :configuration
       t.timestamps

data/features/support/factories.rb

@@ -0,0 +1,18 @@
+require 'factory_girl'
+
+Factory.define :user do |u|
+  u.sequence(:username) { |n| "person#{n}" }
+  u.sequence(:email) { |n| "person#{n}@cucumber.com" }
+  u.password  "greenandjuicy"
+  u.password_confirmation "greenandjuicy"
+end
+
+Factory.define :refinery_user, :parent => :user do |u|
+  u.roles { [ Role[:refinery] ] }
+
+  u.after_create do |user|
+    Refinery::Plugins.registered.each_with_index do |plugin, index|
+      user.plugins.create(:name => plugin.name, :position => index)
+    end
+  end
+end

data/lib/refinerycms-vimeo-videos.rb

@@ -2,6 +2,8 @@ require 'refinerycms-base'
 require 'vimeo'
 
 require 'refinerycms_vimeo_videos/account'
+require 'refinerycms_vimeo_videos/active_record_extension'
+require 'refinerycms_vimeo_videos/url_tempfile'
 
 module Refinery
   module VimeoVideos

data/lib/refinerycms_vimeo_videos/active_record_extension.rb

@@ -0,0 +1,38 @@
+module RefinerycmsVimeoVideos
+  module ActiveRecordExtension
+    
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+    
+    module ClassMethods
+      
+      def vimeo_video field
+        class_eval <<-EOV
+        
+          def #{field}
+            if self.new_record?
+              self.#{field}_id
+            else
+              self.#{field}_id? ? VimeoMetaCache.find_or_create_by_vid(self.#{field}_id) : nil
+            end
+          end
+          
+          before_save :cache_vimeo_meta_for_#{field}
+          
+          def cache_vimeo_meta_for_#{field}
+            if self.#{field}_id? and self.#{field}_id_changed?
+              VimeoMetaCache.find_or_create_by_vid(self.#{field}_id)
+            end
+          end
+          protected :cache_vimeo_meta_for_#{field}
+          
+        EOV
+      end
+    
+    end
+        
+  end
+end
+
+ActiveRecord::Base.class_eval { include RefinerycmsVimeoVideos::ActiveRecordExtension }

data/lib/refinerycms_vimeo_videos/url_tempfile.rb

@@ -0,0 +1,19 @@
+module RefinerycmsVimeoVideos
+  class URLTempfile < Tempfile
+
+    def initialize(url)
+      @url = URI.parse(url)
+
+      begin
+        super('url', Dir.tmpdir, :encoding => 'ascii-8bit')
+
+        Net::HTTP.start(@url.host) do |http|
+          resp = http.get(@url.path)
+          self.write resp.body
+        end
+      ensure
+      end
+    end
+
+  end
+end

data/lib/refinerycms_vimeo_videos/version.rb

@@ -1,3 +1,3 @@
 module RefinerycmsVimeoVideos
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/refinerycms-vimeo-videos.gemspec

@@ -4,7 +4,7 @@ require "refinerycms_vimeo_videos/version"
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-vimeo-videos}
-  s.version           = %q{0.1.6}
+  s.version           = %q{0.1.7}
   s.description       = 'Ruby on Rails Vimeo Videos engine for Refinery CMS'
   s.date              = %q{2011-04-25}
   s.summary           = 'Vimeo Videos engine for Refinery CMS'
@@ -66,6 +66,7 @@ Gem::Specification.new do |s|
     'features/step_definitions',
     'features/step_definitions/vimeo_video_steps.rb',
     'features/support',
+    'features/support/factories.rb',
     'features/support/paths.rb',
     'lib',
     'lib/generators',
@@ -73,6 +74,8 @@ Gem::Specification.new do |s|
     'lib/refinerycms-vimeo-videos.rb',
     'lib/refinerycms_vimeo_videos',
     'lib/refinerycms_vimeo_videos/account.rb',
+    'lib/refinerycms_vimeo_videos/active_record_extension.rb',
+    'lib/refinerycms_vimeo_videos/url_tempfile.rb',
     'lib/refinerycms_vimeo_videos/version.rb',
     'lib/tasks',
     'lib/tasks/vimeo_videos.rake',
@@ -190,7 +193,7 @@ Gem::Specification.new do |s|
     'spec/fixtures/advanced/video_embed/get_presets.json',
     'spec/fixtures/advanced/video_embed/set_preset.json',
     'spec/fixtures/oembed',
-    'spec/fixtures/oembed/oembed.json',
+    'spec/fixtures/oembed/oembed.json.erb',
     'spec/fixtures/simple',
     'spec/fixtures/simple/activity',
     'spec/fixtures/simple/activity/contacts_did.json',
@@ -223,9 +226,12 @@ Gem::Specification.new do |s|
     'spec/fixtures/simple/video',
     'spec/fixtures/simple/video/info.json',
     'spec/models',
+    'spec/models/active_record_extension_spec.rb',
     'spec/models/vimeo_embed_cache_spec.rb',
     'spec/models/vimeo_meta_cache_spec.rb',
     'spec/models/vimeo_video_spec.rb',
+    'spec/samples',
+    'spec/samples/taj.jpg',
     'spec/vimeo_helper.rb'
   ]
 end

data/spec/controllers/admin/vimeo_account_controller_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+require 'factory_girl'
+Dir[File.expand_path('../../../../features/support/factories.rb', __FILE__)].each {|f| require f}
+require File.expand_path '../../../vimeo_helper', __FILE__
+
+include Devise::TestHelpers
+
+describe Admin::VimeoAccountController do
+
+  def reset(options = {})
+    FakeWeb.clean_registry
+    RefinerySetting.delete_all
+    login_user
+  end
+  
+  def login_user
+    @request.env["devise.mapping"] = Devise.mappings[:user]
+    user = Factory.create(:refinery_user)
+    sign_in user
+  end
+
+  before(:each) do
+    reset
+  end
+    
+  it "should not ask for authorization if not ready" do
+    get :authorization
+    
+    response.should be_redirect
+    flash[:alert].should_not == nil
+  end
+  
+  it "should redirect if ready to authorize" do
+    RefinerySetting.set(:vimeo_consumer_key, '0fdb4f200cc52ae06cd3dfa74e680feb')
+    RefinerySetting.set(:vimeo_consumer_secret, 'e6cdebf36a8cdd6b')
+    
+    stub_custom_get("/oauth/request_token", "advanced/auth/request_token.txt")
+    
+    get :authorization
+    
+    response.should redirect_to('http://vimeo.com/oauth/authorize?permission=delete&oauth_token=12345')
+  end
+  
+  it "should redirect to /admin 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')
+    
+    get :authorization
+
+    response.should redirect_to('/admin')
+    flash[:notice].should_not == nil
+  end
+  
+end

data/spec/fixtures/advanced/video/get_info.json

@@ -1,246 +1,175 @@
 {
-  "generated_in":"0.2644",
+  "generated_in":"0.2381",
   "stat":"ok",
-  "video":{
-    "embed_privacy":"anywhere",
-    "id":"6788487",
-    "is_hd":"1",
-    "is_transcoding":"0",
-    "privacy":"anybody",
-    "title":"Riding High",
-    "caption":"13thWitness\u2122 x NYC Bridge Rollers...\n\nhttp:\/\/twitter.com\/13thwitness",
-    "upload_date":"2009-09-27 22:35:02",
-    "number_of_likes":"33",
-    "number_of_plays":"2420",
-    "number_of_comments":"18",
-    "width":"640",
-    "height":"352",
-    "duration":"181",
-    "owner":{
-      "display_name":"13thWitness\u2122",
-      "id":"580098",
-      "is_plus":"1",
-      "is_staff":"0",
-      "profileurl":"http:\/\/vimeo.com\/the13thwitness",
-      "realname":"13thWitness\u2122",
-      "username":"the13thwitness",
-      "videosurl":"http:\/\/vimeo.com\/the13thwitness\/videos",
-      "portraits":{
-        "portrait":[
-          {
-            "height":"30",
-            "width":"30",
-            "_content":"http:\/\/images.vimeo.com\/91\/61\/45\/91614528\/91614528_30.jpg"
+  "video":[
+    {
+      "embed_privacy":"anywhere",
+      "id":"26366794",
+      "is_hd":"0",
+      "is_like":"0",
+      "is_transcoding":"",
+      "is_watchlater":"0",
+      "license":"0",
+      "privacy":"anybody",
+      "title":"Riding High",
+      "description":"Riding High description",
+      "upload_date":"2010-11-15 17:59:15",
+      "modified_date":"2011-04-18 16:32:10",
+      "number_of_likes":"1",
+      "number_of_plays":"50",
+      "number_of_comments":"0",
+      "width":"640",
+      "height":"360",
+      "duration":"214",
+      "owner":{
+        "display_name":"Perfect Film Prd | Baldvin K\u00e1ri",
+        "id":"3067177",
+        "is_plus":"0",
+        "is_staff":"0",
+        "profileurl":"http:\/\/vimeo.com\/perfectfilms",
+        "realname":"Perfect Film Prd | Baldvin K\u00e1ri",
+        "username":"perfectfilms",
+        "videosurl":"http:\/\/vimeo.com\/perfectfilms\/videos",
+        "portraits":{
+          "portrait":[
+            {
+              "height":"30",
+              "width":"30",
+              "_content":"http:\/\/b.vimeocdn.com\/ps\/136\/901\/1369017_30.jpg"
+            },
+            {
+              "height":"75",
+              "width":"75",
+              "_content":"http:\/\/b.vimeocdn.com\/ps\/136\/901\/1369017_75.jpg"
+            },
+            {
+              "height":"100",
+              "width":"100",
+              "_content":"http:\/\/b.vimeocdn.com\/ps\/136\/901\/1369017_100.jpg"
+            },
+            {
+              "height":"300",
+              "width":"300",
+              "_content":"http:\/\/b.vimeocdn.com\/ps\/136\/901\/1369017_300.jpg"
+            }
+          ]
+        }
+      },
+      "tags":{
+        "tag":[
+          {
+            "author":"3067177",
+            "id":"39388789",
+            "normalized":"shortfilm",
+            "url":"http:\/\/vimeo.com\/tag:shortfilm",
+            "_content":"short film"
           },
           {
-            "height":"75",
-            "width":"75",
-            "_content":"http:\/\/images.vimeo.com\/91\/61\/45\/91614528\/91614528_75.jpg"
+            "author":"3067177",
+            "id":"39388792",
+            "normalized":"columbia",
+            "url":"http:\/\/vimeo.com\/tag:columbia",
+            "_content":"columbia"
+          },
+          {
+            "author":"3067177",
+            "id":"39388793",
+            "normalized":"baldvinkari",
+            "url":"http:\/\/vimeo.com\/tag:baldvinkari",
+            "_content":"baldvin kari"
+          },
+          {
+            "author":"3067177",
+            "id":"39388794",
+            "normalized":"hairdo",
+            "url":"http:\/\/vimeo.com\/tag:hairdo",
+            "_content":"hairdo"
+          },
+          {
+            "author":"3067177",
+            "id":"39388795",
+            "normalized":"hairstyle",
+            "url":"http:\/\/vimeo.com\/tag:hairstyle",
+            "_content":"hairstyle"
+          },
+          {
+            "author":"3067177",
+            "id":"39388796",
+            "normalized":"eighties",
+            "url":"http:\/\/vimeo.com\/tag:eighties",
+            "_content":"eighties"
+          },
+          {
+            "author":"3067177",
+            "id":"39388797",
+            "normalized":"80s",
+            "url":"http:\/\/vimeo.com\/tag:80s",
+            "_content":"80s"
+          },
+          {
+            "author":"3067177",
+            "id":"39388798",
+            "normalized":"comedy",
+            "url":"http:\/\/vimeo.com\/tag:comedy",
+            "_content":"comedy"
+          }
+        ]
+      },
+      "cast":{
+        "member":[
+          {
+            "display_name":"Perfect Film Prd | Baldvin K\u00e1ri",
+            "id":"3067177",
+            "role":"Production Company | Director\/Co-Writer",
+            "username":"perfectfilms"
           },
           {
-            "height":"100",
+            "display_name":"Blendwerk",
+            "id":"1139721",
+            "role":"Cinematography (Viktor Schaider)",
+            "username":"user1139721"
+          },
+          {
+            "display_name":"Christoph Kuschnig",
+            "id":"1591276",
+            "role":"Gaffer",
+            "username":"christophkuschnig"
+          },
+          {
+            "display_name":"Erlingur Thoroddsen",
+            "id":"2642258",
+            "role":"Sound recordist",
+            "username":"user2642258"
+          }
+        ]
+      },
+      "urls":{
+        "url":[
+          {
+            "type":"video",
+            "_content":"http:\/\/vimeo.com\/16866796"
+          }
+        ]
+      },
+      "thumbnails":{
+        "thumbnail":[
+          {
+            "height":"75",
             "width":"100",
-            "_content":"http:\/\/images.vimeo.com\/91\/61\/45\/91614528\/91614528_100.jpg"
+            "_content":"http:\/\/b.vimeocdn.com\/ts\/104\/602\/104602144_100.jpg"
+          },
+          {
+            "height":"150",
+            "width":"200",
+            "_content":"http:\/\/b.vimeocdn.com\/ts\/104\/602\/104602144_200.jpg"
           },
           {
-            "height":"300",
-            "width":"300",
-            "_content":"http:\/\/images.vimeo.com\/91\/61\/45\/91614528\/91614528_300.jpg"
+            "height":"360",
+            "width":"640",
+            "_content":"http:\/\/b.vimeocdn.com\/ts\/104\/602\/104602144_640.jpg"
           }
         ]
       }
-    },
-    "tags":{
-      "tag":[
-        {
-          "author":"580098",
-          "id":"16600131",
-          "normalized":"fixedgear",
-          "url":"http:\/\/vimeo.com\/tag:fixedgear",
-          "_content":"fixed gear"
-        },
-        {
-          "author":"580098",
-          "id":"16600141",
-          "normalized":"bicycle",
-          "url":"http:\/\/vimeo.com\/tag:bicycle",
-          "_content":"bicycle"
-        },
-        {
-          "author":"580098",
-          "id":"16600144",
-          "normalized":"clyclist",
-          "url":"http:\/\/vimeo.com\/tag:clyclist",
-          "_content":"clyclist"
-        },
-        {
-          "author":"580098",
-          "id":"16600155",
-          "normalized":"newyorkcity",
-          "url":"http:\/\/vimeo.com\/tag:newyorkcity",
-          "_content":"new york city"
-        },
-        {
-          "author":"580098",
-          "id":"16600159",
-          "normalized":"nycbridgerollers",
-          "url":"http:\/\/vimeo.com\/tag:nycbridgerollers",
-          "_content":"nyc bridge rollers"
-        },
-        {
-          "author":"580098",
-          "id":"16600165",
-          "normalized":"13thwitness",
-          "url":"http:\/\/vimeo.com\/tag:13thwitness",
-          "_content":"13thWitness"
-        },
-        {
-          "author":"580098",
-          "id":"16600169",
-          "normalized":"elsaeso",
-          "url":"http:\/\/vimeo.com\/tag:elsaeso",
-          "_content":"el saeso"
-        },
-        {
-          "author":"580098",
-          "id":"16600174",
-          "normalized":"kai",
-          "url":"http:\/\/vimeo.com\/tag:kai",
-          "_content":"kai"
-        },
-        {
-          "author":"580098",
-          "id":"16600178",
-          "normalized":"mikehernandez",
-          "url":"http:\/\/vimeo.com\/tag:mikehernandez",
-          "_content":"mike hernandez"
-        },
-        {
-          "author":"580098",
-          "id":"16600194",
-          "normalized":"jack",
-          "url":"http:\/\/vimeo.com\/tag:jack",
-          "_content":"jack"
-        },
-        {
-          "author":"580098",
-          "id":"16600212",
-          "normalized":"mitch",
-          "url":"http:\/\/vimeo.com\/tag:mitch",
-          "_content":"mitch"
-        },
-        {
-          "author":"580098",
-          "id":"16600239",
-          "normalized":"brooklyn",
-          "url":"http:\/\/vimeo.com\/tag:brooklyn",
-          "_content":"brooklyn"
-        },
-        {
-          "author":"580098",
-          "id":"16600253",
-          "normalized":"queens",
-          "url":"http:\/\/vimeo.com\/tag:queens",
-          "_content":"queens"
-        },
-        {
-          "author":"580098",
-          "id":"16600260",
-          "normalized":"manhattan",
-          "url":"http:\/\/vimeo.com\/tag:manhattan",
-          "_content":"manhattan"
-        },
-        {
-          "author":"580098",
-          "id":"16600262",
-          "normalized":"bike",
-          "url":"http:\/\/vimeo.com\/tag:bike",
-          "_content":"bike"
-        },
-        {
-          "author":"580098",
-          "id":"16600264",
-          "normalized":"gear",
-          "url":"http:\/\/vimeo.com\/tag:gear",
-          "_content":"gear"
-        },
-        {
-          "author":"580098",
-          "id":"16600290",
-          "normalized":"faze-o",
-          "url":"http:\/\/vimeo.com\/tag:faze-o",
-          "_content":"faze-o"
-        },
-        {
-          "author":"580098",
-          "id":"16600291",
-          "normalized":"ridinghigh",
-          "url":"http:\/\/vimeo.com\/tag:ridinghigh",
-          "_content":"riding high"
-        },
-        {
-          "author":"580098",
-          "id":"16600378",
-          "normalized":"cruising",
-          "url":"http:\/\/vimeo.com\/tag:cruising",
-          "_content":"cruising"
-        },
-        {
-          "author":"580098",
-          "id":"16600396",
-          "normalized":"riding",
-          "url":"http:\/\/vimeo.com\/tag:riding",
-          "_content":"riding"
-        }
-      ]
-    },
-    "cast":{
-      "member":{
-        "display_name":"13thWitness\u2122",
-        "id":"580098",
-        "role":"",
-        "username":"the13thwitness"
-      }
-    },
-    "urls":{
-      "url":[
-        {
-          "type":"video",
-          "_content":"http:\/\/vimeo.com\/6788487"
-        },
-        {
-          "type":"group",
-          "_content":"http:\/\/vimeo.com\/groups\/HDXS\/videos\/6788487"
-        },
-        {
-          "type":"group",
-          "_content":"http:\/\/vimeo.com\/groups\/11906\/videos\/6788487"
-        }
-      ]
-    },
-    "thumbnails":{
-      "thumbnail":[
-        {
-          "height":"75",
-          "width":"100",
-          "_content":"http:\/\/ts.vimeo.com.s3.amazonaws.com\/269\/983\/26998387_100.jpg"
-        },
-        {
-          "height":"150",
-          "width":"200",
-          "_content":"http:\/\/ts.vimeo.com.s3.amazonaws.com\/269\/983\/26998387_200.jpg"
-        },
-        {
-          "height":"360",
-          "width":"640",
-          "_content":"http:\/\/ts.vimeo.com.s3.amazonaws.com\/269\/983\/26998387_640.jpg"
-        },
-        {
-          "height":"720",
-          "width":"1280",
-          "_content":"http:\/\/bitcast.vimeo.com\/vimeo\/thumbnails\/defaults\/default.300x400.jpg"
-        }
-      ]
     }
-  }
+  ]
 }

data/spec/fixtures/oembed/oembed.json.erb

@@ -0,0 +1,5 @@
+{
+  "oembed":{
+    "html":"Hello embedded world <%= @vars.to_s -%>"
+  }
+}

data/spec/models/active_record_extension_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+require File.expand_path '../../vimeo_helper', __FILE__
+
+class Project < ActiveRecord::Base
+  vimeo_video :video
+end
+
+class CreateModels < ActiveRecord::Migration
+  def self.up
+    create_table :projects do |t|
+      t.string :video_id
+    end
+  end
+  
+  def self.down
+  end
+end
+
+ActiveRecord::Base.connection.drop_table("projects") if ActiveRecord::Base.connection.tables.include?("projects")
+ActiveRecord::Migration.verbose = false
+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')
+  end
+  
+  it "should return nil if new record" do
+    project = Project.new
+    project.video.should == nil
+  end
+  
+  it "should return value if new record and vimeo id assigned" do
+    project = Project.new
+    project.video_id = "12345"
+    project.video.should == "12345"
+  end
+  
+  it "should not let video be assigned directly" do
+    project = Project.new
+    lambda { project.video = "100" }.should raise_error NoMethodError
+  end
+  
+  it "should return vimeo meta cache if vimeo id assigned and not new_record?" do
+    stub_post("?video_id=123498432&api_key=12345&format=json&method=vimeo.videos.getInfo&api_sig=0f1a7df7325961a0cf352da6264e913f", "advanced/video/get_info.json")
+    FakeWeb.register_uri(:get, "http://b.vimeocdn.com/ts/104/602/104602144_640.jpg", :body => "", :content_type => "image/jpeg")
+        
+    project = Project.create!(:video_id => "123498432")
+    
+    project.video.class.should == VimeoMetaCache
+    project.video.title.should == "Riding High"
+  end
+  
+end

data/spec/models/vimeo_embed_cache_spec.rb

@@ -27,7 +27,7 @@ describe VimeoEmbedCache do
     end
     
     it "should allow static embedding only if width and height given" do
-      VimeoEmbedCache.embed(@valid_attributes[:vid], @valid_attributes[:geometry], :static => true).should_not == @vimeo_embed_cache.code
+      VimeoEmbedCache.embed(@valid_attributes[:vid], @valid_attributes[:geometry], :static => true).should_not == @vimeo_embed_cache
       lambda { VimeoEmbedCache.embed(@valid_attributes[:vid], '100', :static => true) }.should raise_error ArgumentError
     end
     
@@ -35,16 +35,24 @@ describe VimeoEmbedCache do
   
   context "caching" do
     
-    it "fetches embedding if it has no cache for parameters" do
+    it "should fetch embed code if it has no cache for parameters" do
       stub_vimeo_embed_uri '400x200'
       VimeoEmbedCache.embed(@valid_attributes[:vid], '400x200').should_not == @vimeo_embed_cache
-      VimeoEmbedCache.embed(@valid_attributes[:vid], '400x200').code == "Hello oembed world!"
+      VimeoEmbedCache.embed(@valid_attributes[:vid], '400x200') == "Hello oembed world 400x200"
     end
     
     it "should fetch video from cache" do
       VimeoEmbedCache.embed(@valid_attributes[:vid], @valid_attributes[:geometry]).should == @vimeo_embed_cache
     end
     
+    it "should override cache on update_cache" do
+      vec = VimeoEmbedCache.find_by_vid(123456)
+      vec.code = "Hello"
+      vec.save
+      vec.update_cache
+      vec.code.should_not == "Hello"
+    end
+    
   end
   
   context "geometry" do

data/spec/models/vimeo_meta_cache_spec.rb

@@ -5,7 +5,7 @@ describe VimeoMetaCache do
   def reset_vimeo_meta_cache(options = {})
     @valid_attributes = {
       :id => 1,
-      :title => "RSpec is great for testing too"
+      :vid => "123498432"
     }
 
     @vimeo_meta_cache.destroy! if @vimeo_meta_cache
@@ -13,11 +13,28 @@ describe VimeoMetaCache do
   end
 
   before(:each) do
+    stub_post("?video_id=123498432&api_key=12345&format=json&method=vimeo.videos.getInfo&api_sig=0f1a7df7325961a0cf352da6264e913f", "advanced/video/get_info.json")
+    FakeWeb.register_uri(:get, "http://b.vimeocdn.com/ts/104/602/104602144_640.jpg", :body => "", :content_type => "image/jpeg")
     reset_vimeo_meta_cache
   end
+  
+  context "caching" do
+    
+    it "should cache title and description" do
+      @vimeo_meta_cache.title.should == "Riding High"
+      @vimeo_meta_cache.description.should == "<p>Riding High description</p>"
+    end
+    
+  end
 
-  context "validations" do
+  context "update_cache" do
     
+    it "should update title and description if force = true" do
+      vmc = VimeoMetaCache.create!(@valid_attributes.merge(:title => "Riding Low", :description => "Low Rider"))
+      vmc.update_cache
+      vmc.title.should == "Riding High"
+      vmc.description.should == "<p>Riding High description</p>"
+    end
     
   end
 

data/spec/models/vimeo_video_spec.rb

@@ -18,7 +18,6 @@ describe VimeoVideo do
 
   context "validations" do
     
-    
   end
 
 end

data/spec/vimeo_helper.rb

@@ -1,4 +1,6 @@
 require 'fakeweb'
+require 'erb'
+require 'ostruct'
 
 FakeWeb.allow_net_connect = false
 
@@ -11,6 +13,14 @@ def fixture_file(filename)
   File.read(file_path)
 end
 
+def erb_fixture_file(filename, vars)
+  return '' if filename == ''
+    
+  av = ActionView::Base.new(File.expand_path(File.dirname(__FILE__) + '/fixtures/'))
+  av.assign({:vars => vars})
+  av.render(:template => filename)
+end
+
 def vimeo_base_url(url = "/")
   "http://vimeo.com#{url}"
 end
@@ -47,8 +57,10 @@ end
 def stub_vimeo_embed_uri(geometry)
   geometry_hash = VimeoEmbedCache.geometry_hash(geometry)
   
+  vars = OpenStruct.new :geometry => geometry
+  
   FakeWeb.register_uri( :get,
                         "http://vimeo.com/api/oembed.xml?url=http%3A%2F%2Fvimeo.com%2F123456&#{geometry_hash.to_query}",
-                        :body => fixture_file("oembed/oembed.json"),
+                        :body => erb_fixture_file("oembed/oembed.json.erb", geometry),
                         :content_type => 'application/json' )
 end

metadata

@@ -2,7 +2,7 @@
 name: refinerycms-vimeo-videos
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Marian Andre
@@ -83,10 +83,13 @@ files:
 - db/seeds/vimeo_videos.rb
 - features/manage_vimeo_videos.feature
 - features/step_definitions/vimeo_video_steps.rb
+- features/support/factories.rb
 - features/support/paths.rb
 - lib/generators/refinerycms_vimeo_videos_generator.rb
 - lib/refinerycms-vimeo-videos.rb
 - lib/refinerycms_vimeo_videos/account.rb
+- lib/refinerycms_vimeo_videos/active_record_extension.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
@@ -179,7 +182,7 @@ files:
 - spec/fixtures/advanced/video/set_title.json
 - spec/fixtures/advanced/video_embed/get_presets.json
 - spec/fixtures/advanced/video_embed/set_preset.json
-- spec/fixtures/oembed/oembed.json
+- spec/fixtures/oembed/oembed.json.erb
 - spec/fixtures/simple/activity/contacts_did.json
 - spec/fixtures/simple/activity/everyone_did.json
 - spec/fixtures/simple/activity/happened_to_contacts.json
@@ -204,9 +207,11 @@ files:
 - spec/fixtures/simple/user/subscriptions.json
 - spec/fixtures/simple/user/videos.json
 - spec/fixtures/simple/video/info.json
+- spec/models/active_record_extension_spec.rb
 - spec/models/vimeo_embed_cache_spec.rb
 - spec/models/vimeo_meta_cache_spec.rb
 - spec/models/vimeo_video_spec.rb
+- spec/samples/taj.jpg
 - spec/vimeo_helper.rb
 has_rdoc: true
 homepage: http://bitflut.com

data/spec/fixtures/oembed/oembed.json

@@ -1,5 +0,0 @@
-{
-  "oembed":{
-    "html":"Hello embedded world!"
-  }
-}