shot_mvc 1.0.2 → 1.0.3

data/{application → app}/controllers/view_controller.rb

@@ -18,13 +18,13 @@ class ViewController < Controller
 		<div class="span12">
 			<h1>#{view}</h1>
 			<p>This view is simply a placeholder for something amazing! You can edit the view here:</p>
-			<pre><code>application/views/#{view}.erb</code></pre>
+			<pre><code>app/views/#{view}.erb</code></pre>
 		</div>
 	</div>
 </div>
 			eos
 
-			File.write "application/views/#{view}.erb", contents
+			File.write "app/views/#{view}.erb", contents
 
 			get('controller', 'Home').index
 		end

data/{application → app}/views/view_not_found.erb

@@ -8,7 +8,7 @@
         <p>Uh oh! It looks like you tried to render a view that doesn't exist yet.</p>
 
         <p>
-          <a data-shot-click="GemRoot/application/controllers/view_controller.rb#create" data-shot-data="<%=data[:requested_view]%>" class="btn btn-primary btn-large">
+          <a data-shot-click="GemRoot/app/controllers/view_controller.rb#create" data-shot-data="<%=data[:requested_view]%>" class="btn btn-primary btn-large">
             Create View
           </a>
         </p>

data/lib/shot_mvc/controller.rb

@@ -38,4 +38,12 @@ class Controller
 	def get(type, name)
 		@app.get type, name
 	end
+
+	# Instantiate a new Element, assigned to the specified query
+	#
+	# Note:: Sugary way of writing +get "element", "selector"+
+
+	def e(selector)
+		@app.get 'element', selector
+	end
 end

data/lib/shot_mvc/controller_delegate.rb

@@ -29,12 +29,12 @@ end
 eof
 
 		template = ERB.new template
-		File.write "application/controllers/#{controller_name.underscore}_controller.rb", template.result(binding)
+		File.write "app/controllers/#{controller_name.underscore}_controller.rb", template.result(binding)
 	end
 
 	def delete_controller(controller_name)
-		if File.exists? "application/controllers/#{controller_name.underscore}_controller.rb"
-			File.unlink "application/controllers/#{controller_name.underscore}_controller.rb"
+		if File.exists? "app/controllers/#{controller_name.underscore}_controller.rb"
+			File.unlink "app/controllers/#{controller_name.underscore}_controller.rb"
 		else
 			raise ControllerNotFoundException.new "Could not find controller named #{controller_name}"
 		end

data/lib/shot_mvc/controller_loader.rb

@@ -1,7 +1,7 @@
 # ControllerLoader
 #
-# Adds controller loading functionality to a Shot application. Will attempt to load controllers in the
-# 'application/controllers' folder in the local working directory. If the file is not found, or an appropriate
+# Adds controller loading functionality to a Shot app. Will attempt to load controllers in the
+# 'app/controllers' folder in the local working directory. If the file is not found, or an appropriate
 # filesystem is not set up, a ControllerLoadException will be raised.
 #
 # Shot Framework - Copyright (c) Jesse Aaron Dunlap <me@jessedunlap.me>
@@ -48,7 +48,7 @@ class ControllerLoader < Loader
 				controller_instance
 
 			else
-				load "application/controllers/#{controller.underscore}_controller.rb"
+				load "app/controllers/#{controller.underscore}_controller.rb"
 
 				controller_class_name = get_controller_class controller
 				controller_object = get_controller_object controller_class_name
@@ -59,14 +59,14 @@ class ControllerLoader < Loader
 				controller_instance
 			end
 		else
-			raise ControllerLoadException.new "Error loading controller #{controller}. Please verify that it exists at application/controllers/#{controller.underscore}.rb"
+			raise ControllerLoadException.new "Error loading controller #{controller}. Please verify that it exists at app/controllers/#{controller.underscore}.rb"
 		end
 	end
 
 	private
 
 	def controller_exists?(controller)
-		File.exists? controller or File.exists? "application/controllers/#{controller.underscore}_controller.rb"
+		File.exists? controller or File.exists? "app/controllers/#{controller.underscore}_controller.rb"
 	end
 
 	def direct_path_to_controller?(controller)

data/lib/shot_mvc/model_router.rb

@@ -0,0 +1,7 @@
+class ModelRouter
+  def initialize(client)
+    if Dir.exists? "app/models"
+      Dir.new("app/models").each do |model_file| require_relative "./app/models/#{model_file}" end
+    end
+  end
+end

