fix dependencies

arnaud sellenet committed May 27, 2014

commit 700aa872de677878f4fd7818a2411dcba1a6b144

Gemfile +2 -1

@@	@@ -4,6 +4,7 @@ gemspec

	group :development do
	gem 'locomotivecms_common', '~> 0.0.1', require: 'common' # path: '../common'
+	gem 'locomotivecms_models', '~> 0.0.1', path: '../models', require: 'locomotive/models'
	gem 'thin'
	end

@@	@@ -20,4 +21,4 @@ end

	platform :ruby do
	ruby '2.1.1'
-	end
	\ No newline at end of file
+	end

Gemfile.lock +25 -55

@@	@@ -3,37 +3,37 @@ PATH
	specs:
	locomotivecms_steam (0.1.2)
	dragonfly (~> 1.0.3)
+	haml
+	httparty (~> 0.13)
	kramdown (~> 1.3.3)
	locomotivecms-solid
	locomotivecms_common (~> 0.0.1)
-	locomotivecms_mounter
+	locomotivecms_models (~> 0.0.1)
	moneta (~> 0.7.20)
	rack-cache (~> 1.1)
	sprockets (~> 2.0)
	sprockets-sass (~> 1.0)
	will_paginate (~> 3.0)

+	PATH
+	remote: ../models
+	specs:
+	locomotivecms_models (0.0.1)
+	activesupport (~> 4.1.0)
+	i18n (~> 0.6.9)
+	locomotivecms_common (~> 0.0.1)
+
	GEM
	remote: https://rubygems.org/
	specs:
-	RedCloth (4.2.9)
-	activesupport (3.2.17)
-	i18n (~> 0.6, >= 0.6.4)
-	multi_json (~> 1.0)
+	activesupport (4.1.1)
+	i18n (~> 0.6, >= 0.6.9)
+	json (~> 1.7, >= 1.7.7)
+	minitest (~> 5.1)
+	thread_safe (~> 0.1)
+	tzinfo (~> 1.1)
	addressable (2.3.6)
-	chronic (0.10.2)
-	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.5.8)
-	commonjs (0.2.7)
-	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
@@	@@ -45,18 +45,13 @@ GEM
	daemons (1.1.9)
	diff-lcs (1.2.5)
	docile (1.1.3)
-	dragonfly (1.0.4)
+	dragonfly (1.0.5)
	multi_json (~> 1.0)
	rack
	eventmachine (1.0.3)
-	execjs (2.0.2)
-	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)
@@	@@ -69,41 +64,16 @@ GEM
	kramdown (1.3.3)
	launchy (2.4.2)
	addressable (~> 2.3)
-	less (2.2.2)
-	commonjs (~> 0.2.6)
	locomotivecms-liquid (2.6.0)
	locomotivecms-solid (0.2.2.1)
	locomotivecms-liquid (~> 2.6.0)
	locomotivecms_common (0.0.1)
-	locomotivecms_mounter (1.4.0)
-	RedCloth (~> 4.2.3)
-	activesupport (~> 3.2.15)
-	chronic (~> 0.10.2)
-	coffee-script (~> 2.2.0)
-	colorize (~> 0.5.8)
-	compass (~> 0.12.2)
-	haml (~> 4.0.3)
-	httmultiparty (= 0.3.10)
-	i18n (~> 0.6.0)
-	json (~> 1.8.0)
-	less (~> 2.2.1)
-	logger
-	mime-types (~> 1.19)
-	multi_json (~> 1.7.3)
-	sass (~> 3.2.12)
-	sprockets (~> 2.0)
-	sprockets-sass
-	stringex (~> 2.0.3)
-	tilt (= 1.4.1)
-	tzinfo (~> 0.3.29)
-	zip (~> 2.0.2)
-	logger (1.2.8)
	method_source (0.8.2)
	mime-types (1.25.1)
+	minitest (5.3.4)
	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)
@@	@@ -125,22 +95,20 @@ 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
	simplecov-html (~> 0.8.0)
	simplecov-html (0.8.0)
	slop (3.5.0)
-	sprockets (2.12.0)
+	sprockets (2.12.1)
	hike (~> 1.2)
	multi_json (~> 1.0)
	rack (~> 1.0)
	tilt (~> 1.1, != 1.3.0)
-	sprockets-sass (1.0.3)
+	sprockets-sass (1.1.0)
	sprockets (~> 2.0)
	tilt (~> 1.1)
-	stringex (2.0.11)
	term-ansicolor (1.3.0)
	tins (~> 1.0)
	thin (1.6.2)
@@	@@ -148,15 +116,16 @@ GEM
	eventmachine (>= 1.0.0)
	rack (>= 1.0.0)
	thor (0.18.1)
+	thread_safe (0.3.3)
	tilt (1.4.1)
	tins (1.0.0)
-	tzinfo (0.3.39)
+	tzinfo (1.2.0)
+	thread_safe (~> 0.1)
	vcr (2.9.0)
	webmock (1.8.11)
	addressable (>= 2.2.7)
	crack (>= 0.1.7)
	will_paginate (3.0.5)
-	zip (2.0.2)

	PLATFORMS
	ruby
@@	@@ -167,6 +136,7 @@ DEPENDENCIES
	i18n-spec
	launchy
	locomotivecms_common (~> 0.0.1)
+	locomotivecms_models (~> 0.0.1)!
	locomotivecms_steam!
	pry
	rack-test

