hayabusa 0.0.25 → 0.0.30

data/lib/models/log_link.rb

@@ -1,8 +1,8 @@
-class Hayabusa::Models::Log_link < Knj::Datarow
+class Hayabusa::Models::Log_link < Hayabusa::Datarow
   has_one [
     {:class => :Log, :col => :log_id, :method => :log}
   ]
-  
+
   def self.list(d, &block)
     if d.args["count"]
       sql = "SELECT COUNT(id) AS count FROM #{table} WHERE 1=1"
@@ -11,11 +11,11 @@ class Hayabusa::Models::Log_link < Knj::Datarow
     else
       sql = "SELECT * FROM #{table} WHERE 1=1"
     end
-    
+
     q_args = nil
     ret = self.list_helper(d)
     sql << ret[:sql_joins]
-    
+
     d.args.each do |key, val|
       case key
         when "object_class"
@@ -28,17 +28,17 @@ class Hayabusa::Models::Log_link < Knj::Datarow
           raise "Invalid key: #{key}."
       end
     end
-    
+
     sql << ret[:sql_where]
-    
+
     return d.db.query(sql).fetch[:count].to_i if count
-    
+
     sql << ret[:sql_order]
     sql << ret[:sql_limit]
-    
+
     return d.ob.list_bysql(:Log_link, sql, q_args, &block)
   end
-  
+
   def self.add(d)
     if d.data.has_key?(:object)
       class_data_id = d.ob.static(:Log_data_value, :force, d.data[:object].class.name)
@@ -46,10 +46,10 @@ class Hayabusa::Models::Log_link < Knj::Datarow
       d.data[:object_id] = d.data[:object].id
       d.data.delete(:object)
     end
-    
+
     log = d.ob.get(:Log, d.data[:log_id]) #throws exception if it doesnt exist.
   end
-  
+
   def object(ob_use)
     begin
       class_name = ob.get(:Log_data_value, self[:object_class_value_id])[:value].split("::").last
@@ -58,7 +58,7 @@ class Hayabusa::Models::Log_link < Knj::Datarow
       return false
     end
   end
-  
+
   def object_class
     return ob.get(:Log_data_value, self[:object_class_value_id])[:value]
   end

data/lib/models/session.rb

@@ -1,11 +1,11 @@
-class Hayabusa::Models::Session < Knj::Datarow
+class Hayabusa::Models::Session < Hayabusa::Datarow
   attr_reader :edata
   attr_accessor :sess_data
-  
+
   def initialize(*args, &block)
     @edata = {}
     super(*args, &block)
-    
+
     if self[:sess_data].to_s.length > 0
       begin
         @sess_data = Marshal.load(Base64.decode64(self[:sess_data]))
@@ -17,15 +17,15 @@ class Hayabusa::Models::Session < Knj::Datarow
       @sess_data = {}
     end
   end
-  
+
   def self.add(d)
     d.data[:date_added] = Time.now if !d.data[:date_added]
     d.data[:date_lastused] = Time.now if !d.data[:date_lastused]
   end
-  
+
   def flush
     flush_data = Base64.encode64(Marshal.dump(@sess_data))
-    
+
     if self[:sess_data] != flush_data
       self.update(
         :sess_data => flush_data,

data/pages/config_cgi.rb

@@ -1,5 +1,5 @@
 require "rubygems"
-require "RMagick"
+require "rmagick"
 
 Hayabusa::CGI_CONF = {
   :hayabusa => {
@@ -9,12 +9,12 @@ Hayabusa::CGI_CONF = {
       :regex => /^\/Kasper$/,
       :callback => proc{|data|
         data[:httpsession].page_path = nil
-        
+
         eruby = data[:httpsession].eruby
         eruby.connect(:on_error) do |e|
           _hb.handle_error(e)
         end
-        
+
         eruby.import("#{File.dirname(__FILE__)}/../pages/spec.rhtml")
       }
     }]

data/pages/config_fcgi.rb

@@ -1,5 +1,5 @@
 require "rubygems"
-require "RMagick"
+require "rmagick"
 
 Hayabusa::FCGI_CONF = {
   :hayabusa => {
@@ -9,12 +9,12 @@ Hayabusa::FCGI_CONF = {
       :regex => /^\/Kasper$/,
       :callback => proc{|data|
         data[:httpsession].page_path = nil
-        
+
         eruby = data[:httpsession].eruby
         eruby.connect(:on_error) do |e|
           _hb.handle_error(e)
         end
-        
+
         eruby.import("#{File.dirname(__FILE__)}/../pages/spec.rhtml")
       }
     }]

metadata

@@ -1,29 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: hayabusa
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.30
 platform: ruby
 authors:
-- Kasper Johansen
+- Kasper Stöckel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: baza
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.38
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.38
 - !ruby/object:Gem::Dependency
   name: knjrbfw
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.114
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.114
+- !ruby/object:Gem::Dependency
+  name: wref
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -151,21 +179,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rmagick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.8
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -223,14 +293,9 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- ".document"
-- ".rspec"
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - bin/check_running.rb
 - bin/hayabusa_benchmark.rb
 - bin/hayabusa_cgi.rb
@@ -239,10 +304,6 @@ files:
 - bin/hayabusa_fcgi_server.rb
 - bin/hayabusa_spec_restart.rb
 - bin/knjappserver_start.rb
-- conf/apache2_cgi_rhtml_conf.conf
-- conf/apache2_fcgi_rhtml_conf.conf
-- conf/apache2_hayabusa_conf.conf
-- hayabusa.gemspec
 - lib/hayabusa.rb
 - lib/hayabusa_cgi.rb
 - lib/hayabusa_cgi_session.rb
@@ -250,6 +311,7 @@ files:
 - lib/hayabusa_client_session.rb
 - lib/hayabusa_custom_io.rb
 - lib/hayabusa_database.rb
+- lib/hayabusa_datarow.rb
 - lib/hayabusa_erb_handler.rb
 - lib/hayabusa_ext/cleaner.rb
 - lib/hayabusa_ext/cmdline.rb
@@ -271,6 +333,8 @@ files:
 - lib/hayabusa_http_session_request.rb
 - lib/hayabusa_http_session_response.rb
 - lib/hayabusa_models.rb
+- lib/hayabusa_objects.rb
+- lib/hayabusa_revision.rb
 - lib/kernel_ext/gettext_methods.rb
 - lib/kernel_ext/magic_methods.rb
 - lib/models/log.rb
@@ -307,10 +371,6 @@ files:
 - pages/testpic.jpeg
 - pages/tests.rhtml
 - pages/threadded_content_test.rhtml
-- spec/fcgi_multiple_processes_spec.rb
-- spec/hayabusa_spec.rb
-- spec/spec_helper.rb
-- spec/test_upload.xlsx
 homepage: http://github.com/kaspernj/hayabusa
 licenses:
 - MIT
@@ -330,8 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: A threadded web/app-server that supports stand-alone, CGI and FCGI-modes.

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/Gemfile

@@ -1,24 +0,0 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-
-gem "knjrbfw"
-gem "erubis"
-gem "mail"
-gem "datet"
-gem "http2"
-gem "tpool"
-gem "ruby_process"
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "json"
-  gem "rspec", ">= 2.3.0"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.8.8"
-  gem "rmagick"
-  gem "sqlite3" if RUBY_ENGINE != "jruby"
-  gem "php4r"
-end

data/Gemfile.lock

@@ -1,101 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.3.6)
-    builder (3.2.2)
-    datet (0.0.25)
-    diff-lcs (1.2.4)
-    erubis (2.7.0)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    git (1.2.8)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (3.3.2)
-    highline (1.6.21)
-    http2 (0.0.22)
-    jeweler (1.8.8)
-      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.8.0)
-    jwt (1.2.0)
-    knjrbfw (0.0.107)
-      datet
-      http2
-      php4r
-      ruby_process
-      tsafe
-      wref
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    php4r (0.0.4)
-      datet
-      http2
-      string-strtr
-    polyglot (0.3.3)
-    rack (1.5.2)
-    rake (10.4.2)
-    rdoc (4.1.2)
-      json (~> 1.4)
-    rmagick (2.13.2)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    ruby_process (0.0.8)
-      tsafe
-      wref
-    sqlite3 (1.3.7)
-    string-strtr (0.0.3)
-    tpool (0.0.4)
-    treetop (1.4.14)
-      polyglot
-      polyglot (>= 0.3.1)
-    tsafe (0.0.11)
-    wref (0.0.6)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (>= 1.0.0)
-  datet
-  erubis
-  http2
-  jeweler (~> 1.8.8)
-  json
-  knjrbfw
-  mail
-  php4r
-  rmagick
-  rspec (>= 2.3.0)
-  ruby_process
-  sqlite3
-  tpool

data/VERSION

@@ -1 +0,0 @@
-0.0.25

data/bin/hayabusa_fcgi.fcgi

@@ -1,42 +0,0 @@
-#!/usr/bin/ruby
-
-#This scripts start an appserver, executes a CGI-request for every FCGI-request and terminates when FCGI terminates.
-#Good for programming appserver-supported projects that doesnt need threadding without running an appserver all the time.
-
-error_log_file = "/tmp/hayabusa_fcgi.log"
-
-begin
-  File.unlink(error_log_file) if File.exists?(error_log_file)
-rescue Errno::ENOENT
-  #ignore.
-end
-
-begin
-  require "rubygems"
-  require "fcgi"
-  require "fileutils"
-  
-  #Try to load development-version to enable debugging without doing constant gem-installations.
-  begin
-    require "#{File.realpath(File.dirname(__FILE__))}/../../knjrbfw/lib/knjrbfw.rb"
-  rescue LoadError
-    require "knjrbfw"
-  end
-  
-  #Load 'Hayabusa' and start the FCGI-loop to begin handeling requests.
-  require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../lib/hayabusa.rb"
-  fcgi = Hayabusa::Fcgi.new
-  fcgi.fcgi_loop
-rescue Exception => e
-  if !e.is_a?(Interrupt)
-    #Log error to the log-file if something happened.
-    File.open(error_log_file, "w") do |fp|
-      fp.puts e.inspect
-      fp.puts e.backtrace
-      fp.puts ""
-    end
-  end
-  
-  #Just raise it normally as if a normal error occurred.
-  raise e
-end

data/conf/apache2_cgi_rhtml_conf.conf

@@ -1,10 +0,0 @@
-Alias /hayabusa_cgi_test "/path/to/hayabusa/tests/cgi_test"
-ScriptAlias /hayabusa/ "/path/to/hayabusa/bin/"
-
-<Directory "/path/to/hayabusa/tests/cgi_test">
-  Options +FollowSymLinks +ExecCGI
-  RequestHeader set HAYABUSA_CGI_CONFIG "/path/to/hayabusa/tests/cgi_test/config_cgi.rb"
-  AddHandler application/x-hayabusa-cgi .rhtml
-  Action application/x-hayabusa-cgi /hayabusa/hayabusa_cgi.rb
-  DirectoryIndex index.cgi
-</Directory>

data/conf/apache2_fcgi_rhtml_conf.conf

@@ -1,22 +0,0 @@
-Alias /hayabusa_fcgi_test "/path/to/hayabusa/tests/fcgi_test"
-Alias /hayabusa_fcgi_bin "/path/to/hayabusa/bin"
-
-<IfModule mod_fcgid.c>
-  SocketPath /tmp/fcgi_socket
-  FcgidIdleTimeout 30
-  FcgidMinProcessesPerClass 0
-  FcgidIdleScanInterval 15
-</IfModule>
-
-<Directory "/path/to/hayabusa/tests/fcgi_test">
-  RewriteEngine On
-  RewriteRule ^(.*)\.rhtml$ /hayabusa_fcgi_bin/hayabusa_fcgi.fcgi
-  
-  Options +FollowSymLinks
-  
-  RequestHeader set HAYABUSA_FCGI_CONFIG "/path/to/hayabusa/tests/fcgi_test/config_fcgi.rb"
-  
-  AddHandler fcgid-script .fgci
-  
-  DirectoryIndex index.rhtml
-</Directory>

data/conf/apache2_hayabusa_conf.conf

@@ -1,15 +0,0 @@
-<IfModule mod_fcgid.c>
-  SocketPath /tmp/fcgi_socket
-  FcgidIdleTimeout 30
-  FcgidMinProcessesPerClass 0
-  FcgidIdleScanInterval 15
-</IfModule>
-
-<Directory "/path/to/hayabusa/bin">
-  Options +FollowSymLinks +ExecCGI
-  Order allow,deny
-  Allow from all
-  AllowOverride none
-</Directory>
-
-Alias /hayabusa_fcgi_bin "/path/to/hayabusa/bin"