headwinds 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce924ab8dad600d8b056ee11104953ac7c0e1be8
-  data.tar.gz: 97bf882db04d87b0b63302d8751555c5ff786b67
+  metadata.gz: fd34054c6454f04dda4b91d674d38a255df06000
+  data.tar.gz: ffec4f368e32191ef3d88a3493874885daec2578
 SHA512:
-  metadata.gz: 5f115587e029fcab65137137ca1d881b0178ab20dfa02113970c0099266cd7b4f17a5de04b573591965568d12100f5d57c01317d3b6d6106f3887fcabd796483
-  data.tar.gz: 0b2252eae6490f699336fb1249f2b5f78959425ff4aa9e4d7d9c74aced52c538117fac20041c1f5ee78e6e5704ac53dcff190665a8ecf324c4efeb814515cb1f
+  metadata.gz: 199849973c1e36c8aa0be901db5a29e7d613254ec41ad58ed71284787a63d6a0ab07980d23ba23498b114b8613ed1d327cab94377d7e13c6ba2690a7fa19a474
+  data.tar.gz: c57bd4ea6af9663aa73340734d14a54b95460749747bed36ae7bebcf75359fbb9fd7b26b752f35e453492084d74dc39e3013116499292f88712cb2b2742f6607

data/lib/headwinds.rb

@@ -1,71 +1,19 @@
-require "headwinds/version"
+require 'headwinds/version'
+require 'headwinds/client_helper'
+require 'headwinds/rails'
 
-module Rack
-	class Headwinds
-		#PRIVATE_KEY = 'vLLLZHc9VuihVqYOH3cA'
-		#API_KEY = '51282dee16d3125926000053'
-		INTERVAL = 60*5
-		REFRESHING_TIME = 24 * 3600
+module Headwinds
+	class KaPow
+		$PRIVATE_KEY = 'VrIDKlCHheYsi0tYUr9U'
+		$API_KEY = '512cd0d516d3124c77000001'
+		$INTERVAL = 60*5
+		$REFRESHING_TIME = 24 * 3600
 
-		class << self
-			attr_accessor :private_key, :api_key
+		# move init to client_helper.rb
 
-			def test_mode!(options = {})
-				value = options[:return]
-				self.test_mode = value.nil? ? true : options[:return]
-			end
-		end
-
-
-		def initialize(app, options = {})
-			@app = app
-			self.class.private_key = options[:private_key]
-			self.class.api_key = options[:api_key]
-		end
-
-		def call(env)
-			dup._call(env)
-		end
-
-		def _call(env)
-			print 'testing it'
-		end
-
-
-		def initialize_kapow(location)
-			print "Content-Type: text/html\n\n"
-			print '<script src="http://rabbit.cs.pdx.edu/headwinds/application/js/kapow.js"></script>'
-			print '<input type="hidden" name="kapowField" id="kapowField" value="" />'
-			print "<script> kapowInitialize('#{location}')</script>"
-		end
-
-		def headwinds2_return_initial_cookie(msg, author, email)
-			private_key = Rack::Headwinds.private_key
-			@Ks = getKsFromPK(private_key)
-			ip = request.env['REMOTE_ADDR']
-			@S = String(10)
-			ts = Time.now.to_i
-			@Data = msg+author+email
-
-			@total = @Data+@Ks+@S+ts
-			@Cookie = hashlib.md5(total).hexdigest()
-			dct = Array({:'Cookie'=> @Cookie,
-				:'ts'=> ts,
-				:'S'=> @S,
-				:'comment_author'=> author,
-				:'comment_author_email'=> email,
-				:'comment_author_ip'=> ip,
-				:'comment_date'=> ts,
-				:'comment_author_url'=> 'http://google.com',
-				:'comment_content'=> msg,
-				:'Data'=> @Data,
-				:'api_key'=> private_key
-			})
-			return dct
-		end
-		def kapow_verify(kapowField)
+		def self.kapow_verify(kapowField)
 			require 'json'
-			require 'digest'
+			require 'digest/md5'
 			kapow = JSON.parse(kapowField)
 
 			@Data = kapow['comment'] + kapow['author'] + kapow['email']
@@ -77,7 +25,7 @@ module Rack
 			@Ks_array = generateKsArray()
 			#use Ks to verify the answer
 			for @Ks in @Ks_array
-				@total = @Data+@Ks+@S+@ts
+				@total = @Data+@Ks+@S+String(@ts)
 			end
 			@Cookie = Digest::MD5.hexdigest(@total)
 			@final = @Ks+@Cookie
@@ -89,24 +37,44 @@ module Rack
 			end
 		end
 
-		def generateKsArray()
+		def self.headwinds2_return_initial_cookie(msg, author, email)
+			@Ks = getKsFromPK($PRIVATE_KEY)
+			ip = '173.194.33.38'
+			@S = String(10)
+			@ts = Time.now.strftime("%m.%d.%y %I:%M:%S")
+			@Data = msg+author+email
+
+			@total = @Data+@Ks+@S+String(@ts)
+			@Cookie = Digest::MD5.hexdigest(@total)
+			dct = {:Cookie=> @Cookie,
+					:ts=> @ts,
+					:S=> @S,
+					:comment_author=> author,
+					:comment_author_email=> email,
+					:comment_author_ip=> ip,
+					:comment_date=> @ts,
+					:comment_author_url=> 'http://google.com',
+					:comment_content=> msg,
+					:Data=> @Data,
+					:api_key=> $API_KEY
+			            }
+			return dct
+			end
+		def self.generateKsArray()
 			#	Generate new Ks from the private key. If generation happens at the beginning of a period, two Ks are created.
 			#	@param  private_key
 			#	@return  Ks_array array contains key(s)
 
 			ts = Time.now.to_i
-
-			private_key = Rack::Headwinds.private_key
-
-			if Integer(Integer(ts) % REFRESHING_TIME) < INTERVAL
-				@Ks_array = [ getKsFromPK(private_key), getKsFromPK(private_key,True) ]
+			if Integer(Integer(ts) % $REFRESHING_TIME) < $INTERVAL
+				@Ks_array = [ getKsFromPK($PRIVATE_KEY), getKsFromPK($PRIVATE_KEY,True) ]
 			else
-				@Ks_array = [ getKsFromPK(private_key) ]
+				@Ks_array = [ getKsFromPK($PRIVATE_KEY) ]
 			end
 			return @Ks_array
 		end
 
-		def getKsFromPK(private_key, previous = FALSE)
+		def self.getKsFromPK(private_key, previous = FALSE)
 			#	Generate new Ks from the private key. The generated key is different for each period indicated by REFRESHING_TIME
 			#	It can also be used to generated Ks from the previous period by setting the $previous param to true
 			#	@param  $private_key
@@ -119,7 +87,7 @@ module Rack
 				k = 0
 			end
 			ts = Time.now.to_i
-			concat = String(Integer(Integer(ts) / REFRESHING_TIME) - k)+private_key
+			concat = String(Integer(Integer(ts) / $REFRESHING_TIME) - k)+private_key
 			return Digest::SHA256.hexdigest(concat)
 		end
 	end

data/lib/headwinds/client_helper.rb

@@ -0,0 +1,14 @@
+module Headwinds
+	module ClientHelper
+		def initialize_kapow(location)
+			html = ""
+			html << %{<script src="http://rabbit.cs.pdx.edu/headwinds/application/js/kapow.js"></script>}
+
+			html << %{<input type="hidden" name="kapowField" id="kapowField" value="" />}
+
+			html << %{<script> kapowInitialize('#{location}')</script>\n}
+
+			return (html.respond_to?(:html_safe) && html.html_safe) || html
+		end # headwinds_tags
+	end
+end

data/lib/headwinds/rails.rb

@@ -0,0 +1,4 @@
+require 'net/http'
+require 'headwinds'
+
+ActionView::Base.send(:include, Headwinds::ClientHelper)

data/lib/headwinds/version.rb

@@ -1,3 +1,3 @@
 module Headwinds
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: headwinds
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Tien Le
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,8 +53,9 @@ files:
 - Rakefile
 - headwinds.gemspec
 - lib/headwinds.rb
+- lib/headwinds/client_helper.rb
+- lib/headwinds/rails.rb
 - lib/headwinds/version.rb
-- lib/helpers.rb
 homepage: https://kapow.cs.pdx.edu
 licenses:
 - MIT

data/lib/helpers.rb

@@ -1,17 +0,0 @@
-module Rack
-	class Headwinds
-		module Helpers
-			def headwinds_tags(type= :challenge)
-				html = case type.to_sym
-				when :challenge
-				%{<script type="text/javascript" src="#{path}/challenge?#{params}">
-	            </script>}.gsub(/^ +/, '')
-				when :noscript
-				%{<noscript>noScript
-	            </noscript>}.gsub(/^ +/, '')
-				       end
-
-			end
-		end
-	end
-end