amalgam 2.1.2 → 2.1.3

data/config/locales/en.yml

@@ -2,16 +2,16 @@ en:
   helpers:
     submit:
       page:
-        create: "add %{model}"
-        update: "update %{model}"
+        create: "Add %{model}"
+        update: "Update %{model}"
       group:
-        create: "add %{model}"
-        update: "update %{model}"
+        create: "Add %{model}"
+        update: "Update %{model}"
     label:
       page:
-        slug: 'slug:'
-        path: 'path:'
-        parent_id: 'parent page:'
+        slug: 'Slug:'
+        path: 'Path:'
+        parent_id: 'Parent Page:'
   activerecord:
     errors:
       models:
@@ -19,73 +19,73 @@ en:
           taken: "%{attribute} has been taken"
           blank: "%{attribute} can not be blank"
     models:
-      page: "page"
-      amalgam/models/group: 'group'
+      page: "Page"
+      amalgam/models/group: 'Group'
     attributes:
       amalgam/models/group:
-        name: 'name'
+        name: 'Name'
       page:
-        slug: 'slug'
-        path: 'path'
-        parent_id: 'parent page'
-        group_ids: "groups"
+        slug: 'Slug'
+        path: 'Path'
+        parent_id: 'Parent Page'
+        group_ids: "Groups"
   amalgam:
-    file_download: 'file download'
-    file_pre: 'file pre'
-    file_upload: 'file upload'
-    attachment_list: 'attachment list'
-    attachment: 'attachment'
-    description: 'description'
-    name: 'name'
+    file_download: 'File Download'
+    file_pre: 'File Preview'
+    file_upload: 'File Upload'
+    attachment_list: 'Attachment List'
+    attachment: 'Attachment'
+    description: 'Description'
+    name: 'Name'
     locales:
       zh-CN: '中文(简体)'
       zh-cn: '中文(简体)'
       en: 'English'
     registrations:
-      currentpassword: 'we need your current password to confirm your changes'
-      leaveblank: "leave it blank if you don't want to change it"
+      currentpassword: 'We need your current password to confirm your changes'
+      leaveblank: "Leave it blank if you don't want to change it"
       fail:
-        password_confirmation_not_match: "password and password_confirmation are not match"
-        current_password_not_match: "current_password not match"
+        password_confirmation_not_match: "Password and password_confirmation are not match"
+        current_password_not_match: "Current_password not match"
     sessions:
       actions:
-        sign_in: 'sign in'
-        sign_out: 'sign out'
-        edit_info: 'edit info'
+        sign_in: 'Sign In'
+        sign_out: 'Sign Out'
+        edit_info: 'Edit Info'
       success:
-        sign_in: 'sign in successfully'
-        sign_out: 'sign out successfully'
+        sign_in: 'Sign in successfully'
+        sign_out: 'Sign out successfully'
       fail:
-        invalid_name_or_password: 'invalid username or password'
-        need_to_be_admin: 'you need to be an admin,please sign in as a admin'
-        need_to_be_user: 'you need to be an user,please sign in as a user'
-        not_enough_authority: 'you do not have enough authority,please sign in'
+        invalid_name_or_password: 'Invalid username or password'
+        need_to_be_admin: 'You need to be an admin,please sign in as a admin'
+        need_to_be_user: 'You need to be an user,please sign in as a user'
+        not_enough_authority: 'You do not have enough authority,please sign in'
     admin:
       actions:
-        edit: 'edit'
-        update: 'update'
-        apply: 'apply'
-        cancel: 'cancel'
-        index: 'index'
-        new: 'new'
-        show: "show"
-        destroy: 'destroy'
-        preview: 'preview'
-        new_child: 'new child'
-        edit_content: 'edit content'
+        edit: 'Edit'
+        update: 'Update'
+        apply: 'Apply'
+        cancel: 'Cancel'
+        index: 'Index'
+        new: 'New'
+        show: "Show"
+        destroy: 'Destroy'
+        preview: 'Preview'
+        new_child: 'New child'
+        edit_content: 'Edit content'
       a:
-        back: "back"
-        show: "show"
+        back: "Back"
+        show: "Show"
       confirmation:
-        delete_child: 'delete this %{model} and all its children %{model}, are you sure to remove this %{model}?'
+        delete_child: 'Delete this %{model} and all its children %{model}, are you sure to remove this %{model}?'
       tree:
-        moved: "moved successfully"
-        move_error: "move error"
+        moved: "Moved successfully"
+        move_error: "Move error"
       message:
