[CORE/ARCH] Refactored remarkable to remarkable/core

remarkable-rb · May 25, 2010 · bffa2e9 · bffa2e9
1 parent fb416df
commit bffa2e9
Show file tree

Hide file tree

Showing 27 changed files with 21 additions and 25 deletions.
diff --git a/rake_helpers.rb b/rake_helpers.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 current_dir = File.dirname(__FILE__)
-require File.join(current_dir, "remarkable/lib/remarkable/version.rb")
+require File.join(current_dir, "remarkable/lib/remarkable/core/version.rb")
 
 require 'rubygems'
 require 'rake/gempackagetask'

diff --git a/remarkable/lib/remarkable.rb b/remarkable/lib/remarkable.rb
diff --git a/remarkable/lib/remarkable/core.rb b/remarkable/lib/remarkable/core.rb
@@ -0,0 +1,15 @@
+# Load core files
+require 'remarkable/core/version'
+require 'remarkable/core/matchers'
+require 'remarkable/core/macros'
+require 'remarkable/core/i18n'
+require 'remarkable/core/dsl'
+require 'remarkable/core/messages'
+require 'remarkable/core/base'
+require 'remarkable/core/negative'
+require 'remarkable/core/core_ext/array'
+require 'remarkable/core/rspec' 
+
+# Add default locale
+dir = File.dirname(__FILE__)
+Dir["#{dir}/../../locale/*yml"].each {|f| Remarkable.add_locale(f) }
diff --git a/remarkable/lib/remarkable/base.rb → remarkable/lib/remarkable/core/base.rb b/remarkable/lib/remarkable/base.rb → remarkable/lib/remarkable/core/base.rb
diff --git a/remarkable/lib/remarkable/core_ext/array.rb → ...ble/lib/remarkable/core/core_ext/array.rb b/remarkable/lib/remarkable/core_ext/array.rb → ...ble/lib/remarkable/core/core_ext/array.rb
diff --git a/remarkable/lib/remarkable/dsl.rb → remarkable/lib/remarkable/core/dsl.rb b/remarkable/lib/remarkable/dsl.rb → remarkable/lib/remarkable/core/dsl.rb
@@ -1,6 +1,6 @@
-require 'remarkable/dsl/assertions'
-require 'remarkable/dsl/optionals'
-require 'remarkable/dsl/callbacks'
+require 'remarkable/core/dsl/assertions'
+require 'remarkable/core/dsl/optionals'
+require 'remarkable/core/dsl/callbacks'
 
 module Remarkable
   # The DSL module is responsable for all Remarkable convenience methods.

diff --git a/remarkable/lib/remarkable/dsl/assertions.rb → ...ble/lib/remarkable/core/dsl/assertions.rb b/remarkable/lib/remarkable/dsl/assertions.rb → ...ble/lib/remarkable/core/dsl/assertions.rb
diff --git a/remarkable/lib/remarkable/dsl/callbacks.rb → ...able/lib/remarkable/core/dsl/callbacks.rb b/remarkable/lib/remarkable/dsl/callbacks.rb → ...able/lib/remarkable/core/dsl/callbacks.rb
diff --git a/remarkable/lib/remarkable/dsl/optionals.rb → ...able/lib/remarkable/core/dsl/optionals.rb b/remarkable/lib/remarkable/dsl/optionals.rb → ...able/lib/remarkable/core/dsl/optionals.rb
diff --git a/remarkable/lib/remarkable/i18n.rb → remarkable/lib/remarkable/core/i18n.rb b/remarkable/lib/remarkable/i18n.rb → remarkable/lib/remarkable/core/i18n.rb
diff --git a/remarkable/lib/remarkable/macros.rb → remarkable/lib/remarkable/core/macros.rb b/remarkable/lib/remarkable/macros.rb → remarkable/lib/remarkable/core/macros.rb
diff --git a/remarkable/lib/remarkable/matchers.rb → remarkable/lib/remarkable/core/matchers.rb b/remarkable/lib/remarkable/matchers.rb → remarkable/lib/remarkable/core/matchers.rb
diff --git a/remarkable/lib/remarkable/messages.rb → remarkable/lib/remarkable/core/messages.rb b/remarkable/lib/remarkable/messages.rb → remarkable/lib/remarkable/core/messages.rb
diff --git a/remarkable/lib/remarkable/negative.rb → remarkable/lib/remarkable/core/negative.rb b/remarkable/lib/remarkable/negative.rb → remarkable/lib/remarkable/core/negative.rb
diff --git a/remarkable/lib/remarkable/rspec.rb → remarkable/lib/remarkable/core/rspec.rb b/remarkable/lib/remarkable/rspec.rb → remarkable/lib/remarkable/core/rspec.rb
diff --git a/remarkable/lib/remarkable/version.rb → remarkable/lib/remarkable/core/version.rb b/remarkable/lib/remarkable/version.rb → remarkable/lib/remarkable/core/version.rb
diff --git a/remarkable/spec/lib/base_spec.rb → remarkable/spec/core/base_spec.rb b/remarkable/spec/lib/base_spec.rb → remarkable/spec/core/base_spec.rb
diff --git a/remarkable/spec/lib/dsl/assertions_spec.rb → remarkable/spec/core/dsl/assertions_spec.rb b/remarkable/spec/lib/dsl/assertions_spec.rb → remarkable/spec/core/dsl/assertions_spec.rb
diff --git a/remarkable/spec/lib/dsl/optionals_spec.rb → remarkable/spec/core/dsl/optionals_spec.rb b/remarkable/spec/lib/dsl/optionals_spec.rb → remarkable/spec/core/dsl/optionals_spec.rb
diff --git a/remarkable/spec/lib/i18n_spec.rb → remarkable/spec/core/i18n_spec.rb b/remarkable/spec/lib/i18n_spec.rb → remarkable/spec/core/i18n_spec.rb
diff --git a/remarkable/spec/lib/macros_spec.rb → remarkable/spec/core/macros_spec.rb b/remarkable/spec/lib/macros_spec.rb → remarkable/spec/core/macros_spec.rb
diff --git a/remarkable/spec/lib/matchers_spec.rb → remarkable/spec/core/matchers_spec.rb b/remarkable/spec/lib/matchers_spec.rb → remarkable/spec/core/matchers_spec.rb
diff --git a/remarkable/spec/lib/messages_spec.rb → remarkable/spec/core/messages_spec.rb b/remarkable/spec/lib/messages_spec.rb → remarkable/spec/core/messages_spec.rb
diff --git a/remarkable/spec/lib/pending_spec.rb → remarkable/spec/core/pending_spec.rb b/remarkable/spec/lib/pending_spec.rb → remarkable/spec/core/pending_spec.rb
diff --git a/remarkable/spec/spec_helper.rb b/remarkable/spec/spec_helper.rb
@@ -6,7 +6,7 @@
 require File.expand_path('path_helpers', File.join(File.dirname(__FILE__), '/../../'))
 load_project_path :remarkable
 
-require 'remarkable'
+require 'remarkable/core'
 
 # Requires supporting files with custom matchers and macros, etc,
 # # in ./support/ and its subdirectories.

diff --git a/remarkable_activemodel/lib/remarkable/active_model.rb b/remarkable_activemodel/lib/remarkable/active_model.rb
@@ -1,5 +1,5 @@
 # Load Remarkable
-require 'remarkable'
+require 'remarkable/core'
 require 'remarkable/active_model/base'
 
 # Add default locale

diff --git a/remarkable_activemodel/lib/remarkable_activemodel.rb b/remarkable_activemodel/lib/remarkable_activemodel.rb