Commit 10471a07 by Ivan Lan

Merge branch 'lan/basic_frame' into 'master'

Lan/basic frame See merge request !2
parents 6b676a53 d877f9e5
...@@ -11,4 +11,8 @@ module WeatherModel ...@@ -11,4 +11,8 @@ module WeatherModel
Object.const_get(settings[:sort]).const_set("#{source.to_s.gsub('_', '::')}", Class.new(Storer::Mysql)).use_settings(settings) Object.const_get(settings[:sort]).const_set("#{source.to_s.gsub('_', '::')}", Class.new(Storer::Mysql)).use_settings(settings)
end end
end end
def self.set_ohm redis
Ohm.redis = redis
end
end end
...@@ -6,7 +6,7 @@ RSpec.describe WeatherModel do ...@@ -6,7 +6,7 @@ RSpec.describe WeatherModel do
include WeatherModel include WeatherModel
before do before do
# start an ohm # start an ohm
Ohm.redis = Redic.new("redis://127.0.0.1:6379/5") WeatherModel.set_ohm Redic.new("redis://127.0.0.1:6379/5")
# run migration # run migration
Dir[File.dirname(__FILE__) + '/../db/migrate/*.rb'].each { |file| require file } Dir[File.dirname(__FILE__) + '/../db/migrate/*.rb'].each { |file| require file }
ActiveRecord::Base.establish_connection( ActiveRecord::Base.establish_connection(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment