camping-abingo 1.0.5 → 1.0.6

data/examples/camping-abingo-test/camping-abingo-test-skeleton.rb

@@ -4,10 +4,10 @@
 #	You can use this as a starting point to follow along the instructions to add
 # 	ABingo support based on the blog post series: http://blog.monnet-usa.com/?p=322
 #
-gem 'camping' , '>= 2.0'	
-gem 'filtering_camping' , '>= 1.0'	
+gem 'camping' , '~> 2.0'	
+gem 'filtering_camping' , '~> 1.0'	
 
-%w(rubygems active_record erb  fileutils json markaby md5 redcloth  
+%w(rubygems active_record active_support erb  fileutils json markaby md5   
 camping camping/session filtering_camping 
 ).each { |lib| require lib }
 
@@ -17,13 +17,20 @@ module CampingABingoTest
 	include Camping::Session
 	include CampingFilters
 
-	app_logger = Logger.new(File.dirname(__FILE__) + '/camping-abingo-test.log')
-	app_logger.level = Logger::DEBUG
+	is_under_camping_server = (Camping.const_defined? :Server) 	
+	if is_under_camping_server 
+		app_logger = Logger.new(File.dirname(__FILE__) + '/camping-abingo-test.log')
+		app_logger.level = Logger::DEBUG
+	else
+		app_logger = Logger.new($STDERR)
+		app_logger.level = Logger::ERROR
+	end
 	Camping::Models::Base.logger = app_logger
 	
 	def CampingABingoTest.create
 		dbconfig = YAML.load(File.read('config/database.yml'))								
-		Camping::Models::Base.establish_connection  dbconfig['development']	
+		environment = ENV['DATABASE_URL'] ? 'production' : 'development'
+		Camping::Models::Base.establish_connection  dbconfig[environment]
 		
 		CampingABingoTest::Models.create_schema :assume => (CampingABingoTest::Models::User.table_exists? ? 1.1 : 0.0)
 	end
@@ -35,7 +42,7 @@ module CampingABingoTest::Models
 
 	class CreateUserSchema < V 1.0
 		def self.up
-			create_table :CampingABingoTest_users, :force => true do |t|
+			create_table :campingabingotest_users, :force => true do |t|
 				t.integer 	:id, :null => false
 				t.string		:username
 				t.string		:password
@@ -45,7 +52,7 @@ module CampingABingoTest::Models
 		end
 		
 		def self.down		
-			drop_table :CampingABingoTest_users
+			drop_table :campingabingotest_users
 		end
 	end
 

data/examples/camping-abingo-test/camping-abingo-test.rb

@@ -1,8 +1,8 @@
-gem 'camping' , '>= 2.0'	
-gem 'filtering_camping' , '>= 1.0'	
+gem 'camping' , '~> 2.0'	
+gem 'filtering_camping' , '~> 1.0'	
 gem 'camping-abingo'
 
-%w(rubygems active_record erb  fileutils json markaby md5 redcloth  
+%w(rubygems active_record active_support erb  fileutils json markaby md5   
 camping camping/session filtering_camping camping-abingo
 ).each { |lib| require lib }
 
@@ -23,14 +23,22 @@ module CampingABingoTest
 	extend  ABingoCampingPlugin
 	include ABingoCampingPlugin::Filters
 	
-	app_logger = Logger.new(File.dirname(__FILE__) + '/camping-abingo-test.log')
-	app_logger.level = Logger::DEBUG
+	is_under_camping_server = (Camping.const_defined? :Server) 	
+	if is_under_camping_server 
+		app_logger = Logger.new(File.dirname(__FILE__) + '/camping-abingo-test.log')
+		app_logger.level = Logger::DEBUG
+	else
+		app_logger = Logger.new($STDERR)
+		app_logger.level = Logger::ERROR
+	end
+
 	Camping::Models::Base.logger = app_logger
 	ABingoCampingPlugin.logger   = app_logger
 	
 	def CampingABingoTest.create
 		dbconfig = YAML.load(File.read('config/database.yml'))								
-		Camping::Models::Base.establish_connection  dbconfig['development']	
+		environment = ENV['DATABASE_URL'] ? 'production' : 'development'
+		Camping::Models::Base.establish_connection  dbconfig[environment]
 		
 		ABingoCampingPlugin.create
 		Abingo.cache.logger = Camping::Models::Base.logger
@@ -47,7 +55,7 @@ module CampingABingoTest::Models
 
 	class CreateUserSchema < V 1.1
 		def self.up
-			create_table :CampingABingoTest_users, :force => true do |t|
+			create_table :campingabingotest_users, :force => true do |t|
 				t.integer 	:id, :null => false
 				t.string		:username
 				t.string		:password
@@ -60,7 +68,7 @@ module CampingABingoTest::Models
 		
 		def self.down		
 			ABingoCampingPlugin::Models.down
-			drop_table :CampingABingoTest_users
+			drop_table :campingabingotest_users
 		end
 	end
 

data/lib/camping-abingo.rb

@@ -63,16 +63,7 @@ Ok, at this point we have a minimally configured application module. Our next st
 
 ===Plugging in the ABingo models
 
-First, we'll include the include ABingoCampingPlugin::Models module so we can get all the ABingo-specific models. Then we'll define a User model. The User will need to keep track of the applications it provided access to. It will also manage the tokens associated with these applications. Our model will look like this:
-
-	class User < Base;
-		has_many :client_applications
-		has_many :tokens, 
-			:class_name=>"OauthToken",
-			:order=>"authorized_at desc",
-			:include=>[:client_application]
-
-	end
+First, we'll include the include ABingoCampingPlugin::Models module so we can get all the ABingo-specific models. 
 
 Now we need a CreateUserSchema migration class to define our database tables for User, and ABingo models. In the up and down methods we will plugin a call to the corresponding method from the ABingoCampingPlugin::Models module to create the tables for the Experiment and Alternative models.
 
@@ -706,14 +697,14 @@ module ABingoCampingPlugin::Helpers
 	
 end #ABingoCampingPlugin::Helpers
 
-# Filters module for OAuth Camping Plugin.
+# Filters module for ABingo Camping Plugin.
 # The module will be plugged in to the main app Helpers module. 
 # Example:
 #	module CampingOAuthProvider
 #		include Camping::Session
 #		include CampingFilters
-#		extend  OAuthCampingPlugin
-#		include OAuthCampingPlugin::Filters
+#		extend  ABingoCampingPlugin
+#		include ABingoCampingPlugin::Filters
 #		
 #		# ...
 #	end
@@ -755,11 +746,6 @@ end
 #	module CampingABingoTest::Models
 #		include ABingoCampingPlugin::Models
 #
-#		class User < Base;
-#			has_many :client_applications
-#			has_many :tokens, :class_name=>"OauthToken",:order=>"authorized_at desc",:include=>[:client_application]
-#		
-#		end
 #		# ...
 #	end
 #
@@ -1155,7 +1141,7 @@ module ABingoCampingPlugin::Views
 						}
 						
 					experiment.alternatives.each do | alternative |  
-						tr.abingo_alternative_row { 	td { h(alternative.content) };
+						tr.abingo_alternative_row { 	td { ERB::Util.h(alternative.content) };
 								td { alternative.participants.to_s };
 								td { alternative.conversions.to_s + '(' + alternative.pretty_conversion_rate + ')' };
 								td { 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Patrick McKenzie
@@ -15,7 +15,7 @@ autorequire: camping-abingo
 bindir: bin
 cert_chain: []
 
-date: 2010-12-04 00:00:00 -07:00
+date: 2010-12-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency