refinerycms-vimeo-videos 0.1.8.1 → 0.1.9.rc1

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    refinerycms-vimeo-videos (0.1.4)
-      httparty (~> 0.6.1)
+    refinerycms-vimeo-videos (0.1.8.1)
       vimeo (~> 1.3.0)
 
 GEM
@@ -12,11 +11,10 @@ GEM
     fakeweb (1.2.8)
     httparty (0.6.1)
       crack (= 0.1.8)
-    httpclient (2.2.0.1)
-    json (1.5.1)
-    mocha (0.9.12)
-    multipart-post (1.1.0)
-    oauth (0.4.4)
+    httpclient (2.2.1)
+    json (1.5.3)
+    multipart-post (1.1.2)
+    oauth (0.4.5)
     vimeo (1.3.0)
       httparty (>= 0.4.5)
       httpclient (>= 2.1.5.2)
@@ -29,5 +27,4 @@ PLATFORMS
 
 DEPENDENCIES
   fakeweb (~> 1.2.6)
-  mocha (~> 0.9.12)
   refinerycms-vimeo-videos!

data/app/controllers/admin/vimeo_videos_controller.rb

@@ -1,18 +1,14 @@
+class VimeoAuthorizationError < StandardError; end
 module Admin
   class VimeoVideosController < Admin::BaseController
     
     include ::Refinery::VimeoVideos::Account
     
+    before_filter :ensure_authorized!
     before_filter :init_dialog
     
     def index
-      if authorized?
-        get_videos_on_vimeo_account
-      elsif request.xhr?
-        render :text => 'You have not authorized this application to use your vimeo account.'
-      else
-        raise ArgumentError, 'You have not authorized this application to use your vimeo account.'
-      end
+      get_videos_on_vimeo_account
     end
     
     def new
@@ -72,5 +68,20 @@ module Admin
                                          :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/views/admin/vimeo_videos/_error_message.html.erb

@@ -0,0 +1,3 @@
+<div class="errorExplanation" id="errorExplanation">
+  <p><%= message %></p>
+</div>

data/config/locales/de.yml

@@ -0,0 +1,15 @@
+de:
+  shared:
+    admin:
+      vimeo_video_picker:
+        vimeo_video: vimeo_video
+      vimeo_picker:
+        no_vimeo_video_selected: Es ist kein Video ausgewählt, klicken Sie hier um eines hinzuzufügen.
+        name: Fügen Sie ein Video von Ihrem Vimeo Account hinzu.
+        vimeo_video: vimeo_video
+        none_selected: Es ist kein Video ausgewählt, klicken Sie hier um eines hinzuzufügen.
+        remove_current: Video entfernen.
+        change: Video ändern.
+  plugins:
+    vimeo_videos:
+      title: Vimeo Videos

data/config/locales/en.yml

@@ -16,10 +16,10 @@ en:
   admin:
     vimeo_videos:
       form:
-        maximum_file_size: Maximale Dateigröße ist %{megabytes} Megabytes.
+        maximum_file_size: Maximum file size is %{megabytes} Megabytes.
       insert:
-        existing: Von account
-        new: Neues Video
+        existing: Vimeo account
+        new: Uplaad video
       actions:
         create_new: Add New Vimeo Video
         reorder: Reorder Vimeo Videos
@@ -36,5 +36,4 @@ en:
         button_text: Save
   vimeo_videos:
     show:
-      other: Other Vimeo Videos
-      i18n: en.admin.vimeo_videos.existing_vimeo_video.button_text
+      other: Other Vimeo Videos

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

@@ -0,0 +1,30 @@
+module Refinery
+  module VimeoVideos
+    module ActiveRecord
+  
+      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

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

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

data/lib/refinerycms-vimeo-videos.rb

@@ -1,5 +1,3 @@
-require 'refinerycms-base'
-require 'vimeo'
 require 'refinerycms-vimeo-videos/version'
 
 module Refinery
@@ -7,19 +5,15 @@ module Refinery
     
     autoload :URLTempfile,            'refinerycms-vimeo-videos/url_tempfile.rb'
     autoload :Account,                'refinerycms-vimeo-videos/account.rb'
-    autoload :ActiveRecordExtension,  'refinerycms-vimeo-videos/active_record_extension.rb'
     
     class Engine < Rails::Engine
       initializer "static assets" do |app|
         app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
       end
-      
-      initializer "add active record extensions" do |app|
-        ActiveRecord::Base.class_eval { include Refinery::VimeoVideos::ActiveRecordExtension }
-      end
-      
+            
       config.after_initialize do
         Refinery::Plugin.register do |plugin|
+          plugin.pathname = root
           plugin.version = Refinery::VimeoVideos::VERSION
           plugin.name = "vimeo_videos"
           plugin.hide_from_menu = true
@@ -27,4 +21,12 @@ module Refinery
       end
     end
   end
+end
+
+require 'refinerycms-vimeo-videos/active_record.rb'
+
+module ActiveRecord
+  class Base
+    extend Refinery::VimeoVideos::ActiveRecord
+  end
 end

metadata

@@ -1,49 +1,44 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: refinerycms-vimeo-videos
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.1.8.1
+version: !ruby/object:Gem::Version
+  version: 0.1.9.rc1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Marian Andre
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-29 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-30 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: vimeo
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160941200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160941200
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2160940640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.2.6
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *2160940640
 description: Ruby on Rails Vimeo Videos engine for Refinery CMS
 email: mail@bitflut.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -54,12 +49,14 @@ files:
 - 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
+- config/locales/de.yml
 - config/locales/en.yml
 - config/locales/lolcat.yml
 - config/locales/nb.yml
@@ -72,7 +69,7 @@ files:
 - 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/active_record.rb
 - lib/refinerycms-vimeo-videos/url_tempfile.rb
 - lib/refinerycms-vimeo-videos/version.rb
 - lib/tasks/vimeo_videos.rake
@@ -197,38 +194,35 @@ files:
 - spec/models/vimeo_video_spec.rb
 - spec/samples/taj.jpg
 - spec/vimeo_helper.rb
-has_rdoc: true
 homepage: http://bitflut.com
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - config
 - app
 - public
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Vimeo Videos engine for Refinery CMS
-test_files: 
+test_files:
 - spec/controllers/admin/vimeo_account_controller_spec.rb
 - spec/fixtures/advanced/album/add_video.json
 - spec/fixtures/advanced/album/create.json

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

@@ -1,38 +0,0 @@
-module Refinery
-  module VimeoVideos
-    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
-end