data/lib/shot_mvc/session_router.rb

@@ -22,7 +22,7 @@ class ApplicationInstance
 	end
 
 	def session_save
-		File.write "application/sessions/#{@config[:session_key]}.json", @config[:session].to_json
+		File.write "app/sessions/#{@config[:session_key]}.json", @config[:session].to_json
 	end
 end
 
@@ -31,11 +31,11 @@ class SessionRouter < Router
 		super(client)
 
 		client.on 'session_key' do |key|
-			create_session_folder unless Dir.exists? 'application/sessions'
-			create_session_file key unless File.exists? "application/sessions/#{key}.json"
+			create_session_folder unless Dir.exists? 'app/sessions'
+			create_session_file key unless File.exists? "app/sessions/#{key}.json"
 
 			client.config[:session_key] = key
-			client.config[:session] = JSON.parse File.read "application/sessions/#{key}.json"
+			client.config[:session] = JSON.parse File.read "app/sessions/#{key}.json"
 
 			client.emit 'session_ready'
 		end
@@ -44,11 +44,11 @@ class SessionRouter < Router
 			session_key = SecureRandom.uuid
 			client.emit 'assign_session_key', :key => session_key, :session_hash => client.config['server']['Security']['SessionHash']
 
-			create_session_folder unless Dir.exists? 'application/sessions'
-			create_session_file session_key unless File.exists? "application/sessions/#{session_key}.json"
+			create_session_folder unless Dir.exists? 'app/sessions'
+			create_session_file session_key unless File.exists? "app/sessions/#{session_key}.json"
 
 			client.config[:session_key] = session_key
-			client.config[:session] = JSON.parse File.read "application/sessions/#{session_key}.json"
+			client.config[:session] = JSON.parse File.read "app/sessions/#{session_key}.json"
 
 			client.emit 'session_ready'
 		end
@@ -59,10 +59,10 @@ class SessionRouter < Router
 	private
 
 	def create_session_folder
-		Dir.mkdir 'application/sessions'
+		Dir.mkdir 'app/sessions'
 	end
 
 	def create_session_file(key)
-		File.write "application/sessions/#{key}.json", '{}'
+		File.write "app/sessions/#{key}.json", '{}'
 	end
 end

data/lib/shot_mvc/template_loader.rb

@@ -25,19 +25,19 @@ class TemplateLoader < Loader
 			if full_path? name
 				Template.new name
 			else
-				Template.new "./application/views/#{name}.erb"
+				Template.new "./app/views/#{name}.erb"
 			end
 		else
 			if @client.config['server']['Security']['VisualErrors'] then
 				begin
-					raise TemplateLoadException.new "Could not load #{name}. Verify it exists at application/views/#{name}.erb"
+					raise TemplateLoadException.new "Could not load #{name}. Verify it exists at app/views/#{name}.erb"
 				rescue Exception => ex
-					template = Template.new "#{gem_root}/application/views/view_not_found.erb"
+					template = Template.new "#{gem_root}/app/views/view_not_found.erb"
 					template.data = { :requested_view => name, :exception => ex }
 					return template
 				end
 			else
-				raise TemplateLoadException.new "Could not load #{name}. Verify it exists at application/views/#{name}.erb"
+				raise TemplateLoadException.new "Could not load #{name}. Verify it exists at app/views/#{name}.erb"
 			end
 		end
 	end
@@ -53,6 +53,6 @@ class TemplateLoader < Loader
 	end
 
 	def template_exists?(view_name)
-		File.exists? view_name or File.exists? "application/views/#{view_name}.erb"
+		File.exists? view_name or File.exists? "app/views/#{view_name}.erb"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shot_mvc
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shot
@@ -59,14 +59,15 @@ files:
 - lib/shot_mvc/controller_router.rb
 - lib/shot_mvc/element.rb
 - lib/shot_mvc/element_loader.rb
+- lib/shot_mvc/model_router.rb
 - lib/shot_mvc/mvc_application.rb
 - lib/shot_mvc/session_router.rb
 - lib/shot_mvc/template.rb
 - lib/shot_mvc/template_loader.rb
 - lib/shot_mvc/template_load_exception.rb
 - lib/shot_mvc.rb
-- application/controllers/view_controller.rb
-- application/views/view_not_found.erb
+- app/controllers/view_controller.rb
+- app/views/view_not_found.erb
 - LICENSE.md
 - README.md
 homepage: http://github.com/shot/