refinerycms-vimeo-videos 0.1.9.rc1 → 0.1.9.rc2

data/app/controllers/admin/vimeo_account_controller.rb

@@ -8,7 +8,7 @@ module Admin
       if not authorized? and ready_to_authorize?
         
         # begin authorization process
-        base = Vimeo::Advanced::Base.new(
+        base = ::Vimeo::Advanced::Base.new(
           account[:consumer_key],
           account[:consumer_secret])
         request_token = base.get_request_token
@@ -34,7 +34,7 @@ module Admin
     def callback
       
       # vimeo will redirect us here upon successful authorization
-      base = Vimeo::Advanced::Base.new(
+      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])

data/app/controllers/admin/vimeo_videos_controller.rb

@@ -39,7 +39,7 @@ module Admin
     
     protected
       def get_videos_on_vimeo_account
-        video = Vimeo::Advanced::Video.new(
+        video = ::Vimeo::Advanced::Video.new(
           account[:consumer_key],
           account[:consumer_secret],
           :token => account[:token],

data/app/models/vimeo_embed_cache.rb

@@ -22,7 +22,7 @@ class VimeoEmbedCache < ActiveRecord::Base
       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
+      find_or_create_by_vid_and_configuration(vid, :configuration => ::YAML.dump(configuration)).code.html_safe
     end
   end
   
@@ -34,7 +34,7 @@ class VimeoEmbedCache < ActiveRecord::Base
   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
+  VIMEO_GEOMETRY = ::Regexp.union FIXED_GEOMETRY, FIXED_HEIGHT_GEOMETRY, FIXED_WIDTH_GEOMETRY
   
   def self.geometry_hash geometry
     case geometry
@@ -58,9 +58,9 @@ class VimeoEmbedCache < ActiveRecord::Base
     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}")
+        url = ::CGI::escape("http://vimeo.com/#{self.vid}")
         
-        response = HTTParty.get "http://vimeo.com/api/oembed.xml?url=#{url}&#{self.configuration.to_query}"
+        response = ::HTTParty.get "http://vimeo.com/api/oembed.xml?url=#{url}&#{self.configuration.to_query}"
         self.code = response["oembed"]["html"]
       end
     end

data/app/models/vimeo_meta_cache.rb

@@ -30,7 +30,7 @@ class VimeoMetaCache < ActiveRecord::Base
     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(
+        video_info_request = ::Vimeo::Advanced::Video.new(
           account[:consumer_key],
           account[:consumer_secret],
           :token => account[:token],

data/lib/refinerycms-vimeo-videos/version.rb

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

data/lib/refinerycms-vimeo-videos.rb

@@ -1,3 +1,4 @@
+require 'vimeo'
 require 'refinerycms-vimeo-videos/version'
 
 module Refinery
@@ -27,6 +28,6 @@ require 'refinerycms-vimeo-videos/active_record.rb'
 
 module ActiveRecord
   class Base
-    extend Refinery::VimeoVideos::ActiveRecord
+    extend ::Refinery::VimeoVideos::ActiveRecord
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-vimeo-videos
 version: !ruby/object:Gem::Version
-  version: 0.1.9.rc1
+  version: 0.1.9.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-06-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vimeo
-  requirement: &2160941200 !ruby/object:Gem::Requirement
+  requirement: &2160421960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160941200
+  version_requirements: *2160421960
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2160940640 !ruby/object:Gem::Requirement
+  requirement: &2160421440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *2160940640
+  version_requirements: *2160421440
 description: Ruby on Rails Vimeo Videos engine for Refinery CMS
 email: mail@bitflut.com
 executables: []