comfy_blog 1.12.3 → 2.0.0

data/test/fixtures/comfy/blog/posts.yml

@@ -1,10 +1,9 @@
 default:
-  blog: default
+  site: default
   title: Default Title
   slug: default-title
-  content: Default Content
-  author: Default Author
   is_published: true
   year: 2012
   month: 1
-  published_at: <%= 2.days.ago %>
+  published_at: <%= 2.days.ago %>
+  layout: default

data/test/fixtures/comfy/cms/layouts.yml

@@ -0,0 +1,10 @@
+default:
+  site: default
+  label: Default Layout
+  identifier: default
+  parent:
+  content: |-
+    {{cms:text content}}
+  css:
+  js:
+  position: 0

data/test/fixtures/comfy/cms/sites.yml

@@ -1,4 +1,4 @@
 default:
   label: Default Site
   identifier: default-site
-  hostname: test.host
+  hostname: test.host

data/test/fixtures/generators/blog/routes.rb

@@ -1,6 +1,5 @@
 Test::Application.routes.draw do
 
-  comfy_route :blog_admin, :path => '/admin'
-  comfy_route :blog, :path => '/blog'
-
+  comfy_route :blog_admin, path: "/admin"
+  comfy_route :blog, path: "/blog"
 end

data/test/gemfiles/Gemfile.rails.5.2

@@ -0,0 +1,22 @@
+source 'http://rubygems.org'
+
+gem "rails",
+  github: "rails"
+gem "arel",
+  github: "rails/arel"
+
+gem "bootstrap_form",
+  github: "bootstrap-ruby/rails-bootstrap-forms",
+  branch: "bootstrap-v4"
+
+gem "comfortable_mexican_sofa",
+  github: "comfy/comfortable-mexican-sofa"
+
+gem 'kaminari', '>= 0.14.0'
+
+group :test do
+  gem 'sqlite3'
+  gem 'coveralls',  require: false
+  gem 'mocha',      require: false
+  gem 'rails-controller-testing'
+end

data/test/generators/blog_generator_test.rb

@@ -3,17 +3,17 @@ require_relative '../../lib/generators/comfy/blog/blog_generator'
 
 class CmsGeneratorTest < Rails::Generators::TestCase
   tests Comfy::Generators::BlogGenerator
-  
+
   def test_generator
     run_generator
-    
+
     assert_migration 'db/migrate/create_blog.rb'
-    
+
     assert_file 'config/initializers/comfy_blog.rb'
-    
+
     assert_file 'config/routes.rb', read_file('blog/routes.rb')
-    
+
     assert_directory 'app/views/comfy/blog'
   end
-  
-end
+
+end

data/test/integration/i18n_test.rb

@@ -0,0 +1,37 @@
+require_relative '../test_helper'
+
+class I18nIntegrationTest < ActionDispatch::IntegrationTest
+
+  def collect_combined_keys(hash, ns = nil)
+    hash.collect do |k, v|
+      keys = [ ]
+      keys << collect_combined_keys(v, "#{ns}.#{k}") if v.is_a?(Hash)
+      keys << "#{ns}.#{k}"
+    end.flatten
+  end
+
+  def test_translations
+    locales_path = File.expand_path('../../../config/locales', __FILE__)
+    locales = Dir.glob("#{locales_path}/*.yml").collect do |file_path|
+      File.basename(file_path, '.yml')
+    end
+
+    # collecting all locales
+    locale_keys = { }
+    locales.each do |locale|
+      translations = YAML.load_file("#{locales_path}/#{locale}.yml")
+      locale_keys[locale] = collect_combined_keys(translations[locale])
+    end
+
+    # Using en as reference
+    reference = locale_keys[locales.delete('en')]
+    assert reference.present?
+
+    locale_keys.each do |locale, keys|
+      missing = reference - keys
+      assert missing.blank?, "#{locale} locale is missing: #{missing.join(', ')}"
+      extra = keys - reference
+      assert extra.blank?, "#{locale} locale has extra: #{extra.join(', ')}"
+    end
+  end
+end

data/test/lib/configuration_test.rb

@@ -4,14 +4,13 @@ class ConfigurationTest < ActiveSupport::TestCase
 
   def test_configuration
     assert config = ComfyBlog.configuration
-    assert_equal 10,    config.posts_per_page
-    assert_equal false, config.auto_publish_comments
-    assert_equal nil,   config.default_author
+    assert_equal  10,                       config.posts_per_page
+    assert_equal 'comfy/blog/application',  config.app_layout
+    assert_equal 'blog',                    config.public_blog_path
   end
 
   def test_initialization_overrides
     ComfyBlog.config.posts_per_page = 5
     assert_equal 5, ComfyBlog.config.posts_per_page
   end
-
-end
+end

data/test/models/posts_test.rb

@@ -2,6 +2,12 @@ require_relative '../test_helper'
 
 class BlogPostsTest < ActiveSupport::TestCase
 
+  setup do
+    @site   = comfy_cms_sites(:default)
+    @layout = comfy_cms_layouts(:default)
+    @post   = comfy_blog_posts(:default)
+  end
+
   def test_fixtures_validity
     Comfy::Blog::Post.all.each do |post|
       assert post.valid?, post.errors.full_messages.to_s
@@ -11,46 +17,45 @@ class BlogPostsTest < ActiveSupport::TestCase
   def test_validations
     post = Comfy::Blog::Post.new
     assert post.invalid?
-    assert_errors_on post, :blog_id, :title, :slug, :content
+    assert_errors_on post, :site, :title, :slug, :layout
   end
 
   def test_validation_of_slug_uniqueness
-    old_post = comfy_blog_posts(:default)
-    old_post.update_attributes!(:published_at => Time.now)
-    post = comfy_blog_blogs(:default).posts.new(
-      :title    => old_post.title,
-      :content  => 'Test Content'
+    @post.update_attributes!(published_at: Time.now)
+    post = @site.blog_posts.new(
+      title:  @post.title,
+      layout: @layout
     )
     assert post.invalid?
     assert_errors_on post, [:slug]
 
-    old_post.update_attributes!(:published_at => 1.year.ago)
+    @post.update_attributes!(published_at: 1.year.ago)
     assert post.valid?
   end
 
   def test_validation_of_slug_format
-    post = comfy_blog_blogs(:default).posts.new(
-      :title    => 'Test Title',
-      :slug     => 'test%slug',
-      :content  => 'Test Content'
+    post = @site.blog_posts.new(
+      title: 'Test Title',
+      slug:  'test%slug',
+      layout: @layout
     )
     assert post.valid?
   end
 
   def test_creation
-    assert_difference 'Comfy::Blog::Post.count' do
-      post = comfy_blog_blogs(:default).posts.create!(
-        :title    => 'Test Post',
-        :content  => 'Test Content'
+    assert_difference -> {Comfy::Blog::Post.count} do
+      post = @site.blog_posts.create!(
+        title: 'Test Post',
+        layout: @layout
       )
-      assert_equal 'test-post', post.slug
-      assert_equal Time.now.year, post.year
-      assert_equal Time.now.month, post.month
+      assert_equal 'test-post',     post.slug
+      assert_equal Time.now.year,   post.year
+      assert_equal Time.now.month,  post.month
     end
   end
 
   def test_set_slug
-    post = Comfy::Blog::Post.new(:title => 'Test Title')
+    post = Comfy::Blog::Post.new(title: 'Test Title')
     post.send(:set_slug)
     assert_equal 'test-title', post.slug
   end
@@ -59,7 +64,7 @@ class BlogPostsTest < ActiveSupport::TestCase
     post = Comfy::Blog::Post.new
     post.send(:set_published_at)
     post.send(:set_date)
-    assert_equal post.published_at.year, post.year
+    assert_equal post.published_at.year,  post.year
     assert_equal post.published_at.month, post.month
   end
 
@@ -69,18 +74,11 @@ class BlogPostsTest < ActiveSupport::TestCase
     assert post.published_at.present?
   end
 
-  def test_destroy
-    assert_difference ['Comfy::Blog::Post.count', 'Comfy::Blog::Comment.count'], -1 do
-      comfy_blog_posts(:default).destroy
-    end
-  end
-
   def test_scope_published
-    post = comfy_blog_posts(:default)
-    assert post.is_published?
+    assert @post.is_published?
     assert_equal 1, Comfy::Blog::Post.published.count
 
-    post.update_attribute(:is_published, false)
+    @post.update_attribute(:is_published, false)
     assert_equal 0, Comfy::Blog::Post.published.count
   end
 
@@ -94,4 +92,11 @@ class BlogPostsTest < ActiveSupport::TestCase
     assert_equal 0, Comfy::Blog::Post.for_month(2).count
   end
 
-end
+  def test_url
+    assert_equal '//test.host/blog/2012/1/default-title', @post.url
+    assert_equal '/blog/2012/1/default-title', @post.url(relative: true)
+
+    ComfyBlog.config.public_blog_path = "test-blog"
+    assert_equal '//test.host/test-blog/2012/1/default-title', @post.url
+  end
+end

data/test/test_helper.rb

@@ -1,31 +1,33 @@
-require 'coveralls'
-Coveralls.wear!('rails')
-
 ENV['RAILS_ENV'] = 'test'
 
+require 'simplecov'
+require 'coveralls'
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter 'lib/generators'
+  add_filter 'lib/comfy_blog/engine.rb '
+end
 require_relative '../config/environment'
+
 require 'rails/test_help'
 require 'rails/generators'
 
 Rails.backtrace_cleaner.remove_silencers!
 
-# Load fixtures from the engine
-ActiveSupport::TestCase.fixture_path = File.expand_path('../fixtures', __FILE__)
-
 class ActiveSupport::TestCase
-  
+
   fixtures :all
-  
+
   setup :reset_config
-  
+
   def reset_config
     ComfyBlog.configure do |config|
-      config.posts_per_page         = 10
-      config.auto_publish_comments  = false
-      config.default_author         = nil
+      config.posts_per_page   = 10
+      config.app_layout       = 'comfy/blog/application'
+      config.public_blog_path = 'blog'
     end
   end
-  
+
   # Example usage:
   #   assert_has_errors_on @record, :field_1, :field_2
   def assert_errors_on(record, *fields)
@@ -34,7 +36,7 @@ class ActiveSupport::TestCase
     unmatched = fields.flatten - record.errors.keys
     assert unmatched.blank?, "#{record.class} doesn't have errors on '#{unmatched.join(', ')}'"
   end
-  
+
   # Example usage:
   #   assert_exception_raised                                 do ... end
   #   assert_exception_raised ActiveRecord::RecordInvalid     do ... end
@@ -55,27 +57,37 @@ class ActiveSupport::TestCase
       flunk 'Exception was not raised'
     end
   end
-  
+
 end
 
-class ActionController::TestCase
-  
-  setup :set_basic_auth
-  
-  # CMS by default is going to prompt with basic auth request
-  def set_basic_auth
-    @request.env['HTTP_AUTHORIZATION'] = "Basic #{Base64.encode64('username:password')}"
+class ActionDispatch::IntegrationTest
+
+  setup :setup_host
+
+  def setup_host
+    host! 'test.host'
+  end
+
+  # Attaching http_auth stuff with request. Example use:
+  #   r :get, '/cms-admin/pages'
+  def r(method, path, options = {})
+    headers = options[:headers] || {}
+    headers['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(
+      ComfortableMexicanSofa::AccessControl::AdminAuthentication.username,
+      ComfortableMexicanSofa::AccessControl::AdminAuthentication.password
+    )
+    options.merge!(headers: headers)
+    send(method, path, options)
   end
-  
 end
 
 class Rails::Generators::TestCase
-  
+
   destination File.expand_path('../tmp', File.dirname(__FILE__))
-  
+
   setup :prepare_destination,
         :prepare_files
-  
+
   def prepare_files
     config_path = File.join(self.destination_root, 'config')
     routes_path = File.join(config_path, 'routes.rb')
@@ -85,7 +97,7 @@ class Rails::Generators::TestCase
       f.write("Test::Application.routes.draw do\n\nend")
     end
   end
-  
+
   def read_file(filename)
     File.read(
       File.join(
@@ -94,5 +106,4 @@ class Rails::Generators::TestCase
       )
     )
   end
-  
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfy_blog
 version: !ruby/object:Gem::Version
-  version: 1.12.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: comfortable_mexican_sofa
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.7
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.12.7
+        version: 2.0.0
 description: Simple Blog Engine for ComfortableMexicanSofa
 email:
 - oleg@khabarov.ca
@@ -37,33 +37,17 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/controllers/comfy/admin/blog/base_controller.rb
-- app/controllers/comfy/admin/blog/blogs_controller.rb
-- app/controllers/comfy/admin/blog/comments_controller.rb
 - app/controllers/comfy/admin/blog/posts_controller.rb
-- app/controllers/comfy/blog/base_controller.rb
-- app/controllers/comfy/blog/comments_controller.rb
 - app/controllers/comfy/blog/posts_controller.rb
-- app/models/comfy/blog/blog.rb
-- app/models/comfy/blog/comment.rb
 - app/models/comfy/blog/post.rb
-- app/views/comfy/admin/blog/blogs/_form.html.haml
-- app/views/comfy/admin/blog/blogs/edit.html.haml
-- app/views/comfy/admin/blog/blogs/index.html.haml
-- app/views/comfy/admin/blog/blogs/new.html.haml
-- app/views/comfy/admin/blog/comments/_comment.html.haml
-- app/views/comfy/admin/blog/comments/index.html.haml
-- app/views/comfy/admin/blog/comments/toggle_publish.js.erb
 - app/views/comfy/admin/blog/partials/_navigation.html.haml
 - app/views/comfy/admin/blog/posts/_form.html.haml
 - app/views/comfy/admin/blog/posts/edit.html.haml
 - app/views/comfy/admin/blog/posts/index.html.haml
 - app/views/comfy/admin/blog/posts/new.html.haml
-- app/views/comfy/blog/comments/_form.html.haml
 - app/views/comfy/blog/posts/index.html.haml
 - app/views/comfy/blog/posts/index.rss.builder
-- app/views/comfy/blog/posts/show.html.haml
-- app/views/layouts/comfy/blog/application.html.haml
+- app/views/layouts/comfy/blog/application.html.erb
 - comfy_blog.gemspec
 - config.ru
 - config/application.rb
@@ -74,7 +58,25 @@ files:
 - config/environments/development.rb
 - config/environments/test.rb
 - config/initializers/comfy_blog.rb
-- config/initializers/secret_token.rb
+- config/locales/cs.yml
+- config/locales/da.yml
+- config/locales/de.yml
+- config/locales/en.yml
+- config/locales/es.yml
+- config/locales/fr.yml
+- config/locales/it.yml
+- config/locales/ja.yml
+- config/locales/nb.yml
+- config/locales/nl.yml
+- config/locales/pl.yml
+- config/locales/pt-BR.yml
+- config/locales/ru.yml
+- config/locales/sv.yml
+- config/locales/tr.yml
+- config/locales/uk.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
+- config/storage.yml
 - db/migrate/00_create_cms.rb
 - db/migrate/01_create_blog.rb
 - lib/comfy_blog.rb
@@ -87,24 +89,16 @@ files:
 - lib/generators/comfy/blog/README
 - lib/generators/comfy/blog/blog_generator.rb
 - script/rails
-- test/controllers/comfy/admin/blog/blogs_controller_test.rb
-- test/controllers/comfy/admin/blog/comments_controller_test.rb
 - test/controllers/comfy/admin/blog/posts_controller_test.rb
-- test/controllers/comfy/blog/comments_controller_test.rb
 - test/controllers/comfy/blog/posts_controller_test.rb
-- test/fixtures/comfy/blog/blogs.yml
-- test/fixtures/comfy/blog/comments.yml
 - test/fixtures/comfy/blog/posts.yml
+- test/fixtures/comfy/cms/layouts.yml
 - test/fixtures/comfy/cms/sites.yml
 - test/fixtures/generators/blog/routes.rb
-- test/gemfiles/Gemfile.rails.4.0
-- test/gemfiles/Gemfile.rails.4.1
-- test/gemfiles/Gemfile.rails.4.2
-- test/gemfiles/Gemfile.rails.master
+- test/gemfiles/Gemfile.rails.5.2
 - test/generators/blog_generator_test.rb
+- test/integration/i18n_test.rb
 - test/lib/configuration_test.rb
-- test/models/blog_test.rb
-- test/models/comments_test.rb
 - test/models/posts_test.rb
 - test/test_helper.rb
 homepage: http://github.com/comfy/comfy-blog
@@ -119,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -127,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Simple Blog Engine for ComfortableMexicanSofa