locomotive/steam/liquid.rb b/lib/locomotive/steam/liquid.rb +3 -3

@@	@@ -1,5 +1,5 @@
	require 'solid'
-	require 'locomotive/mounter'
+	require 'locomotive/models'

	require_relative 'liquid/scopeable'
	require_relative 'liquid/drops/base'
@@	@@ -10,9 +10,9 @@ require_relative 'liquid/tags/path_helper'
	Dir[File.join(File.dirname(__FILE__), 'liquid', dir, '*.rb')].each { \|lib\| require lib }
	end

-	# add to_liquid methods to main models from the mounter
+	# add to_liquid methods to main models
	%w{site page content_entry}.each do \|name\|
-	klass = "Locomotive::Mounter::Models::#{name.classify}".constantize
+	klass = "Locomotive::Entities::#{name.classify}".constantize

	klass.class_eval <<-EOV
	def to_liquid

locomotive/steam/misc.rb b/lib/locomotive/steam/misc.rb +0 -10

@@	@@ -1,10 +0,0 @@
-	require_relative 'core_ext.rb'
-
-	require_relative 'initializers/i18n.rb'
-	require_relative 'initializers/markdown.rb'
-	require_relative 'initializers/will_paginate.rb'
-
-	require_relative 'monkey_patches/httparty.rb'
-	require_relative 'monkey_patches/dragonfly.rb'
-	require_relative 'monkey_patches/mounter.rb'
-	require_relative 'monkey_patches/haml.rb'
	\ No newline at end of file

locomotive/steam/monkey_patches.rb b/lib/locomotive/steam/monkey_patches.rb +1 -2

@@	@@ -1,4 +1,3 @@
	# require_relative 'monkey_patches/httparty.rb'
	# require_relative 'monkey_patches/dragonfly.rb'
-	require_relative 'monkey_patches/mounter.rb'
-	require_relative 'monkey_patches/haml.rb'
	\ No newline at end of file
+	require_relative 'monkey_patches/haml.rb'

locomotive/steam/monkey_patches/haml.rb b/lib/locomotive/steam/monkey_patches/haml.rb +1 -1

@@	@@ -14,4 +14,4 @@ module Haml::Filters

	end

-	end
	\ No newline at end of file
+	end

locomotive/steam/monkey_patches/mounter.rb b/lib/locomotive/steam/monkey_patches/mounter.rb +0 -54

@@	@@ -1,54 +0,0 @@
-	require 'locomotive/mounter'
-
-	module Locomotive
-	module Mounter
-	module Models
-	class Page
-
-	def render(context)
-	self.parse(context).render(context)
-	end
-
-	protected
-
-	def parse(context)
-	options = {
-	page: self,
-	mounting_point: context.registers[:mounting_point],
-	error_mode: :strict,
-	count_lines: true
-	}
-
-	begin
-	template = ::Liquid::Template.parse(self.source, options)
-	rescue Liquid::SyntaxError => e
-	# do it again on the raw source instead so that the error line matches
-	# the source file.
-	::Liquid::Template.parse(self.template.raw_source, options)
-	end
-	end
-
-	end
-	end
-
-	module Reader
-	module FileSystem
-	class Runner
-
-	def build_mounting_point(host)
-	self.mounting_point
-	end
-
-	end
-	end
-	end
-
-	class MountingPoint
-
-	def assets_path
-	File.join(self.path, 'public')
-	end
-
-	end
-	end
-	end
	\ No newline at end of file

locomotive/steam/services/external_api.rb b/lib/locomotive/steam/services/external_api.rb +2 -1

@@	@@ -1,4 +1,5 @@
	require 'uri'
+	require 'httparty'

	module Locomotive
	module Steam
@@	@@ -43,4 +44,4 @@ module Locomotive
	end
	end
	end
-	end
	\ No newline at end of file
+	end

locomotive/steam/standalone_server.rb b/lib/locomotive/steam/standalone_server.rb +2 -2

@@	@@ -5,7 +5,7 @@ require_relative 'version'
	require_relative 'exceptions'
	require_relative 'server'

-	require 'locomotive/mounter'
+	require 'locomotive/models'

	module Locomotive
	module Steam
@@	@@ -27,4 +27,4 @@ module Locomotive
	end
	end
	end
-	end
	\ No newline at end of file
+	end

locomotivecms_steam.gemspec +4 -1

@@	@@ -25,6 +25,7 @@ Gem::Specification.new do \|spec\|
	spec.add_development_dependency 'rack-test'
	spec.add_development_dependency 'i18n-spec'

+	spec.add_dependency 'httparty', '~> 0.13'
	spec.add_dependency 'rack-cache', '~> 1.1'
	spec.add_dependency 'moneta', '~> 0.7.20'
	spec.add_dependency 'sprockets', '~> 2.0'
@@	@@ -32,8 +33,10 @@ Gem::Specification.new do \|spec\|
	spec.add_dependency 'dragonfly', '~> 1.0.3'
	spec.add_dependency 'will_paginate', '~> 3.0' # TODO: move to kaminari
	spec.add_dependency 'kramdown', '~> 1.3.3'
+	spec.add_dependency 'haml'

-	spec.add_dependency 'locomotivecms_mounter'
+
+	spec.add_dependency 'locomotivecms_models', '~> 0.0.1'
	spec.add_dependency 'locomotivecms-solid'
	spec.add_dependency 'locomotivecms_common', '~> 0.0.1'