merrycms 0.1.2 → 0.1.4

data/config/locales/fr/fr.yml

@@ -0,0 +1,182 @@
+# French translations for Ruby on Rails
+# by Christian Lescuyer (christian@flyingcoders.com)
+# contributors:
+#  - Sebastien Grosjean - ZenCocoon.com
+#  - Bruno Michel - http://github.com/nono
+#  - Tsutomu Kuroda - http://github.com/kuroda (t-kuroda@oiax.jp)
+
+fr:
+  date:
+    formats:
+      default: "%d/%m/%Y"
+      short: "%e %b"
+      long: "%e %B %Y"
+    day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
+    abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
+    month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
+    abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
+    order:
+      - :day
+      - :month
+      - :year
+
+  time:
+    formats:
+      default: "%d %B %Y %H:%M:%S"
+      short: "%d %b %H:%M"
+      long: "%A %d %B %Y %H:%M"
+    am: 'am'
+    pm: 'pm'
+
+  datetime:
+    distance_in_words:
+      half_a_minute: "une demi-minute"
+      less_than_x_seconds:
+        zero:  "moins d'une seconde"
+        one:   "moins d'une seconde"
+        other: "moins de %{count} secondes"
+      x_seconds:
+        one:   "1 seconde"
+        other: "%{count} secondes"
+      less_than_x_minutes:
+        zero:  "moins d'une minute"
+        one:   "moins d'une minute"
+        other: "moins de %{count} minutes"
+      x_minutes:
+        one:   "1 minute"
+        other: "%{count} minutes"
+      about_x_hours:
+        one:   "environ une heure"
+        other: "environ %{count} heures"
+      x_days:
+        one:   "1 jour"
+        other: "%{count} jours"
+      about_x_months:
+        one:   "environ un mois"
+        other: "environ %{count} mois"
+      x_months:
+        one:   "1 mois"
+        other: "%{count} mois"
+      about_x_years:
+        one:   "environ un an"
+        other: "environ %{count} ans"
+      over_x_years:
+        one:   "plus d'un an"
+        other: "plus de %{count} ans"
+      almost_x_years:
+        one:   "presqu'un an"
+        other: "presque %{count} ans"
+    prompts:
+      year:   "Année"
+      month:  "Mois"
+      day:    "Jour"
+      hour:   "Heure"
+      minute: "Minute"
+      second: "Seconde"
+
+  number:
+    format:
+      separator: ","
+      delimiter: " "
+      precision: 3
+      significant: false
+      strip_insignificant_zeros: false
+    currency:
+      format:
+        format: "%n %u"
+        unit: "€"
+        separator: ","
+        delimiter: " "
+        precision: 2
+        significant: false
+        strip_insignificant_zeros: false
+    percentage:
+      format:
+        delimiter: ""
+    precision:
+      format:
+        delimiter: ""
+    human:
+      format:
+        delimiter: ""
+        precision: 2
+        significant: true
+        strip_insignificant_zeros: true
+      storage_units:
+        format: "%n %u"
+        units:
+          byte:
+            one:   "octet"
+            other: "octets"
+          kb: "ko"
+          mb: "Mo"
+          gb: "Go"
+          tb: "To"
+      decimal_units:
+        format: "%n %u"
+        units:
+          unit: ""
+          thousand: "millier"
+          million: "million"
+          billion: "milliard"
+          trillion: "billion"
+          quadrillion: "million de milliards"
+
+  support:
+    array:
+      words_connector: ", "
+      two_words_connector: " et "
+      last_word_connector: " et "
+    select:
+      prompt: "Veuillez sélectionner"
+
+  helpers:
+    select:
+      prompt: "Veuillez sélectionner"
+    submit:
+      create: "Créer un %{model}"
+      update: "Modifier ce %{model}"
+      submit: "Enregistrer ce %{model}"
+
+  attributes:
+    created_at: "Créé le"
+    updated_at: "Modifié le"
+
+  errors:
+    format: "Le %{attribute} %{message}"
+    messages: &errors_messages
+      inclusion: "n'est pas inclus(e) dans la liste"
+      exclusion: "n'est pas disponible"
+      invalid: "n'est pas valide"
+      confirmation: "ne concorde pas avec la confirmation"
+      accepted: "doit être accepté(e)"
+      empty: "doit être rempli(e)"
+      blank: "doit être rempli(e)"
+      too_long: "est trop long (pas plus de %{count} caractères)"
+      too_short: "est trop court (au moins %{count} caractères)"
+      wrong_length: "ne fait pas la bonne longueur (doit comporter %{count} caractères)"
+      not_a_number: "n'est pas un nombre"
+      not_an_integer: "doit être un nombre entier"
+      greater_than: "doit être supérieur à %{count}"
+      greater_than_or_equal_to: "doit être supérieur ou égal à %{count}"
+      equal_to: "doit être égal à %{count}"
+      less_than: "doit être inférieur à %{count}"
+      less_than_or_equal_to: "doit être inférieur ou égal à %{count}"
+      odd: "doit être impair"
+      even: "doit être pair"
+    template: &errors_template
+      header:
+        one:   "Impossible d'enregistrer ce %{model} : 1 erreur"
+        other: "Impossible d'enregistrer ce %{model} : %{count} erreurs"
+      body: "Veuillez vérifier les champs suivants : "
+
+  activerecord:
+    errors:
+      messages:
+        taken: "n'est pas disponible"
+        record_invalid: "La validation a échoué : %{errors}"
+        <<: *errors_messages
+      template:
+        <<: *errors_template
+      full_messages:
+        format: "%{attribute} %{message}"

