Merge branch 'master' of github.com:Jarred-Sumner/FundingList.us

Conflicts: Gemfile.lock
Jarred-Sumner · Aug 18, 2012 · 7ce9fc4 · 7ce9fc4
2 parents 2fc9266 + 9679005
commit 7ce9fc4
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 32 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,6 @@ gem 'rails', '3.2.1'
 # XML Parsing
 gem 'nokogiri'
 
-
 gem 'jquery-rails'
 
 group :assets do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -28,70 +28,70 @@ GEM
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
-    bootstrap-sass (2.0.1)
-    bourbon (1.3.6)
+    arel (3.0.2)
+    bootstrap-sass (2.0.4.0)
+    bourbon (2.1.1)
       sass (>= 3.1)
     builder (3.0.0)
-    capistrano (2.9.0)
+    capistrano (2.13.0)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    coderay (1.0.5)
+    coderay (1.0.7)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.2.0)
+    coffee-script-source (1.3.3)
     erubis (2.7.0)
-    execjs (1.3.0)
+    execjs (1.4.0)
       multi_json (~> 1.0)
-    gon (2.1.0)
+    gon (4.0.0)
       actionpack (>= 2.3.0)
       json
     highcharts-rails (2.1.9)
       railties (~> 3.1)
-    highline (1.6.11)
+    highline (1.6.13)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.1)
-    jquery-rails (2.0.0)
-      railties (>= 3.2.0.beta, < 5.0)
+    journey (1.0.4)
+    jquery-rails (2.1.0)
+      railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.5)
+    json (1.7.5)
     libv8 (3.3.10.4)
-    mail (2.4.1)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.7.0)
-    mime-types (1.17.2)
-    multi_json (1.0.4)
+    method_source (0.8)
+    mime-types (1.19)
+    multi_json (1.3.6)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.3.0)
+    net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.5.0)
-    pg (0.13.1)
+    nokogiri (1.5.5)
+    pg (0.14.0)
     pjax-rails (0.1.4)
       jquery-rails
     polyglot (0.3.3)
-    pry (0.9.8.2)
+    pry (0.9.10)
       coderay (~> 1.0.5)
-      method_source (~> 0.7)
-      slop (>= 2.4.4, < 3)
-    rabl (0.5.5.g)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
+    rabl (0.7.1)
       activesupport (>= 2.3.14)
-      multi_json (~> 1.0.3)
+      multi_json (~> 1.0)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
@@ -115,6 +115,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+<<<<<<< HEAD
     sass (3.1.15)
     sass-rails (3.2.4)
       railties (~> 3.2.0)
@@ -127,16 +128,30 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
     therubyracer (0.9.10)
+=======
+    sass (3.2.1)
+    sass-rails (3.2.5)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    slop (3.3.2)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    therubyracer (0.10.2)
+>>>>>>> 9679005f2ba248ca814e7a3018c90fd8dbfbe61c
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    uglifier (1.2.3)
+    tzinfo (0.3.33)
+    uglifier (1.2.7)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.3)
 
 PLATFORMS
   ruby

diff --git a/albipes.sublime-project b/albipes.sublime-project
@@ -3,6 +3,9 @@
 	[
 		{
 			"path": "/E/Programming/Albipes"
+		},
+		{
+			"path": "/Users/jarred/Code/FundingList.us"
 		}
 	]
 }
diff --git a/lib/tasks/sec.rake b/lib/tasks/sec.rake
@@ -1,3 +1,6 @@
+CURRENT_QUARTER = 4
+CURRENT_YEAR = 2012
+
 desc 'SEC'
 namespace :sec do
 
@@ -7,7 +10,7 @@ namespace :sec do
       start_index = 1
       start_index = 4 if year == 2008
       (1..4).each do |quarter|
-        break if year == 2012 and quarter > 1
+        break if year == CURRENT_YEAR && quarter == CURRENT_QUARTER
         Company.parse_from_quarterly_filings(year, quarter, false, nil) 
       end
     end
@@ -36,7 +39,7 @@ namespace :sec do
       start_index = 1
       start_index = 4 if year == 2008
       (start_index..4).each do |quarter|
-        break if quarter > 1 and year == 2012
+        break if year == CURRENT_YEAR && quarter == CURRENT_QUARTER
         Company.parse_from_quarterly_filings(year,quarter,false,"#{year}/QTR#{quarter}/form.idx")
       end
     end