plezi 0.12.15 → 0.12.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2ced994d1b21af157a084e747c60c2fd113a5c
-  data.tar.gz: 6828e742abc6eb612cf70bfbe0c6f2f6da1cac1c
+  metadata.gz: 6f6fba282cfa6309e0cccf3aff5da8e19de6fc5e
+  data.tar.gz: 9aa0efac03e405a8d4db93455d56b51ea328c956
 SHA512:
-  metadata.gz: d7f1d3f579ae87afdf56028e80e093c00ae1f9bd01f155e424c71cb2d846cf418f109c82ee559d21454836345ebe219d614a6af0f11d94e81665fee40856e203
-  data.tar.gz: 23a7279397df8ea1326bfe2da342b5c9c3ab5f85bb3970aae34bbc6c265e01b34392e292a2638e5b48596d720af2a1eb58ae588c624d63324b357c56c01b676f
+  metadata.gz: f447f812e27e63bd503c8ed4d945cd7202f5a6e38524b248368730295407a7a49336af8b45bc618e4f13b1f1112df0e0b0a1c73f1c96c0a199abb7277f4701f0
+  data.tar.gz: ab4818fb422e3d0a275f8a73338d50e70d3d092b7776b6bab3a6c8373f86f9b186a85f58e9dc1ee2ef08cdc7a1249aec18189b9786abcf9164c739707bf8aeef

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ***
 
+Change log v.0.12.16
+
+**Fix**: fixed an issue with the `#url_for` method, which couldn't be used as a class method.
+
+**Update**: a new and improved `#url_for` method (both for Controller class and instance). The instance class will attempt to preserve any re-write route paramerets, such as the `:locale` and `:format` parameters. The class method will do the same IF it receives the exiting request's `params` Hash as a second argument. `#url_for` is always a "best guess" and should be accurate for when guessing isn't super difficult.
+
+***
+
 Change log v.0.12.15
 
 **Fix**: fixed the Redis connection, which was failing after DB selection support was added.

data/bin/plezi

@@ -3,6 +3,7 @@ $0="Plezi Builder"
 # count lines of code with: ^[ \t]*[\w\d\"\(\{\@\[\]\}\)\:\'\.\*\&]+.*$
 
 require 'irb'
+require 'benchmark'
 require 'securerandom'
 require 'plezi/builders/builder'
 require 'plezi/builders/app_builder'
@@ -70,13 +71,10 @@ elsif ARGV[0] == 'server' || ARGV[0] == 'start' || ARGV[0] == 's'
 	ARGV.shift
 	load File.expand_path(Dir["."][0], (File.expand_path(Dir["."][0]).split(/[\\\/]/).last) ) rescue load( File.expand_path(Dir["."][0], (File.expand_path(Dir["."][0]).split(/[\\\/]/).last ) ) )
 elsif ARGV[0] == 'console' || ARGV[0] == 'c'
-	NO_PLEZI_AUTO_START ||= true
 	load File.expand_path(Dir["."][0], (File.expand_path(Dir["."][0]).split(/[\\\/]/).last) ) rescue load( File.expand_path(Dir["."][0], (File.expand_path(Dir["."][0]).split(/[\\\/]/).last) ) )
 	ARGV.clear
-	IRB.setup nil
-	IRB.conf[:MAIN_CONTEXT] = IRB::Irb.new.context
-	require 'irb/ext/multi-irb'
-	IRB.irb nil, self
+	Iodine.protocol = nil
+	IRB.start
 else
 	puts ""
 	puts "Plezi fast web app starter.".pink

data/lib/plezi/builders/app_builder.rb

@@ -21,6 +21,7 @@ module Plezi
 				app_tree["Gemfile"] ||= String.new
 				app_tree["Gemfile"] << "source 'https://rubygems.org'\n\n####################\n# core gems\n\n# include the basic plezi framework and server\ngem 'plezi', '~> #{Plezi::VERSION}'\n"
 				app_tree["Gemfile"] << "\n\n\nruby '#{RUBY_VERSION}'\n"
+				app_tree["rakefile"] ||= IO.read(File.join(@root,"resources" ,"rakefile")).sub('initialize.rb', "#{app_name}.rb")
 				app_tree["templates"] ||= {}
 				app_tree["templates"]["404.html.erb"] ||= IO.read(File.join(@root, "resources" ,"404.erb"))
 				app_tree["templates"]["500.html.erb"] ||= IO.read(File.join(@root, "resources" ,"500.erb"))

data/lib/plezi/handlers/controller_magic.rb

@@ -79,7 +79,7 @@ module Plezi
 			#
 			def redirect_to url, options = {}
 				return super() if defined? super
-				url = full_url_for(url) unless url.is_a?(String) || url.nil?
+				url = full_url_for(url, params) unless url.is_a?(String) || url.nil?
 				# redirect
 				response.redirect_to url, options
 			end
