days 0.2.0 → 1.0.0.rc1

data/app/views/admin.haml

@@ -3,35 +3,45 @@
   %head
     %meta{charset: 'UTF-8'}
     %meta{name: "viewport", content: "width=device-width, initial-scale=1.0"}
-    %link{href: "/assets/bootstrap.min.css", rel: "stylesheet"}
+    %link{href: "/assets/admin/bootstrap.min.css", rel: "stylesheet"}
     %link{href: "/assets/admin.css", rel: "stylesheet", media: "screen"}
-    %link{href: "/assets/bootstrap-responsive.min.css", rel: "stylesheet"}
-    %script{src: '/assets/jquery-1.8.3.min.js'}
-    %script{src: '/assets/bootstrap.min.js'}
+    %script{src: '/assets/jquery-2.1.3.min.js'}
+    %script{src: '/assets/admin/bootstrap.min.js'}
     - if @title
       %title #{@title} - Days Admin
     - else
       %title Days Admin
   %body
-    .navbar.navbar-inverse.navbar-fixed-top
-      .navbar-inner
-        .container
-          %a.btn.btn-navbar{data: {toggle: 'collapse', target: '.nav-collapse'}}
+    %nav.navbar.navbar-default.navbar-fixed-top
+      .container
+        .navbar-header
+          %button.navbar-toggle.collapsed{type: 'button', data: {toggle: 'collapse', target: '#navbar-collapse-1'}}
+            %span.sr-only Toggle navigation
             %span.icon-bar
             %span.icon-bar
             %span.icon-bar
-          %a.brand{href: '/admin/'} Days
-          %form.navbar-form.pull-right{action: "/admin/logout", method: "POST"}
-            != csrf_tag
-            %button.btn.btn-link{type: 'submit'} Log out
-            %a.btn.btn-primary{href: '/admin/entries/new'} New Entry
 
-          %div.nav-collapse.collapse
-            %ul.nav
-              %li
-                %a{href: '/admin/entries'} Entries
-              %li
-                %a{href: '/admin/categories'} Categories
-              %li
-                %a{href: '/admin/users'} Users
+          %a.navbar-brand{href: '/admin/'} Days
+
+        %form.navbar-form.navbar-right.hidden-xs{action: "/admin/logout", method: "POST"}
+          != csrf_tag
+          %button.btn.btn-link{type: 'submit'} Log out
+          %a.btn.btn-default{href: '/admin/entries/new'} New Entry
+
+        %div.collapse.navbar-collapse#navbar-collapse-1
+          %ul.nav.navbar-nav
+            %li.visible-xs
+              %form
+                %a.btn.btn-default.visible-xs{href: '/admin/entries/new'} New Entry
+            %li
+              %a{href: '/admin/entries'} Entries
+            %li
+              %a{href: '/admin/categories'} Categories
+            %li
+              %a{href: '/admin/users'} Users
+            %li.visible-xs
+              %form.form-inline{action: "/admin/logout", method: "POST"}
+                != csrf_tag
+                %button.btn.btn-link{type: 'submit'} Log out
+
     != yield

data/days.gemspec

@@ -17,31 +17,34 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "sinatra", '~> 1.3.3'
+  gem.add_dependency "sinatra", '>= 1.4.5'
   gem.add_dependency "thor", '~> 0.16.0'
-  gem.add_dependency "rack_csrf", '~> 2.4.0'
+  gem.add_dependency "rack_csrf", '~> 2.5.0'
 
   gem.add_dependency "settingslogic", '~> 2.0.9'
 
-  gem.add_dependency "sprockets", '~> 2.2.2'
-  gem.add_dependency "haml", '~> 3.1.7'
+  gem.add_dependency "sprockets", '~> 2.12.3'
+  gem.add_dependency "faml", '>= 0.2.4'
   gem.add_dependency "sass", '~> 3.2.5'
 
-  gem.add_dependency "redcarpet", '~> 2.2.2'
-  gem.add_dependency "builder", '~> 3.0.0'
+  gem.add_dependency "builder", '~> 3.1'
 
-  gem.add_dependency "activerecord", "~> 3.2.14"
-  gem.add_dependency "kaminari", "~> 0.13"
+  gem.add_dependency "activerecord", "~> 4.2.0"
+  gem.add_dependency "protected_attributes"
+  gem.add_dependency "kaminari", "~> 0.16.1"
   gem.add_dependency "padrino-helpers", '~> 0.9.21'
   gem.add_dependency "stringex", '~> 1.5.1'
-  gem.add_dependency "bcrypt-ruby", '~> 3.0.1'
+  gem.add_dependency "bcrypt", '~> 3.1.9'
+
+  gem.add_dependency "html-pipeline", '>= 1.11.0'
+  gem.add_dependency "github-markdown"
 
   gem.add_development_dependency "sqlite3"
 
-  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rspec", '~> 3.2.0'
   gem.add_development_dependency "rack-test"
   gem.add_development_dependency "fuubar"
+  gem.add_development_dependency "database_rewinder"
 
   gem.add_dependency "pry"
-  gem.add_development_dependency "pry-nav"
 end

data/lib/days/app/admin/entries.rb

@@ -1,7 +1,11 @@
 module Days
   class App < Sinatra::Base
     get "/admin/entries", :admin_only => true do
-      @entries = Entry.order('id DESC').all
+      @entries = Entry.order(id: :desc)
+      @entries = @entries.draft if params[:draft] && !params[:draft].empty?
+      @entries = @entries.scheduled if params[:scheduled] && !params[:scheduled].empty?
+      @entries = @entries.published if params[:published] && !params[:published].empty?
+      @entries = @entries.page(params[:page] || 1)
       haml :'admin/entries/index', layout: :admin
     end
 
@@ -22,6 +26,7 @@ module Days
 
         @entry = Entry.new(entry)
         @entry.user = current_user
+        @entry.pipeline = config.html_pipeline if config.html_pipeline
 
         if @entry.save
           redirect "/admin/entries/#{@entry.id}" # FIXME: Permalink
@@ -36,19 +41,20 @@ module Days
     end
 
     get "/admin/entries/:id", :admin_only => true do
-      @entry = Entry.where(id: params[:id]).first || halt(404)
+      @entry = Entry.find_by(id: params[:id]) || halt(404)
       @categories = Category.all
       haml :'admin/entries/form', layout: :admin
     end
 
     put "/admin/entries/:id", :admin_only => true do
       entry = params[:entry] || halt(400)
-      @entry = Entry.where(id: params[:id]).first || halt(404)
+      @entry = Entry.find_by(id: params[:id]) || halt(404)
+      @entry.pipeline = config.html_pipeline if config.html_pipeline
 
       entry[:categories] = Category.where(
         id: (entry[:categories] || {}).keys.map(&:to_i)
       )
-      @entry.update_attributes(entry)
+      @entry.assign_attributes(entry)
 
       if @entry.save
         redirect "/admin/entries/#{@entry.id}"
@@ -60,7 +66,7 @@ module Days
     end
 
     delete "/admin/entries/:id", :admin_only => true do
-      @entry = Entry.where(id: params[:id]).first || halt(404)
+      @entry = Entry.find_by(id: params[:id]) || halt(404)
       @entry.destroy
 
       redirect "/admin/entries"

data/lib/days/app/entries.rb

@@ -20,7 +20,7 @@ module Days
         end
       end
 
-      entry = Entry.where(old_path: request.path).first
+      entry = Entry.find_by(old_path: request.path)
       if entry
         return [301, {'Location' => entry_path(entry)}, ""]
       end
@@ -32,7 +32,7 @@ module Days
     end
 
     get '/category/:name' do
-      category = Category.where(name: params[:name]).first || halt(404)
+      category = Category.find_by(name: params[:name]) || halt(404)
       @entries = category.entries.published.page(params[:page] || 1)
       haml :entries
     end
@@ -50,20 +50,15 @@ module Days
       haml :entries
     end
 
-    get '/feed' do
-      content_type 'application/atom+xml'
-      entries = Entry.published.first(50)
-
+    private def generate_atom_feed(entries, title: config.title, html_path: '/feed')
       xml = Builder::XmlMarkup.new
-
       xml.instruct!
-
       xml.feed("xmlns" => 'http://www.w3.org/2005/Atom') do
         xml.id("tag:#{request.host},2005:#{request.fullpath.split(".")[0]}")
 
