simple-pages-rails 0.3.1 → 0.4.0

data/app/assets/javascripts/simple_pages/pages.js.coffee

@@ -2,3 +2,17 @@ $ ->
   $('.pages .chzn-select').chosen
     allow_single_deselect: true
     no_results_text: 'No results matched'
+
+  $('.pages')
+    .on 'focusout', '#page_url', ->
+      if $(this).val().length > 0
+        if ! /^([\w\-]{3,})$/.test($(this).val())
+          alert('Invalid URL!')
+          $(this).val('')
+    .on 'submit', '.simple_form', (event) ->
+      url = $('#page_url')
+      if url.val().length > 0
+        if ! /^([\w\-]{3,})$/.test(url.val())
+          alert('Invalid URL!')
+          url.val('')
+          return false

data/app/controllers/simple_pages/application_controller.rb

@@ -10,5 +10,14 @@ module SimplePages
     if SimplePages.extra_page_layout.present?
       has_page_layout_at SimplePages.extra_page_layout
     end
+
+    protected
+
+    def load_author_options
+      load_authors
+      @author_options = @authors.map do |author|
+        [author.name, author.simple_page_owner_option]
+      end
+    end
   end
 end

data/app/controllers/simple_pages/pages_controller.rb

@@ -59,17 +59,11 @@ module SimplePages
     def load_page_options
       load_author_options
       load_page_layout_at_options
+      load_page_cluster_options
     end
 
     private
 
-    def load_author_options
-      load_authors
-      @author_options = @authors.map do |author|
-        [author.name, author.simple_page_owner_option]
-      end
-    end
-
     def pagination_options
       { page: params[:page], per_page: SimplePages.pages_per_page }
     end

data/app/models/simple_pages/page.rb

@@ -9,6 +9,14 @@ module SimplePages
     scope :published, lambda { where('published_at <= ?', Time.zone.now) }
     scope :layout_at, lambda { |location| where(layout_at: location) }
 
+    def layout_at=(values)
+      if values.blank?
+        super nil
+      else
+        super values
+      end
+    end
+
     SimplePages.page_modules.each { |module_name| include module_name }
   end
 end

data/app/views/simple_pages/pages/_form.html.erb

@@ -3,9 +3,34 @@
     <%= f.input :url, input_html: { class: 'span10' } %>
   <% end %>
   <%= f.input :title, input_html: { class: 'span10' } %>
-  <%= f.input :excerpt, as: :text, input_html: { rows: 5, class: 'span10' } %>
+  <%= f.input :excerpt,
+    as: :text,
+    input_html: {
+      rows: 5,
+      class: 'span10'
+    } %>
   <%= f.input :content, input_html: { class: 'ckeditor' } %>
-  <%= f.input :owner, collection: author_options, selected: selected_page_author(f.object), input_html: { class: 'chzn-select' } %>
-  <%= f.input :published_at, as: :string, input_html: { value: local_published_at(f.object), class: 'datetimepicker' }  %>
-  <%= f.input :layout_at, as: :select, collection: layout_at_options %>
+  <%= f.input :owner,
+    collection: author_options,
+    selected: selected_page_author(f.object),
+    input_html: {
+      class: 'chzn-select'
+    } %>
+  <%= f.input :published_at,
+    as: :string,
+    input_html: {
+      value: local_published_at(f.object),
+      class: 'datetimepicker'
+    } %>
+  <%= f.input :layout_at,
+    as: :select,
+    collection: layout_at_options,
+    include_blank: false %>
+  <%= f.input :cluster,
+    as: :select,
+    collection: cluster_options,
+    input_html: {
+      multiple: true,
+      class: 'chzn-select'
+    } %>
 </div>

data/app/views/simple_pages/pages/edit.html.erb

@@ -15,7 +15,12 @@
   <div>
     <%= simple_form_for @page, as: :page, html: { class: 'form-horizontal' } do |f| %>
       <%= f.error_notification %>
-      <%= render 'form', f: f, author_options: @author_options, layout_at_options: @layout_at_options %>
+      <%= render 'form', {
+        f: f,
+        cluster_options: @cluster_options,
+        layout_at_options: @layout_at_options,
+        author_options: @author_options
+      } %>
       <div class="form-actions">
         <%= submit_button f %>
       </div>

