ki 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/examples/base/config.yml

@@ -0,0 +1,16 @@
+---
+chdir: PATH_TO_YOUR_APP
+environment: development
+address: 0.0.0.0
+port: 3000
+timeout: 30
+log: log/thin.log
+pid: tmp/pids/thin.pid
+max_conns: 1024
+max_persistent_conns: 100
+require: []
+wait: 30
+daemonize: false
+database_name: np
+database_host: 127.0.0.1
+database_port: 27017

data/ki.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ki"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cristian Mircea Messel"]
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "examples/base/Gemfile.lock",
     "examples/base/app.rb",
     "examples/base/config.ru",
+    "examples/base/config.yml",
     "gfx/colors.xcf",
     "gfx/ki3.eps",
     "gfx/logo.png",

data/lib/db.rb

@@ -47,8 +47,9 @@ module Ki
     end
     
     def config_db
-      yaml = read_yaml
-      config yaml['host'], yaml['port'], yaml['db_name']
+      config_path = File.join(Dir.pwd, 'config.yml')
+      yaml = YAML.load_file(config_path)
+      config yaml['database_host'], yaml['database_port'], yaml['database_name']
     end
 
     def config host, port, db_name
@@ -59,22 +60,6 @@ module Ki
       puts "Could not connect to MongoDB"
       exit 1
     end
-
-    private
-
-    def read_yaml
-      config_path = File.join(Dir.pwd, 'config.yml')
-      yaml = {}
-      if File.exists? config_path
-        YAML.load_file(config_path)
-      else
-        {
-          'host' => '127.0.0.1',
-          'port' => 27017,
-          'db_name' => Util.app_name
-        }
-      end
-    end
   end
 end
 

data/lib/ki.rb

@@ -22,3 +22,8 @@ module Ki
     end
   end
 end
+
+Dir['public/**/**'].each do |s|
+  Ki::StaticFile.compile_css(s)
+  Ki::StaticFile.compile_js(s)
+end

data/lib/ki_cli.rb

@@ -10,14 +10,6 @@ class KiGenerator < Thor::Group
   end
 end
 
-class ConfigGenerator < KiGenerator
-  def generate
-    create_file 'config.yml' do
-      "host: 127.0.0.1\nport: 27017\ndb_name: #{Ki::Util.app_name}\n"
-    end
-  end
-end
-
 class AppGenerator < KiGenerator
 
   argument :app_name
@@ -38,7 +30,7 @@ class AppGenerator < KiGenerator
   def create_app
     dest_root = File.join(Dir.pwd, app_name)
 
-    ['Gemfile', 'config.ru', 'app.rb'].each do |f|
+    ['Gemfile', 'config.ru', 'app.rb', 'config.yml'].each do |f|
       copy_file f, File.join(dest_root, f)
     end
   end
@@ -46,7 +38,6 @@ end
 
 class KiCli < Thor
   register AppGenerator, :new, 'new [APP_NAME]', 'generate a new app'
-  register ConfigGenerator, :config, 'config', 'generate a new config.yml'
 
   desc 'server', 'starts the app'
   # method_option :reload, :type => :boolean, :aliases => '-r', :desc => 'Recommended for development'

data/lib/modules/query_interface.rb

@@ -12,6 +12,15 @@ module Ki
       end
     end
 
+    def find_or_create hash
+      elem = find(hash)
+      if elem.empty?
+        elem_id = create(hash)
+        elem = find(elem_id)
+      end
+      elem
+    end
+
     def create hash
       Db.instance.create class_name, hash
     end

data/lib/static_file.rb

@@ -20,26 +20,46 @@ module Ki
 
     def self.compile_js filename
       if filename.end_with? '.js'
-        path = File.join(Util.root, filename)
-        coffee_path = path.gsub('.js', '.coffee')
-        if File.exists? coffee_path
-          cont = CoffeeScript.compile File.read(coffee_path)
-          File.open(path, 'w') do |f|
-            f.puts cont
-          end
-        end
+        js_path = File.join(Util.root, filename)
+        coffee_path = js_path.gsub('.js', '.coffee')
+        coffee_to_js coffee_path, js_path
+      elsif filename.end_with? '.coffee'
+        coffee_path = File.join(Util.root, filename)
+        js_path = coffee_path.gsub('.coffee', '.js')
+        coffee_to_js coffee_path, js_path
       end
     end
 
     def self.compile_css filename
       if filename.end_with? '.css'
-        path = File.join(Util.root, filename)
-        sass_path = path.gsub('.css', '.sass')
-        if File.exists? sass_path
-          eng = Sass::Engine.new(File.read(sass_path), :syntax => :sass)
-          File.open(path, 'w') do |f|
-            f.puts eng.render
-          end
+        css_path = File.join(Util.root, filename)
+        sass_path = css_path.gsub('.css', '.sass')
+        sass_to_css sass_path, css_path
+      elsif filename.end_with? '.sass'
+        sass_path = File.join(Util.root, filename)
+        css_path = sass_path.gsub('.sass', '.css')
+        sass_to_css sass_path, css_path
+      end
+    end
+
+    private
+
+    def self.sass_to_css sass_path, css_path
+      if File.exists? sass_path
+        p "Compiling #{sass_path}"
+        eng = Sass::Engine.new(File.read(sass_path), :syntax => :sass)
+        File.open(css_path, 'w') do |f|
+          f.puts eng.render
+        end
+      end
+    end
+
+    def self.coffee_to_js coffee_path, js_path
+      if File.exists? coffee_path
+        p "Compiling #{coffee_path}"
+        cont = CoffeeScript.compile(File.read(coffee_path))
+        File.open(js_path, 'w') do |f|
+          f.puts cont
         end
       end
     end

data/spec/modules/query_interface_spec.rb

@@ -75,4 +75,19 @@ describe Ki::QueryInterface do
       Software.find(id)['version'].should == 1.2
     }.to change(Software, :count).by(0)
   end
+
+  it "should find or create" do
+    class Crab < Ki::Model
+    end
+    hash = {'user' => 'name', 'birth' => '2015'}
+
+    Crab.find(hash).empty?.should be_true
+    expect {
+      Crab.find_or_create hash
+    }.to change(Crab, :count).by(1)
+
+    expect {
+      Crab.find_or_create hash
+    }.to change(Crab, :count).by(0)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ki
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -292,6 +292,7 @@ files:
 - examples/base/Gemfile.lock
 - examples/base/app.rb
 - examples/base/config.ru
+- examples/base/config.yml
 - gfx/colors.xcf
 - gfx/ki3.eps
 - gfx/logo.png
@@ -342,7 +343,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2680538544156376822
+      hash: 524519885161704144
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: