tdiary 3.2.2.20130614 → 3.2.2.20130617

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eca5541a6d02354e337c5d41dc2bd36fb8ea5fe0
-  data.tar.gz: d5b7f5622d0edaae1391032d2f16e599e93a8133
+  metadata.gz: 8a6bd345a66f7d2db907e1625749a750ed236392
+  data.tar.gz: 32a98bf9b15d6ea973669a09fd20b903a2ba1f75
 SHA512:
-  metadata.gz: 46f8edaf87b103a50c2f4ef339cdc2dc3e202f8486dfb361d58af145019f0e3fe41ad4717fca13d1fa4e021b39235d57ae284761ea2c5735230ac2032062af32
-  data.tar.gz: aed17e747b8f90391fd534bb86feb12532b8b25c51a6652f2951b7bb9aef9b98c4e94188e508232356bcdacc3acfcf8a24073604cbdc17a09d12951a9d7fe972
+  metadata.gz: f393adf1156f339c0920be89f52c72f0f7ab5c5415c11367e2aefbd6a7f229e31d9783607d777520ba5fbcbfd13255cf0b158ed21484e1792aaf09b77d27a8f6
+  data.tar.gz: 1edfe539d32b123e32b14f8fa69c05a0190fa07ca95b6bb8da509dae4c1b5f1a49f67321a5d809e5895889a61a24bdb407de741a9ec3586ad2cf17dcfae93c20

data/Gemfile

@@ -18,10 +18,6 @@ end
 
 gem 'coffee-script', :group => [:development, :test]
 
-gem 'omniauth'
-gem 'omniauth-twitter'
-gem 'omniauth-github'
-
 gem 'dalli'
 gem 'redis'
 gem 'redis-namespace'

data/Gemfile.cgi

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'hikidoc', '>= 0.0.6'
+gem 'rdtool', '>= 0.6.0'
+gem 'imagesize', '>= 0.1.0'

data/Gemfile.cgi.lock

@@ -0,0 +1,14 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    hikidoc (0.0.6)
+    imagesize (0.1.1)
+    rdtool (0.6.38)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  hikidoc (>= 0.0.6)
+  imagesize (>= 0.1.0)
+  rdtool (>= 0.6.0)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tdiary (3.2.2.20130614)
+    tdiary (3.2.2.20130617)
       bundler (~> 1.3)
       hikidoc (>= 0.0.6)
       imagesize (>= 0.1.0)
@@ -41,13 +41,9 @@ GEM
     eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
     ffi (1.9.0)
-    hashie (2.0.5)
     hike (1.2.3)
     hikidoc (0.0.6)
-    httpauth (0.2.0)
     imagesize (0.1.1)
     jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
@@ -55,39 +51,14 @@ GEM
       rspec (>= 1.3.1)
       selenium-webdriver (>= 0.1.3)
     jasmine-core (1.3.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
     launchy (2.3.0)
       addressable (~> 2.3)
     method_source (0.8.1)
     mime-types (1.23)
     mini_portile (0.5.0)
-    multi_json (1.7.6)
-    multipart-post (1.2.0)
+    multi_json (1.7.7)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
-    oauth (0.4.7)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      rack (~> 1.2)
-    omniauth (1.1.4)
-      hashie (>= 1.2, < 3)
-      rack
-    omniauth-github (1.1.0)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.1)
-    omniauth-oauth (1.0.1)
-      oauth
-      omniauth (~> 1.0)
-    omniauth-oauth2 (1.1.1)
-      oauth2 (~> 0.8.0)
-      omniauth (~> 1.0)
-    omniauth-twitter (0.0.16)
-      multi_json (~> 1.3)
-      omniauth-oauth (~> 1.0)
     pit (0.0.7)
     posix-spawn (0.3.6)
     pry (0.9.12.2)
@@ -166,9 +137,6 @@ DEPENDENCIES
   dalli
   jasmine
   launchy
-  omniauth
-  omniauth-github
-  omniauth-twitter
   pit
   pry
   pygments.rb

data/index.rb

@@ -8,6 +8,8 @@
 #
 BEGIN { $stdout.binmode }
 
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile.cgi', __FILE__)
+
 begin
 	if FileTest::symlink?( __FILE__ ) then
 		org_path = File::dirname( File::readlink( __FILE__ ) ).untaint

data/spec/core/rack/static_spec.rb

@@ -18,5 +18,10 @@ describe TDiary::Rack::Static do
 			get '/index.rb'
 			last_response.status.should be 500
 		end
+
+		it 'should run the app when post method' do
+			post '/index.rb'
+			last_response.status.should be 500
+		end
 	end
 end

data/tdiary/cli.rb

@@ -55,6 +55,21 @@ module TDiary
 			say 'update finished', :green
 		end
 
+		desc "assets_copy", "copy assets files"
+		def assets_copy
+			require 'tdiary/environment'
+			assets_path = File.join(TDiary.server_root, 'public/assets')
+			TDiary::Application.config.assets_paths.each do |path|
+				Dir.glob(File.join(path, '*')).each do |entity|
+					if File.directory?(entity)
+						directory entity, File.join(assets_path, File.basename(entity))
+					else
+						copy_file entity, File.join(assets_path, File.basename(entity))
+					end
+				end
+			end
+		end
+
 		desc "test", "Create test server and run tDiary test"
 		def test
 			target = File.join(Dir.pwd, 'tmp/test')
@@ -81,7 +96,7 @@ module TDiary
 		method_option "port", :aliases => "p", :type => :numeric, :default => 19292, :banner =>
 			"use PORT"
 		def server
-			require 'tdiary'
+			require 'tdiary/environment'
 
 			if options[:cgi]
 				opts = {
@@ -105,7 +120,7 @@ module TDiary
 					:AccessLog   => $stderr,
 					:config      => File.expand_path("config.ru")
 				}
-				Rack::Server.start( opts )
+				::Rack::Server.start( opts )
 			end
 		end
 

data/tdiary/rack/static.rb

@@ -11,7 +11,7 @@ module TDiary
 
 			def call( env )
 				result = @file.call( env )
-				if result[0].to_i == 404
+				if result[0].to_i >= 400 && result[0].to_i < 500
 					@app.call( env )
 				else
 					result

data/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '3.2.2.20130614'
+	VERSION = '3.2.2.20130617'
 end

data/update.rb

@@ -8,6 +8,8 @@
 #
 BEGIN { $stdout.binmode }
 
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile.cgi', __FILE__)
+
 begin
 	if FileTest::symlink?( __FILE__ ) then
 		org_path = File::dirname( File::readlink( __FILE__ ) ).untaint

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary
 version: !ruby/object:Gem::Version
-  version: 3.2.2.20130614
+  version: 3.2.2.20130617
 platform: ruby
 authors:
 - TADA Tadashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -137,6 +137,8 @@ files:
 - .travis.yml
 - ChangeLog
 - Gemfile
+- Gemfile.cgi
+- Gemfile.cgi.lock
 - Gemfile.lock
 - LICENSE
 - Procfile