rhino-framework 0.0.4 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 492876e8b44ac07720daaa2f0f21da53899a3c83
-  data.tar.gz: ba4db5600b64551d69bf934537b7fe11e6422436
+  metadata.gz: 412ba9a96517119ba80bc654b3deed90e37c30f9
+  data.tar.gz: ed58a073c98123dc03d5aebe4624d35be1ad5923
 SHA512:
-  metadata.gz: 24279bbf2b49923991899d273694cc563be92e7fa2455efb432d66e3ee885f0bcbce16204df18002fbb3eee7d738258bcf55aae2aa2d735a393c15d5629bc2be
-  data.tar.gz: d8ad14a65bbeb15242b0c1c1de5c01b67d92e9ef4340686b8bb5851b29e76fb25695ff8eda7002dfb5d0ac20e2599fe0dc765b43f1b7c46cd8357591a820719a
+  metadata.gz: 5d27191222b7f3cea729bcbcc2731744aef3a43d4e3575fab3be510287c8ca845c88b126eb5a5f2c45a8378990f0bda30d2325ba5d493be242cb72056d92a0b3
+  data.tar.gz: f3709ccdbd9817d20c16fb12603848eac6903f0622e9e9fde5ec4a03dfaca488c0e76465db7de23e1f0c634e6b5cd24a0747ddc51fdeda55927ca5a675a5008e

data/bin/rhino

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require 'rhino/cli'
+Rhino::Cli.new(ARGV).run

data/lib/rhino.rb

@@ -1,42 +1,21 @@
+require 'yaml'
 require "rhino/version"
 require "rhino/routing"
 require "rhino/util"
 require "rhino/dependencies"
 require "rhino/controller"
 require "rhino/file_model"
+require "rhino/sqlite_model"
 
 module Rhino
-
   class Application
-
     def call(env)
-      klass, act = get_controller_and_action(env)
-      controller = klass.new(env)
-      text = controller.send(act) rescue (return action_not_found)
-      [200, {'Content-Type' => 'text/html'}, [text]]
-    rescue LoadError => e
-      return error_404(e)
-    rescue => e # StandardError
-      return error_500(e)
-    end
-
-    def error_404(error)
-      [404, {'Content-Type' => 'text/html'}, ["The page not found ! <br/> <b>#{error.message}</b>"]]
+      if env['PATH_INFO'] == '/favicon.ico'
+        return [404,
+          {'Content-Type' => 'text/html'}, []]
+      end
+      rack_app = get_rack_app(env)
+      rack_app.call(env)
     end
-
-    def action_not_found
-      [404, {'Content-Type' => 'text/html'}, ['The action not found !']]
-    end
-
-    def error_500(error)
-      [500, {'Content-Type' => 'text/html'}, ["Some thing went wrong ! <br/> <b>#{error.message}</b>"]]
-    end
-
-    def self.root_path
-      "/home/buikhanh/projects/my_projects/ruby-framework/best_quotes/"
-    end
-
   end
-
-
 end

data/lib/rhino/cli.rb

@@ -0,0 +1,40 @@
+module Rhino
+  class Cli
+    def initialize(args)
+      @args = args
+      @template_path = File.join(File.dirname(__FILE__), 'generators', 'template_codes')
+    end
+
+    def run
+      if @args[0] == 'new' && !@args[1].nil?
+        new_app(@args[1])
+      end
+    end
+
+    def new_app(app_name)
+      structure_path = @template_path + '/structure'
+      FileUtils.cp_r structure_path, app_name
+      create_application_file(app_name)
+      create_config_file(app_name)
+      p "created app `#{app_name}`"
+    end
+
+    def create_application_file(app_name)
+      template_file = File.read(@template_path + '/application.rb.tt')
+      new_file_content = template_file.gsub('{{app_name}}', module_app_name(app_name))
+      File.open("#{app_name}/config/application.rb", 'w') {|file| file.puts new_file_content }
+    end
+
+    def create_config_file(app_name)
+      template_file = File.read(@template_path + '/config.ru.tt')
+      new_file_content = template_file.gsub('{{app_name}}', module_app_name(app_name))
+      File.open("#{app_name}/config.ru", 'w') {|file| file.puts new_file_content }
+    end
+
+    # convert from string to module_name: 'new_app' => 'NewApp'
+    def module_app_name(name)
+      name.split("_").map!{|x| x.capitalize}.join
+    end
+
+  end
+end

data/lib/rhino/controller.rb

@@ -8,14 +8,48 @@ module Rhino
 
     def initialize(env)
       @env = env
+      @routing_params = {}
+    end
+
+    def dispatch(action, routing_params = {})
+      @routing_params = routing_params
+      text = self.send(action)
+      if get_response
+        st, hd, rs =  get_response.to_a
+        [st, hd, [rs].flatten]
+      else
+        [200, {'Context-Type' => 'text/html'}, [text].flatten]
+      end
+    end
+
+    def self.action(act, rp = {})
+      proc {|e| self.new(e).dispatch(act, rp)}
     end
 
     def env
       @env
     end
 
+    def request
+      @request ||= Rack::Request.new(@env)
+    end
+
+    def response(text, status=200, headers = {})
+      raise "Already responded!" if @response
+      a = [text].flatten
+      @response = Rack::Response.new(a, status, headers)
+    end
+
+    def get_response
+      @response
+    end
+
+    def params
+      request.params.merge(@routing_params)
+    end
+
     def render(view_name, locals={})
-      file_name = File.join Rhino::Application.root_path, 'app', 'views', controller_name, "#{view_name}.html.erb"
+      file_name = File.join 'app', 'views', controller_name, "#{view_name}.html.erb"
       template = File.read file_name
       eruby = Erubis::Eruby.new(template)
       eruby.result locals.merge(env: env)

data/lib/rhino/file_model.rb

@@ -22,13 +22,13 @@ module Rhino
       end
 
       def self.find(id)
-        FileModel.new(Rhino::Application.root_path + "/db/quotes/#{id}.json")
+        FileModel.new("db/quotes/#{id}.json")
       rescue
         nil
       end
 
       def self.all
-        files = Dir[Rhino::Application.root_path + '/db/quotes/*.json']
+        files = Dir['db/quotes/*.json']
         files.map{|f| FileModel.new f}.select{|x| !x.nil? }
       end
 

data/lib/rhino/generators/template_codes/application.rb.tt

@@ -0,0 +1,8 @@
+require 'rhino'
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'app', 'controllers')
+$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'app', 'models')
+
+module {{app_name}}
+  class Application < Rhino::Application
+  end
+end

data/lib/rhino/generators/template_codes/config.ru.tt

@@ -0,0 +1,17 @@
+require './config/application'
+
+app = {{app_name}}::Application.new
+
+use Rack::ContentType
+
+app.route do
+  # default routes
+  match "", proc { [200, {}, ["Congratulation! You're running a application based on Rhino-Framework"]] }
+  match ":controller/:id/:action"
+  match ":controller/:id",
+    :default => { "action" => "show" }
+  match ":controller",
+    :default => { "action" => "index" }
+end
+
+run app

data/lib/rhino/generators/template_codes/structure/Gemfile

@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gem 'rhino-framework'
+gem 'rack'
+gem 'bundler'
+
+group :development do
+  gem 'thin'
+  gem 'rerun'
+  gem 'test-unit', '~> 3.0'
+  gem 'minitest', '~> 5.5'
+  gem 'rack-test', '~> 0.6'
+  gem 'better_errors'
+  gem 'pry'
+end
+
+

data/lib/rhino/generators/template_codes/structure/config/database.yml

@@ -0,0 +1,6 @@
+# default using sqlite3 for database
+# please install sqlite3 server first
+
+database:
+  name: database.db
+

data/lib/rhino/routing.rb

@@ -1,9 +1,95 @@
+class RouteObject
+  def initialize
+    @rules = []
+  end
+
+  def match(url, *args)
+    options = {}
+    options = args.pop if args[-1].is_a?(Hash)
+    options[:default] ||= {}
+
+    dest = nil
+    dest = args.pop if args.size > 0
+    raise "Too many args!" if args.size > 0
+
+    parts = url.split("/")
+    parts.select! { |p| !p.empty? }
+
+    vars = []
+    regexp_parts = parts.map do |part|
+      if part[0] == ":"
+        vars << part[1..-1]
+        "([a-zA-Z0-9]+)"
+      elsif part[0] == "*"
+        vars << part[1..-1]
+        "(.*)"
+      else
+        part
+      end
+    end
+
+    regexp = regexp_parts.join("/")
+    @rules.push({
+      :regexp => Regexp.new("^/#{regexp}$"),
+      :vars => vars,
+      :dest => dest,
+      :options => options,
+    })
+  end
+
+  def check_url(url)
+    @rules.each do |r|
+      m = r[:regexp].match(url)
+
+      if m
+        options = r[:options]
+        params = options[:default].dup
+        r[:vars].each_with_index do |v, i|
+          params[v] = m.captures[i]
+        end
+        dest = nil
+        if r[:dest]
+          return get_dest(r[:dest], params)
+        else
+          controller = params["controller"]
+          action = params["action"]
+          return get_dest("#{controller}" +
+            "##{action}", params)
+        end
+      end
+    end
+
+    nil
+  end
+
+  def get_dest(dest, routing_params = {})
+    return dest if dest.respond_to?(:call)
+    if dest =~ /^([^#]+)#([^#]+)$/
+      name = $1.capitalize
+      cont = Object.const_get("#{name}Controller")
+      return cont.action($2, routing_params)
+    end
+    raise "No destination: #{dest.inspect}!"
+  end
+end
+
 module Rhino
   class Application
+    def route(&block)
+      @route_obj ||= RouteObject.new
+      @route_obj.instance_eval(&block)
+    end
+
+    def get_rack_app(env)
+      raise "No routes!" unless @route_obj
+      @route_obj.check_url env["PATH_INFO"]
+    end
+
     def get_controller_and_action(env)
-      _, cont, action, after = env['PATH_INFO'].split("/", 4)
-      cont = cont.capitalize
-      cont += "Controller"
+      _, cont, action, after =
+        env["PATH_INFO"].split('/', 4)
+      cont = cont.capitalize # "People"
+      cont += "Controller" # "PeopleController"
 
       [Object.const_get(cont), action]
     end

data/lib/rhino/sqlite_model.rb

@@ -0,0 +1,109 @@
+require 'sqlite3'
+require 'rhino/util'
+
+# initialize database. Only for sqlite 3
+config_database = YAML.load_file('config/database.yml')
+DB = SQLite3::Database.new("db/" + config_database['database']['name'])
+
+module Rhino
+  module Model
+    class SQLite
+
+      def initialize(data = {})
+        @hash = data
+      end
+
+      def self.to_sql(val)
+        case val
+        when Numeric
+          val.to_s
+        when String
+          "'#{val}'"
+        else
+          raise "Can't change #{val.class} to SQL"
+        end
+      end
+
+      def self.find(id)
+        row = DB.execute("
+          SELECT #{schema.keys.join(',')} from #{table} where id = #{id};
+        ")
+        mapping_data row[0]
+      end
+
+      def self.all
+        rows = DB.execute("SELECT #{schema.keys.join(',')} from #{table};")
+        rows.map {|row| mapping_data row }
+      end
+
+      def [](name)
+        @hash[name.to_s]
+      end
+
+      def []=(name, value)
+        @hash[name.to_s] = value
+      end
+
+      def self.mapping_data(row_data)
+        self.new Hash[schema.keys.zip row_data]
+      end
+
+      def self.create(values)
+        values.delete "id"
+        keys = schema.keys - ['id']
+        vals =  keys.map do |key|
+          values[key] ? to_sql(values[key]) : "NULL"
+        end
+        DB.execute "INSERT INTO #{table} (#{keys.join ","}) VALUES (#{vals.join ","});"
+
+        data = Hash[keys.zip vals]
+        sql = "SELECT last_insert_rowid();"
+        data["id"] = DB.execute(sql)[0][0]
+        self.new data
+      end
+
+      def save!
+        unless @hash["id"]
+          self.class.create @hash
+          return true
+        end
+        fields = @hash.map do |k,v|
+          "#{k}=#{self.class.to_sql(v)}"
+        end.join(",")
+
+        DB.execute ("
+          UPDATE #{self.class.table}
+          SET #{fields}
+          WHERE id = #{@hash['id']}
+        ")
+        true
+      end
+
+      def save
+        self.save!  rescue false
+      end
+
+      def self.delete(id)
+        DB.execute("DELETE FROM #{table} WHERE id = #{id.to_i}")
+        true
+      end
+
+      def self.count
+        DB.execute("SELECT COUNT(*) FROM #{table}")[0][0]
+      end
+
+      def self.table
+        Rhino.to_underscore name
+      end
+
+      def self.schema
+        return @schema if @schema
+        @schema = {}
+        DB.table_info(table) do |row|
+          @schema[row["name"]] = row["type"]
+        end
+        @schema
+      end
+    end
+  end
+end

data/lib/rhino/version.rb

@@ -1,3 +1,3 @@
 module Rhino
-  VERSION = "0.0.4"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhino-framework
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.1
 platform: ruby
 authors:
-- rhino
+- Rhino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,30 +42,44 @@ dependencies:
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -108,29 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-description: This is Rails-like, Rack based framework
+description: This is Rack-based Ruby framework. I created it just for `Learning Ruby`
+  and for `Fun`
 email:
-- 18hino@gmail.com
-executables: []
+- buikhanh.bk@gmail.com
+executables:
+- rhino
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- LICENSE.txt
-- README.md
-- Rakefile
+- bin/rhino
 - lib/rhino.rb
-- lib/rhino/array.rb
+- lib/rhino/cli.rb
 - lib/rhino/controller.rb
 - lib/rhino/dependencies.rb
 - lib/rhino/file_model.rb
+- lib/rhino/generators/template_codes/application.rb.tt
+- lib/rhino/generators/template_codes/config.ru.tt
+- lib/rhino/generators/template_codes/structure/Gemfile
+- lib/rhino/generators/template_codes/structure/app/controllers/.keep
+- lib/rhino/generators/template_codes/structure/app/models/.keep
+- lib/rhino/generators/template_codes/structure/app/views/.keep
+- lib/rhino/generators/template_codes/structure/config/.keep
+- lib/rhino/generators/template_codes/structure/config/database.yml
+- lib/rhino/generators/template_codes/structure/db/database.db
 - lib/rhino/routing.rb
+- lib/rhino/sqlite_model.rb
 - lib/rhino/util.rb
 - lib/rhino/version.rb
-- rhino.gemspec
-- test/erb_test.rb
-- test/test_application.rb
-- test/test_helper.rb
 homepage: http://1rhino.github.io
 licenses:
 - MIT
@@ -151,11 +184,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rhino - Ruby Web Framework
-test_files:
-- test/erb_test.rb
-- test/test_application.rb
-- test/test_helper.rb
+test_files: []
+has_rdoc: 

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in rhino.gemspec
-gemspec

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2015 Rhino
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,27 +0,0 @@
-# Rhino
-
-This is a small Ruby Web Framework. Rails-like framework.
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'rhino'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install rhino
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/rhino/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

data/Rakefile

@@ -1,2 +0,0 @@
-require "bundler/gem_tasks"
-

data/lib/rhino/array.rb

@@ -1,5 +0,0 @@
-class Array
-  def sum(start = 0)
-    inject(start, &:+)
-  end
-end

data/rhino.gemspec

@@ -1,29 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'rhino/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "rhino-framework"
-  spec.version       = Rhino::VERSION
-  spec.authors       = ["rhino"]
-  spec.email         = ["18hino@gmail.com"]
-  spec.summary       = %q{Rhino - Ruby Web Framework}
-  spec.description   = %q{This is Rails-like, Rack based framework}
-  spec.homepage      = "http://1rhino.github.io"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "bundler", "~> 1.7"
-  spec.add_runtime_dependency "rake", "~> 10.0"
-  spec.add_runtime_dependency "erubis"
-  spec.add_runtime_dependency "multi_json"
-  spec.add_development_dependency "test-unit", "~> 3.0"
-  spec.add_development_dependency "minitest", "~> 5.5"
-  spec.add_development_dependency "rack-test", "~> 0.6"
-
-end

data/test/erb_test.rb

@@ -1,11 +0,0 @@
-require 'erubis'
-
-template = <<TEMPLATE
-This is a template.
-It has <%= some_thing %>.
-TEMPLATE
-
-eruby = Erubis::Eruby.new(template)
-puts eruby.src
-puts "========="
-puts eruby.result(some_thing: "Xicaloa")

data/test/test_application.rb

@@ -1,27 +0,0 @@
-require_relative 'test_helper'
-
-class RhinoAppTest < Test::Unit::TestCase
-  include Rack::Test::Methods
-
-  def app
-    BestQuotes::Application.new
-  end
-
-  def test_get
-    get '/'
-
-    assert last_response, "404"
-    body = last_response.body
-    assert body["not found"]
-
-  end
-
-  def test_request_post
-    get '/quotes/a_quote'
-
-    assert last_response.ok?
-    body = last_response.body
-    assert body["Ruby Version"]
-  end
-
-end

data/test/test_helper.rb

@@ -1,11 +0,0 @@
-require 'rack/test'
-require 'test/unit'
-
-# Alway use the local code first
-dir = File.join(File.dirname(__FILE__), "..", 'lib')
-best_quotes_dir =  File.join(File.dirname(__FILE__), "..", "..", 'best_quotes')
-$LOAD_PATH.unshift File.expand_path(dir)
-$LOAD_PATH.unshift File.expand_path(best_quotes_dir)
-
-require 'rhino'
-require 'config/application.rb'