ki 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1220ce293d5e44656dcd0de47a4dead7235fecd2
-  data.tar.gz: 5304aed72ce2b943dbd1a29e9fab5c030876351b
+  metadata.gz: 15b4a578063b70b747d42d5f0326bcd79865351a
+  data.tar.gz: 942f6272d7b8a256cc4c469f6fa4ac82d6c4b82c
 SHA512:
-  metadata.gz: 79ebf8cb49cbb020aaf8af5e5858bcd89b3d2188eaf747ea7db8434630f597274fcf2eec357e508973b4a617d08d5dfaa1f6d89e386012d92e493159060842ed
-  data.tar.gz: fbe87bdd7e91000f2f00ad50e442fe56a4b79ff6019b90c3e2b71b80056fcb74618d985aa1d16e593921512b09a9fb9792fdd875a66901e50588fc58bbec1750
+  metadata.gz: 9ab148975be190e176f344ecbfc7ece85d79dc728730e7bc30189099ce770c054ac20fef8500ca69d409d0c9e333c58195dd0f932b4e7ad079f79c9d3b6550c4
+  data.tar.gz: b649dad7d5ce844da1da67df28f4e88a92702705dcb68fa123587dc64ee7297fd6b000e2ec350dd2ba4d4e069a0330b9cc960bfee1050fb6c1dadb00a3eb158b

data/.gitignore

@@ -9,5 +9,6 @@
 
 spec/examples/*/tmp
 spec/examples/*/log
