spokes_blog 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fe259d812ee077303d0c8568d0a53924a821b3e
-  data.tar.gz: 2f80615157378e1ac24d23f6511fac08291bcb01
+  metadata.gz: 6512cf9fc0e532bb2bcda3ef233435ff8341435c
+  data.tar.gz: 042c3f97f6342d2c94fec5f9dc488c94b59a6a12
 SHA512:
-  metadata.gz: c11e7fcfae26f4703f72477d5966274f90ccc87af915a5e5a610ec68650fe031ea033837196cfb25aed008fd93d1ac4b79a5016abc1e11bd85dfc6212ef868a7
-  data.tar.gz: 0f1e23c806718d6e84eb4b20d6f082100bfd0fda023ceb1e3700b9028ed88ba2350fb0e713f56b99fc7a91c1c21595c6f082c03f4844580a548a2171ec2ff187
+  metadata.gz: 182e4c97fd9107558abe9b2ddb0af5d2cf4fbbfbd25640fe83e8f32450ab47248333b8d8b153501aa339948001f7eee8d67e7083c12d0b9e13d19e851e778d92
+  data.tar.gz: a4d4e2b6700204f6a3f6b8b8d8cc147e8f2f6e026c9db8cf64d2e44cd09959934e807fe5a199fc50965fa0650e3f7e39b355ab610e4fe4431eb8c155039d0842

data/lib/generators/spokes_blog/spokes_blog_generator.rb

@@ -9,35 +9,40 @@ module SpokesBlog
         generate "acts_as_taggable_on:migration"
       end
 
-      def generate_files
-        #models and concerns
+      def copy_models_and_concerns
         copy_file "models/block.rb", "app/models/spokes_blog/block.rb"
         copy_file "models/post.rb", "app/models/spokes_blog/post.rb"
         copy_file "models/seo_meta.rb", "app/models/spokes_blog/seo_meta.rb"
         copy_file "models/concerns/pageable.rb", "app/models/spokes_blog/concerns/pageable.rb"
+      end
 
 
-        #controllers
+      def copy_controllers
         copy_file "controllers/admin/posts_controller.rb", "app/controllers/admin/spokes_blog/posts_controller.rb"
         copy_file "controllers/posts_controller.rb", "app/controllers/spokes_blog/posts_controller.rb"
+      end
 
-        #admin views
+      def copy_admin_views
         copy_file "views/admin/index.html.haml", "app/views/admin/spokes_blog/posts/index.html.haml"
         copy_file "views/admin/index.json.jbuilder", "app/views/admin/spokes_blog/posts/index.json.jbuilder"
         copy_file "views/admin/new.html.haml", "app/views/admin/spokes_blog/posts/new.html.haml"
         copy_file "views/admin/_form.html.haml", "app/views/admin/spokes_blog/posts/_form.html.haml"
         copy_file "views/admin/_block_content_form.html.haml", "app/views/admin/spokes_blog/posts/_block_content_form.html.haml"
+        copy_file "views/admin/_seo_meta_form.html.haml", "app/views/admin_spokes_blog/posts/_seo_meta_form.html.haml"
+      end
 
-        #user_views
+      def copy_user_views
         copy_file "views/index.html.haml", "app/views/spokes_blog/posts/index.html.haml"
         copy_file "views/show.html.haml", "app/views/spokes_blog/posts/show.html.haml"
+      end
 
 
-        #presenters
+      def copy_presenters
         copy_file "presenters/presenter.rb", "app/presenters/spokes_blog/presenter.rb"
         copy_file "presenters/post_presenter.rb", "app/presenters/spokes_blog/post_presenter.rb"
+      end
 
-        #modify or create user model
+      def modify_or_create_user_model
         if File.exist?(Rails.root.join('app', 'models', 'user.rb')) and
           File.readlines(Rails.root.join('app', 'models', 'user.rb')).grep(/authored_posts/).size == 0
           line = "class User < ActiveRecord::Base"
@@ -47,60 +52,67 @@ module SpokesBlog
         else
           copy_file "models/user.rb", "app/models/user.rb"
         end
+      end
 
-        #modify routes file using default routes
+      def add_default_routes
         if File.readlines(Rails.root.join('config', 'routes.rb')).grep(/spokes_blog/).size == 0
           line = "::Application.routes.draw do"
           gsub_file Rails.root.join('config', 'routes.rb'), /(#{Regexp.escape(line)})/mi do |match|
             %{#{match}
-      namespace :admin do
-        scope module: 'spokes_blog' do
-          resources :posts
-        end
-      end
+  namespace :admin do
+    scope module: 'spokes_blog' do
+      resources :posts
+    end
+  end
 
-      scope module: 'spokes_blog' do
-        resources :posts
-      end}
+  scope module: 'spokes_blog' do
+    resources :posts, only: [:index]
+  end
+  get "/posts/:slug" => "spokes_blog/posts#show", as: :post_slug
+  }
           end
         end
+      end
 
-        #modify application.rb ot add models and concerns to load path
+      def add_spokes_blog_models_to_load_path
         if File.readlines(Rails.root.join("config", "application.rb")).grep(/spokes_blog config/).size == 0
           line = "class Application < Rails::Application"
           gsub_file Rails.root.join("config", "application.rb"), /(#{Regexp.escape(line)})/mi do |match|
             %{#{match}
-        # spokes_blog config
-        config.autoload_paths += Dir[Rails.root.join('app', 'models', '{**/}')]}
+    # spokes_blog config
+    config.autoload_paths += Dir[Rails.root.join('app', 'models', '{**/}')]}
           end
         end
+      end
 
-        #add acts-as-taggable-on to gemfile
-        add_gem_entry_to_gemfile("acts-as-taggable-on")
-        add_gem_entry_to_gemfile("haml")
-        add_gem_entry_to_gemfile("kaminari")
+      def add_gems_to_gem_file
+        %w(acts-as-taggable-on haml kaminari).each do |gem|
+          add_gem_entry_to_gemfile(gem)
+        end
+      end
 
-        #migrations for posts and blocks
+      def create_migrations
+        @migration_count = 10
         if Dir.glob("db/migrate/*_create_post.rb").empty?
-          sleep(1)
+          #sleep(1)
           copy_file "migrations/post_migration.rb", "db/migrate/#{migration_timestamp}_create_post.rb"
         end
         if Dir.glob("db/migrate/*_create_block.rb").empty?
-          sleep(1)
+          #sleep(1)
           copy_file "migrations/block_migration.rb", "db/migrate/#{migration_timestamp}_create_block.rb"
         end
         if Dir.glob("db/migrate/*_create_seo_meta.rb").empty?
-          sleep(1)
+          #sleep(1)
           copy_file "migrations/seo_meta_migration.rb", "db/migrate/#{migration_timestamp}_create_seo_meta.rb"
         end
-
       end
 
       private
 
       def migration_timestamp
         migration_number = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-        migration_number += 1
+        migration_number += @migration_count
+        @migration_count += 1
         migration_number.to_s
       end
 

data/lib/generators/spokes_blog/templates/controllers/admin/posts_controller.rb

@@ -47,7 +47,9 @@ class Admin::SpokesBlog::PostsController < ApplicationController
 
   def post_params
     params.require(:spokes_blog_post).permit(:title, :slug, :description, :tag_list,
-                                 :author_id, blocks_attributes: [:content, :id])
+                                 :author_id, :state,
+                                 blocks_attributes: [:content, :id],
+                                seo_meta_attributes: [:browser_title, :meta_description])
   end
 end
 

data/lib/generators/spokes_blog/templates/controllers/posts_controller.rb

@@ -1,11 +1,12 @@
 class SpokesBlog::PostsController < ApplicationController
+  around_filter :check_if_record_found, only: :show
 
   def index
     @posts = SpokesBlog::Post.published.page(params[:page]).per(10)
   end
 
   def show
-    @presenter = post_presenter.single_post(slug: params[:slug])
+    @presenter = SpokesBlog::Post.post_presenter.single_post(slug: params[:slug])
   end
 
   private
@@ -13,5 +14,15 @@ class SpokesBlog::PostsController < ApplicationController
   def post_presenter
     @post_presenter || @post_presenter = PostPresenter.new
   end
+
+  def check_if_record_found 
+    begin
+      yield
+    rescue ActiveRecord::RecordNotFound
+      #this should be handled in application controller
+      raise ActionController::RoutingError.new("Not Found")
+    end
+  end
+
 end
 

data/lib/generators/spokes_blog/templates/models/concerns/pageable.rb

@@ -26,7 +26,7 @@ module Pageable
 
   module ClassMethods
     def by_slug(slug)
-      self.find_by(slug: slug)
+      self.find_by!(slug: slug)
     end
 
     def by_template(template)

data/lib/generators/spokes_blog/templates/models/post.rb

@@ -6,10 +6,13 @@ class SpokesBlog::Post < ActiveRecord::Base
   belongs_to :created_by, class_name: User
   belongs_to :author, class_name: User
   has_many :blocks, class_name: :'SpokesBlog::Block'
+  has_one :seo_meta, as: :seo_meta, class_name: :'SpokesBlog::SeoMeta'
 
   accepts_nested_attributes_for :blocks,
     reject_if: lambda { |attrs| attrs['content'].blank? }
 
+  accepts_nested_attributes_for :seo_meta
+
   validates_presence_of :title, :slug
 
   validates_format_of :slug, with: /\A[a-zA-Z0-9-]+\z/

data/lib/generators/spokes_blog/templates/models/seo_meta.rb

@@ -1,4 +1,4 @@
-class SeoMeta < ActiveRecord::Base
+class SpokesBlog::SeoMeta < ActiveRecord::Base
   belongs_to :seo_meta, polymorphic: true
 
 end

data/lib/generators/spokes_blog/templates/presenters/post_presenter.rb

@@ -1,7 +1,7 @@
 class SpokesBlog::PostPresenter < Presenter
 
   def single_post(params = {})
-    @post = Post.includes(:author).includes(:blocks).by_slug(params[:slug])
+    @post = SpokesBlog::Post.includes(:author).includes(:blocks).includes(:seo_meta).by_slug(params[:slug])
     self
   end
 
@@ -20,5 +20,13 @@ class SpokesBlog::PostPresenter < Presenter
   def published_at
     @post.updated_at.strftime("%A, %b %d, %Y")
   end
+
+  def browser_title
+    @post.seo_meta.browser_title
+  end
+
+  def meta_description
+    @post.seo_meta.meta_description
+  end
 end
 

data/lib/generators/spokes_blog/templates/views/admin/_block_content_form.html.haml

@@ -1,4 +1,4 @@
 = f.fields_for :blocks do |block_form|
   = block_form.label :content
-  = block_form.text_area
+  = block_form.text_area :content
 

data/lib/generators/spokes_blog/templates/views/admin/_form.html.haml

@@ -1,18 +1,25 @@
-= form_for [:admin, @post] do |f|
-  %fieldset
-    = f.label :title
-    = f.text_field :title
+%fieldset
+  = f.label :title
+  = f.text_field :title
 
-    = f.label :slug
-    = f.text_field :slug
+  = f.label :slug
+  = f.text_field :slug
 
-    = f.label :description
-    = f.text_area :description
+  = f.label :description
+  = f.text_area :description
 
-    = render "block_content_form", { f: f }
+  = render "seo_meta_form", { f: f }
 
-    = f.label :tags
-    = f.text_field :tag_list
+  = render "block_content_form", { f: f }
 
-    = f.submit "Submit"
+  = f.label :author_id
+  = f.select :author_id, options_from_collection_for_select(User.all.where(role: :admin), "id", "email", current_user.id)
+
+  = f.label :state
+  = f.select :state, options_from_collection_for_select(SpokesBlog::Post::STATES, :last, :first, @post.state)
+
+  = f.label :tags
+  = f.text_field :tag_list
+
+  = f.submit "Submit"
 

data/lib/generators/spokes_blog/templates/views/admin/_seo_meta_form.html.haml

@@ -0,0 +1,7 @@
+= f.fields_for :seo_meta, @post.seo_meta||SpokesBlog::SeoMeta.new do |meta|
+  = meta.label :browser_title
+  = meta.text_field :browser_title
+
+  = meta.label :meta_description
+  = meta.text_field :meta_description
+

data/lib/generators/spokes_blog/templates/views/admin/edit.html.haml

@@ -0,0 +1,2 @@
+= form_for @post, url: admin_post_path(@post) do |f|
+  = render "form", { f: f }

data/lib/generators/spokes_blog/templates/views/admin/index.html.haml

@@ -14,12 +14,12 @@
   $(document).ready(function() {
     $('.table').dataTable({
       "bProcessing": true,
-      "sAjaxSource": "/admin/spokes_blog/posts.json",
+      "sAjaxSource": "/admin/posts.json",
       "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
       "sPaginationType": "bootstrap"
       });
 
-    $.extend($.fin.dataTableExt.oStdClasses, {
+    $.extend($.fn.dataTableExt.oStdClasses, {
       "sWrapper": "dataTables_wrapper form-inline"
     });
   });

data/lib/generators/spokes_blog/templates/views/admin/new.html.haml

@@ -1 +1,2 @@
-= render "form"
+= form_for @post, url: admin_posts_path(@post) do |f|
+  = render "form", { f: f }

data/lib/generators/spokes_blog/templates/views/show.html.haml

@@ -1,6 +1,6 @@
 = @presenter.title
 = @presenter.published_at
 = @presenter.author
-- @presenter.blocks.each do |block|
+- @presenter.content.each do |block|
   = block.content.html_safe
 

data/lib/spokes_blog/version.rb

@@ -1,3 +1,3 @@
 module SpokesBlog
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spokes_blog
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Matt Obarzanek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,9 @@ files:
 - lib/generators/spokes_blog/templates/views/admin/_block_content_form.html.haml
 - lib/generators/spokes_blog/templates/views/admin/new.html.haml
 - lib/generators/spokes_blog/templates/views/admin/index.html.haml
+- lib/generators/spokes_blog/templates/views/admin/edit.html.haml
 - lib/generators/spokes_blog/templates/views/admin/_form.html.haml
+- lib/generators/spokes_blog/templates/views/admin/_seo_meta_form.html.haml
 - lib/generators/spokes_blog/templates/views/show.html.haml
 - lib/generators/spokes_blog/templates/views/index.html.haml
 - lib/generators/spokes_blog/templates/controllers/admin/posts_controller.rb