data/lib/generators/merrycms/install_documents_generator.rb

@@ -0,0 +1,26 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+module Merrycms
+  class InstallDocumentsGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+  
+    def self.source_root
+      @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+    end
+  
+    def self.next_migration_number(dirname)
+      if ActiveRecord::Base.timestamped_migrations
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      else
+        "%.3d" % (current_migration_number(dirname) + 1)
+      end
+    end
+              
+    def create_translations_migration_files
+      migration_template 'create_documents_migration.rb', 'db/migrate/create_documents.rb'
+      sleep 1
+    end
+          
+  end
+end

data/lib/generators/merrycms/install_images_generator.rb

@@ -0,0 +1,30 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+module Merrycms
+  class InstallImagesGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+  
+    def self.source_root
+      @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+    end
+  
+    def self.next_migration_number(dirname)
+      if ActiveRecord::Base.timestamped_migrations
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      else
+        "%.3d" % (current_migration_number(dirname) + 1)
+      end
+    end
+              
+    def create_translations_migration_files
+      migration_template 'create_images_migration.rb', 'db/migrate/create_images.rb'
+      sleep 1
+    end
+        
+    def copy_locale_initializer
+      copy_file 'paperclip_initializer.rb', 'config/initializers/paperclip.rb'
+    end
+  
+  end
+end

data/lib/generators/merrycms/install_videos_generator.rb

@@ -0,0 +1,26 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+module Merrycms
+  class InstallVideosGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+  
+    def self.source_root
+      @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+    end
+  
+    def self.next_migration_number(dirname)
+      if ActiveRecord::Base.timestamped_migrations
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      else
+        "%.3d" % (current_migration_number(dirname) + 1)
+      end
+    end
+              
+    def create_translations_migration_files
+      migration_template 'create_videos_migration.rb', 'db/migrate/create_videos.rb'
+      sleep 1
+    end
+          
+  end
+end

data/lib/generators/merrycms/templates/create_documents_migration.rb

@@ -0,0 +1,16 @@
+class CreateDocuments < ActiveRecord::Migration
+  def self.up
+    create_table :documents do |t|
+      t.string    :title
+      t.string    :doc_file_name
+      t.string    :doc_content_type
+      t.integer   :doc_file_size
+      t.datetime  :doc_updated_at
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :documents
+  end
+end

data/lib/generators/merrycms/templates/create_images_migration.rb

@@ -0,0 +1,16 @@
+class CreateImages < ActiveRecord::Migration
+  def self.up
+    create_table :images do |t|
+      t.string    :title
+      t.string    :image_file_name
+      t.string    :image_content_type
+      t.integer   :image_file_size
+      t.datetime  :image_updated_at
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :images
+  end
+end

data/lib/generators/merrycms/templates/create_videos_migration.rb

@@ -0,0 +1,25 @@
+class CreateVideos < ActiveRecord::Migration
+  def self.up
+    create_table :videos do |t|
+      t.string    :title
+      t.timestamps
+    end
+    
+    create_table :sources do |t|
+      t.integer   :video_id
+      t.string    :width
+      t.string    :height
+      t.string    :container_type
+      t.string    :video_file_name
+      t.string    :video_content_type
+      t.integer   :video_file_size
+      t.datetime  :video_updated_at
+    end
+    
+  end
+
+  def self.down
+    drop_table :videos
+    drop_table :sources
+  end
+end

data/lib/generators/merrycms/templates/paperclip_initializer.rb

@@ -0,0 +1,6 @@
+#if RAILS_ENV == 'development' || RAILS_ENV == 'test' || RAILS_ENV == 'production'
+if Rails.env == 'development' || Rails.env == 'test'
+  Paperclip.options[:command_path] = "/opt/local/bin/"
+else
+  Paperclip.options[:command_path] = "/usr/local/bin/"
+end

data/lib/merrycms/engine.rb

@@ -11,12 +11,18 @@ require 'i18n/active_record'
 require 'merrycms/rails/routes'
 require 'kaminari'
 require 'meta_search'
+require 'open4'
+require 'rvideo'
+require 'paperclip'
+require 'paperclip_processors/video_thumbnail'
+require 'paperclip_processors/poster'
 
 module Merrycms
   class Engine < Rails::Engine
     
     # I18n config
     #config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '*', '*.{rb,yml}').to_s]
+    config.i18n.load_path += Dir[File.join(File.dirname(__FILE__), '../../config/locales/*/*.{rb,yml}')]
     config.i18n.load_path += Dir[File.join(File.dirname(__FILE__), '../../config/locales/*/admin/*.{rb,yml}')]
     config.i18n.default_locale = :fr
 

data/lib/merrycms/rails/routes.rb

@@ -32,6 +32,11 @@ module ActionDispatch::Routing
         match 'translations/pending/:language' => 'translations#pending', :as => 'pending_translations'
         match 'translations/all/:language' => 'translations#all', :as => 'all_translations'
         
+        resources :images
+        resources :documents
+        resources :videos
+        
+        
         root :to => 'pages#index'
       end
     end

data/lib/merrycms/railties/merrycms_tasks.rake

@@ -5,6 +5,9 @@ namespace :merrycms do
     system("rails generate merrycms:install_auth")
     system("rails generate merrycms:install_pages")
     system("rails generate merrycms:install_translations")
+    system("rails generate merrycms:install_images")
+    system("rails generate merrycms:install_documents")
+    system("rails generate merrycms:install_videos")
     system("rails generate jquery:install")
     
     Rake::Task['merrycms:import_assets'].invoke

data/lib/merrycms/validates_as_image.rb

@@ -0,0 +1,20 @@
+module ValidatesAsImage
+
+  def self.included receiver
+    receiver.extend ClassMethods
+  end
+
+  module ClassMethods
+    def validates_as_image fields
+
+      validates_each fields do |record, attr, value|
+        if !value.queued_for_write.empty? and value.to_file
+          `identify "#{value.to_file.path}"`
+          record.errors.add attr, I18n.t("activerecord.errors.models.#{record.class.table_name.singularize}.attributes.#{attr}.wrong_format") unless $? == 0
+        end
+      end
+         
+    end
+  end
+  
+end

data/lib/merrycms.rb

@@ -1 +1,2 @@
-require 'merrycms/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+require 'merrycms/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
+require 'merrycms/validates_as_image'

data/lib/paperclip_processors/poster.rb

