comfy_blog 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed87b17424062fedd960bd78ef9b0c6bd9b8923d
-  data.tar.gz: a652f008197705629d93c583c1d36cb79a9b9712
+  metadata.gz: c23d02796c11c424383ef59503f004d9d11a14a7
+  data.tar.gz: 2bcdbffe51266427e3598a4cb27097b1abecd76f
 SHA512:
-  metadata.gz: d1489b02510daba80054da073d9c0ef0ee001146e6f00fdd0eeca4594cf69b74699d36843ff07dd29532b3dbaff5cd127b1a758ed36cead694851d8d6aa67cc7
-  data.tar.gz: '0586168fa718e0f0123e98568a8f20f9c71a17ad3b98debda40ba06854d645a71ed85332d6f03c93721d25f6ceab735046d639539b29b7ee0d578e5bc0b530e7'
+  metadata.gz: b8973cc41e1de0ce35f3ce0e115471f5b6fb86dff10c14737693f12bc7e68d54d8e8b5e594948eda998a6b196f9a30f5ef8416ca54168e627fab1499251e1ba9
+  data.tar.gz: 107f15a97709acce139482c6536602c1029269f4ba90ee5b7c463bd42614c2d15f3bd446b41b52e6bc2aafc7aed5911f5fbcd84d1f5f1e4802f5829b36f9fd22

data/.github/issue_template.md

@@ -0,0 +1,22 @@
+*Note:* For general questions and feature requests please leave a message
+on Gitter: https://gitter.im/comfy/comfortable-mexican-sofa
+
+### Expected behavior
+Tell us what should happen
+
+### Actual behavior
+Tell us what happens instead
+
+### Steps to reproduce
+Things that help:
+
+* Describe issue in detail.
+* Add relevant code snippets.
+* Create a failing test case.
+
+### System configuration
+**Rails version**:
+
+**CMS version**:
+
+**Ruby version**:

data/.github/pull_request_template.md

@@ -0,0 +1,6 @@
+### Summary
+
+General information about what this PR is all about. If it fixes any issues
+please don't forget to tag them.
+
+Thanks for contributing!

data/.rubocop.yml

@@ -0,0 +1,96 @@
+AllCops:
+  TargetRubyVersion: 2.2
+  Exclude:
+    - bin/*
+    - db/schema.rb
+    - db/migrate/**/*
+    - test/fixtures/**/*
+    - tmp/**/*
+
+# -- Performance ---------------------------------------------------------------
+Performance/Casecmp:
+  Enabled: false
+
+# -- Metrics -------------------------------------------------------------------
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false
+
+# -- Layout --------------------------------------------------------------------
+Layout/MultilineOperationIndentation:
+  Enabled: false
+
+Layout/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Layout/MultilineHashBraceLayout:
+  Enabled: false
+
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+Layout/EmptyLinesAroundModuleBody:
+  EnforcedStyle: empty_lines_except_namespace
+
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Enabled: false
+
+Layout/EmptyLinesAroundClassBody:
+  EnforcedStyle: empty_lines_except_namespace
+
+Layout/AlignParameters:
+  Enabled: false
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: outdent
+
+# -- Style ---------------------------------------------------------------------
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/RegexpLiteral:
+  EnforcedStyle: percent_r
+
+Style/Lambda:
+  EnforcedStyle: literal
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/DateTime:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/AsciiComments:
+  Enabled: false

data/.travis.yml

@@ -4,7 +4,8 @@ before_install:
 before_script:
   - rake db:migrate
 script:
-  - rake test
+  - bundle exec rake test
+  - bundle exec rubocop
 rvm:
   - 2.2.7
   - 2.3.5

data/CONTRIBUTING.md

@@ -0,0 +1,32 @@
+# Contributing
+
+Contribute your code to ComfyBlog in 5 easy steps:
+
+### 1. Fork it
+
+Fork the project. Optionally, create a branch you want to work on.
+
+### 2. Get it running locally
+
+- Install gem dependencies with `bundle install`
+- There's nothing to configure, by default database is SQLite so it will be created for you.
+  Just run `rake db:migrate`
+- Make sure that existing tests are passing by running `rake test`
+- You should be able to start the app via `rails s` and navigate to http://localhost:3000/admin
+
+### 3. Hack away
+
+- Create a few small pull requests instead of a humoungous one. I can merge small stuff faster.
+- When adding new code just make sure it follows the same slyle as the existing code.
+- Avoid adding 3rd party dependencies if you can.
+- Tests please, but nothing complicated. UnitTest / Fixtures all the way. Make sure all tests pass.
+- Run `bundle exec rubocop` and fix any issues raised.
+
+### 4. Make a pull request
+
+- If you never done it before read this: https://help.github.com/articles/using-pull-requests
+- When PR is submitted check if TravisCI ran all tests successfully and Rubocop didn't raise any issues
+
+### 5. Done!
+
+If everything is good your changes will be merged into master branch. Eventually a new version of gem will be published.