data/app/views/simple_pages/pages/new.html.erb

@@ -12,7 +12,12 @@
   <div>
     <%= simple_form_for @page, as: :page, html: { class: 'form-horizontal' } do |f| %>
       <%= f.error_notification %>
-      <%= render 'form', f: f, author_options: @author_options, layout_at_options: @layout_at_options %>
+      <%= render 'form', {
+        f: f,
+        cluster_options: @cluster_options,
+        layout_at_options: @layout_at_options,
+        author_options: @author_options
+      } %>
       <div class="form-actions">
         <%= submit_button f %>
       </div>

data/config/locales/pages.en.yml

@@ -22,6 +22,7 @@ en:
         content: 'Content'
         author: 'Author'
         layout_at: 'Layout at'
+        cluster: 'Cluster'
         published_at: 'Published at'
         owner: 'Author'
 
@@ -30,7 +31,7 @@ en:
       page:
     hints:
       page:
-        url: 'Only characters(a-zA-Z), numbers(0-9), hyphen(-) and underline(_) are allowed. It will be given if left blank.'
+        url: 'At least 3 characters. Only characters(a-zA-Z), numbers(0-9), underline(_) and hyphen(-) are allowed.<bt>It will be given if left blank.'
         published_at: 'It will not show up if blank.'
     placeholders:
       page:

data/config/locales/pages.zh-TW.yml

@@ -22,6 +22,7 @@ zh-TW:
         content: '內容'
         author: '作者'
         layout_at: '呈現於'
+        cluster: '群組'
         published_at: '發布於'
         owner: '作者'
 
@@ -30,7 +31,7 @@ zh-TW:
       page:
     hints:
       page:
-        url: '僅限使用英文字母（ a-zA-Z ）、數字（ 0-9 ）、破折號（ - ）與底線（ _ ）。若不輸入，則由系統自行賦予。'
+        url: '至少三個字元，僅限使用英文字母（ a-zA-Z ）、數字（ 0-9 ）、底線（ _ ）與破折號（ - ）。<br>若不輸入，則由系統自行賦予。'
         published_at: '若沒有設定時間，則不會顯示在網站中。'
     placeholders:
       page:

data/config/locales/simple_pages.en.yml

@@ -1,9 +1,10 @@
 en:
   simple_pages:
     layout_at:
-      header: 'header'
-      footer: 'footer'
-      sidebar: 'sidebar'
+      general: 'General'
+      header: 'Header'
+      footer: 'Footer'
+      sidebar: 'Sidebar'
     titles:
       about: 'About'
       copyright: 'Copyright'

data/config/locales/simple_pages.zh-TW.yml

@@ -1,6 +1,7 @@
 zh-TW:
   simple_pages:
     layout_at:
+      general: '一般'
       header: '頁首'
       footer: '頁尾'
       sidebar: '側欄'

data/db/migrate/20130318034034_add_cluster_to_simple_pages.rb

@@ -0,0 +1,5 @@
+class AddGroupToSimplePages < ActiveRecord::Migration
+  def change
+    add_column :simple_pages, :cluster, :string, after: :layout_at
+  end
+end

data/lib/simple-pages-rails/version.rb

@@ -1,3 +1,3 @@
 module SimplePagesRails
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

data/lib/simple_pages.rb

@@ -1,7 +1,9 @@
 require 'simple_pages/engine'
+require 'simple_pages/controllers/page_cluster'
 require 'simple_pages/controllers/page_layout_at'
 require 'simple_pages/models/page_attachment'
 require 'simple_pages/models/page_author'
+require 'simple_pages/models/page_cluster'
 require 'simple_pages/models/page_locale'
 require 'simple_pages/models/page_owner'
 require 'simple_pages/models/page_url'
@@ -9,6 +11,7 @@ require 'simple_pages/models/page_url'
 module SimplePages
   mattr_accessor :controller_modules
   @@controller_modules = [
+    SimplePages::Controllers::PageCluster,
     SimplePages::Controllers::PageLayoutAt
   ]
 
@@ -26,6 +29,7 @@ module SimplePages
     SimplePages::Models::PageUrl,
     SimplePages::Models::PageOwner,
     SimplePages::Models::PageLocale,