@@ -0,0 +1,38 @@
+require 'rvideo'
+require 'logger'
+
+module Paperclip
+  class Poster < Processor
+
+    attr_accessor :time_offset, :geometry, :whiny
+
+    def initialize(file, options = {}, attachment = nil)
+      super
+      @time_offset = options[:time_offset] || '-4'
+      @instance = attachment.instance
+            
+      @video = RVideo::Inspector.new(:file => file.path)
+      @instance.width = @video.width
+      @instance.height = @video.height
+      
+      @whiny = options[:whiny].nil? ? true : options[:whiny]
+      @basename = File.basename(file.path, File.extname(file.path))
+    end
+
+    def make
+      dst = Tempfile.new([ @basename, 'jpg' ].compact.join("."))
+      dst.binmode
+
+      cmd = %Q[-itsoffset #{time_offset} -i "#{File.expand_path(file.path)}" -y -vcodec mjpeg -vframes 1 -an -f rawvideo ]
+      cmd << "-s #{@video.resolution} " if @video && @video.resolution
+      cmd << %Q["#{File.expand_path(dst.path)}"]
+
+      begin
+        success = Paperclip.run('ffmpeg', cmd)
+      rescue PaperclipCommandLineError
+        raise PaperclipError, "There was an error processing the thumbnail for #{@basename}" if whiny
+      end
+      dst
+    end
+  end
+end

data/lib/paperclip_processors/video_thumbnail.rb

@@ -0,0 +1,42 @@
+require 'rvideo'
+require 'logger'
+
+module Paperclip
+  class VideoThumbnail < Processor
+
+    attr_accessor :time_offset, :geometry, :whiny
+
+    def initialize(file, options = {}, attachment = nil)
+      super
+      @time_offset = options[:time_offset] || '-4'
+      
+      logger = Logger.new(STDOUT)
+      
+      logger.debug("FILE : #{file.inspect}")
+      logger.debug("FILE PATH : #{file.path}")
+      
+      video = RVideo::Inspector.new(:file => file.path)
+      logger.debug("VIDEO : #{video.inspect}")
+      logger.debug("VIDEO WIDTH : #{video.width}")
+      
+      @whiny = options[:whiny].nil? ? true : options[:whiny]
+      @basename = File.basename(file.path, File.extname(file.path))
+    end
+
+    def make
+      dst = Tempfile.new([ @basename, 'jpg' ].compact.join("."))
+      dst.binmode
+
+      cmd = %Q[-itsoffset #{time_offset} -i "#{File.expand_path(file.path)}" -y -vcodec mjpeg -vframes 1 -an -f rawvideo ]
+      cmd << "-s #{video.resolution} " if video && video.resolution
+      cmd << %Q["#{File.expand_path(dst.path)}"]
+
+      begin
+        success = Paperclip.run('ffmpeg', cmd)
+      rescue PaperclipCommandLineError
+        raise PaperclipError, "There was an error processing the thumbnail for #{@basename}" if whiny
+      end
+      dst
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Franck D'agostini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 +01:00
+date: 2011-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -151,6 +151,45 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: paperclip
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: open4
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: newbamboo-rvideo
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id013
 description: "Admin panel for rails3 app : user management, pages, categories"
 email: franck.dagostini@gmail.com
 executables: []
@@ -162,29 +201,54 @@ extra_rdoc_files:
 files: 
 - app/controllers/admin/base_controller.rb
 - app/controllers/admin/categories_controller.rb
+- app/controllers/admin/documents_controller.rb
+- app/controllers/admin/images_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/admin/translations_controller.rb
 - app/controllers/admin/users_controller.rb
+- app/controllers/admin/videos_controller.rb
+- app/helpers/admin/base_helper.rb
 - app/helpers/admin/categories_helper.rb
+- app/helpers/admin/documents_helper.rb
+- app/helpers/admin/images_helper.rb
 - app/helpers/admin/pages_helper.rb
 - app/helpers/admin/translations_helper.rb
 - app/helpers/admin/users_helper.rb
+- app/helpers/admin/videos_helper.rb
 - app/models/category.rb
+- app/models/document.rb
+- app/models/image.rb
 - app/models/page.rb
 - app/models/role.rb
+- app/models/source.rb
 - app/models/translation.rb
 - app/models/user.rb
-- app/views/admin/_nav.html.erb
+- app/models/video.rb
 - app/views/admin/categories/_form.erb
 - app/views/admin/categories/edit.html.erb
 - app/views/admin/categories/index.html.erb
 - app/views/admin/categories/new.html.erb
 - app/views/admin/categories/sort.html.erb
+- app/views/admin/documents/_form.erb
+- app/views/admin/documents/_search.erb
+- app/views/admin/documents/_subnav.erb
+- app/views/admin/documents/edit.html.erb
+- app/views/admin/documents/index.html.erb
+- app/views/admin/documents/new.html.erb
+- app/views/admin/images/_form.erb
+- app/views/admin/images/_search.erb
+- app/views/admin/images/_subnav.erb
+- app/views/admin/images/edit.html.erb
+- app/views/admin/images/index.html.erb
+- app/views/admin/images/new.html.erb
 - app/views/admin/pages/_form.html.erb
 - app/views/admin/pages/_search.erb
 - app/views/admin/pages/edit.html.erb
 - app/views/admin/pages/index.html.erb
 - app/views/admin/pages/new.html.erb
+- app/views/admin/shared/_nav.erb
+- app/views/admin/shared/_subnav.erb
+- app/views/admin/shared/_toplinks.erb
 - app/views/admin/translations/_edit_javascript.erb
 - app/views/admin/translations/_filter.html.erb
 - app/views/admin/translations/_form.erb
@@ -196,6 +260,14 @@ files:
 - app/views/admin/users/edit.html.erb
 - app/views/admin/users/index.html.erb
 - app/views/admin/users/new.html.erb
+- app/views/admin/videos/_form.erb
+- app/views/admin/videos/_head_info.erb
+- app/views/admin/videos/_search.erb
+- app/views/admin/videos/_subnav.erb
+- app/views/admin/videos/edit.html.erb
+- app/views/admin/videos/index.html.erb
+- app/views/admin/videos/new.html.erb
+- app/views/admin/videos/show.html.erb
 - app/views/devise/confirmations/new.html.erb
 - app/views/devise/mailer/confirmation_instructions.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
@@ -211,11 +283,14 @@ files:
 - app/views/layouts/login.html.erb
 - app/views/shared/_error_messages.html.erb
 - app/views/shared/_flashbox.html.erb
-- app/views/shared/_toplinks.html.erb
+- config/locales/de/de.yml
 - config/locales/en/admin/missing.yml
+- config/locales/en/en-US.yml
 - config/locales/fr/admin/admin.fr.yml
 - config/locales/fr/admin/category.fr.yml
 - config/locales/fr/admin/devise.fr.yml
+- config/locales/fr/admin/documents.fr.yml
+- config/locales/fr/admin/images.fr.yml
 - config/locales/fr/admin/merrycms.fr.yml
 - config/locales/fr/admin/missing.yml
 - config/locales/fr/admin/pages.fr.yml
@@ -223,21 +298,33 @@ files:
 - config/locales/fr/admin/toplinks.fr.yml
 - config/locales/fr/admin/translations.fr.yml
 - config/locales/fr/admin/users.fr.yml
+- config/locales/fr/admin/videos.fr.yml
+- config/locales/fr/fr.yml
 - lib/generators/merrycms/install_auth_generator.rb
+- lib/generators/merrycms/install_documents_generator.rb
+- lib/generators/merrycms/install_images_generator.rb
 - lib/generators/merrycms/install_pages_generator.rb
 - lib/generators/merrycms/install_translations_generator.rb
+- lib/generators/merrycms/install_videos_generator.rb
+- lib/generators/merrycms/templates/create_documents_migration.rb
+- lib/generators/merrycms/templates/create_images_migration.rb
 - lib/generators/merrycms/templates/create_pages_and_categories_migration.rb
 - lib/generators/merrycms/templates/create_roles_migration.rb
 - lib/generators/merrycms/templates/create_translations_migration.rb
+- lib/generators/merrycms/templates/create_videos_migration.rb
 - lib/generators/merrycms/templates/devise_create_users_migration.rb
 - lib/generators/merrycms/templates/devise_initializer.rb
 - lib/generators/merrycms/templates/locale_initializer.rb
+- lib/generators/merrycms/templates/paperclip_initializer.rb
 - lib/generators/merrycms/templates/roles_users_migration.rb
 - lib/generators/merrycms/views_generator.rb
 - lib/merrycms.rb
 - lib/merrycms/engine.rb
 - lib/merrycms/rails/routes.rb
 - lib/merrycms/railties/merrycms_tasks.rake
+- lib/merrycms/validates_as_image.rb
+- lib/paperclip_processors/poster.rb
+- lib/paperclip_processors/video_thumbnail.rb
 - README
 has_rdoc: true
 homepage: https://github.com/franck/merrycms

data/app/views/admin/_nav.html.erb

@@ -1,10 +0,0 @@
-<div id="nav">
-  <ul id="left">
-    <li><%= link_to t('.pages'), admin_pages_path %></li>
-    <li><%= link_to t('.categories'), admin_categories_path %></li>
-    <li><%= link_to t('.translations'), admin_translations_path %></li>
-  </ul>
-  <ul id="right">
-    <li><%= link_to t('.users'), admin_users_path %></li>
-  </ul>
-</div>