data/Gemfile

@@ -1,18 +1,18 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 
 gemspec
 
-gem 'kaminari'
+gem "kaminari"
 
 group :development do
-  gem 'web-console'
-  gem 'listen'
+  gem "listen"
   gem "rubocop", "~> 0.51.0", require: false
+  gem "web-console"
 end
 
 group :test do
-  gem 'rails-controller-testing'
-  gem 'sqlite3'
-  gem 'mocha',      require: false
-  gem 'coveralls',  require: false
+  gem "coveralls",  require: false
+  gem "mocha", require: false
+  gem "rails-controller-testing"
+  gem "sqlite3"
 end

data/README.md

@@ -8,6 +8,7 @@ ComfyBlog is a simple blog management engine for [ComfortableMexicanSofa](https:
 [![Dependency Status](https://img.shields.io/gemnasium/comfy/comfy-blog.svg?style=flat)](https://gemnasium.com/comfy/comfy-blog)
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/comfy/comfy-blog.svg?style=flat)](https://codeclimate.com/github/comfy/comfy-blog)
 [![Coverage Status](https://img.shields.io/coveralls/comfy/comfy-blog.svg?style=flat)](https://coveralls.io/r/comfy/comfy-blog?branch=master)
+[![Gitter](https://badges.gitter.im/comfy/comfortable-mexican-sofa.svg)](https://gitter.im/comfy/comfortable-mexican-sofa)
 
 ## Dependencies
 

data/Rakefile

@@ -1,3 +1,3 @@
-require_relative 'config/application'
+require_relative "config/application"
 
 Rails.application.load_tasks

data/app/controllers/comfy/admin/blog/posts_controller.rb

@@ -1,14 +1,16 @@
 class Comfy::Admin::Blog::PostsController < Comfy::Admin::Cms::BaseController
 
-  before_action :build_post, only: [:new, :create]
-  before_action :load_post,  only: [:edit, :update, :destroy]
+  before_action :build_post, only: %i[new create]
+  before_action :load_post,  only: %i[edit update destroy]
   before_action :authorize
 
   def index
-    return redirect_to action: :new if @site.blog_posts.count == 0
+    return redirect_to action: :new if @site.blog_posts.count.zero?
 
-    posts_scope = @site.blog_posts.
-      includes(:categories).for_category(params[:categories]).order(published_at: :desc)
+    posts_scope = @site.blog_posts
+      .includes(:categories)
+      .for_category(params[:categories])
+      .order(published_at: :desc)
     @posts = comfy_paginate(posts_scope)
   end
 
@@ -18,11 +20,11 @@ class Comfy::Admin::Blog::PostsController < Comfy::Admin::Cms::BaseController
 
   def create
     @post.save!
-    flash[:success] = t('.created')
+    flash[:success] = t(".created")
     redirect_to action: :edit, id: @post
 
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = t('.create_failure')
+    flash.now[:danger] = t(".create_failure")
     render action: :new
   end
 
@@ -32,26 +34,31 @@ class Comfy::Admin::Blog::PostsController < Comfy::Admin::Cms::BaseController
 
   def update
     @post.update_attributes!(post_params)
-    flash[:success] = t('.updated')
+    flash[:success] = t(".updated")
     redirect_to action: :edit, id: @post
 
   rescue ActiveRecord::RecordInvalid
-    flash.now[:danger] = t('.update_failure')
+    flash.now[:danger] = t(".update_failure")
     render action: :edit
   end
 
   def destroy
     @post.destroy
-    flash[:success] = t('.deleted')
+    flash[:success] = t(".deleted")
     redirect_to action: :index
   end
 
+  def form_fragments
+    @post = @site.blog_posts.find_by(id: params[:id]) || @site.blog_posts.new
+    @post.layout = @site.layouts.find_by(id: params[:layout_id])
+  end
+
 protected
 
   def load_post
     @post = @site.blog_posts.find(params[:id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = t('.not_found')
+    flash[:danger] = t(".not_found")
     redirect_to action: :index
   end
 
@@ -65,4 +72,5 @@ protected
   def post_params
     params.fetch(:post, {}).permit!
   end
+
 end

data/app/controllers/comfy/admin/blog/revisions/post_controller.rb

@@ -1,8 +1,13 @@
 class Comfy::Admin::Blog::Revisions::PostController < Comfy::Admin::Cms::Revisions::BaseController
 
   def show
-    @current_content    = @record.fragments.inject({}){|c, b| c[b.identifier] = b.content; c }
-    @versioned_content  = @record.fragments.inject({}){|c, b| c[b.identifier] = @revision.data['fragments_attributes'].detect{|r| r[:identifier] == b.identifier}.try(:[], :content); c }
+    @current_content = @record.fragments.each_with_object({}) do |b, c|
+      c[b.identifier] = b.content
+    end
+    @versioned_content = @record.fragments.each_with_object({}) do |b, c|
+      data = @revision.data["fragments_attributes"].detect { |r| r[:identifier] == b.identifier }
+      c[b.identifier] = data.try(:[], :content)
+    end
 
     render "comfy/admin/cms/revisions/show"
   end
@@ -12,11 +17,12 @@ private
   def load_record
     @record = @site.blog_posts.find(params[:blog_post_id])
   rescue ActiveRecord::RecordNotFound
-    flash[:danger] = I18n.t('comfy.admin.cms.revisions.record_not_found')
+    flash[:danger] = I18n.t("comfy.admin.cms.revisions.record_not_found")
     redirect_to comfy_admin_blog_posts_path(@site)
   end
 
   def record_path
     edit_comfy_admin_blog_post_path(@site, @record)
   end
+
 end

data/app/controllers/comfy/blog/posts_controller.rb

@@ -3,12 +3,13 @@ class Comfy::Blog::PostsController < Comfy::Cms::BaseController
   include Comfy::Paginate
 
   def index
-    scope = if params[:year]
-      scope = @cms_site.blog_posts.published.for_year(params[:year])
-      params[:month] ? scope.for_month(params[:month]) : scope
-    else
-      @cms_site.blog_posts.published
-    end
+    scope =
+      if params[:year]
+        scope = @cms_site.blog_posts.published.for_year(params[:year])
+        params[:month] ? scope.for_month(params[:month]) : scope
+      else
+        @cms_site.blog_posts.published
+      end
 
     scope = scope.for_category(params[:category]) if params[:category]
 
@@ -24,18 +25,19 @@ class Comfy::Blog::PostsController < Comfy::Cms::BaseController
             content_type: "text/html"
 
   rescue ActiveRecord::RecordNotFound
-    render cms_page: '/404', status: 404
+    render cms_page: "/404", status: 404
   end
 
 private
 
   def load_post
     post_scope = @cms_site.blog_posts.published.where(slug: params[:slug])
-    @cms_post = if params[:year] && params[:month]
-      post_scope = post_scope.where(year: params[:year], month: params[:month]).first!
-    else
-      post_scope.first!
-    end
+    @cms_post =
+      if params[:year] && params[:month]
+        post_scope.where(year: params[:year], month: params[:month]).first!
+      else
+        post_scope.first!
+      end
     @cms_layout = @cms_post.layout
   end
 
@@ -43,4 +45,5 @@ private
     return false unless @cms_layout
     @cms_layout.app_layout.present? ? @cms_layout.app_layout : false
   end
+
 end

data/app/models/comfy/blog/post.rb

@@ -1,6 +1,6 @@
 class Comfy::Blog::Post < ActiveRecord::Base
 
-  self.table_name = 'comfy_blog_posts'
+  self.table_name = "comfy_blog_posts"
 
   include Comfy::Cms::WithFragments
   include Comfy::Cms::WithCategories
@@ -9,19 +9,19 @@ class Comfy::Blog::Post < ActiveRecord::Base
 
   # -- Relationships -----------------------------------------------------------
   belongs_to :site,
-    class_name: 'Comfy::Cms::Site'
+    class_name: "Comfy::Cms::Site"
 
   # -- Validations -------------------------------------------------------------
   validates :title, :slug, :year, :month,
     presence: true
   validates :slug,
-    uniqueness: {scope: [:site_id, :year, :month]},
-    format:     {with: /\A%*\w[a-z0-9_\-\%]*\z/i }
+    uniqueness: { scope: %i[site_id year month] },
+    format:     { with: %r{\A%*\w[a-z0-9_%-]*\z}i }
 
   # -- Scopes ------------------------------------------------------------------
-  scope :published, -> {where(is_published: true)}
-  scope :for_year,  -> year {where(year: year)}
-  scope :for_month, -> month {where(month: month)}
+  scope :published, -> { where(is_published: true) }
+  scope :for_year,  ->(year) { where(year: year) }
+  scope :for_month, ->(month) { where(month: month) }
 
   # -- Callbacks ---------------------------------------------------------------
   before_validation :set_slug,
@@ -31,22 +31,23 @@ class Comfy::Blog::Post < ActiveRecord::Base
   # -- Instance Mathods --------------------------------------------------------
   def url(relative: false)
     public_blog_path = ComfyBlog.config.public_blog_path
-    post_path = ['/', public_blog_path, self.year, self.month, self.slug].join('/').squeeze('/')
-    [self.site.url(relative: relative), post_path].join
+    post_path = ["/", public_blog_path, year, month, slug].join("/").squeeze("/")
+    [site.url(relative: relative), post_path].join
   end
 
 protected
 
   def set_slug
-    self.slug ||= self.title.to_s.parameterize
+    self.slug ||= title.to_s.parameterize
   end
 
   def set_date
-    self.year   = self.published_at.year
-    self.month  = self.published_at.month
+    self.year   = published_at.year
+    self.month  = published_at.month
   end
 
   def set_published_at
     self.published_at ||= Time.zone.now
   end
+
 end