starlight_helpers 0.1000 → 0.1001

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a3b4b798441b86215b526db3c2cc0a856a89ed9
-  data.tar.gz: a723db3edfb4bc5b3305115df2fa3c8f2b23e880
+  metadata.gz: 45e55034b256a85f964b924fac2efca201e29de7
+  data.tar.gz: 9caccc25808fd94dda3cdb918ddbc0712fc8c08e
 SHA512:
-  metadata.gz: 1564ea9d08e5f9fe0e4f45843ed433a38465b0876f634958eb56574e56c900a34fbd6bb453f2bee89188d12af57b5eaac6c927d2c3739a1eea41fded95fd3e29
-  data.tar.gz: 006d29a60f780a0dc05023bca2875c89d9f726f8dc4cb4a5bc778d26058748d1e418cc9c1ac39ea9aff09f8e1e10a0207d210618dd881cb8388218c59a23aed2
+  metadata.gz: 69eeea96fbb58530cf4ff315192e36351345fe3ec421369f04c7367242528a2b0498759e963a12f70fed505ee8730e353713e67a8291c3e65f953293a2c6264f
+  data.tar.gz: 8f84b6601c37a506af1f4886a60d328f7ba3c97f37c889c6a9a3825ed6cd9f0af33594f9ea7a11c707d33ea56ad7a01dc8e6c9ab181457229082ba67874bc603

data/lib/starlight_helpers.rb

@@ -1,4 +1,5 @@
 require "starlight_helpers/version"
 
 module StarlightHelpers
+  require "starlight_helpers/all"
 end

data/lib/starlight_helpers/content.rb

@@ -1,4 +1,5 @@
 require 'redcarpet'
+require 'redcloth'
 require 'action_view'
 
 module StarlightHelpers
@@ -11,15 +12,35 @@ module StarlightHelpers
 			link_to(name, options, html_options, &block)
 		end
 
-		def convert_content(content, markup)
-			if markup == 'plain'
-				content.gsub("\n", '<br>')
-			elsif markup == 'markdown'
-				markdown = ::Redcarpet::Markdown.new(::Redcarpet::Render::HTML)
-				markdown.render(content)
-			elsif markup == 'html'
+		def render_text(content, markup = 'text/plain', options = {})
+			textile_opts = []
+			markdown_opts = {
+				tables: true, fenced_code_blocks: true, autolink: true,
+				disable_indented_code_blocks: true, strikethrough: true,
+				underline: true, highlight: true, footnotes: true
+			}
+			if options[:not_trusted]
+				textile_opts << :lite_mode << :filter_html
+				markdown_opts = {filter_html: true, no_styles: true}
+			end
+		  
+			if markup == 'text/markdown'
+				renderer = Redcarpet::Render::HTML.new(markdown_opts)
+				Redcarpet::Markdown.new(renderer).render(content)
+			elsif markup == 'text/textile'
+				RedCloth.new(content, textile_opts).to_html
+			elsif markup == 'text/html' && options[:not_trusted] != true
 				# nothing
 				content
+			# for text/plain and other
+			else
+				content.gsub(/["&'<>]/,
+					'"' => '&quot;',
+					'&' => '&amp;',
+					"'" => '&apos;',
+					'<' => '&lt;',
+					'>' => '&gt;'
+				).gsub("\n", '<br>')
 			end
 		end
 

data/lib/starlight_helpers/locale.rb

@@ -12,7 +12,7 @@ module StarlightHelpers
 		end
 
     # function parses user agent string from web browser (Accept-Language)
-    # and returns sorted array of {quality => code} segments
+    # and returns sorted array of {code => quality} segments
 		def parse_accept_language(ualangs)
 			# quality? format
 			qf = "q=(1|0\.[1-9])"
@@ -40,19 +40,36 @@ module StarlightHelpers
 		def valid_locale?(loc)
 			loc =~ format ? true : false
 		end
-
-		def language(loc)
-		  loc.match(format)[1]
-		end
 		
 		def country(loc)
-		  loc.match(format)[3]
+		  matchdata = loc.match(format)
+		  matchdata ? matchdata[3] : nil
 		end
 
 		def country?(loc)
-		  loc.match(format)[3] != nil
+		  matchdata = loc.match(format)
+		  if matchdata
+		    matchdata[3] ? true : false
+		  else
+		    false
+		  end
 		end
 		alias_method :full_locale?, :country?
+		
+		def language(loc)
+		  matchdata = loc.match(format)
+		  matchdata ? matchdata[1] : nil
+		end
+
+		def only_language?(loc)
+		  matchdata = loc.match(format)
+		  if matchdata
+		  	matchdata[3] ? false : true
+		  else
+		    false
+		  end
+		end
+		alias_method :short_locale?, :only_language?
 	end
 end
 

data/lib/starlight_helpers/version.rb

@@ -1,3 +1,3 @@
 module StarlightHelpers
-  VERSION = "0.1000"
+  VERSION = "0.1001"
 end

data/starlight_helpers.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "actionpack"
   spec.add_dependency "redcarpet"
+  spec.add_dependency "RedCloth"
   spec.add_dependency "rack"
   spec.add_dependency "actionview"
 

data/test/content_test.rb

@@ -16,11 +16,36 @@ describe StarlightHelpers::Content do
   end
   
   it '#render_text' do
-    assert_equal 'Hello<br>world',
-      LesterHelper.convert_content("Hello\nworld", 'plain')
-    assert_equal "<p><em>Hello</em></p>\n",
-      LesterHelper.convert_content("*Hello*", 'markdown')
-    assert_equal '<font color="navy">Hello</font>',
-      LesterHelper.convert_content('<font color="navy">Hello</font>', 'html')
+        text = "h1. *Ahoy*
+
+<style>body{color: navy}</style>"
+
+    assert_equal "<p>h1. <em>Ahoy</em></p>\n\n<style>body{color: navy}</style>\n",
+      LesterHelper.render_text(text, 'text/markdown')
+    
+    assert_equal "<h1><strong>Ahoy</strong></h1>\n<style>body{color: navy}</style>",
+      LesterHelper.render_text(text, 'text/textile')
+    
+    assert_equal "h1. *Ahoy*\n\n<style>body{color: navy}</style>",
+      LesterHelper.render_text(text, 'text/html')
+    
+    assert_equal "h1. *Ahoy*<br><br>&lt;style&gt;body{color: navy}&lt;/style&gt;",
+      LesterHelper.render_text(text, 'text/plain')
+    
+    # not trusted mode like comments
+    assert_equal "<p>h1. <em>Ahoy</em></p>\n\n<p>body{color: navy}</p>\n",
+      LesterHelper.render_text(text, 'text/markdown', not_trusted: true)
+
+    assert_equal "h1. <strong>Ahoy</strong><br />\n<br />\n&lt;style&gt;body{color: navy}&lt;/style&gt;",
+      LesterHelper.render_text(text, 'text/textile', not_trusted: true)
+
+    assert_equal "h1. *Ahoy*<br><br>&lt;style&gt;body{color: navy}&lt;/style&gt;",
+      LesterHelper.render_text(text, 'text/html', not_trusted: true)
+
+    assert_equal "h1. *Ahoy*<br><br>&lt;style&gt;body{color: navy}&lt;/style&gt;",
+      LesterHelper.render_text(text, 'text/plain', not_trusted: true)
+    # handled like plain
+    assert_equal "h1. *Ahoy*<br><br>&lt;style&gt;body{color: navy}&lt;/style&gt;",
+      LesterHelper.render_text(text, 'something', not_trusted: true)
   end
 end 

data/test/locale_test.rb

@@ -16,24 +16,38 @@ describe StarlightHelpers::Locale do
     assert !Lester.valid_locale?('sks_SKs')
     assert !Lester.valid_locale?('0a_SK')
     assert !Lester.valid_locale?('0')
-    assert !Lester.valid_locale?('0_SK')    
+    assert !Lester.valid_locale?('0_SK')
+    assert !Lester.valid_locale?('sk_')    
+  end
+
+  it '#country' do
+    assert_equal 'US', Lester.country('en_US')
+    assert_nil Lester.country('sk')
+    assert_nil Lester.country('invalid')
   end
 
   it '#country?, #full_locale?' do
     assert Lester.country?('sk_SK')
     assert !Lester.country?('sk')
+    assert !Lester.country?('invalid')
     assert Lester.full_locale?('sk_SK')
     assert !Lester.full_locale?('sk')
-  end
-
-  it '#country' do
-    assert_equal 'US', Lester.country('en_US')
-    assert_nil Lester.country('sk')
+    assert !Lester.full_locale?('invalid')
   end
   
   it '#language' do
     assert_equal 'en', Lester.language('en_US')
     assert_equal 'sk', Lester.language('sk')
+    assert_nil Lester.language('invalid')
+  end
+  
+  it 'only_language?' do
+    assert !Lester.only_language?('sk_SK')
+    assert Lester.only_language?('sk')
+    assert !Lester.only_language?('invalid')
+    assert !Lester.short_locale?('sk_SK')
+    assert Lester.short_locale?('sk')
+    assert !Lester.short_locale?('invalid')
   end
   
   it '#parse_accept_language' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: starlight_helpers
 version: !ruby/object:Gem::Version
-  version: '0.1000'
+  version: '0.1001'
 platform: ruby
 authors:
 - Ivan Stana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Helper modules for building websites. Flash, content, locale and model.