From 2107e76df707fb969dac46ed3aea75c1ea01669e Mon Sep 17 00:00:00 2001
From: Gregory Eremin <magnolia_fan@me.com>
Date: Thu, 11 Jul 2013 02:16:26 +0700
Subject: [PATCH] Renamed type field to syntax

---
 app/assets/javascripts/dropdown.coffee |  4 ++--
 app/models/paste.rb                    | 14 +++++++-------
 app/views/form.slim                    |  6 +++---
 pastemaster.rb                         |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/dropdown.coffee b/app/assets/javascripts/dropdown.coffee
index 583103d..8b29a68 100644
--- a/app/assets/javascripts/dropdown.coffee
+++ b/app/assets/javascripts/dropdown.coffee
@@ -1,7 +1,7 @@
 class Selector
   constructor: (selector) ->
     @input = $("#{selector}-input")
-    @dropdown = $(selector)
+    @dropdown = $("#{selector}-selector")
     @placeholder = @dropdown.children 'span'
     @prefix = @placeholder.text()
     @options = @dropdown.find 'ul.dropdown > li'
@@ -29,6 +29,6 @@ class Selector
     @input.val value
 
 $ ->
-  new Selector '#type'
+  new Selector '#syntax'
   $(document).on 'click', (e) ->
     $('.wrapper-dropdown').removeClass 'active'
diff --git a/app/models/paste.rb b/app/models/paste.rb
index e84e6f2..5cda49d 100644
--- a/app/models/paste.rb
+++ b/app/models/paste.rb
@@ -1,21 +1,21 @@
 class Paste
-  attr_reader :contents, :type
+  attr_reader :contents, :syntax
 
   class << self
     def find(id)
       record = DB[:pastes].where(id: id).first
-      record ? new(record[:contents], record[:type]) : nil
+      record ? new(record[:contents], record[:syntax]) : nil
     end
   end
 
-  def initialize(contents, type = nil)
+  def initialize(contents, syntax = nil)
     @contents = contents
-    @type = type if CONFIG.available_syntaxes.include?(type)
+    @syntax = syntax if CONFIG.available_syntaxes.include?(syntax)
   end
 
   def save
     encrypt!
-    DB[:pastes].insert(contents: contents, type: type)
+    DB[:pastes].insert(contents: contents, syntax: syntax)
   end
 
   def decrypt(key)
@@ -37,7 +37,7 @@ class Paste
   end
 
   def highlighted
-    Pygments.highlight(contents, lexer: type, options: { linenos: 'table' })
+    Pygments.highlight(contents, lexer: syntax, options: { linenos: 'table' })
   end
 
   def paragraph
@@ -45,6 +45,6 @@ class Paste
   end
 
   def html
-    type ? highlighted : paragraph
+    syntax ? highlighted : paragraph
   end
 end
diff --git a/app/views/form.slim b/app/views/form.slim
index 8e59a0c..13cabec 100644
--- a/app/views/form.slim
+++ b/app/views/form.slim
@@ -1,11 +1,11 @@
 form action="/" method="post" accept-charset="UTF-8"
   textarea name="contents"
-  input id="type-input" type="hidden" name="type" value=""
-  div id="type" class="wrapper-dropdown" tabindex="1"
+  input id="syntax-input" type="hidden" name="syntax" value=""
+  div id="syntax-selector" class="wrapper-dropdown" tabindex="1"
     span Syntax
     ul.dropdown
       li.selected data-value="" Plain Text
-      - for code, name in @lexers
+      - for code, name in @syntaxes
         li data-value=code =name
   input type="submit" value="Save"
   a href="#" role="submit" Save
diff --git a/pastemaster.rb b/pastemaster.rb
index 5325acd..e5bdad4 100644
--- a/pastemaster.rb
+++ b/pastemaster.rb
@@ -34,13 +34,13 @@ class Pastemaster < Sinatra::Application
   use StylusAssets
 
   get '/' do
-    @lexers = CONFIG.syntaxes_map
+    @syntaxes = CONFIG.syntaxes_map
 
     slim :form, layout: :default
   end
 
   post '/' do
-    paste = Paste.new(params[:contents], params[:type])
+    paste = Paste.new(params[:contents], params[:syntax])
     id = paste.save
 
     redirect "/#{id}/#{paste.key}"