-        create_successfully: 'created successfully'
-        update_successfully: 'updated successfully'
-        destroy_successfully: 'destroyed successfully'
-        destroy_failed: 'destroy failed'
-        error: "load error!"
-        loading: "loading..."
-        done: "done!"
+        create_successfully: 'Created successfully'
+        update_successfully: 'Updated successfully'
+        destroy_successfully: 'Destroyed successfully'
+        destroy_failed: 'Destroy failed'
+        error: "Load error!"
+        loading: "Loading..."
+        done: "Done!"

data/lib/amalgam/globalize/helpers.rb

@@ -37,7 +37,7 @@ module Amalgam
 
       def extract_locale_from_subdomain
         res = request.subdomains.first
-        res if !request.subdomains.empty? and res != request.host
+        res if !request.subdomains.empty? and res != request.host and available_locales.include? res
       end
     end
   end

data/lib/amalgam/version.rb

@@ -1,3 +1,3 @@
 module Amalgam
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

data/lib/generators/amalgam/install_generator.rb

@@ -0,0 +1,210 @@
+module Amalgam
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      class_option :i18n, :type => :boolean, :default => false, :description => "Include the globalize module"
+
+      source_root File.expand_path("../../templates", __FILE__)
+
+      desc "Creates a Amalgam initializer and copy locale files to your application and init the basic model page."
+
+      def copy_initializer
+        template "amalgam.rb", "config/initializers/amalgam.rb"
+      end
+
+      def copy_locale
+        copy_file "../../../config/locales/en.yml", "config/locales/amalgam.en.yml"
+        copy_file "../../../config/locales/zh-CN.yml", "config/locales/amalgam.zh-CN.yml"
+      end
+
+      def init_page
+        create_file "app/models/page.rb" do
+           <<-RUBY
+class Page < ActiveRecord::Base
+  include Amalgam::Models::Page
+  attr_accessible :parent_id, :prev_id ,:next_id ,:title ,:slug
+end
+          RUBY
+        end
+      end
+
+      def init_admin_user
+        create_file "app/models/admin_user.rb" do
+           <<-RUBY
+class AdminUser < Amalgam::Authorities::Models::ActiveRecord
+  attr_accessible :email, :username
+end
+          RUBY
+        end
+      end
+
+      def inti_attachments
+        create_file "app/models/attachment.rb" do
+           <<-RUBY
+class Attachment < ActiveRecord::Base
+  attr_accessible :attachable_id, :file, :name, :description, :position
+
+  mount_uploader :file , AttachmentUploader
+  validates_presence_of :file, :on => :create
+
+  belongs_to :attachable, :polymorphic => true
+
+
+  delegate :url, :to => :file
+
+  def serializable_hash(options = nil)
+    options ||= {}
+    options[:methods] ||= []
+    options[:methods] << :url
+    super(options)
+  end
+
+  protected
+
+  before_save :update_file_attributes
+  def update_file_attributes
+    if file.present? && file_changed?
+      self.content_type = file.file.content_type
+      self.file_size = file.file.size
+      self.original_filename = file.file.original_filename
+    end
+  end
+end
+          RUBY
+        end
+      end
+
+      def create_migration_files
+        time = Time.now.strftime('%Y%m%d%H%M%S').to_i
+        create_file "db/migrate/#{time}_create_pages.rb" do
+          <<-RUBY
+class CreatePages < ActiveRecord::Migration
+  def change
+    create_table :pages do |t|
+      t.string :title, :null => false
+      t.string :path
+      t.string :slug, :null => false
+      t.integer :lft
+      t.integer :rgt
+      t.integer :parent_id
+
+      t.timestamps
+    end
+  end
+end
+          RUBY
+        end
+
+        time += 1
+        create_file "db/migrate/#{time}_create_admin_users.rb" do
+          <<-RUBY
+class CreateAdminUsers < ActiveRecord::Migration
+  def change
+    create_table :admin_users do |t|
+
+      t.string :username
+      t.string :email
+      t.string :password_digest
+
+      t.timestamps
+    end
+  end
+end
+          RUBY
+        end
+
+        time += 1
+        create_file "db/migrate/#{time}_create_attachments.rb" do
+          <<-RUBY
+class CreateAttachments < ActiveRecord::Migration
+  create_table :attachments do |t|
+    t.references :attachable ,:polymorphic => {:default => 'Page'}
+    t.string :name
+    t.string :file
+    t.string :content_type
+    t.string :original_filename
+    t.string :description
+    t.string :secure_token
+    t.integer :file_size
+    t.integer :position
+
+    t.timestamps
+  end
+end
+          RUBY
+        end
+
+        time += 1
+        create_file "db/migrate/#{time}_create_groups.rb" do
+          <<-RUBY
+class CreateGroups < ActiveRecord::Migration
+  def change
+    create_table :groups do |t|
+
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end
+          RUBY
+        end
+
+        time += 1
+        create_file "db/migrate/#{time}_create_base_groups.rb" do
+          <<-RUBY
+class CreateBaseGroups < ActiveRecord::Migration
+  def change
+    create_table :base_groups do |t|
+
+      t.integer :group_id
+      t.string :groupable_type
+      t.integer :groupable_id
+
+      t.timestamps
+    end
+  end
+end
+          RUBY
+        end
+      end
+
+      def extra
+        inject_into_file 'app/controllers/application_controller.rb', :before => 'protect_from_forgery' do
+          <<-RUBY
+  include Amalgam::Authorities::Controllers::Helpers
+          RUBY
+        end
+
+        create_file "app/controllers/pages_controller.rb" do
+          <<-RUBY
+class PagesController < ApplicationController
+  include Amalgam::TemplateFinder
+  include Amalgam::Editable
+
+  def show
+    @page = Page.where(:slug => params[:slug]).first
+    raise ActiveRecord::RecordNotFound , "Couldn't find page with PATH=\#\{params[:slug]\}" if @page.blank?
+    render template_for(@page)
+  end
+end
+          RUBY
+        end
+
+        inject_into_file 'config/routes.rb', :after => "Application.routes.draw do\n" do
+          <<-RUBY
+  hierarchical_resource :pages
+  mount Amalgam::Engine => "/"
+  root :to => 'pages#show' , :defaults => {:slug => 'home'}
+          RUBY
+        end
+
+        append_file 'db/seeds.rb' do
+          <<-RUBY
+AdminUser.create(:username => 'admin', :email => 'admin@example.com',:password => 'admin1234', :password_confirmation => 'admin1234')
+          RUBY
+        end
+      end
+    end
+  end
+end

