Merge branch 'develop' into help_develop

Conflicts:
	.gitignore

18 files changed, 23 insertions, 41 deletions

diff --git a/core/Readme.md b/core/Readme.md
index f76999e..795c0a4 100644
--- a/core/Readme.md
+++ b/core/Readme.md
@@ -2,3 +2,5 @@ Leap Web Core
 ===
 
 [Leap](http://www.leap.se) is the Leap Encryption Access Project and this is the rails app for its web interface.
+
+This is the its core gem. Currently it only serves to load shared dependencies.
diff --git a/core/app/assets/images/leap_web_core/.gitkeep b/core/app/assets/images/leap_web_core/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/core/app/assets/images/leap_web_core/.gitkeep
+++ /dev/null
diff --git a/core/app/assets/javascripts/leap_web_core/.gitkeep b/core/app/assets/javascripts/leap_web_core/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/core/app/assets/javascripts/leap_web_core/.gitkeep
+++ /dev/null
diff --git a/core/app/assets/stylesheets/leap_web_core/.gitkeep b/core/app/assets/stylesheets/leap_web_core/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/core/app/assets/stylesheets/leap_web_core/.gitkeep
+++ /dev/null
diff --git a/core/app/controllers/.gitkeep b/core/app/controllers/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/core/app/controllers/.gitkeep
+++ /dev/null
diff --git a/core/app/controllers/home_controller.rb b/core/app/controllers/home_controller.rb
deleted file mode 100644
index 7db5397..0000000
--- a/core/app/controllers/home_controller.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-
-class HomeController < ApplicationController
-  def index
-  end
-end
diff --git a/core/app/helpers/.gitkeep b/core/app/helpers/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/core/app/helpers/.gitkeep
+++ /dev/null
diff --git a/core/app/mailers/.gitkeep b/core/app/mailers/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/core/app/mailers/.gitkeep
+++ /dev/null
diff --git a/core/app/models/.gitkeep b/core/app/models/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/core/app/models/.gitkeep
+++ /dev/null
diff --git a/core/app/views/.gitkeep b/core/app/views/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/core/app/views/.gitkeep
+++ /dev/null
diff --git a/core/app/views/home/index.html.haml b/core/app/views/home/index.html.haml
deleted file mode 100644
index 82f5152..0000000
--- a/core/app/views/home/index.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-%h3 Home
diff --git a/core/leap_web_core.gemspec b/core/leap_web_core.gemspec
index c3bb98d..e721637 100644
--- a/core/leap_web_core.gemspec
+++ b/core/leap_web_core.gemspec
@@ -16,8 +16,10 @@ Gem::Specification.new do |s|
   s.test_files = Dir["test/**/*"]
 
   s.add_dependency "rails", "~> 3.2.8"
+
   s.add_dependency "couchrest", "~> 1.1.3"
   s.add_dependency "couchrest_model", "~> 2.0.0.beta2"
   s.add_dependency "couchrest_session_store", "~> 0.0.1"
 
+  s.add_dependency "json"
 end
diff --git a/core/lib/leap_web_core.rb b/core/lib/leap_web_core.rb
index 16004f8..8826880 100644
--- a/core/lib/leap_web_core.rb
+++ b/core/lib/leap_web_core.rb
@@ -1,5 +1,12 @@
+require "rails"
+
+require "couchrest"
+require "couchrest_model"
+require "couchrest_session_store"
+
+require "json"
+
 require "extensions/testing"
-require "leap_web_core/dependencies"
 require "leap_web_core/engine"
 
 module LeapWebCore
diff --git a/core/lib/leap_web_core/ui_dependencies.rb b/core/lib/leap_web_core/ui_dependencies.rb
new file mode 100644
index 0000000..e0a0b86
--- /dev/null
+++ b/core/lib/leap_web_core/ui_dependencies.rb
@@ -0,0 +1,11 @@
+require "haml"
+require "bootstrap-sass"
+require "jquery-rails"
+require "simple_form"
+
+if Rails.env == "development"
+  require "haml-rails"
+  require "sass-rails"
+  require "coffee-rails"
+  require "uglifier"
+end
diff --git a/core/lib/leap_web_core/version.rb b/core/lib/leap_web_core/version.rb
deleted file mode 100644
index 6a34982..0000000
--- a/core/lib/leap_web_core/version.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module LeapWebCore
-  VERSION = "0.0.1"
-end
diff --git a/core/test/integration/navigation_test.rb b/core/test/integration/navigation_test.rb
deleted file mode 100644
index eec8c0e..0000000
--- a/core/test/integration/navigation_test.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'test_helper'
-
-class NavigationTest < ActionDispatch::IntegrationTest
-
-  # test "the truth" do
-  #   assert true
-  # end
-end
-
diff --git a/core/test/leap_web_core_test.rb b/core/test/leap_web_core_test.rb
deleted file mode 100644
index 0dd71ff..0000000
--- a/core/test/leap_web_core_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class LeapWebCoreTest < ActiveSupport::TestCase
-  test "truth" do
-    assert_kind_of Module, LeapWebCore
-  end
-end
diff --git a/core/test/test_helper.rb b/core/test/test_helper.rb
deleted file mode 100644
index 1e26a31..0000000
--- a/core/test/test_helper.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# Configure Rails Environment
-ENV["RAILS_ENV"] = "test"
-
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-# Load fixtures from the engine
-if ActiveSupport::TestCase.method_defined?(:fixture_path=)
-  ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
-end