effective_posts 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6c0cbc8c247c67715094aba5e52ea2f212cdbe3
-  data.tar.gz: a67ae4457e20eb7675c78dc1c769a1b1cc84595b
+  metadata.gz: 5cbae7b7138b3a8c12923d42784c42ba660abfb1
+  data.tar.gz: d3235a3688cd1d3dc9f1d7af60fb142f00a58c78
 SHA512:
-  metadata.gz: 1999a9f99ca390aab1e0576f8a1d5df86b0d33ccc7b29ea66b3903dd69777ac0ba29341a91f18abd1dc9e8360c98f5409d93cdeb4fe5f088d861cff8ae6b27e0
-  data.tar.gz: b09a6b63101b33d938f70230485668f0c2c1dd1b34d1bd01650a04757c9aa01d1943e9a5226af362d4826bff0ba9f4931bcb2d04b3621a7946b65956872eba3c
+  metadata.gz: f63838c6ffa90c6eaa6efb925c8cbd39a9b2bc9155605bebd8be62c44e8d29a5f0439bc9e89c8d25142bb143ce3ee537c17246a0f711bd33b56cfe7d12d35e10
+  data.tar.gz: aa39d8b2d97656f24e387abc3f7de7108a5607ea7378f5b1e61b7bb3f014cc70157c63a678b6b8e9a4a26074a1a906a94d467b114355377d39050b50660677d7

data/README.md

@@ -140,7 +140,11 @@ The permissions you actually want to define are as follows (using CanCan):
 
 ```ruby
 can [:index, :show], Effective::Post
-can [:manage], Effective::Post if user.is?(:admin)
+
+if user.admin?
+  can :manage, Effective::Post
+  can :admin, :effective_pages
+end
 ```
 
 ## Future Plans
@@ -156,9 +160,6 @@ There are some obvious additional features that have yet to be implemented:
 
 MIT License.  Copyright [Code and Effect Inc.](http://www.codeandeffect.com/)
 
-Code and Effect is the product arm of [AgileStyle](http://www.agilestyle.com/), an Edmonton-based shop that specializes in building custom web applications with Ruby on Rails.
-
-
 ## Testing
 
 Run tests by:

data/app/controllers/admin/posts_controller.rb

@@ -6,16 +6,16 @@ module Admin
 
     def index
       @page_title = 'Posts'
-      EffectivePosts.authorized?(self, :index, Effective::Post)
+      @datatable = Effective::Datatables::Posts.new()
 
-      @datatable = Effective::Datatables::Posts.new() if defined?(EffectiveDatatables)
+      authorize_effective_posts!
     end
 
     def new
       @post = Effective::Post.new(published_at: Time.zone.now)
       @page_title = 'New Post'
 
-      EffectivePosts.authorized?(self, :new, @post)
+      authorize_effective_posts!
     end
 
     def create
@@ -24,7 +24,7 @@ module Admin
 
       @page_title = 'New Post'
 
-      EffectivePosts.authorized?(self, :create, @post)
+      authorize_effective_posts!
 
       if @post.save
         if params[:commit] == 'Save and Edit Content' && defined?(EffectiveRegions)
@@ -46,14 +46,14 @@ module Admin
       @post = Effective::Post.find(params[:id])
       @page_title = 'Edit Post'
 
-      EffectivePosts.authorized?(self, :edit, @post)
+      authorize_effective_posts!
     end
 
     def update
       @post = Effective::Post.find(params[:id])
       @page_title = 'Edit Post'
 
-      EffectivePosts.authorized?(self, :update, @post)
+      authorize_effective_posts!
 
       if @post.update_attributes(post_params)
         if params[:commit] == 'Save and Edit Content' && defined?(EffectiveRegions)
@@ -74,7 +74,7 @@ module Admin
     def destroy
       @post = Effective::Post.find(params[:id])
 
-      EffectivePosts.authorized?(self, :destroy, @post)
+      authorize_effective_posts!
 
       if @post.destroy
         flash[:success] = 'Successfully deleted post'
@@ -87,8 +87,9 @@ module Admin
 
     def approve
       @post = Effective::Post.find(params[:id])
+      @page_title = 'Approve Post'
 
-      EffectivePosts.authorized?(self, :approve, @post)
+      authorize_effective_posts!
 
       if @post.update_attributes(draft: false)
         flash[:success] = 'Successfully approved post.  It is now displayed on the website.'
@@ -100,15 +101,19 @@ module Admin
     end
 
     def excerpts
+      @posts = Effective::Post.includes(:regions)
       @page_title = 'Post Excerpts'
 
-      EffectivePosts.authorized?(self, :index, Effective::Post)
-
-      @posts = Effective::Post.includes(:regions)
+      authorize_effective_posts!
     end
 
     private
 
+    def authorize_effective_posts!
+      EffectivePosts.authorized?(self, :admin, :effective_posts)
+      EffectivePosts.authorized?(self, action_name.to_sym, @post || Effective::Post)
+    end
+
     def post_params
       params.require(:effective_post).permit(EffectivePosts.permitted_params)
     end

data/app/controllers/effective/posts_controller.rb

@@ -13,7 +13,7 @@ module Effective
 
       EffectivePosts.authorized?(self, :index, Effective::Post)
 
-      @page_title = (params[:page_title] || params[:category] || 'Posts').titleize
+      @page_title = (params[:page_title] || params[:category] || params[:defaults].try(:[], :category) || 'Posts').titleize
     end
 
     def show

data/app/views/admin/posts/edit.html.haml

@@ -1,2 +1,3 @@
-%h2= @page_title
+%h1.effective-admin-heading= @page_title
+
 = render partial: 'form', as: :post, object: @post

data/app/views/admin/posts/excerpts.html.haml

@@ -1,4 +1,4 @@
-%h2= @page_title
+%h1.effective-admin-heading= @page_title
 
 - @posts.find_each do |post|
   .row

data/app/views/admin/posts/index.html.haml

@@ -1,9 +1,6 @@
-%h2= @page_title
+%h1.effective-admin-heading= @page_title
 
-%p.text-right= link_to 'New Post', effective_posts.new_admin_post_path, :class => 'btn btn-primary'
+%p.text-right.effective-admin-actions
+  = link_to 'New Post', effective_posts.new_admin_post_path, class: 'btn btn-primary'
 
-= render_datatable @datatable do
-  %p There are no posts
-
-- if @datatable.present?
-  %p.text-right= link_to 'New Post', effective_posts.new_admin_post_path, :class => 'btn btn-primary'
+= render_datatable(@datatable)

data/app/views/admin/posts/new.html.haml

@@ -1,2 +1,3 @@
-%h2= @page_title
+%h1.effective-admin-heading= @page_title
+
 = render partial: 'form', as: :post, object: @post

data/{lib/generators/templates → config}/effective_posts.rb

@@ -1,5 +1,3 @@
-# EffectivePosts Rails Engine
-
 EffectivePosts.setup do |config|
   config.posts_table_name = :posts
 
@@ -24,9 +22,27 @@ EffectivePosts.setup do |config|
   # The author is the user that created the Effective::Post object
   config.post_meta_author = true
 
-  # Use CanCan: authorize!(action, resource)
+  # Authorization Method
+  #
+  # This method is called by all controller actions with the appropriate action and resource
+  # If the method returns false, an Effective::AccessDenied Error will be raised (see README.md for complete info)
+  #
+  # Use via Proc (and with CanCan):
+  # config.authorization_method = Proc.new { |controller, action, resource| can?(action, resource) }
+  #
+  # Use via custom method:
+  # config.authorization_method = :my_authorization_method
+  #
+  # And then in your application_controller.rb:
+  #
+  # def my_authorization_method(action, resource)
+  #   current_user.is?(:admin)
+  # end
+  #
+  # Or disable the check completely:
+  # config.authorization_method = false
+  config.authorization_method = Proc.new { |controller, action, resource| authorize!(action, resource) && resource.roles_permit?(current_user) } # CanCanCan
   # Use effective_roles:  resource.roles_permit?(current_user)
-  config.authorization_method = Proc.new { |controller, action, resource| true }
 
   # Layout Settings
   # Configure the Layout per controller, or all at once

data/lib/effective_posts/engine.rb

@@ -12,7 +12,7 @@ module EffectivePosts
     # Set up our default configuration options.
     initializer "effective_posts.defaults", :before => :load_config_initializers do |app|
       # Set up our defaults, as per our initializer template
-      eval File.read("#{config.root}/lib/generators/templates/effective_posts.rb")
+      eval File.read("#{config.root}/config/effective_posts.rb")
     end
   end
 end

data/lib/effective_posts/version.rb

@@ -1,3 +1,3 @@
 module EffectivePosts
-  VERSION = '0.4.7'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/generators/effective_posts/install_generator.rb

@@ -3,9 +3,9 @@ module EffectivePosts
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
 
-      desc "Creates an EffectivePosts initializer in your application."
+      desc 'Creates an EffectivePosts initializer in your application.'
 
-      source_root File.expand_path("../../templates", __FILE__)
+      source_root File.expand_path('../../templates', __FILE__)
 
       def self.next_migration_number(dirname)
         if not ActiveRecord::Base.timestamped_migrations
@@ -16,13 +16,13 @@ module EffectivePosts
       end
 
       def copy_initializer
-        template "effective_posts.rb", "config/initializers/effective_posts.rb"
+        template ('../' * 3) + 'config/effective_posts.rb', 'config/initializers/effective_posts.rb'
       end
 
       def create_migration_file
         @posts_table_name = ':' + EffectivePosts.posts_table_name.to_s
 
-        migration_template '../../../db/migrate/01_create_effective_posts.rb.erb', 'db/migrate/create_effective_posts.rb'
+        migration_template ('../' * 3) + 'db/migrate/01_create_effective_posts.rb.erb', 'db/migrate/create_effective_posts.rb'
       end
 
       def copy_mailer_preview
@@ -34,10 +34,6 @@ module EffectivePosts
           puts "couldn't find action_mailer.preview_path.  Skipping effective_posts_mailer_preview."
         end
       end
-
-      def show_readme
-        readme "README" if behavior == :invoke
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_posts
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -187,18 +187,14 @@ files:
 - app/views/kaminari/_paginator.html.haml
 - app/views/kaminari/_prev_page.html.haml
 - app/views/layouts/effective_posts_mailer_layout.html.haml
+- config/effective_posts.rb
 - config/routes.rb
 - db/migrate/01_create_effective_posts.rb.erb
 - lib/effective_posts.rb
 - lib/effective_posts/engine.rb
 - lib/effective_posts/version.rb
 - lib/generators/effective_posts/install_generator.rb
-- lib/generators/templates/README
-- lib/generators/templates/effective_posts.rb
 - lib/generators/templates/effective_posts_mailer_preview.rb
-- spec/effective_pages_spec.rb
-- spec/spec_helper.rb
-- spec/support/factories.rb
 homepage: https://github.com/code-and-effect/effective_posts
 licenses:
 - MIT
@@ -224,7 +220,4 @@ signing_key:
 specification_version: 4
 summary: A blog implementation with WYSIWYG content editing, post scheduling, pagination
   and optional top level routes for each post category.
-test_files:
-- spec/effective_pages_spec.rb
-- spec/spec_helper.rb
-- spec/support/factories.rb
+test_files: []

data/lib/generators/templates/README

@@ -1 +0,0 @@
-Thanks for using EffectivePosts

data/spec/effective_pages_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe EffectivePosts do
-  it 'should be a module' do
-    assert_kind_of Module, EffectivePosts
-  end
-end

data/spec/spec_helper.rb

@@ -1,43 +0,0 @@
-ENV["RAILS_ENV"] ||= 'test'
-
-require File.expand_path("../dummy/config/environment", __FILE__)
-
-require 'rspec/rails'
-require 'rspec/autorun'
-require 'capybara/rspec'
-require 'capybara/poltergeist'
-require 'factory_girl_rails'
-require 'haml'
-
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f }
-
-RSpec.configure do |config|
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  config.include Capybara::DSL
-
-  Capybara.current_driver = :poltergeist
-  Capybara.javascript_driver = :poltergeist
-  Capybara.default_wait_time = 5
-
-  Rails.logger.level = 4    # Output only minimal stuff to test.log
-
-  config.use_transactional_fixtures = true   # Make this false to once again use DatabaseCleaner
-  config.infer_base_class_for_anonymous_controllers = false
-  config.order = 'random'
-end
-
-class ActiveRecord::Base
-  mattr_accessor :shared_connection
-  @@shared_connection = nil
-
-  def self.connection
-    @@shared_connection || retrieve_connection
-  end
-end
-
-# Forces all threads to share the same connection. This works on
-# Capybara because it starts the web server in a thread.
-ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection

data/spec/support/factories.rb

@@ -1,15 +0,0 @@
-require 'factory_girl'
-
-FactoryGirl.define do
-  factory :post, :class => Effective::Post do
-    sequence(:title) { |n| "Title #{n}" }
-    sequence(:slug) { |n| "title-#{n}" }
-
-    meta_description 'meta description'
-    draft false
-
-    template 'example'
-    layout 'application'
-  end
-end
-