data/lib/generators/templates/amalgam.rb

@@ -0,0 +1,50 @@
+#encoding: utf-8
+Amalgam.setup do |config|
+  # type_whitelist 允许mercury编辑器编辑更新的模型列表,不在这个列表内的模型无法通过mercury编辑器编辑更新,
+  # 里面应该填写对应的模型的类名字符串,是个数组，可以填多个模型。例如
+  #
+  #config.type_whitelist = ['Page']
+  #config.type_whitelist = ['Page', 'Post']
+  #
+  config.type_whitelist = ['Page']
+
+  # models_with_templates 采用新模板匹配方式查询模板的控制器列表,
+  # 里面应该填写对应的模型的控制器名字符串,是个数组，可以填多个模型。例如
+  #
+  #config.models_with_templates = ['pages']
+  #config.models_with_templates = ['pages', 'posts']
+  #
+  config.models_with_templates = ['pages']
+
+
+  # authority_model 内置的权限系统,内部会根据这里的设置生成routes, 默认是后台管理员 admin_user。
+  # 例如
+  #  config.authority_model :user
+  # 如果要给这个用户以管理员权限，则加入一个:as => :admin选项
+  # 例如
+  #  config.authority_model :admin_user, :as => :admin
+  # 可以加入多个用户，目前管理员只能有一个
+  #
+  config.authority_model :admin_user, :as => :admin
+
+  # admin_routes 后台的routes, 在block里填写后台需要编辑的模型的routes, 后台会根据对应的routes生成顶栏
+  # 链接
+  # 例如
+  # config.admin_routes do
+  #   resources :pages, :except => [:show]
+  #   # resources :posts, :except => [:show]
+  #   resources :appointments, :except => [:edit,:update,:create,:new]
+  # end
+  config.admin_routes do
+    resources :pages, :except => [:show]
+  end
+
+  # i18n 支持多语言的选项，默认是nil,是不支持多语言，使用默认语言
+  # 如果
+  #   config.i18n = params
+  # 是说明采用参数传递语言种类
+  # 如果
+  #   config.i18n = subdomain
+  # 是说明用子域名的方式传递语言种类
+  config.i18n = nil
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amalgam
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -379,7 +379,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Amalgam is a WYSIWYG gem for CMS
+description: CMS based on Mercury Editor
 email:
 - andrew@xtunes.cn
 executables: []
@@ -472,6 +472,8 @@ files:
 - lib/amalgam/validators/slug.rb
 - lib/amalgam/version.rb
 - lib/amalgam.rb
+- lib/generators/amalgam/install_generator.rb
+- lib/generators/templates/amalgam.rb
 - lib/page_routes.rb
 - lib/tasks/amalgam_tasks.rake
 - lib/tasks/dump.rake
@@ -898,18 +900,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -10239737494206678
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -10239737494206678
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -917,3 +913,4 @@ signing_key:
 specification_version: 3
 summary: Amalgam is a gem for cms building
 test_files: []
+has_rdoc: