Cleanup

iron-io · Jan 13, 2012 · e3c91f8 · e3c91f8
1 parent 34caf19
commit e3c91f8
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 327 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
+
 gem 'sinatra'
 
 gem 'iron_worker'
 gem 'iron_mq'
-gem 'twitter'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,13 +1,6 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    addressable (2.2.6)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (< 2, >= 1.1.0)
     iron_mq (1.2.8)
       typhoeus
       typhoeus
@@ -17,24 +10,16 @@ GEM
       zip
       zip
     mime-types (1.17.2)
-    multi_json (1.0.4)
-    multipart-post (1.1.4)
     rack (1.3.5)
     rack-protection (1.1.4)
       rack
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    simple_oauth (0.1.5)
     sinatra (1.3.1)
-      rack (>= 1.3.4, ~> 1.3)
+      rack (~> 1.3, >= 1.3.4)
-      rack-protection (>= 1.1.2, ~> 1.1)
+      rack-protection (~> 1.1, >= 1.1.2)
-      tilt (>= 1.3.3, ~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
     tilt (1.3.3)
-    twitter (2.0.2)
-      activesupport (< 4, >= 2.3.9)
-      faraday (~> 0.7)
-      multi_json (~> 1.0)
-      simple_oauth (~> 0.1)
     typhoeus (0.3.3)
       mime-types
     zip (2.0.2)
@@ -46,4 +31,3 @@ DEPENDENCIES
   iron_mq
   iron_worker
   sinatra
-  twitter
diff --git a/README.md b/README.md
@@ -1,14 +0,0 @@
-
-
-First you need a token and project_id from your Iron.io account. Login at http://www.iron.io
-to get it.
-
-To run in development, run:
-
-    IRON_WORKER_TOKEN=my_token IRON_WORKER_PROJECT_ID=my_project_id rackup -p 3000 config.ru
-
-To run on heroku:
-
-- heroku addons:add iron_worker
-- heroku addons:add iron_mq
-

diff --git a/app.rb b/app.rb
@@ -0,0 +1,17 @@
+require 'rubygems'
+require 'sinatra'
+require 'iron_worker'
+require 'iron_mq'
+
+enable :sessions
+
+set :public_folder, File.dirname(__FILE__) + '/static'
+
+IronWorker.configure do |iwc|
+  iwc.token = ENV['IRON_WORKER_TOKEN']
+  iwc.project_id = ENV['IRON_WORKER_PROJECT_ID']
+end
+
+set :ironmq, IronMQ::Client.new('token' => ENV['IRON_WORKER_TOKEN'], 'project_id' => ENV['IRON_WORKER_PROJECT_ID'])
+
+require 'controllers/main'
diff --git a/config.ru b/config.ru
@@ -1,14 +1,5 @@
-require 'yaml'
+$: << File.expand_path(File.dirname(__FILE__))
-require 'iron_worker'
 
-#@config = YAML.load_file('config.yml')
+require 'app'
 
-IronWorker.configure do |iwc|
-  iwc.token = ENV['IRON_WORKER_TOKEN']
-  iwc.project_id = ENV['IRON_WORKER_PROJECT_ID']
-  #iwc.token = @config['iron']['token']
-  #iwc.project_id = @config['iron']['project_id']
-end
-
-require './hello'
 run Sinatra::Application
diff --git a/controllers/main.rb b/controllers/main.rb
@@ -0,0 +1,3 @@
+get '*' do
+  erb :index
+end
diff --git a/hello.rb b/hello.rb
diff --git a/static/images/ajax-loader.gif b/static/images/ajax-loader.gif
diff --git a/static/js/jquery.ba-dotimeout.min.js b/static/js/jquery.ba-dotimeout.min.js
diff --git a/views/hello.erb b/views/hello.erb
diff --git a/views/index.erb b/views/index.erb
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+  Hello
+</body>
+</html>