story 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 169c4477ec511b09e0a7704c632f4601401a52f1
-  data.tar.gz: 8d2480c30354ccb9ff725615e90920144294c218
+  metadata.gz: b0bfb4f0326a20c37b1ee6f7615986a83e9210a6
+  data.tar.gz: 01a5e1f4c3834cb889c10318d230c28fd8f358a1
 SHA512:
-  metadata.gz: 94dc6f30ef38e2e035fdd7b737285ec46e49860b6538bb4f252dca998f36fd38fb88766f4914a5ccf29c69fb6e5afffcca184edb18b0c6b354ccb1ab4839a5d5
-  data.tar.gz: 8bf1bf2fb71743d589e4f7cc7578207af1553f1725fce7a17e20e23324e3a110d708cc2036a5525e92419b76835575d25174d7cc47ead4a2a30bc9671ebd770d
+  metadata.gz: 573a00980ec9a68e0077466f408bb066ee3ed7516380d9cdd7b2de251d38f7b38b327a4785e37f0bfa4b0c45cf9d2773cc2d53c85bad9fdfecc516c142ac39a1
+  data.tar.gz: aac4615283d5c0fc94ac9c5866387e0f53dabce7c4c103c62bc934da7e1b04390005721cd5f7fc793f79e69ac3dac675554f9b7f436f3e72e18a101e1e329abf

data/.coveralls.yml

@@ -0,0 +1,2 @@
+service_name: travis-pro
+repo_token: yXIkwXyJxv4u8MsUbhz7Y33AawuxQ9qez

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 gem 'sinatra'
 gem 'slim'
 gem 'sass'
-gem 'compass'
+gem 'compass'
+gem 'coveralls', require: false

data/README.md

@@ -1,5 +1,5 @@
 # Story