+    SimplePages::Models::PageCluster,
     SimplePages::Models::PageAttachment
   ]
 

data/lib/simple_pages/controllers/page_cluster.rb

@@ -0,0 +1,27 @@
+require 'active_support/concern'
+
+module SimplePages
+  module Controllers
+    module PageCluster
+      extend ActiveSupport::Concern
+      included do
+        helper_method :pages_cluster_for
+      end
+
+      module ClassMethods
+      end
+
+      protected
+
+      def pages_cluster_for(name, location)
+        SimplePages::Page.with_cluster(name).layout_at(location).published
+      end
+
+      def load_page_cluster_options
+        @cluster_options = ::Role.all.map do |role|
+          [t(role.name, scope: 'roles.names'), role.name]
+        end
+      end
+    end
+  end
+end

data/lib/simple_pages/controllers/page_layout_at.rb

@@ -6,7 +6,7 @@ module SimplePages
       extend ActiveSupport::Concern
       included do
         cattr_accessor :page_layout_at
-        self.page_layout_at = %w{header footer}
+        self.page_layout_at = %w{general header footer}
 
         helper_method :pages_layout_at
       end
@@ -21,7 +21,7 @@ module SimplePages
       protected
 
       def pages_layout_at(location)
-        SimplePages::Page.layout_at(location).published
+        SimplePages::Page.without_cluster.layout_at(location).published
       end
 
       def load_page_layout_at_options

data/lib/simple_pages/models/page_cluster.rb

@@ -0,0 +1,32 @@
+require 'active_support/concern'
+
+module SimplePages
+  module Models
+    module PageCluster
+      extend ActiveSupport::Concern
+      included do
+        serialize :cluster
+        attr_accessible :cluster
+      end
+
+      module ClassMethods
+        def without_cluster
+          where(cluster: "--- \n...\n")
+        end
+
+        def with_cluster(name)
+          where('cluster LIKE ?', "%#{name}%")
+        end
+      end
+
+      def cluster=(values)
+        values = values.delete_if { |v| v.blank? }
+        if values.blank?
+          super nil
+        else
+          super values
+        end
+      end
+    end
+  end
+end

data/lib/simple_pages/models/page_url.rb

@@ -6,20 +6,14 @@ module SimplePages
       extend ActiveSupport::Concern
       included do
         attr_accessible :url
-        validates :url, format: { with: /[\w\d\-_]{3,}/ }, allow_blank: true
+        validates :url, format: { with: /^([\w\-]{3,})$/ }, allow_blank: true
         acts_as_url :title, sync_url: true, only_when_blank: true
       end
 
       module ClassMethods
         def find_or_create_by_url(attrs)
           url = attrs.delete :url
-          page = where(url: url).first
-          if page.nil?
-            page = create(attrs)
-            page.url = url
-            page.save
-          end
-          page
+          where(url: url).first_or_create(attrs)
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-pages-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2013-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -241,6 +241,7 @@ files:
 - config/locales/simple_pages.zh-TW.yml
 - config/routes.rb
 - db/migrate/20121206042138_create_simple_pages.rb
+- db/migrate/20130318034034_add_cluster_to_simple_pages.rb
 - lib/generators/simple_pages/USAGE
 - lib/generators/simple_pages/install_generator.rb
 - lib/generators/simple_pages/templates/cancan_ext.rb
@@ -249,10 +250,12 @@ files:
 - lib/simple-pages-rails.rb
 - lib/simple-pages-rails/version.rb
 - lib/simple_pages.rb
+- lib/simple_pages/controllers/page_cluster.rb
 - lib/simple_pages/controllers/page_layout_at.rb
 - lib/simple_pages/engine.rb
 - lib/simple_pages/models/page_attachment.rb
 - lib/simple_pages/models/page_author.rb
+- lib/simple_pages/models/page_cluster.rb
 - lib/simple_pages/models/page_locale.rb
 - lib/simple_pages/models/page_owner.rb
 - lib/simple_pages/models/page_url.rb
@@ -321,7 +324,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4070382107726894177
+      hash: 1460486982569856472
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -330,7 +333,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4070382107726894177
+      hash: 1460486982569856472
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24