ki 0.3.2 → 0.3.3

data/Gemfile

@@ -9,6 +9,7 @@ gem "sass"
 gem "coffee-script"
 gem "thin"
 gem "mail"
+gem "json"
 
 group :development do
   gem "rspec"

data/Gemfile.lock

@@ -1,81 +1,110 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    bson (1.8.2)
-    bson_ext (1.8.2)
-      bson (~> 1.8.2)
-    coderay (1.0.8)
+    addressable (2.3.5)
+    bson (1.9.2)
+    bson_ext (1.9.2)
+      bson (~> 1.9.2)
+    builder (3.2.2)
+    coderay (1.0.9)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
+    coffee-script-source (1.6.3)
     daemons (1.1.9)
-    diff-lcs (1.1.3)
-    eventmachine (1.0.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    ffi (1.3.1)
-    git (1.2.5)
-    guard (1.6.2)
+    diff-lcs (1.2.4)
+    eventmachine (1.0.3)
+    execjs (2.0.0)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    ffi (1.9.0)
+    formatador (0.2.4)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    guard (1.7.0)
+      formatador (>= 0.2.4)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
-      terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
-    guard-rspec (2.4.0)
+    guard-rspec (2.5.4)
       guard (>= 1.1)
       rspec (~> 2.11)
-    haml (3.1.7)
-    i18n (0.6.1)
-    jeweler (1.8.4)
+    haml (4.0.3)
+      tilt
+    hashie (2.0.5)
+    highline (1.6.19)
+    httpauth (0.2.0)
+    jeweler (1.8.7)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.6)
-    listen (0.7.2)
-    lumberjack (1.0.2)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
+    json (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    listen (0.7.3)
+    lumberjack (1.0.4)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.8.1)
-    mime-types (1.21)
-    mongo (1.8.2)
-      bson (~> 1.8.2)
-    multi_json (1.5.0)
+    method_source (0.8.2)
+    mime-types (1.24)
+    mongo (1.9.2)
+      bson (~> 1.9.2)
+    multi_json (1.7.9)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     polyglot (0.3.3)
-    pry (0.9.11.4)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.5.1)
-    rake (10.0.3)
+    rack (1.5.2)
+    rake (10.1.0)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
-    rdoc (3.12)
+    rdoc (4.0.1)
       json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    sass (3.2.5)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    sass (3.2.10)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.3)
-    terminal-table (1.4.5)
-    thin (1.5.0)
+    slop (3.4.6)
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.17.0)
-    treetop (1.4.12)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
 
@@ -89,6 +118,7 @@ DEPENDENCIES
   guard-rspec
   haml
   jeweler
+  json
   mail
   mongo
   rack

data/README.rdoc

@@ -1,20 +1,3 @@
 = ki
 
-Description goes here.
-
-== Contributing to ki
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
 http://openclipart.org/detail/97081/polar-bear-by-aguasas
-
-== Copyright
-
-Copyright (c) 2013 Cristian Mircea Messel. See LICENSE.txt for
-further details.

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/ki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ki"
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cristian Mircea Messel"]
-  s.date = "2013-06-27"
+  s.date = "2013-09-02"
   s.description = "Fuck setting up a database for your prototypes. Some call it an ORM with a RESTful interface. Some say its for prototyping."
   s.email = "mess110@gmail.com"
   s.executables = ["ki"]
@@ -41,13 +41,13 @@ Gem::Specification.new do |s|
     "ki_wrap.rb",
     "lib/conf.rb",
     "lib/db.rb",
-    "lib/extensions/mail.rb",
     "lib/helpers.rb",
     "lib/ki.rb",
     "lib/ki_cli.rb",
     "lib/mockreq.rb",
     "lib/model.rb",
     "lib/modules/callbacks.rb",
+    "lib/modules/email.rb",
     "lib/modules/model_helpers.rb",
     "lib/modules/query_interface.rb",
     "lib/modules/restrictions.rb",
@@ -61,11 +61,11 @@ Gem::Specification.new do |s|
     "lib/views/layout.haml",
     "spec/conf_spec.rb",
     "spec/db_spec.rb",
-    "spec/extensions/mail_spec.rb",
     "spec/integration/integration_spec.rb",
     "spec/ki_spec.rb",
     "spec/model_spec.rb",
     "spec/modules/callbacks_spec.rb",
+    "spec/modules/email_spec.rb",
     "spec/modules/query_interface_spec.rb",
     "spec/modules/restrictions_spec.rb",
     "spec/performance/performance.sh",
@@ -76,7 +76,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/mess110/ki"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.23"
   s.summary = "Prototyping noSQL RESTful API cloud database"
 
   if s.respond_to? :specification_version then
@@ -92,6 +92,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<coffee-script>, [">= 0"])
       s.add_runtime_dependency(%q<thin>, [">= 0"])
       s.add_runtime_dependency(%q<mail>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
       s.add_development_dependency(%q<rb-inotify>, ["~> 0.8.8"])
@@ -109,6 +110,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<coffee-script>, [">= 0"])
       s.add_dependency(%q<thin>, [">= 0"])
       s.add_dependency(%q<mail>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
       s.add_dependency(%q<rb-inotify>, ["~> 0.8.8"])
@@ -127,6 +129,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<coffee-script>, [">= 0"])
     s.add_dependency(%q<thin>, [">= 0"])
     s.add_dependency(%q<mail>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<rb-inotify>, ["~> 0.8.8"])

data/lib/model.rb

@@ -2,8 +2,7 @@ require 'modules/callbacks'
 require 'modules/restrictions'
 require 'modules/query_interface'
 require 'modules/model_helpers'
-
-require 'extensions/mail'
+require 'modules/email'
 
 module Ki
   class Model
@@ -108,8 +107,4 @@ module Ki
       raise "invalid id format: #{params['id']}"
     end
   end
-
-  class Site < Model
-    respond_to :html
-  end
 end

data/lib/{extensions/mail.rb → modules/email.rb}

@@ -2,14 +2,7 @@ require 'mail'
 require 'net/smtp'
 
 module Ki
-  # Extension module which helps with sending emails.
-  # Include it in a Ki::Model to load its send_mail method
-  #
-  # === Example
-  #   class Article < Ki::Model
-  #     include Ki::EMail
-  #   end
-  module EMail
+  module Email
     def valid_mail? s
       return false if s == '' || s.nil?
       r = /^[a-z0-9\+\-\.]+@[a-z0-9]+\.[a-z0-9\.\-]+$/i =~ s
@@ -22,10 +15,10 @@ module Ki
       if params.length != 4
         raise 'params missing'
       end
-      
+
       params.each do |elem|
         if !self.class.required_attributes.include? elem
-          raise "invalid attribute #{elem.to_s}" 
+          raise "invalid attribute #{elem.to_s}"
         end
       end
 
@@ -53,5 +46,6 @@ module Ki
         smtp.send_message msgstr, f, t
       end
     end
+
   end
 end

data/lib/req.rb

@@ -18,7 +18,11 @@ module Ki
     def route
       @klass = Util.base(path).to_class
       @format = content_type == 'application/json' ? :json : Util.format(path)
-      @code = klass || path == '/' ? 200 : 404
+      if @klass || path == '/' || has_view?
+        @code = 200
+      else
+        @code = 404
+      end
     end
 
     def json?
@@ -40,6 +44,10 @@ module Ki
       }[@format]
     end
 
+    def has_view?
+      File.exists?(Util.root_view_path(Util.base(path)))
+    end
+
     private
 
     def static_path_requested?

data/lib/resp.rb

@@ -13,6 +13,8 @@ module Ki
       }
 
       # TODO think of a way to clean this up
+      # here be dragons. don't try to understand this because it is a nested mess
+      # it is my duty to clean it. one day
       klass = @req.klass
       if klass.responds_to_formats.include? @req.format
         if @req.code == 404
@@ -21,9 +23,13 @@ module Ki
           if @req.index?
             body = @req.html? ? partial('index') : { :index => 200 }
           else
-            klass_view = Util.root_view_path(klass.to_s.downcase)
             if @req.html?
-              body = File.exists?(klass_view) ? partial(klass.to_s.downcase) : partial('index')
+              if klass == nil # if route is /ruby it means ruby.haml exists in views
+                body = Util.render_partial Util.base(@req.path), { 'env' => @req.env }, 'layout'
+              else
+                klass_view = Util.root_view_path(klass.to_s.downcase)
+                body = File.exists?(klass_view) ? partial(klass.to_s.downcase) : partial('index')
+              end
             else
               begin
                 interpret_json_params

data/lib/static_file.rb

@@ -1,4 +1,6 @@
 module Ki
+  # serve files from public folder
+  # and compile them if they are coffee of sass
   class StaticFile < Rack::File
     attr_reader :env
 
@@ -55,7 +57,8 @@ module Ki
 
     def self.coffee_to_js coffee_path, js_path
       if File.exists? coffee_path
-        cont = CoffeeScript.compile(File.read(coffee_path))
+        coffee_file = File.read(coffee_path)
+        cont = CoffeeScript.compile(coffee_file)
         File.open(js_path, 'w') do |f|
           f.puts cont
         end

data/spec/{extensions/mail_spec.rb → modules/email_spec.rb}

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe Ki::EMail do
-  it "should validate emails" do
-    extend Ki::EMail
+describe Ki::Email do
+  it "should validate email properly" do
+    extend Ki::Email
 
     valid_mail?('asd').should be_false
     valid_mail?('asd.asd').should be_false
@@ -16,11 +16,4 @@ describe Ki::EMail do
     valid_mail?('cool@gmail.co.uk').should be_true
     valid_mail?('cool+beans@gmail.com').should be_true
   end
-
-  it "should also work as instance method" do
-    class CoolMail
-      include Ki::EMail
-    end
-    CoolMail.new.valid_mail?('cool@gmail.com').should be_true
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -300,13 +316,13 @@ files:
 - ki_wrap.rb
 - lib/conf.rb
 - lib/db.rb
-- lib/extensions/mail.rb
 - lib/helpers.rb
 - lib/ki.rb
 - lib/ki_cli.rb
 - lib/mockreq.rb
 - lib/model.rb
 - lib/modules/callbacks.rb
+- lib/modules/email.rb
 - lib/modules/model_helpers.rb
 - lib/modules/query_interface.rb
 - lib/modules/restrictions.rb
@@ -320,11 +336,11 @@ files:
 - lib/views/layout.haml
 - spec/conf_spec.rb
 - spec/db_spec.rb
-- spec/extensions/mail_spec.rb
 - spec/integration/integration_spec.rb
 - spec/ki_spec.rb
 - spec/model_spec.rb
 - spec/modules/callbacks_spec.rb
+- spec/modules/email_spec.rb
 - spec/modules/query_interface_spec.rb
 - spec/modules/restrictions_spec.rb
 - spec/performance/performance.sh
@@ -346,7 +362,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4593100471811426201
+      hash: 4153304961759907564
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -355,7 +371,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Prototyping noSQL RESTful API cloud database