story 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ccce0cd43a669d138a50cca4c1400f3a1a6a4ec
-  data.tar.gz: 6eca7f7abd9308770fd22292148a6d7ca57c54cc
+  metadata.gz: 169c4477ec511b09e0a7704c632f4601401a52f1
+  data.tar.gz: 8d2480c30354ccb9ff725615e90920144294c218
 SHA512:
-  metadata.gz: 9b26b8043c9dc2f0ab26159ce7a97df16ccc262878bf681812d10270c55627002baa6e0d4977263aedde62b950260cedaed022226b8c3f6908bca9c0f95935ea
-  data.tar.gz: dcde24f6fcc57a30240a6ee4853882a83fb4249ae04034e490107f53d693be8ef9ab4dbbf933adf17433f2b9caf270fe94abec0fe44b5fe291acb11421cc391b
+  metadata.gz: 94dc6f30ef38e2e035fdd7b737285ec46e49860b6538bb4f252dca998f36fd38fb88766f4914a5ccf29c69fb6e5afffcca184edb18b0c6b354ccb1ab4839a5d5
+  data.tar.gz: 8bf1bf2fb71743d589e4f7cc7578207af1553f1725fce7a17e20e23324e3a110d708cc2036a5525e92419b76835575d25174d7cc47ead4a2a30bc9671ebd770d

data/README.md

@@ -4,8 +4,8 @@ Gem for creating awesome personal blog.
 
 [Installing](#installation)  
 [Setting up](#setting-up)  
-[Using](#using)  
-[API](#api)
+Using (in progress)      
+API (in progress)  
 
 ## Installation
 Story is a RubyGem, so simply install it with `gem install story`.  
@@ -31,4 +31,4 @@ Story::Base.run!
 And in your terminal: 
 ```bash
 $ ruby app.rb
-```
+```

data/lib/story/db/config.yml

@@ -0,0 +1,2 @@
+adapter: sqlite3
+database: blog.db

data/lib/story/db/utils.rb

@@ -0,0 +1,23 @@
+module Story
+  module DB
+    module Utils
+      def db_connected?
+        @errors ||= ''
+        begin
+          configuration_file = File.exists?('dbconfig.yml') ? 'dbconfig.yml' : File.join(File.dirname(__FILE__), 'config.yml')
+          p configuration_file
+          dbconfig = YAML::load File.open configuration_file
+          ActiveRecord::Base.logger = Logger.new STDERR
+          ActiveRecord::Base.establish_connection dbconfig
+          true
+        rescue Errno::ENOENT
+          @errors += "Database configuration file not found."
+          false
+        rescue => e
+          @errors += e.to_s
+          false
+        end
+      end
+    end
+  end
+end

data/lib/story/meta.rb

@@ -1,7 +1,7 @@
 module Story
   module Meta
     NAME = 'story'
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
     CHARSET = 'utf-8'
     DEFAULT_BLOG_TITLE = 'Personal Blog'
   end

data/lib/story/router.rb

@@ -1,6 +1,7 @@
 module Story
   class Base < Sinatra::Base
     include Utils
+    include DB::Utils
 
     configure do
       set :views, settings.views.to_s.gsub(/views$/, '/templates/story')
@@ -8,9 +9,13 @@ module Story
       set :charset, Meta::CHARSET
       set :static_ext, ''
       set :sass, Compass.sass_engine_options
+      set :title_separator, " | "
     end
 
     before do
+      raise error @errors if not db_connected?
+      @title = settings.blog_title
+      @header_needed = @footer_needed = true
       @additional_styles ||= load_additional_styles
     end
 
@@ -24,10 +29,17 @@ module Story
     end
 
     get '/' do
+      title "Posts"
       slim :index
     end
 
+    error do |*errors|
+      @errors = errors
+      slim :error_page
+    end
+
     not_found do
+      title "404"
       'Page not found'
     end
   end

data/lib/story/templates/story/error_page.slim

@@ -0,0 +1,3 @@
+- @errors.each do |error|
+  p == error
+  br

data/lib/story/utils.rb

@@ -13,6 +13,12 @@ module Story
       raise LoadError
     end
 
+    def title *sections
+      sections.each do |section|
+        @title += "#{settings.title_separator}#{section.to_s}"
+      end
+    end
+
     def parse_file filename, extension = '', root = true
       file_path = "#{'.' if root}#{filename}.#{extension}"
       raise not_found if not File.exists? file_path

data/lib/story.rb

@@ -3,6 +3,8 @@ require 'sinatra'
 require 'slim'
 require 'sass'
 require 'compass'
+require 'yaml'
 require 'story/meta'
 require 'story/utils'
+require 'story/db/utils'
 require 'story/router'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: story
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Rozzy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,8 +107,11 @@ files:
 - README.md
 - Rakefile
 - lib/story.rb
+- lib/story/db/config.yml
+- lib/story/db/utils.rb
 - lib/story/meta.rb
 - lib/story/router.rb
+- lib/story/templates/story/error_page.slim
 - lib/story/templates/story/index.slim
 - lib/story/templates/story/layout.slim
 - lib/story/templates/story/meta.slim