-        xml.link(:rel => 'alternate', :type => 'text/html', :href => request.url.gsub(/feed$/,''))
+        xml.link(:rel => 'alternate', :type => 'text/html', :href => [request.base_url, config.base_path, html_path].join.gsub(%r{//}, '/'))
         xml.link(:rel => 'self', :type => 'application/atom+xml', :href => request.url)
-        xml.title config.title
+        xml.title title
 
         xml.updated(entries.map(&:updated_at).max)
 
@@ -74,14 +69,30 @@ module Days
             xml.published entry.published_at.xmlschema
             xml.updated entry.updated_at.xmlschema
 
-            xml.link(rel: 'alternate', type: 'text/html', href: "#{request.url.gsub(/\/feed$/,'')}#{entry_path(entry)}")
-
             xml.title entry.title
 
-            xml.content(entry.short_rendered { '... <a href="'+entry_path(entry)+'">Continue Reading</a>' }, type: 'html')
+            href = [request.base_url, config.base_path, entry_path(entry)].join.gsub(%r{//}, '/')
+            xml.link(rel: 'alternate', type: 'text/html', href: href)
+            xml.content(entry.short_rendered { '... <a href="'+href+'">Continue Reading</a>' }, type: 'html')
           end
         end
       end
     end
+
+    get '/feed' do
+      entries = Entry.published.page(params[:page])
+
+      content_type 'application/atom+xml'
+      generate_atom_feed(entries)
+    end
+
+    get '/feed/category/:name' do
+      category = Category.find_by(name: params[:name]) || halt(404)
+      entries = category.entries.published.page(params[:page])
+
+      content_type 'application/atom+xml'
+      generate_atom_feed(entries, title: "#{config.title} (Category: #{category.name})", html_path: "/category/#{category.name}")
+    end
+
   end
 end

data/lib/days/app.rb

@@ -5,7 +5,7 @@ require 'rack/csrf'
 require_relative 'config'
 require_relative 'models'
 require_relative 'helpers'
-require 'haml'
+require 'faml'
 require 'sass'
 
 I18n.load_path.reject! {|_| _.match(/padrino/) }
@@ -48,8 +48,6 @@ module Days
     set(:config, nil)
     set :method_override, true
 
-    set :haml, :escape_html => true
-
     helpers Helpers
     helpers Kaminari::Helpers::SinatraHelpers
 
@@ -106,6 +104,7 @@ module Days
           env.append_path "#{self.root}/images"
         })
         config.establish_db_connection()
+        config.run_scripts()
         x
       end
     end

data/lib/days/command.rb

@@ -55,7 +55,7 @@ module Days
     desc "server", "Starts the server"
     method_option :config, :type => :string, :aliases => "-c"
     method_option :port, :type => :numeric, :aliases => "-p", :default => 3162
-    method_option :bind, :type => :string, :aliases => "-b", :default => nil
+    method_option :bind, :type => :string, :aliases => "-b", :default => 'localhost'
     method_option :environment, :type => :string, :aliases => "-e", :default => "development"
     method_option :pid, :type => :string, :aliases => "-c"
     def server

data/lib/days/config.rb

@@ -1,5 +1,6 @@
 require_relative 'app'
-require 'active_record'
+require 'days/models/base'
+require 'html/pipeline'
 require 'logger'
 require 'settingslogic'
 
@@ -33,17 +34,29 @@ module Days
       end
     end
 
+    attr_accessor :html_pipeline
 
-    def establish_db_connection(force=false)
+    def run_scripts
+      instance_eval (self[:script_lines] || []).join("\n")
+
+      (self[:scripts] || []).each do |_|
+        path = File.expand_path(_, self[:root])
+        instance_eval File.read(path), path, 1
+      end
+    end
+
+    def establish_db_connection(force=false, base: ActiveRecord::Base)
       if Days::App.environment.to_sym == :development && (self.has_key?(:activerecord_log) ? self.activerecord_log == true : true)
-        ActiveRecord::Base.logger = Logger.new($stdout)
+        base.logger = Logger.new($stdout)
       end
 
+      base.default_timezone = self['database_timezone'] ? self['database_timezone'].to_sym : :local
+
       begin
         raise ActiveRecord::ConnectionNotEstablished if force
-        return ActiveRecord::Base.connection
+        return base.connection
       rescue ActiveRecord::ConnectionNotEstablished
-        ActiveRecord::Base.establish_connection(self['database'] ? Hash[self.database] : ENV["DATABASE_URL"])
+        base.establish_connection(self['database'] ? Hash[self.database] : ENV["DATABASE_URL"])
         retry
       end
     end

data/lib/days/helpers.rb

@@ -38,8 +38,12 @@ module Days
       config.permalink.gsub(/{(\w+?)}/) { hash[$1.to_sym] }
     end
 
+    def self.lookup_entry_regexp_for(permalink_format)
+      (@lookup_entry_regexp_cache ||= {})[permalink_format] ||= Regexp.compile(Regexp.escape(permalink_format).gsub(/\\{(\w+?)\\}/) { "(?<#{$1}>.+?)" } + "$")
+    end
+
     def lookup_entry(path)
-      regexp = Regexp.compile(Regexp.escape(config.permalink).gsub(/\\{(\w+?)\\}/) { "(?<#{$1}>.+?)" } + "$")
+      regexp = Helpers.lookup_entry_regexp_for(config.permalink)
       m = regexp.match(path)
       return nil unless m
 
@@ -48,27 +52,25 @@ module Days
         hash
       end
 
-
       if match[:id] || match[:slug]
         if match[:id]
-          query = Entry.where(id: match[:id])
+          entry = Entry.find(match[:id])
         else
-          query = Entry.where(slug: match[:slug])
+          entry = Entry.find_by(slug: match[:slug])
         end
 
-        entry = query.first
         return nil unless entry
         published_at = entry.published_at
         return nil unless published_at
 
         return nil if match[:slug]   && match[:slug]        != entry.slug
         return nil if match[:id]     && match[:id].to_i     != entry.id
-        return nil if match[:year]   && match[:year].to_i   != published_at.year
-        return nil if match[:month]  && match[:month].to_i  != published_at.month
-        return nil if match[:day]    && match[:day].to_i    != published_at.day
-        return nil if match[:hour]   && match[:hour].to_i   != published_at.hour
-        return nil if match[:minute] && match[:minute].to_i != published_at.min
-        return nil if match[:second] && match[:second].to_i != published_at.sec
+        return nil if match[:year]   && match[:year].to_i   != published_at.localtime.year
+        return nil if match[:month]  && match[:month].to_i  != published_at.localtime.month
+        return nil if match[:day]    && match[:day].to_i    != published_at.localtime.day
+        return nil if match[:hour]   && match[:hour].to_i   != published_at.localtime.hour
+        return nil if match[:minute] && match[:minute].to_i != published_at.localtime.min
+        return nil if match[:second] && match[:second].to_i != published_at.localtime.sec
 
         return entry
       else

data/lib/days/models/base.rb

@@ -0,0 +1,11 @@
+ require 'active_record'
+ require 'protected_attributes'
+ require 'active_record/mass_assignment_security'
+
+module Days
+  module Models
+    class Base < ActiveRecord::Base
+      self.abstract_class = true
+    end
+  end
+end

data/lib/days/models/category.rb

@@ -1,7 +1,7 @@
-require 'active_record'
+require 'days/models/base'
 
 module Days
-  class Category < ActiveRecord::Base
+  class Category < Days::Models::Base
     attr_accessible :name
 
     validates_presence_of :name

data/lib/days/models/entry.rb

@@ -1,9 +1,9 @@
-require 'active_record'
+require 'days/models/base'
+require 'html/pipeline'
 require 'stringex'
-require 'redcarpet'
 
 module Days
-  class Entry < ActiveRecord::Base
+  class Entry < Days::Models::Base
     attr_accessible :title, :body, :slug, :published_at, :categories, :user, :draft, :old_path
 
     validates_uniqueness_of :slug
@@ -18,6 +18,16 @@ module Days
       order('published_at DESC')
     end
 
+    scope :draft, -> do
+      where(published_at: nil)
+    end
+
+    scope :scheduled, -> do
+      includes(:categories).
+      where('published_at IS NOT NULL AND published_at >= ?', Time.now).
+      order('published_at DESC')
+    end
+
     paginates_per 12
 
     def draft=(x)
@@ -45,6 +55,32 @@ module Days
       self.rendered.gsub(/<!-- *more *-->.+\z/m, block_given? ? yield(self) : '')
     end
 
+    def body=(*)
+      @need_rendering = true
+      super
+    end
+
+    def self.default_pipeline
+      HTML::Pipeline.new([
+        HTML::Pipeline::MarkdownFilter,
+      ])
+    end
+
+    def pipeline=(other)
+      @pipeline = other
+    end
+
+    def pipeline
+      @pipeline ||= self.class.default_pipeline
+    end
+
+    def render!(pipeline: self.pipeline)
+      result = pipeline.call(self.body)
+      self.rendered = result[:output].to_s
+      @need_rendering = false
+      nil
+    end
+
     before_validation do
       if draft?
         self.published_at = nil
@@ -55,11 +91,8 @@ module Days
       if self.title && (!self.slug || self.slug.empty?)
         self.slug = self.title.to_url
       end
-      markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
-        :autolink => true, :space_after_headers => true,
-        :no_intra_emphasis => true, :fenced_code_blocks => true,
-        :tables => true, :superscript => true)
-      self.rendered = markdown.render(self.body)
+
+      self.render! if @need_rendering
     end
   end
 end

data/lib/days/models/user.rb

@@ -1,7 +1,7 @@
-require 'active_record'
+require 'days/models/base'
 
 module Days
-  class User < ActiveRecord::Base
+  class User < Days::Models::Base
     has_secure_password
 
     attr_accessible :login_name, :name, :password, :password_confirmation

data/lib/days/version.rb

@@ -1,3 +1,3 @@
 module Days
-  VERSION = "0.2.0"
+  VERSION = "1.0.0.rc1"
 end

data/scripts/tumblr_export.rb

@@ -71,7 +71,7 @@ loop do
   <div class="t-photos-caption">
   #{post['caption']}
   </div>
-</div>
+</section>
       EOF
     when 'quote'
       entry[:title] = post['text'] ? post['text'].dup : ''

data/spec/controllers/admin/categories_spec.rb

@@ -2,9 +2,8 @@ require 'spec_helper'
 
 describe Days::App, type: :controller do
   describe "admin: categories" do
-    fixtures :users, :categories
-    let(:user)  { users(:blogger) }
-    let(:category) { categories(:daily) }
+    let(:user)  { Days::User.create!(login_name: 'blogger', name: 'blogger', password: 'x', password_confirmation: 'x') }
+    let!(:category) { Days::Category.create!(name: 'daily') }
 
     before { login(user) }
 
@@ -13,13 +12,13 @@ describe Days::App, type: :controller do
 
       it_behaves_like 'an admin page'
 
-      it { should be_ok }
+      it { is_expected.to be_ok }
 
       it "lists up categories" do
-        render[:data].should == :'admin/categories'
+        expect(render[:data]).to eq(:'admin/categories')
 
         categories = render[:ivars][:@categories]
-        categories.should == Days::Category.all
+        expect(categories.to_a).to eq([category])
       end
     end
 
@@ -30,20 +29,21 @@ describe Days::App, type: :controller do
       it_behaves_like 'an admin page'
 
       it "creates category" do
-        subject.should be_redirect
+        expect(subject).to be_redirect
 
-        Days::Category.last.name.should == params[:category][:name]
+        expect(Days::Category.last.name).to eq(params[:category][:name])
       end
 
       context "when category is invalid" do
         before do
-          Days::Category.any_instance.stub(:valid? => false, :save => false)
+          allow_any_instance_of(Days::Category).to receive(:valid?).and_return(false)
+          allow_any_instance_of(Days::Category).to receive(:save).and_return(false)
         end
 
-        specify { subject.status.should == 406 } # not acceptable
+        specify { expect(subject.status).to eq(406) } # not acceptable
 
         it "renders form" do
-          render[:data].should == :'admin/categories'
+          expect(render[:data]).to eq(:'admin/categories')
         end
       end
     end
@@ -55,27 +55,27 @@ describe Days::App, type: :controller do
       it_behaves_like 'an admin page'
 
       it "updates category" do
-        subject.should be_redirect
-        URI.parse(subject['Location']).path.should == '/admin/categories'
+        expect(subject).to be_redirect
+        expect(URI.parse(subject['Location']).path).to eq('/admin/categories')
 
         category.reload
-        category.name.should == 'Storm'
+        expect(category.name).to eq('Storm')
       end
 
       context "when invalid" do
         before do
-          Days::Category.any_instance.stub(:valid? => false, :save => false)
+          allow_any_instance_of(Days::Category).to receive_messages(:valid? => false, :save => false)
         end
 
         it "renders form" do
-          render[:data].should == :'admin/categories'
+          expect(render[:data]).to eq(:'admin/categories')
         end
       end
 
       context "with invalid category" do
-        let(:category) { double.tap { |_| _.stub(id: Days::Category.last.id.succ) } }
+        before { category.destroy }
 
-        it { should be_not_found }
+        it { is_expected.to be_not_found }
       end
     end
 
@@ -86,14 +86,14 @@ describe Days::App, type: :controller do
 
       it "destroys category" do
         expect { subject }.to change { Days::Category.where(id: category.id).count }.from(1).to(0)
-        subject.should be_redirect
-        URI.parse(subject.location).path.should == "/admin/categories"
+        expect(subject).to be_redirect
+        expect(URI.parse(subject.location).path).to eq("/admin/categories")
       end
 
       context "with invalid category" do
-        let(:category) { double.tap { |_| _.stub(id: Days::Category.last.id.succ) } }
+        before { category.destroy }
 
-        it { should be_not_found }
+        it { is_expected.to be_not_found }
       end
     end
   end