-[![Gem Version](https://badge.fury.io/rb/story.png)](http://badge.fury.io/rb/story) [![Code Climate](https://codeclimate.com/github/rozzy/story.png)](https://codeclimate.com/github/rozzy/story) [![Dependency Status](https://gemnasium.com/rozzy/story.png)](https://gemnasium.com/rozzy/story)  
+[![Gem Version](https://badge.fury.io/rb/story.png)](http://badge.fury.io/rb/story) [![Code Climate](https://codeclimate.com/github/rozzy/story.png)](https://codeclimate.com/github/rozzy/story) [![Dependency Status](https://gemnasium.com/rozzy/story.png)](https://gemnasium.com/rozzy/story) [![Coverage Status](https://coveralls.io/repos/rozzy/story/badge.png)](https://coveralls.io/r/rozzy/story)  
 Gem for creating awesome personal blog.  
 
 [Installing](#installation)  

data/lib/story/db/utils.rb

@@ -2,22 +2,64 @@ module Story
   module DB
     module Utils
       def db_connected?
-        @errors ||= ''
+        @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
+          dbconfig = parse_configuration_from configuration_file
           ActiveRecord::Base.logger = Logger.new STDERR
           ActiveRecord::Base.establish_connection dbconfig
           true
         rescue Errno::ENOENT
-          @errors += "Database configuration file not found."
+          @errors.push "Database configuration file not found."
           false
-        rescue => e
-          @errors += e.to_s
+        rescue Errors::DatabaseError => e
+          @errors.push e.message
           false
         end
       end
+
+      def sinatra_setting_exists? setting
+        settings.respond_to? setting
+      end
+
+      def get_list_of_db_adapters
+        ["jdbc", "fb", "frontbase", "mysql", "openbase", "oci", "postgresql", "sqlite3", "sqlite2", "sqlite", "sqlserver", "sybsql"]
+      end
+
+      def concat_default_and_user_adapters?
+        sinatra_setting_exists? :db_adapters and settings.db_adapters.select { |b| b.is_a? (String) }.size > 0 and settings.db_adapters.is_a? (Array)
+      end
+
+      def parse_adapters
+        default_adapters = get_list_of_db_adapters
+        if concat_default_and_user_adapters? then default_adapters.concat(settings.db_adapters.each(&:downcase!))
+        else default_adapters end
+      end
+
+      def define_db_error_type adapters, config
+        case
+          when !config.has_key?("adapter") && !adapters.include?(config["adapter"].downcase) then 0
+          when !config.has_key?("adapter") then 1
+          when !config.has_key?("database") then 2
+          when !config.has_key?("adapter") && !config.has_key?("database") then 3
+        end
+      end 
+
+      def some_db_errors_in? config
+        adapters = parse_adapters
+        errors_found = !config.has_key?("adapter") or !config.has_key?("database") or !(config.has_key?("adapter") and adapters.include?(config["adapter"].downcase))
+        if errors_found then
+          @db_error_type = define_db_error_type adapters, config
+        end
+        errors_found
+      end
+
+      def parse_configuration_from file
+        config = YAML::load File.open file
+        error_types = ["unsupported_db_adapter", "no_db_adapter_specified", "no_database_specified", "no_db_adapter_and_database_specified"]
+        raise Errors::DatabaseError, send("raise_#{error_types[@db_error_type]}".to_sym, file, config) if some_db_errors_in? config
+        config
+      end
     end
   end
 end

data/lib/story/meta.rb

@@ -1,8 +1,37 @@
 module Story
   module Meta
     NAME = 'story'
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
     CHARSET = 'utf-8'
     DEFAULT_BLOG_TITLE = 'Personal Blog'
   end
+
+  module Errors
+    class DatabaseError < Exception; end
+    class ConnectionError < Exception; end
+
+    def print_config_file_location
+      "#{"STORY_GEM_ROOT/" if !(/#{Gem.dir}/ =~ file).is_a? NilClass }#{File.basename(File.dirname(file))}/#{File.basename(file)}"
+    end
+
+    def raise_unsupported_db_adapter file, config
+      "Unsupported database adapter <b>#{config["adapter"]}</b> in database config file (#{print_config_file_location})."
+    end
+
+    def raise_no_db_adapter_specified file, config
+      "No database adapter specified in database config file (#{print_config_file_location})."
+    end
+
+    def raise_no_database_specified file, config
+      "No database file or data specified in database config file (#{print_config_file_location})."
+    end
+
+    def raise_no_db_adapter_and_database_specified file, config
+      "No database file and data specified in database config file (#{print_config_file_location})."
+    end
+
+    def check_on_error_page
+      @on_error_page = request.path_info.downcase.match "/e_([a-z0-9_]+)"
+    end
+  end
 end

data/lib/story/router.rb

@@ -1,10 +1,13 @@
 module Story
   class Base < Sinatra::Base
     include Utils
+    include Errors
     include DB::Utils
 
     configure do
-      set :views, settings.views.to_s.gsub(/views$/, '/templates/story')
+      enable :show_exceptions
+      set :environment, :development
+      set :views, settings.views.to_s.gsub(/views$/, 'templates/story')
       set :blog_title, Meta::DEFAULT_BLOG_TITLE
       set :charset, Meta::CHARSET
       set :static_ext, ''
@@ -13,10 +16,16 @@ module Story
     end
 
     before do
-      raise error @errors if not db_connected?
-      @title = settings.blog_title
-      @header_needed = @footer_needed = true
-      @additional_styles ||= load_additional_styles
+      begin
+        @title = settings.blog_title
+        @header_needed = @footer_needed = true
+        @additional_styles ||= load_additional_styles
+        raise ConnectionError if not db_connected?
+        get_last_session_url
+      rescue ConnectionError => e
+        check_on_error_page
+        if not @on_error_page then redirect '/e_config' end
+      end
     end
 
     get %r{(.*\..*)} do |url|
@@ -33,12 +42,24 @@ module Story
       slim :index
     end
 
-    error do |*errors|
-      @errors = errors
+    get %r{e([0-9]+)} do |error|
+      status error
       slim :error_page
     end
 
+    get %r{e_([a-zA-Z0-9_]+)} do |error|
+      redirect @last_session != request.path_info ? @last_session : '/' if @errors.size == 0
+      title @errors.size > 0 ? @errors.first : "Error occured"
+      title_type :error
+      slim :error_page
+    end
+
+    after do
+      set_session_url
+    end
+
     not_found do
+      status 404
       title "404"
       'Page not found'
     end

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

@@ -1,3 +1,2 @@
-- @errors.each do |error|
-  p == error
-  br
+- @errors.flatten.each do |error|
+  b == error

data/lib/story/templates/story/footer.slim

@@ -0,0 +1 @@
+| footer

data/lib/story/templates/story/header.slim

@@ -0,0 +1 @@
+| header

data/lib/story/templates/story/layout.slim

@@ -1,9 +1,11 @@
 doctype html
 html
   head
-    title = settings.blog_title
+    title == @title
     == slim :meta
     == slim :styles
     == slim :scripts
   body
-    == yield
+    == slim :header if @header_needed
+    == yield
+    == slim :footer if @footer_needed

data/lib/story/utils.rb

@@ -19,6 +19,18 @@ module Story
       end
     end
 
+    def title_type type_given = false
+      @title = "(#{type_given}) #{@title}" if type_given
+    end
+
+    def get_last_session_url
+      @last_session = request.cookies["session_url"] != "" ? request.cookies["session_url"] : '/'
+    end
+
+    def set_session_url
+      response.set_cookie "session_url", request.path_info if !(request.path_info.match /^e_/).is_a? NilClass and @last_session != request.path_info
+    end
+
     def parse_file filename, extension = '', root = true
       file_path = "#{'.' if root}#{filename}.#{extension}"
       raise not_found if not File.exists? file_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: story
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Rozzy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -112,6 +113,8 @@ files:
 - lib/story/meta.rb
 - lib/story/router.rb
 - lib/story/templates/story/error_page.slim
+- lib/story/templates/story/footer.slim
+- lib/story/templates/story/header.slim
 - lib/story/templates/story/index.slim
 - lib/story/templates/story/layout.slim
 - lib/story/templates/story/meta.slim