ki 0.4.6 → 0.4.7

data/lib/ki/ki_app.rb

@@ -0,0 +1,16 @@
+module Ki
+  class KiApp
+    include Middleware::Helpers::HamlCompiler
+    include Middleware::Helpers::View
+
+    def call(env)
+      path = view_exists?('404') ? view_path('404') : custom_view_path
+      html = render_haml_file(path).strip!
+      Rack::Response.new(html, 404).finish
+    end
+
+    def custom_view_path
+      File.join(File.dirname(__FILE__), 'views', '404.haml')
+    end
+  end
+end

data/lib/ki/ki_cli.rb

@@ -12,24 +12,23 @@ module Ki
       end
 
       def self.requies_ki_directory
-        unless File.exists? 'config.ru'
-          say "Working directory should be a ki app."
+        unless File.exist? 'config.ru'
+          say 'Working directory should be a ki app.'
           exit 3
         end
       end
     end
 
     class AppGenerator < KiGenerator
-
       argument :app_name
 
       def prepare_dir
         unless app_name =~ /^[a-zA-Z0-9-]*$/
-          say "App name must contain only alphanumeric characters and -"
+          say 'App name must contain only alphanumeric characters and -'
           exit 1
         end
 
-        if Dir.exists? app_name
+        if Dir.exist? app_name
           say "#{app_name} already exists"
           exit 2
         end
@@ -38,14 +37,14 @@ module Ki
       end
 
       def create_app
-        directory("spec/examples/base", app_name)
+        directory('spec/examples/base', app_name)
 
         # Set database names
         config_file = File.read("#{app_name}/config.yml")
-        config_file.gsub!("name: np_development", "name: #{app_name}_development")
-        config_file.gsub!("name: np_test", "name: #{app_name}_test")
-        config_file.gsub!("name: np", "name: #{app_name}")
-        File.open("#{app_name}/config.yml", "w") {|file| file.puts config_file}
+        config_file.gsub!('name: np_development', "name: #{app_name}_development")
+        config_file.gsub!('name: np_test', "name: #{app_name}_test")
+        config_file.gsub!('name: np', "name: #{app_name}")
+        File.open("#{app_name}/config.yml", 'w') { |file| file.puts config_file }
 
         # Set rvm gemset name
         `echo #{app_name} > #{app_name}/.ruby-gemset`
@@ -55,8 +54,8 @@ module Ki
     class DevServer < KiGenerator
       DEFAULT_PORT = 1337
 
-      argument :port, type: :numeric, desc: "port for ki server.", default: DEFAULT_PORT
-      desc "Starts the ki server"
+      argument :port, type: :numeric, desc: 'port for ki server.', default: DEFAULT_PORT
+      desc 'Starts the ki server'
 
       def start_server
         KiGenerator.requies_ki_directory

data/lib/ki/ki_config.rb

@@ -6,25 +6,29 @@ module Ki
 
     attr_reader :config, :environment
 
-    def read environment
+    def read(environment)
       @environment = environment
       @config = YAML.load_file(config_file_path)[environment]
+      @config['cors'] ||= true
     end
 
     def config_file_path
       'config.yml'
     end
 
-    def middleware
-      used_middleware = %w(ApiHandler CoffeeCompiler SassCompiler HamlCompiler PublicFileServer)
+    def cors?
+      @config['cors']
+    end
 
-      if @config['middleware'].present?
-        used_middleware = @config['middleware']
-      end
+    def middleware
+      used_middleware = %w(ApiHandler CoffeeCompiler SassCompiler HamlCompiler
+                           PublicFileServer)
+      used_middleware = @config['middleware'] if @config['middleware'].present?
 
-      used_middleware.map { |middleware|
+      # convert middleware to ruby object
+      used_middleware.map do |middleware|
         Object.const_get('Ki').const_get('Middleware').const_get(middleware)
-      }
+      end
     end
 
     def database

data/lib/ki/middleware/admin_interface_generator.rb

@@ -5,7 +5,7 @@ module Ki
         File.join(File.dirname(__FILE__), '..', 'views', 'instadmin.haml')
       end
 
-      def custom_check req
+      def custom_check(req)
         req.admin?
       end
     end

data/lib/ki/middleware/api_handler.rb

@@ -1,6 +1,5 @@
 module Ki
   module Middleware #:nodoc:
-
     # Handles all API calls
     #
     # Any json request is considered an api call. A request is considered as json
@@ -11,7 +10,7 @@ module Ki
     class ApiHandler
       include BaseMiddleware
 
-      def call env
+      def call(env)
         req = BaseRequest.new env
         if req.json?
           resourcerize(req)
@@ -20,30 +19,30 @@ module Ki
         end
       end
 
-      def resourcerize req
+      def resourcerize(req)
         klass = req.to_ki_model_class
 
         unless Model.descendants.include?(klass)
-          raise InvalidUrlError.new("invalid url '#{req.path}'", 404)
+          fail InvalidUrlError.new("invalid url '#{req.path}'", 404)
         end
 
         model = klass.new(req.to_action, req.params)
-        if req.params['redirect_to'].nil? # TODO document this
+        if req.params['redirect_to'].nil? # TODO: document this
           render model
         else
-          redirect_to req.params['redirect_to'] # TODO check for injection
+          redirect_to req.params['redirect_to'] # TODO: check for injection
         end
       rescue ApiError => e
         render e
       end
 
-      def redirect_to s
+      def redirect_to(s)
         resp = Rack::Response.new
         resp.redirect(s)
         resp.finish
       end
 
-      def render r
+      def render(r)
         resp = Rack::Response.new(r.result.to_json, r.status)
         resp['Content-Type'] = 'application/json'
         resp.finish

data/lib/ki/middleware/base_middleware.rb

@@ -5,7 +5,7 @@ module Ki
       include Helpers::View
       include Helpers::PublicFile
 
-      def initialize app
+      def initialize(app)
         @app = app
       end
     end

data/lib/ki/middleware/coffee_compiler.rb

@@ -3,12 +3,12 @@ module Ki
     class CoffeeCompiler
       include BaseMiddleware
 
-      def call env
+      def call(env)
         req = BaseRequest.new env
         coffee_path = req.path.to_s[0...-3] + '.coffee'
         if !public_file_exists?(req) && format_of(req) == 'js' && public_file_exists?(coffee_path)
           js = CoffeeScript.compile(File.read(public_file_path(coffee_path)))
-          Rack::Response.new(js, 200, {"Content-Type" => "application/javascript"}).finish
+          Rack::Response.new(js, 200, { 'Content-Type' => 'application/javascript' }).finish
         else
           @app.call env
         end

data/lib/ki/middleware/doc_generator.rb

@@ -3,20 +3,21 @@ module Ki
     class DocGenerator < HamlCompiler
       include BaseMiddleware
 
-      def call env
+      def call(env)
         req = BaseRequest.new env
         if custom_check(req)
           if view_exists?(req)
-            render_haml view_path(req)
+            html = render_haml_file view_path(req)
           else
-            render_haml custom_view_path
+            html = render_haml_file custom_view_path
           end
+          Rack::Response.new(html).finish
         else
           @app.call env
         end
       end
 
-      def custom_check req
+      def custom_check(req)
         req.doc?
       end
 

data/lib/ki/middleware/haml_compiler.rb

@@ -2,35 +2,17 @@ module Ki
   module Middleware
     class HamlCompiler
       include BaseMiddleware
+      include Helpers::HamlCompiler
 
-      def call env
+      def call(env)
         req = BaseRequest.new env
         if view_exists?(req)
-          render_haml view_path(req)
+          html = render_haml_file view_path(req)
+          Rack::Response.new(html).finish
         else
           @app.call env
         end
       end
-
-      def render_haml file_path
-        file_contents = File.read(file_path)
-
-        if view_exists? 'layout'
-          layout_contents = File.read(view_path('layout'))
-        else
-          layout_contents = "= yield"
-        end
-
-        html = haml(layout_contents).render do
-          haml(file_contents).render
-        end
-
-        Rack::Response.new(html).finish
-      end
-
-      def haml s
-        Haml::Engine.new("- extend Ki::Helpers\n" + s)
-      end
     end
   end
 end

data/lib/ki/{modules/format_of.rb → middleware/helpers/format_of_helper.rb}

@@ -2,10 +2,10 @@ module Ki
   module Middleware
     module Helpers
       module FormatOf
-        def format_of uri
+        def format_of(uri)
           uri = uri.path if uri.class == BaseRequest
-          File.extname(URI.parse(uri).path).gsub('.','')
-        rescue URI::InvalidURIError => e
+          File.extname(URI.parse(uri).path).gsub('.', '')
+        rescue URI::InvalidURIError
           ''
         end
       end

data/lib/ki/middleware/helpers/haml_compiler_helper.rb

@@ -0,0 +1,27 @@
+module Ki
+  module Middleware
+    module Helpers
+      module HamlCompiler
+        def render_haml_file(file_path, layout = true)
+          file_contents = File.read(file_path)
+
+          if layout && view_exists?('layout')
+            layout_contents = File.read(view_path('layout'))
+          else
+            layout_contents = '= yield'
+          end
+
+          html = render_haml(layout_contents).render do
+            render_haml(file_contents).render
+          end
+
+          html
+        end
+
+        def render_haml(s)
+          Haml::Engine.new("- extend Ki::Helpers\n" + s)
+        end
+      end
+    end
+  end
+end