@@ -97,13 +97,15 @@ module Plezi
 			#
 			# * If you use the same controller in different routes, the first route will dictate the returned url's structure (cause by route priority).
 			#
+			# * The route's host will be ignored. Even when using {#full_url_for}, the same host as the current request will be assumed. To change hosts, add the new host's address manualy, i.e.: `request.base_url.gsub('//www.', '//admin.') + UserController.url_for(user.id, params)
+			#
 			# * Not all controllers support this method. Regexp controller paths and multi-path options will throw an exception.
 			def url_for dest = nil
-				self.class.url_for dest
+				self.class.url_for dest, params
 			end
 			# same as #url_for, but returns the full URL (protocol:port:://host/path?params=foo)
 			def full_url_for dest
-				"#{request.base_url}#{self.class.url_for(dest)}"
+				"#{request.base_url}#{self.class.url_for(dest, params)}"
 			end
 
 			# Send raw data to be saved as a file or viewed as an attachment. Browser should believe it had recieved a file.
@@ -229,9 +231,24 @@ module Plezi
 		module ClassMethods
 			public
 
-			# This class method behaves the same way as the instance method #url_for. See the instance method's documentation for more details.
-			def url_for dest
-				get_pl_route.url_for dest
+			# This class method behaves the same way as the instance method #url_for, but accepts an added `params` Hash
+			# that will be used to infer any persistent re-write parameters (i.e. `:locale` or `:format`).
+			# See the instance method's documentation for more details.
+			def url_for dest, params={}
+				case dest
+				when :index, nil, false
+					dest = {}
+				when String
+					dest = {id: dest}
+				when Numeric, Symbol
+					dest = {id: dest}
+				when Hash
+					true
+				else
+					# convert dest.id and dest[:id] to their actual :id value.
+					dest = {id: (dest.id rescue false) || (raise TypeError, "Expecting a Symbol, Hash, String, Numeric or an object that answers to obj[:id] or obj.id") }
+				end
+				::Plezi::Base::HTTPRouter.url_for self, dest, params
 			end
 
 			# resets the routing cache
@@ -241,20 +258,6 @@ module Plezi
 
 			protected
 
-			# Sets the HTTP route that is the owner of this controller.
-			#
-			# This is used by the Plezi framework internally and is supplied only for advanced purposes. It is better to avoid using this method. 
-			def set_pl_route route
-				@pl_http_route = route
-			end
-
-			# Gets the HTTP route that is the owner of this controller.
-			#
-			# This is used to utilize the `url_for` method.
-			def get_pl_route
-				@pl_http_route
-			end
-
 			# a callback that resets the class router whenever a method (a potential route) is added
 			def method_added(id)
 				reset_routing_cache

data/lib/plezi/handlers/http_router.rb

@@ -91,6 +91,61 @@ module Plezi
 				end
 			end
 
+			# This method attempts to guess at the desired controller's URL, based on it's first path in order of route creation (ignoring host hierarchy).
+			#
+			# This will be usually used by the Controller's #url_for method to get the relative part of the url.
+			def url_for controller, dest, params = {}
+				raise TypeError, "Expecting destination parameter to be a Hash" unless dest.is_a?(Hash)
+				host = nil
+				@hosts.values.each do |h|
+					h.routes.each {|r| (host = h) && (controller = r.controller) && break if r.controller && r.controller.ancestors.include?(controller) }
+					break if host
+				end
+				raise "couldn't find Controller's route and host." unless host
+				url = []
+				dest = dest.dup
+				dest.default_proc = Plezi::Base::Helpers::HASH_SYM_PROC
+				host.routes.each do |r|
+					if r.controller == false
+						add = []
+						r.url_array.each do |sec|
+							next if sec == '*'
+							param_name = (::Plezi::Base::Route::REGEXP_OPTIONAL_PARAMS.match(sec) || ::Plezi::Base::Route::REGEXP_FORMATTED_OPTIONAL_PARAMS.match(sec) || ::Plezi::Base::Route::REGEXP_REQUIRED_PARAMS.match(sec) || ::Plezi::Base::Route::REGEXP_FORMATTED_REQUIRED_PARAMS.match(sec))
+							param_name = param_name[1].to_sym if param_name
+
+							if param_name && (dest[param_name] || params[param_name])
+								add << Plezi::Base::Helpers.encode_url(dest.delete(param_name) || params[param_name])
+							elsif !param_name
+								add << sec
+							else
+								add.clear
+								next
+							end
+						end if r.url_array
+						url.concat add
+					end
+					if r.controller == controller
+						raise NotImplementedError, "#url_for isn't implemented for this controller's route - could this be a Regexp based or special route?" unless r.url_array
+						r.url_array.each do |sec|
+							next if sec == '*'
+							param_name = (::Plezi::Base::Route::REGEXP_OPTIONAL_PARAMS.match(sec) || ::Plezi::Base::Route::REGEXP_FORMATTED_OPTIONAL_PARAMS.match(sec) || ::Plezi::Base::Route::REGEXP_REQUIRED_PARAMS.match(sec) || ::Plezi::Base::Route::REGEXP_FORMATTED_REQUIRED_PARAMS.match(sec))
+							param_name = param_name[1].to_sym if param_name
+							if param_name && dest[param_name]
+								url << Plezi::Base::Helpers.encode_url(dest.delete(param_name))
+							elsif !param_name
+								url << sec
+							elsif ::Plezi::Base::Route::REGEXP_REQUIRED_PARAMS === sec || ::Plezi::Base::Route::REGEXP_OPTIONAL_PARAMS === sec
+								url << ''.freeze
+							elsif ::Plezi::Base::Route::REGEXP_FORMATTED_REQUIRED_PARAMS === sec
+								raise ArgumentError, "URL can't be formatted becuse a required parameter (#{param_name.to_s}) isn't specified and it requires a special format (#{::Plezi::Base::Route::REGEXP_FORMATTED_REQUIRED_PARAMS.match(sec)[2]})."
+							end
+						end
+						return "/#{url.join '/'.freeze}#{"?#{dest.map {|k,v| "#{Plezi::Base::Helpers.encode_url k}=#{Plezi::Base::Helpers.encode_url v}" } .join('&'.freeze)}" if dest.any?}" 
+					end
+				end
+				false
+			end
+
 			protected
 
 			def get_host host_name

data/lib/plezi/handlers/route.rb

@@ -9,6 +9,8 @@ module Plezi
 			attr_reader :proc
 			# the parameters for the router and service that were used to create the service, router and host.
 			attr_reader :params
+			# an array containing the parts of the original url, if any. `false` for Regexp or non relevant routes.
+			attr_reader :url_array
 
 			# lets the route answer the request. returns false if no response has been sent.
 			def on_request request, response
@@ -75,80 +77,6 @@ module Plezi
 				end
 			end
 
-			# # returns the url for THIS route (i.e. `url_for :index`)
-			# #
-			# # This will be usually used by the Controller's #url_for method to get the relative part of the url.
-			# def url_for dest = :index
-			# 	raise NotImplementedError, "#url_for isn't implemented for this router - could this be a Regexp based router?" unless @url_array
-			# 	# convert dest.id and dest[:id] to their actual :id value.
-			# 	dest = (dest.id rescue false) || (raise TypeError, "Expecting a Symbol, Hash, String, Numeric or an object that answers to obj[:id] or obj.id") unless !dest || dest.is_a?(Symbol) || dest.is_a?(String) || dest.is_a?(Numeric) || dest.is_a?(Hash)
-			# 	url = '/'
-			# 	case dest
-			# 	when false, nil, '', :index
-			# 		add = true
-			# 		@url_array.each do |sec|
-			# 			add = false unless sec[0] != :path
-			# 			url << sec[1] if add
-			# 			raise NotImplementedError, '#url_for(index) cannot be implementedfor this path.' if !add && sec[0] == :path
-			# 			# todo: :multi_path
-			# 		end
-			# 	when Hash
-			# 	when Symbol, String, Numeric
-			# 	end
-			# end
-
-
-
-			# returns the url for THIS route (i.e. `url_for :index`)
-			#
-			# This will be usually used by the Controller's #url_for method to get the relative part of the url.
-			def url_for dest = :index
-				raise NotImplementedError, "#url_for isn't implemented for this router - could this be a Regexp based router?" unless @url_array
-				case dest
-				when :index, nil, false
-					dest = {}
-				when String
-					dest = {id: dest.dup}
-				when Numeric, Symbol
-					dest = {id: dest}
-				when Hash
-					dest = dest.dup
-					dest.each {|k,v| dest[k] = v.dup if v.is_a? String }
-				else
-					# convert dest.id and dest[:id] to their actual :id value.
-					dest = {id: (dest.id rescue false) || (raise TypeError, "Expecting a Symbol, Hash, String, Numeric or an object that answers to obj[:id] or obj.id") }
-				end
-				dest.default_proc = Plezi::Base::Helpers::HASH_SYM_PROC
-
-				url = '/'.dup
-
-				@url_array.each do |sec|
-					raise NotImplementedError, "#url_for isn't implemented for this router - Regexp multi-path routes are still being worked on... use a named parameter instead (i.e. '/foo/(:multi_route){route1|route2}/bar')" if REGEXP_FORMATTED_PATH === sec
-
-					param_name = (REGEXP_OPTIONAL_PARAMS.match(sec) || REGEXP_FORMATTED_OPTIONAL_PARAMS.match(sec) || REGEXP_REQUIRED_PARAMS.match(sec) || REGEXP_FORMATTED_REQUIRED_PARAMS.match(sec))
-					param_name = param_name[1].to_sym if param_name
-
-					if param_name && dest[param_name]
-						url << Plezi::Base::Helpers.encode_url(dest.delete(param_name))
-						url << '/'.freeze
-					elsif !param_name
-						url << sec
-						url << '/'.freeze
-					elsif REGEXP_REQUIRED_PARAMS === sec || REGEXP_OPTIONAL_PARAMS === sec
-						url << '/'.freeze
-					elsif REGEXP_FORMATTED_REQUIRED_PARAMS === sec
-						raise ArgumentError, "URL can't be formatted becuse a required parameter (#{param_name.to_s}) isn't specified and it requires a special format (#{REGEXP_FORMATTED_REQUIRED_PARAMS.match(sec)[2]})."
-					end
-				end
-				unless dest.empty?
-					add = '?'.freeze
-					dest.each {|k, v| url << "#{add}#{Plezi::Base::Helpers.encode_url k}=#{Plezi::Base::Helpers.encode_url v}"; add = '&'.freeze}
-				end
-				url
-
-			end
-
-
 			# Used to check for routes formatted: /:paramater - required parameters
 			REGEXP_REQUIRED_PARAMS = /^\:([^\(\)\{\}\:]*)$/
 			# Used to check for routes formatted: /(:paramater) - optional parameters
@@ -279,7 +207,6 @@ module Plezi
 				end
 				Object.const_set(new_class_name, ret)
 				Module.const_get(new_class_name).reset_routing_cache
-				ret.instance_exec(container) {|r| set_pl_route r;}
 				ret
 			end
 

data/lib/plezi/rake.rb

@@ -0,0 +1,19 @@
+# Make sure the server doesn't start
+Iodine.protocol = false
+
+
+namespace :make do
+	# add ActiveRecord controller-model generator
+
+	# add Squel controller-model generator
+
+end
+# add console mode
+desc "Same as `plezi c`: starts the application as a console, NOT a server."
+task :console do
+	Kernel.exec "plezi c"
+end
+desc "Same as `rake console`: starts the application as a console, NOT a server."
+task :c do
+	Kernel.exec "plezi c"
+end

data/lib/plezi/version.rb

@@ -1,3 +1,3 @@
 module Plezi
-    VERSION = "0.12.15"
+    VERSION = "0.12.16"
 end

data/plezi.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "iodine", "~> 0.1.15"
+  spec.add_dependency "iodine", "~> 0.1.16"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 

data/resources/rakefile

@@ -1,8 +1,7 @@
 # load all application code and gems
 load ::File.expand_path(File.join("..", "initialize.rb"),  __FILE__)
-
-# Make sure the server doesn't start
-Iodine.protocol = false
+# set Plezi to rake mode and load it's tasks (if relevant).
+require "plezi/rake"
 
 # create a default task
 desc "The default task will simply remind you to call 'rake -T'."

data/test/plezi_tests.rb

@@ -335,9 +335,9 @@ module PleziTestTasks
 		end
 	end
 	def test_url_for
-		test_url = "/some/path/test/my_url/ask/"
-		puts "    * simple #url_for test: #{RESULTS[URI.parse("http://localhost:3000" + test_url).read == test_url]}"
-		test_url = "/some/another_path/my_url/ask/"
+		test_url = "/some/path/test/my_url/ask"
+		puts "    * simple #url_for test: #{RESULTS[(URI.parse("http://localhost:3000" + test_url).read == test_url) || puts("Got path: #{URI.parse("http://localhost:3000" + test_url).read}")]}"
+		test_url = "/some/another_path/my_url/ask"
 		puts "    * missing arguments #url_for test: #{RESULTS[URI.parse("http://localhost:3000" + test_url).read == test_url]}"
 
 		rescue => e
@@ -364,7 +364,7 @@ module PleziTestTasks
 				end
 			end
 			ws2 = Iodine::Http::WebsocketClient.connect("ws://localhost:3000/") do |data|
-				next unless @is_connected || !( (@is_connected = true) )
+				next unless @is_connected || !( ( @is_connected = true ) == true )
 				if data == "unicast"
 					puts "    * Websocket unicast message test: #{RESULTS[false]}"
 					unicast_test = :failed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plezi
 version: !ruby/object:Gem::Version
-  version: 0.12.15
+  version: 0.12.16
 platform: ruby
 authors:
 - Boaz Segev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-14 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iodine
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.16
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,7 @@ files:
 - lib/plezi/helpers/mime_types.rb
 - lib/plezi/oauth.rb
 - lib/plezi/oauth/auth_controller.rb
+- lib/plezi/rake.rb
 - lib/plezi/version.rb
 - logo/dark.png
 - logo/light.png