simple-pages-rails 0.2.0 → 0.3.0

data/app/models/simple_pages/page.rb

@@ -4,31 +4,11 @@ module SimplePages
 
     attr_accessible :title, :excerpt, :content, :published_at, :layout_at
 
-    validates :url, presence: true
     validates :title, presence: true
 
-    acts_as_url :title
-
     scope :published, lambda { where('published_at <= ?', Time.zone.now) }
     scope :layout_at, lambda { |location| where(layout_at: location) }
 
-    class << self
-      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
-      end
-    end
-
-    def to_param
-      url
-    end
-
     SimplePages.page_modules.each { |module_name| include module_name }
   end
 end

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

@@ -1,6 +1,7 @@
-<%= f.error_notification %>
-
 <div class="form-inputs">
+  <% if can? :update_url, f.object %>
+    <%= 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 :content, input_html: { class: 'ckeditor' } %>

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

@@ -14,6 +14,7 @@
 
   <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 %>
       <div class="form-actions">
         <%= submit_button f %>

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

@@ -11,6 +11,7 @@
 
   <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 %>
       <div class="form-actions">
         <%= submit_button f %>

data/config/locales/pages.en.yml

@@ -27,14 +27,16 @@ en:
 
   simple_form:
     labels:
-      simple_pages_page:
+      page:
     hints:
-      simple_pages_page:
+      page:
+        url: 'Only characters(a-zA-Z), numbers(0-9), dash(-) and underline(_) are allowed. It will be given if left blank.'
+        published_at: 'It will not show up if blank.'
     placeholders:
-      simple_pages_page:
+      page:
 
   helpers:
     submit:
-      simple_pages_page:
+      page:
         create: 'Create %{model}'
         update: 'Update %{model}'

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

@@ -27,14 +27,16 @@ zh-TW:
 
   simple_form:
     labels:
-      simple_pages_page:
+      page:
     hints:
-      simple_pages_page:
+      page:
+        url: '僅限使用英文字母（ a-zA-Z ）、數字（ 0-9 ）、破折號（ - ）與底線（ _ ）。若不輸入，則由系統自行賦予。'
+        published_at: '若沒有設定時間，則不會顯示在網站中。'
     placeholders:
-      simple_pages_page:
+      page:
 
   helpers:
     submit:
-      simple_pages_page:
+      page:
         create: '建立%{model}'
         update: '更新%{model}'

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

@@ -1,3 +1,3 @@
 module SimplePagesRails
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/simple_pages/models/page_url.rb

@@ -0,0 +1,31 @@
+require 'active_support/concern'
+
+module SimplePages
+  module Models
+    module PageUrl
+      extend ActiveSupport::Concern
+      included do
+        attr_accessible :url
+        validates :url, format: { with: /[\w\d-_]{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
+        end
+      end
+
+      def to_param
+        url
+      end
+    end
+  end
+end

data/lib/simple_pages.rb

@@ -4,6 +4,7 @@ require 'simple_pages/models/page_attachment'
 require 'simple_pages/models/page_author'
 require 'simple_pages/models/page_locale'
 require 'simple_pages/models/page_owner'
+require 'simple_pages/models/page_url'
 
 module SimplePages
   mattr_accessor :controller_modules
@@ -22,6 +23,7 @@ module SimplePages
 
   mattr_accessor :page_modules
   @@page_modules = [
+    SimplePages::Models::PageUrl,
     SimplePages::Models::PageOwner,
     SimplePages::Models::PageLocale,
     SimplePages::Models::PageAttachment

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-pages-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -255,6 +255,7 @@ files:
 - lib/simple_pages/models/page_author.rb
 - lib/simple_pages/models/page_locale.rb
 - lib/simple_pages/models/page_owner.rb
+- lib/simple_pages/models/page_url.rb
 - lib/tasks/simple_pages_tasks.rake
 - script/rails
 - simple-pages-rails.gemspec
@@ -320,7 +321,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3697549356973948748
+      hash: -3329774996417494791
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -329,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3697549356973948748
+      hash: -3329774996417494791
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24