data/lib/ki/{modules → middleware/helpers}/public_file_helper.rb

@@ -2,12 +2,12 @@ module Ki
   module Middleware
     module Helpers
       module PublicFile
-        def public_file_exists? path
+        def public_file_exists?(path)
           path = path.path if path.class == BaseRequest
           File.file?(public_file_path(path))
         end
 
-        def public_file_path path
+        def public_file_path(path)
           path = path.path if path.class == BaseRequest
           File.join(Ki::PUBLIC_PATH, path)
         end

data/lib/ki/{modules → middleware/helpers}/view_helper.rb

@@ -2,14 +2,14 @@ module Ki
   module Middleware
     module Helpers
       module View
-        def view_exists? path
+        def view_exists?(path)
           path = path.path if path.class == BaseRequest
           File.file?(view_path(path))
         end
 
-        def view_path path
+        def view_path(path)
           path = path.path if path.class == BaseRequest
-          File.join(Ki::VIEWS_PATH, path + ".haml")
+          File.join(Ki::VIEWS_PATH, path + '.haml')
         end
       end
     end

data/lib/ki/middleware/init_middleware.rb

@@ -3,7 +3,7 @@ module Ki
     class InitMiddleware
       include BaseMiddleware
 
-      def call env
+      def call(env)
         req = BaseRequest.new env
         if req.root?
           if public_file_exists? 'index.html'

data/lib/ki/middleware/public_file_server.rb

@@ -3,7 +3,7 @@ module Ki
     class PublicFileServer
       include BaseMiddleware
 
-      def call env
+      def call(env)
         req = BaseRequest.new env
         if public_file_exists? req
           Rack::File.new(Ki::PUBLIC_PATH).call env

data/lib/ki/middleware/sass_compiler.rb

@@ -3,13 +3,13 @@ module Ki
     class SassCompiler
       include BaseMiddleware
 
-      def call env
+      def call(env)
         req = BaseRequest.new env
         sass_path = req.path.to_s[0...-4] + '.sass'
         # if req ends with css and it does not exist, if a sass file exists instead
         if !public_file_exists?(req) && format_of(req) == 'css' && public_file_exists?(sass_path)
-          eng = Sass::Engine.new(File.read(public_file_path(sass_path)), :syntax => :sass)
-          Rack::Response.new(eng.render, 200, {"Content-Type" => "text/css"}).finish
+          eng = Sass::Engine.new(File.read(public_file_path(sass_path)), syntax: :sass)
+          Rack::Response.new(eng.render, 200, { 'Content-Type' => 'text/css' }).finish
         else
           @app.call env
         end

data/lib/ki/model.rb

@@ -3,16 +3,17 @@ module Ki
     extend QueryInterface
     extend Restrictions
     include Callbacks
-    include ModelHelpers
+    include ModelHelper
 
     attr_accessor :action, :result, :params, :status
 
-    def initialize action, params
+    def initialize(action, params)
       @action = action
       @params = params
       @status = 200
 
-      raise ForbiddenAction.new if forbidden_actions.include? @action
+      fail ForbiddenAction if forbidden_actions.include? @action
+
       ccall
     end
 
@@ -40,26 +41,24 @@ module Ki
 
     def check_for_required_attributes
       required_attributes.each do |ra|
-        if !@params.keys.include?(ra.to_s)
-          raise RequiredAttributeMissing.new("#{ra.to_s} missing")
+        unless @params.keys.include?(ra.to_s)
+          fail RequiredAttributeMissing, "#{ra} missing"
         end
       end
     end
 
     def check_for_unique_attributes
       unique_attributes.each do |ua|
-        u = self.class.find({ua.to_s => @params[ua.to_s]})
-        unless u.empty?
-          raise AttributeNotUnique.new("#{ua.to_s} not unique")
-        end
+        u = self.class.find({ ua.to_s => @params[ua.to_s] })
+        fail AttributeNotUnique, "#{ua} not unique" unless u.empty?
       end
     end
 
     def ccall
       before_all
-      send "before_#{@action.to_s}".to_sym
+      send "before_#{@action}".to_sym
       send @action.to_sym
-      send "after_#{@action.to_s}".to_sym
+      send "after_#{@action}".to_sym
       after_all
     end
 

data/lib/ki/modules/{model_helpers.rb → model_helper.rb}

@@ -1,6 +1,6 @@
 module Ki
   class Model
-    module ModelHelpers
+    module ModelHelper
       def get?
         @req.get?
       end