Rationale requires
arnaud sellenet
committed Jun 17, 2014
commit da6d6f1c8916607f4b6e9b1425c4558eb4fb941c
Showing 6
changed files with
26 additions
and 10 deletions
Gemfile.lock
+13
-0
| @@ | @@ -3,8 +3,10 @@ PATH |
| specs: | |
| locomotivecms_steam (0.1.2) | |
| coffee-script (~> 2.2.0) | |
| + | compass (~> 0.12.2) |
| dragonfly (~> 1.0.3) | |
| haml (~> 4.0.3) | |
| + | httmultiparty (~> 0.3.10) |
| httparty (~> 0.13) | |
| kramdown (~> 1.3.3) | |
| locomotivecms-solid | |
| @@ | @@ -34,12 +36,17 @@ GEM |
| thread_safe (~> 0.1) | |
| tzinfo (~> 1.1) | |
| addressable (2.3.6) | |
| + | chunky_png (1.3.0) |
| coderay (1.1.0) | |
| coffee-script (2.2.0) | |
| coffee-script-source | |
| execjs | |
| coffee-script-source (1.7.0) | |
| colorize (0.7.3) | |
| + | compass (0.12.5) |
| + | chunky_png (~> 1.2) |
| + | fssm (>= 0.2.7) |
| + | sass (~> 3.2.19) |
| coveralls (0.7.0) | |
| multi_json (~> 1.3) | |
| rest-client | |
| @@ | @@ -56,9 +63,13 @@ GEM |
| rack | |
| eventmachine (1.0.3) | |
| execjs (2.1.0) | |
| + | fssm (0.2.10) |
| haml (4.0.5) | |
| tilt | |
| hike (1.2.3) | |
| + | httmultiparty (0.3.10) |
| + | httparty (>= 0.7.3) |
| + | multipart-post |
| httparty (0.13.1) | |
| json (~> 1.8) | |
| multi_xml (>= 0.5.2) | |
| @@ | @@ -82,6 +93,7 @@ GEM |
| moneta (0.7.20) | |
| multi_json (1.7.9) | |
| multi_xml (0.5.5) | |
| + | multipart-post (2.0.0) |
| pry (0.9.12.6) | |
| coderay (~> 1.0) | |
| method_source (~> 0.8) | |
| @@ | @@ -103,6 +115,7 @@ GEM |
| diff-lcs (>= 1.1.3, < 2.0) | |
| rspec-mocks (2.14.6) | |
| safe_yaml (1.0.1) | |
| + | sass (3.2.19) |
| simplecov (0.8.2) | |
| docile (~> 1.1.0) | |
| multi_json | |
locomotive/steam.rb b/lib/locomotive/steam.rb
+9
-2
| @@ | @@ -1,12 +1,19 @@ |
| - | require_relative 'steam/version' |
| + | require 'locomotive/models' |
| + | require 'locomotive/decorators' |
| + | require 'locomotive/common' |
| + | |
| require_relative 'steam/exceptions' | |
| + | require_relative 'steam/decorators' |
| + | |
| + | |
| + | |
| require 'sprockets' | |
| require 'sprockets-sass' | |
| require 'haml' | |
| require 'compass' | |
| - | require 'httmultiparty' |
| + | #require 'httmultiparty' |
| require 'mime/types' | |
| module Locomotive | |
locomotive/steam/liquid/drops/content_types.rb b/lib/locomotive/steam/liquid/drops/content_types.rb
+1
-1
| @@ | @@ -5,7 +5,7 @@ module Locomotive |
| class ContentTypes < ::Liquid::Drop | |
| def before_method(meth) | |
| - | type = self.mounting_point.content_types[meth.to_s] |
| + | type = Locomotive::Models['content_types'][meth.to_s] |
| ProxyCollection.new(type) | |
| end | |
locomotive/steam/server.rb b/lib/locomotive/steam/server.rb
+0
-4
| @@ | @@ -4,10 +4,6 @@ require_relative 'liquid' |
| require_relative 'services' | |
| require_relative 'middlewares' | |
| - | require 'locomotive/models' |
| - | require 'locomotive/decorators' |
| - | require_relative 'decorators' |
| - | |
| module Locomotive::Steam | |
| class Server | |
locomotivecms_steam.gemspec
+3
-1
| @@ | @@ -1,4 +1,4 @@ |
| - | require_relative 'lib/locomotive/steam' |
| + | require_relative 'lib/locomotive/steam/version' |
| Gem::Specification.new do |spec| | |
| spec.name = 'locomotivecms_steam' | |
| @@ | @@ -26,6 +26,7 @@ Gem::Specification.new do |spec| |
| spec.add_development_dependency 'i18n-spec' | |
| spec.add_dependency 'httparty', '~> 0.13' | |
| + | spec.add_dependency 'httmultiparty', '~> 0.3.10' |
| spec.add_dependency 'rack-cache', '~> 1.1' | |
| spec.add_dependency 'moneta', '~> 0.7.20' | |
| spec.add_dependency 'sprockets', '~> 2.0' | |
| @@ | @@ -35,6 +36,7 @@ Gem::Specification.new do |spec| |
| spec.add_dependency 'kramdown', '~> 1.3.3' | |
| spec.add_dependency 'coffee-script', '~> 2.2.0' | |
| spec.add_dependency 'haml', '~> 4.0.3' | |
| + | spec.add_dependency 'compass', '~> 0.12.2' |
| spec.add_dependency 'locomotivecms_models', '~> 0.0.1' | |
spec/spec_helper.rb
+0
-2
| @@ | @@ -1,7 +1,6 @@ |
| require 'rubygems' | |
| require 'bundler/setup' | |
| - | require 'locomotive/common' |
| require 'i18n-spec' | |
| require 'coveralls' | |
| @@ | @@ -10,7 +9,6 @@ begin |
| rescue LoadError | |
| end | |
| - | |
| require_relative '../lib/locomotive/steam' | |
| require_relative 'support' | |