simple-pages-rails 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d41286186d3466f03371243b10c95a323973cb8
-  data.tar.gz: 1ff02604adfdbb548791dad6b005082010db2825
+  metadata.gz: bc0d261ff974173b3b85ac94f1bb6cf238044b54
+  data.tar.gz: 4d259a29837760a217725a58526eecaa3bd24278
 SHA512:
-  metadata.gz: cdae70ecf369fcbc36c015a8aa6533b7c81ccaea1c6f4ee3374ee6d83630906f70bd93fe99401af2ad3a98a52b9467fb76ca091b22aa53ee12d8adb8ec89d928
-  data.tar.gz: af430b859d15ad2c71220a4e3f3018aebf80dad91181b1efa203a78e90c1ea1b0345b73a4ca4434e6b38d2dcf31454ea8dcb3f4867a9c894957ee972ec92dbf8
+  metadata.gz: a08e5493f0435790d9a9e76ca58dfc2ad19fc4d6bb512f4fe88643805e85f987a209ef4701686e0a05e20db9b31eec282275d8cf232e1673fa60c82e578e604a
+  data.tar.gz: e32b92dd5f371d25c9f05b8d1f5d3f0ac996414dbc3284627a96d8a018abafdc619fdb21adeb72cd62ffffe507b823ca6f08c14b3e116fcb1ddb9be8e452aa8b

data/Gemfile

@@ -20,7 +20,7 @@ gem 'coffee-rails'
 gem 'devise'
 gem 'cancan'
 gem 'simple_form'
-gem 'anjlab-bootstrap-rails', require: 'bootstrap-rails'
+gem 'anjlab-bootstrap-rails', '< 3.0', require: 'bootstrap-rails'
 
 group :test do
   if RUBY_PLATFORM =~ /darwin/i

data/app/controllers/simple_pages/application_controller.rb

@@ -10,14 +10,5 @@ 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

@@ -20,28 +20,20 @@ module SimplePages
     end
 
     def new
-      load_page_options
       @page.author = session_user
       respond_with @page
     end
 
     def edit
-      load_page_options
     end
 
     def create
       @page.save
-      if @page.invalid?
-        load_page_options
-      end
       respond_with @page
     end
 
     def update
       @page.update_attributes page_params
-      if @page.invalid?
-        load_page_options
-      end
       respond_with @page
     end
 
@@ -64,12 +56,6 @@ module SimplePages
       @page = SimplePages::Page.new page_params
     end
 
-    def load_page_options
-      load_author_options
-      load_page_layout_at_options
-      load_page_cluster_options
-    end
-
     private
 
     def pagination_options

data/app/helpers/simple_pages/pages_helper.rb

@@ -24,5 +24,23 @@ module SimplePages
     def local_published_at(object)
       object.published_at? ? object.published_at.localtime : nil
     end
+
+    def page_author_options
+      ::User.unscoped.map do |author|
+        [author.name, author.simple_page_owner_option]
+      end
+    end
+
+    def page_cluster_options
+      ::Role.enabled.map do |role|
+        [t(role.name, scope: 'roles.names'), role.name]
+      end
+    end
+
+    def page_layout_at_options
+      page_layout_at.map do |key|
+        [t(key, scope: 'simple_pages.layout_at'), key]
+      end
+    end
   end
 end

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

@@ -11,7 +11,7 @@
     } %>
   <%= f.input :content, input_html: { class: 'ckeditor' } %>
   <%= f.input :owner,
-    collection: author_options,
+    collection: page_author_options,
     selected: selected_page_author(f.object),
     input_html: {
       class: 'chzn-select'
@@ -24,11 +24,11 @@
     } %>
   <%= f.input :layout_at,
     as: :select,
-    collection: layout_at_options,
+    collection: page_layout_at_options,
     include_blank: false %>
   <%= f.input :cluster,
     as: :select,
-    collection: cluster_options,
+    collection: page_cluster_options,
     input_html: {
       multiple: true,
       class: 'chzn-select'

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

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

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

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

data/lib/generators/simple_pages/templates/devise_ext.rb

@@ -18,8 +18,4 @@ module DeviseExt
   def session_user
     current_user
   end
-
-  def load_authors
-    @authors = User.unscoped
-  end
 end

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

@@ -1,3 +1,3 @@
 module SimplePagesRails
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

data/lib/simple_pages/controllers/page_cluster.rb

@@ -16,12 +16,6 @@ module SimplePages
       def pages_cluster_for(name, location)
         SimplePages::Page.with_cluster(name).layout_at(location).published
       end
-
-      def load_page_cluster_options
-        @cluster_options = ::Role.enabled.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

@@ -9,6 +9,7 @@ module SimplePages
         self.page_layout_at = %w{general header footer}
 
         helper_method :pages_layout_at
+        helper_method :page_layout_at
       end
 
       module ClassMethods
@@ -23,12 +24,6 @@ module SimplePages
       def pages_layout_at(location)
         SimplePages::Page.without_cluster.layout_at(location).published
       end
-
-      def load_page_layout_at_options
-        @layout_at_options = page_layout_at.map do |key|
-          [t(key, scope: 'simple_pages.layout_at'), key]
-        end
-      end
     end
   end
 end

data/simple-pages-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'rails', '>= 3.2.13'
   gem.add_dependency 'will_paginate'
-  gem.add_dependency 'rails-theme-helper'
+  gem.add_dependency 'rails-theme-helper', '< 0.1'
   gem.add_dependency 'chosen-rails'
   gem.add_dependency 'ckeditor_rails'
   gem.add_dependency 'stringex'

data/spec/dummy/lib/devise_ext.rb

@@ -18,8 +18,4 @@ module DeviseExt
   def session_user
     current_user
   end
-
-  def load_authors
-    @authors = User.unscoped
-  end
 end

metadata

@@ -1,181 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: simple-pages-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Tse-Ching Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails-theme-helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: chosen-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ckeditor_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-spork
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem provides simple pages with rails engine
@@ -185,7 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -294,17 +294,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: provides simple pages with rails engine