From 00b7b36516d1d07300870029ad5190f06122a493 Mon Sep 17 00:00:00 2001 From: Azul Date: Wed, 10 Oct 2012 19:56:35 +0200 Subject: first steps at reducing core --- core/leap_web_core.gemspec | 2 ++ core/lib/leap_web_core.rb | 9 ++++++++- core/lib/leap_web_core/version.rb | 3 --- 3 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 core/lib/leap_web_core/version.rb (limited to 'core') 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..5b53978 100644 --- a/core/lib/leap_web_core.rb +++ b/core/lib/leap_web_core.rb @@ -1,5 +1,12 @@ +require "rails/all" + +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/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 -- cgit v1.2.3 From add8d015c87a00626b739080bd75c7e7aeb9c1df Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 11 Oct 2012 10:22:34 +0200 Subject: moved core dependency into */Gemfile with :path In order to get the rails generators and the like to work properly in engines we need to require all the dependencies in the engine.rb file. Since I want to keep that list of engines in a centralized place we still need core and we need to require it from the other engines. We don't want to require the core gem to be installed so I added it with :path option to the Gemfile. --- core/lib/leap_web_core.rb | 2 +- core/lib/leap_web_core/ui_dependencies.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 core/lib/leap_web_core/ui_dependencies.rb (limited to 'core') diff --git a/core/lib/leap_web_core.rb b/core/lib/leap_web_core.rb index 5b53978..8826880 100644 --- a/core/lib/leap_web_core.rb +++ b/core/lib/leap_web_core.rb @@ -1,4 +1,4 @@ -require "rails/all" +require "rails" require "couchrest" require "couchrest_model" 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 -- cgit v1.2.3 From 49e72b7456c7ffcbc222f41f468de1e3f6d8e299 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 11 Oct 2012 11:56:15 +0200 Subject: cleared out unused stuff from core --- core/app/assets/images/leap_web_core/.gitkeep | 0 core/app/assets/javascripts/leap_web_core/.gitkeep | 0 core/app/assets/stylesheets/leap_web_core/.gitkeep | 0 core/app/controllers/.gitkeep | 0 core/app/controllers/home_controller.rb | 5 ----- core/app/helpers/.gitkeep | 0 core/app/mailers/.gitkeep | 0 core/app/models/.gitkeep | 0 core/app/views/.gitkeep | 0 core/app/views/home/index.html.haml | 1 - core/test/integration/navigation_test.rb | 9 --------- core/test/leap_web_core_test.rb | 7 ------- core/test/test_helper.rb | 15 --------------- 13 files changed, 37 deletions(-) delete mode 100644 core/app/assets/images/leap_web_core/.gitkeep delete mode 100644 core/app/assets/javascripts/leap_web_core/.gitkeep delete mode 100644 core/app/assets/stylesheets/leap_web_core/.gitkeep delete mode 100644 core/app/controllers/.gitkeep delete mode 100644 core/app/controllers/home_controller.rb delete mode 100644 core/app/helpers/.gitkeep delete mode 100644 core/app/mailers/.gitkeep delete mode 100644 core/app/models/.gitkeep delete mode 100644 core/app/views/.gitkeep delete mode 100644 core/app/views/home/index.html.haml delete mode 100644 core/test/integration/navigation_test.rb delete mode 100644 core/test/leap_web_core_test.rb delete mode 100644 core/test/test_helper.rb (limited to 'core') 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 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 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 diff --git a/core/app/controllers/.gitkeep b/core/app/controllers/.gitkeep deleted file mode 100644 index e69de29..0000000 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 diff --git a/core/app/mailers/.gitkeep b/core/app/mailers/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/core/app/models/.gitkeep b/core/app/models/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/core/app/views/.gitkeep b/core/app/views/.gitkeep deleted file mode 100644 index e69de29..0000000 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/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 -- cgit v1.2.3 From 7bfa2bee738408c6ab286947fadf3253ec83c087 Mon Sep 17 00:00:00 2001 From: Azul Date: Thu, 11 Oct 2012 12:27:45 +0200 Subject: modified Readme to point out what core currently is for --- core/Readme.md | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core') 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. -- cgit v1.2.3