+spec/examples/*/Gemfile.lock
 
 /doc/*

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    ki (0.4.5)
+    ki (0.4.6)
       bson_ext
       bundler (~> 1.5)
       coffee-script
       haml
       mongo
       rack
+      rack-cors
       rack-parser
       sass
       thor
@@ -15,9 +16,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    bson (1.9.2)
-    bson_ext (1.9.2)
-      bson (~> 1.9.2)
+    bson (3.0.1)
+    bson_ext (1.5.1)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
@@ -26,13 +26,13 @@ GEM
     codeclimate-test-reporter (0.4.7)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
-    coffee-script (2.2.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
+    coffee-script-source (1.9.1.1)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    execjs (2.0.2)
+    execjs (2.5.2)
     ffi (1.9.3)
     formatador (0.2.4)
     guard (2.5.1)
@@ -44,7 +44,7 @@ GEM
     guard-rspec (4.2.8)
       guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
-    haml (4.0.5)
+    haml (4.0.6)
       tilt
     listen (2.7.1)
       celluloid (>= 0.15.2)
@@ -53,8 +53,8 @@ GEM
       rb-inotify (>= 0.9)
     lumberjack (1.0.5)
     method_source (0.8.2)
-    mongo (1.9.2)
-      bson (~> 1.9.2)
+    mongo (2.0.2)
+      bson (~> 3.0)
     multi_json (1.11.0)
     nio4r (1.0.0)
     pry (0.9.12.6)
@@ -62,7 +62,8 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-parser (0.6.0)
+    rack-cors (0.4.0)
+    rack-parser (0.6.1)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -78,7 +79,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    sass (3.3.4)
+    sass (3.4.13)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)

data/README.md

@@ -82,6 +82,13 @@ ki server
 *ki server* is the command which starts the webserver. By default it starts on
 port 1337.
 
+For an interactive environment, you can run the *console* command. It starts a
+irb session with your application context already loaded.
+
+```shell
+ki console
+```
+
 ### Adding a view
 
 A view is a html page. By default, a view called 'index.haml' is created for

data/ki.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "coffee-script"
   spec.add_runtime_dependency "mongo"
   spec.add_runtime_dependency "bson_ext"
+  spec.add_runtime_dependency "rack-cors"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rack-test"

data/lib/ki/base_request.rb

@@ -10,6 +10,10 @@ module Ki
       path == '/instadoc'
     end
 
+    def admin?
+      path == '/instadmin'
+    end
+
     def json?
       content_type == 'application/json' || format_of(path) == 'json'
     end

data/lib/ki/helpers.rb

@@ -1,51 +1,3 @@
-class String
-  # Converts a string to a class
-  #
-  # ==== Examples
-  #
-  #   class User
-  #   end
-  #
-  #   "user".to_class == User
-  #
-  def to_class
-    chain = self.split "::"
-    klass = Kernel
-    chain.each do |klass_string|
-      klass = klass.const_get klass_string.split('_').map{|w| w.capitalize}.join('')
-    end
-    klass.is_a?(Class) ? klass : nil
-  rescue NameError
-    nil
-  end
-end
-
-class Array
-  def stringify_ids
-    self.collect do |e|
-      if e['_id']
-        e['id'] = e['_id'].to_s
-        e.delete('_id')
-      end
-      if e[:_id]
-        e['id'] = e[:_id].to_s
-        e.delete(:_id)
-      end
-      e
-    end
-  end
-
-  def present?
-    !nil? && !empty?
-  end
-end
-
-class NilClass
-  def present?
-    false
-  end
-end
-
 module Ki
   module Helpers
     include Middleware::Helpers::View

data/lib/ki/ki.rb

@@ -13,8 +13,7 @@ module Ki
     VIEWS_PATH = 'views'
 
     def initialize
-      KiConfig.instance.read environment
-      Orm::Db.instance.establish_connection
+      Ki.connect
 
       @app = Rack::Builder.new do
         use Middleware::InitMiddleware
@@ -23,12 +22,23 @@ module Ki
         KiConfig.instance.middleware.each do |middleware|
           use middleware
         end
+        use Rack::Cors do
+          allow do
+            origins '*'
+            resource '*', headers: :any, methods: :any
+          end
+        end
         run KiApp.new
       end
     end
 
-    def environment
-      ENV['RACK_ENV']
+    def self.connect
+      KiConfig.instance.read Ki.environment
+      Orm::Db.instance.establish_connection
+    end
+
+    def self.environment
+      ENV['RACK_ENV'] || 'development'
     end
 
     def call env

data/lib/ki/ki_cli.rb

@@ -1,5 +1,7 @@
 require 'thor'
 
+require 'ki/utils/extra_irb'
+
 module Ki
   module Cli #:nodoc:
     class KiGenerator < Thor::Group #:nodoc:
@@ -8,6 +10,13 @@ module Ki
       def self.source_root
         File.join(File.dirname(__FILE__), '..', '..')
       end
+
+      def self.requies_ki_directory
+        unless File.exists? 'config.ru'
+          say "Working directory should be a ki app."
+          exit 3
+        end
+      end
     end
 
     class AppGenerator < KiGenerator
@@ -50,18 +59,24 @@ module Ki
       desc "Starts the ki server"
 
       def start_server
-        unless File.exists? 'config.ru'
-          say "Working directory should be a ki app."
-          exit 3
-        end
-
+        KiGenerator.requies_ki_directory
         `bundle exec rackup -o 0.0.0.0 -p #{port}`
       end
     end
 
+    class DevConsole < KiGenerator
+      def start_console
+        KiGenerator.requies_ki_directory
+        require './app'
+        Ki.connect
+        IRB.start_session(nil)
+      end
+    end
+
     class Main < Thor
       register AppGenerator, :new, 'new [APP_NAME]', 'generate a new app'
       register DevServer, :server, 'server [PORT]', "start the ki server. Default port is #{DevServer::DEFAULT_PORT}"
+      register DevConsole, :console, 'console', 'start the console'
     end
   end
 end

data/lib/ki/middleware/admin_interface_generator.rb

@@ -0,0 +1,13 @@
+module Ki
+  module Middleware
+    class AdminInterfaceGenerator < DocGenerator
+      def custom_view_path
+        File.join(File.dirname(__FILE__), '..', 'views', 'instadmin.haml')
+      end
+
+      def custom_check req
+        req.admin?
+      end
+    end
+  end
+end

data/lib/ki/middleware/doc_generator.rb

@@ -5,18 +5,22 @@ module Ki
 
       def call env
         req = BaseRequest.new env
-        if req.doc?
+        if custom_check(req)
           if view_exists?(req)
             render_haml view_path(req)
           else
-            render_haml doc_view_path(req)
+            render_haml custom_view_path
           end
         else
           @app.call env
         end
       end
 
-      def doc_view_path path
+      def custom_check req
+        req.doc?
+      end
+
+      def custom_view_path
         File.join(File.dirname(__FILE__), '..', 'views', 'instadoc.haml')
       end
     end

data/lib/ki/orm.rb

@@ -40,6 +40,15 @@ module Ki
         self
       end
 
+      def connection_string
+        db = KiConfig.instance.database
+        if ENV["MONGODB_URI"]
+          ENV["MONGODB_URI"]
+        else
+          "#{db['host']}:#{db['port']}/#{db['name']}"
+        end
+      end
+
       # ==== Returns
       #
       # An array of all the collection names in the database.

data/lib/ki/utils/extra_irb.rb

@@ -0,0 +1,25 @@
+# http://jasonroelofs.com/2009/04/02/embedding-irb-into-your-ruby-application/
+require 'irb'
+
+module IRB # :nodoc:
+  def self.start_session(binding)
+    unless @__initialized
+      args = ARGV
+      ARGV.replace(ARGV.dup)
+      IRB.setup(nil)
+      ARGV.replace(args)
+      @__initialized = true
+    end
+
+    workspace = WorkSpace.new(binding)
+
+    irb = Irb.new(workspace)
+
+    @CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
+    @CONF[:MAIN_CONTEXT] = irb.context
+
+    catch(:IRB_EXIT) do
+      irb.eval_input
+    end
+  end
+end

data/lib/ki/utils/extra_ruby.rb

@@ -0,0 +1,47 @@
+class String
+  # Converts a string to a class
+  #
+  # ==== Examples
+  #
+  #   class User
+  #   end
+  #
+  #   "user".to_class == User
+  #
+  def to_class
+    chain = self.split "::"
+    klass = Kernel
+    chain.each do |klass_string|
+      klass = klass.const_get klass_string.split('_').map{|w| w.capitalize}.join('')
+    end
+    klass.is_a?(Class) ? klass : nil
+  rescue NameError
+    nil
+  end
+end
+
+class Array
+  def stringify_ids
+    self.collect do |e|
+      if e['_id']
+        e['id'] = e['_id'].to_s
+        e.delete('_id')
+      end
+      if e[:_id]
+        e['id'] = e[:_id].to_s
+        e.delete(:_id)
+      end
+      e
+    end
+  end
+
+  def present?
+    !nil? && !empty?
+  end
+end
+
+class NilClass
+  def present?
+    false
+  end
+end

data/lib/ki/version.rb

@@ -1,3 +1,3 @@
-module Ki 
-  VERSION = "0.4.5"
+module Ki
+  VERSION = "0.4.6"
 end

data/lib/ki/views/instadmin.haml

@@ -0,0 +1,5 @@
+%h1 Ki InstAdmin
+
+%p
+  Connected to
+  = Ki::Orm::Db.instance.connection_string

data/lib/ki.rb

@@ -1,15 +1,20 @@
+# ruby stdlib
 require 'yaml'
 require 'uri'
 
+# gems
 require 'rack'
 require 'rack/parser'
+require 'rack/cors'
 require 'haml'
 require 'sass'
 require 'coffee-script'
 require 'mongo'
 
-
-require 'ki/api_error'
+# code
+require 'ki/utils/api_error'
+require 'ki/utils/extra_ruby'
+require 'ki/utils/indifferent_hash'
 
 require 'ki/modules/query_interface'
 require 'ki/modules/restrictions'
@@ -19,11 +24,20 @@ require 'ki/modules/view_helper'
 require 'ki/modules/format_of'
 require 'ki/modules/public_file_helper'
 
-require 'ki/indifferent_hash'
+require 'ki/middleware/base_middleware'
+require 'ki/middleware/init_middleware'
+require 'ki/middleware/api_handler'
+require 'ki/middleware/public_file_server'
+require 'ki/middleware/sass_compiler'
+require 'ki/middleware/haml_compiler'
+require 'ki/middleware/coffee_compiler'
+require 'ki/middleware/doc_generator'
+require 'ki/middleware/admin_interface_generator'
+
 require 'ki/ki_config'
 require 'ki/helpers'
 require 'ki/orm'
-require 'ki/middleware'
-require 'ki/ki'
 require 'ki/model'
 require 'ki/base_request'
+
+require 'ki/ki'

data/spec/config.yml.example

@@ -8,6 +8,7 @@ test:
   middleware: [
     'ApiHandler',
     'DocGenerator',
+    'AdminInterfaceGenerator',
     'CoffeeCompiler',
     'SassCompiler',
     'HamlCompiler',

data/spec/lib/ki/model_spec.rb

@@ -21,14 +21,14 @@ describe Ki::Model do
         Foo.update('id' => id, 'hello' => 'universe')
         Foo.find(id).first['hello'].should == 'universe'
         Foo.delete(id)
-      }.to change{Foo.count}.by 0
+      }.to change { Foo.count }.by 0
     end
 
     it 'should find or create' do
       expect {
-        h = { 'time' => Time.now.to_i.to_s }
-        r = Foo.find_or_create(h)
-        r = Foo.find_or_create(h)
+        h = { time: Time.now.to_i.to_s, random: SecureRandom.uuid }
+        Foo.find_or_create(h)
+        Foo.find_or_create(h)
       }.to change { Foo.count }.by 1
     end
   end

data/spec/lib/ki/orm_spec.rb

@@ -9,6 +9,10 @@ describe Ki::Orm do
     @db.config['name'].should == 'np_test'
   end
 
+  it 'has a connection string' do
+    expect(@db.connection_string.class).to be String
+  end
+
   it 'should create a db object' do
     expect {
       oid = @db.insert 'foo', {hello: 'world'}

data/spec/util_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Ki do
   it 'should run in test env' do
-    Ki::Ki.new.environment.should == 'test'
+    Ki::Ki.environment.should == 'test'
   end
 
   it 'should convert string to class corectly' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ki
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Cristian Mircea Messel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-cors
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -229,14 +243,12 @@ files:
 - bin/ki
 - ki.gemspec
 - lib/ki.rb
-- lib/ki/api_error.rb
 - lib/ki/base_request.rb
 - lib/ki/helpers.rb
-- lib/ki/indifferent_hash.rb
 - lib/ki/ki.rb
 - lib/ki/ki_cli.rb
 - lib/ki/ki_config.rb
-- lib/ki/middleware.rb
+- lib/ki/middleware/admin_interface_generator.rb
 - lib/ki/middleware/api_handler.rb
 - lib/ki/middleware/base_middleware.rb
 - lib/ki/middleware/coffee_compiler.rb
@@ -254,7 +266,12 @@ files:
 - lib/ki/modules/restrictions.rb
 - lib/ki/modules/view_helper.rb
 - lib/ki/orm.rb
+- lib/ki/utils/api_error.rb
+- lib/ki/utils/extra_irb.rb
+- lib/ki/utils/extra_ruby.rb
+- lib/ki/utils/indifferent_hash.rb
 - lib/ki/version.rb
+- lib/ki/views/instadmin.haml
 - lib/ki/views/instadoc.haml
 - spec/config.yml.example
 - spec/examples/base/.ruby-gemset

data/lib/ki/middleware.rb

@@ -1,11 +0,0 @@
-require 'ki/middleware/base_middleware'
-
-require 'ki/middleware/init_middleware'
-require 'ki/middleware/api_handler'
-require 'ki/middleware/public_file_server'
-
-require 'ki/middleware/sass_compiler'
-require 'ki/middleware/haml_compiler'
-require 'ki/middleware/coffee_compiler'
-
-require 'ki/middleware/doc_generator'