rails_admin_content 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5357b2927e1dad8c03c98c0f51e21ff0e337b7c7
-  data.tar.gz: b68d48176b17cf56c1dbc610316188bbf31d2b23
+  metadata.gz: 7e1c68eeec42e8eece237bcb1de6a29c1ddd6596
+  data.tar.gz: a6ad4aa205dea3456d75f33670388c38fe4a0f9a
 SHA512:
-  metadata.gz: 3eb506451fa2c7445678cceb81a839f412cb8bd800b451e0bf86f2639d77e2fd126bac1eb92551650a83371bf863ff30f2bc1eed71ff04474e46b81d47e773ae
-  data.tar.gz: 7857810a4bcf3d9949043fe5c2ad238bd7c99faeeeffa4a15e528791d8afc9e559d6e3cc3c32bf6c52e4d9b0843cb1c7af5ec7fb8f43fb1e1cf3ea623dd82fe7
+  metadata.gz: 90a0bc1806ab164cb7bef7daf5ba24d38bd3d04f14bb46203c6c7bc1db26e269191ff204b271763fb88c202488dff78b29df4d7b7abf00e21642a50a533fd7e4
+  data.tar.gz: 554c571bbfb19d62ecc7fbd25614a6342c207294e72d6a003df3bcbece67915586b35cb0984daa9e4f36957c49c45af59c62080895d907fe1237a98933f49605

data/app/assets/javascripts/develop/manages.js.coffee

@@ -20,16 +20,21 @@ search_input_change = ->
 			return $(li).show() if $.trim($('#seaerch-T').val()).length == 0
 			if RegExp($('#seaerch-T').val().toLocaleLowerCase()).test($(li).attr('data-field')) then $(li).show() else $(li).hide()
 
+initialize_textarea_sql = (id) ->
+	if var_id = document.getElementById(id)
+		editor = CodeMirror.fromTextArea var_id,
+			mode: "text/x-sql",
+			tabMode: "indent",
+			smartIndent: true,
+			lineNumbers: true,
+			matchBrackets: true,
+			indentUnit: 2
+			
+
 $(document).ready ->
-	if document.getElementById("search-textarea")
-		editor = CodeMirror.fromTextArea(document.getElementById("search-textarea"), {
-				mode: "text/x-sql",
-				tabMode: "indent",
-				smartIndent: true,
-				lineNumbers: true,
-				matchBrackets: true,
-				indentUnit: 2
-		  });
+	initialize_textarea_sql 'search-textarea'
+	initialize_textarea_sql 'show-sql-textarea'
+
 
 	$('span.edit_datepicker').on 'click', 'textarea', -> $(this).dynDateTime()
 	$('.formitem .datetime').on 'click', -> $(this).dynDateTime()

data/app/controllers/rails_admin_content/develop/application_controller.rb

@@ -1,3 +1,3 @@
 class RailsAdminContent::Develop::ApplicationController < ApplicationController
-	layout 'rails_admin_content/admin'
+  layout 'rails_admin_content/admin'
 end

data/app/controllers/rails_admin_content/develop/manages_controller.rb

@@ -1,77 +1,82 @@
 class RailsAdminContent::Develop::ManagesController < RailsAdminContent::Develop::ApplicationController
 
-	before_filter :find_params, except: %w(update create new)
-
-	def index
-		@version = RailsAdminContent::Client.conn.origin_query("SELECT VERSION() as version").each
-	end
-
-	def query
-		@entries = RailsAdminContent::Client.query(RailsAdminContent::Client.query_str,@page, @per).each  if RailsAdminContent::Client.query_str
-	rescue Exception => e
-		flash[:errors] = e.message
-	end
-
-	def filter
-		RailsAdminContent::Client.query_str = params[:q]
-		redirect_to action: :query
-	end
-
-	def show
-		@query_str = "SELECT * FROM #{params[:id]} ORDER BY id DESC"
-		@query_str = RailsAdminContent::Client.compose(params) if params[:field].present?
-		@fields = RailsAdminContent::Client.desc_table params[:id]
-		@entries = RailsAdminContent::Client.query(@query_str,@page, @per)
-	rescue Exception => e
-		flash[:errors] = e.message
-	end
-
-	def new;end
-
-	def edit; end
-
-	def edit_column
-		@fields = RailsAdminContent::Client.desc_table params[:id]
-		@sql = RailsAdminContent::Client.show_create_sql params[:id]
-	end
-
-	def details
-		@details = RailsAdminContent::Client.conn.origin_query("SHOW TABLE STATUS LIKE '#{params[:id]}'").each
-	end
-
-	def create
-		RailsAdminContent::Client.insert(params[:table_name], params[:field])
-		flash[:success] = "成功添加#{params[:table_name]}一条数据。"
-	rescue Exception => e
-		flash[:errors] = e.message
-	ensure
-		redirect_to develop_manage_path(params[:table_name])
-	end
-
-	def update
-		RailsAdminContent::Client.update(params[:table_name], params[:id], params[:field])
-		flash[:success] = "更新#{params[:id]}内容成功。"
-	rescue Exception => e
-		flash[:errors] = e.message
-	ensure
-		redirect_to develop_manage_path(params[:table_name])
-	end
-
-
-	def update_field
-		RailsAdminContent::Client.conn.origin_query("UPDATE #{params[:table]} SET #{params[:field]} = REPLACE(REPLACE(REPLACE('#{params[:value]}', '&','&amp;'), '>', '&gt;'), '<', '&lt;') WHERE id = #{params[:id]}")
-		render text: 'success'
-	end
-
-	def destroy
-		RailsAdminContent::Client.delete(params[:id], params[:edit_id]) if params[:edit_id].present?
-		render json: params[:edit_id]
-	end
-
-	private
-
-	def find_params
-		@page, @per = (params[:page] || 1).to_i, (params[:per] || 100).to_i
-	end
+  before_filter :find_params, except: %w(update create new)
+
+  def index
+    @version = RailsAdminContent::Client.conn.origin_query("SELECT VERSION() as version").each
+  end
+
+  def query
+    @entries = RailsAdminContent::Client.query(session[:query_str],@page, @per).each  if session[:query_str]
+  rescue Exception => e
+    flash[:errors] = e.message
+  end
+
+  def filter
+    session[:query_str] = params[:q]
+    redirect_to action: :query
+  end
+
+  def show
+    @query_str = "SELECT * FROM #{params[:id]} ORDER BY id DESC"
+    @query_str = RailsAdminContent::Client.compose(params) if params[:field].present?
+    @fields = RailsAdminContent::Client.desc_table params[:id]
+    @entries = RailsAdminContent::Client.query(@query_str,@page, @per)
+  rescue Exception => e
+    flash[:errors] = e.message
+  end
+
+  def new;end
+
+  def edit; end
+
+  def edit_column
+    @fields = RailsAdminContent::Client.desc_table params[:id]
+    @sql = RailsAdminContent::Client.show_create_sql params[:id]
+  end
+
+  def details
+    @details = RailsAdminContent::Client.conn.origin_query("SHOW TABLE STATUS LIKE '#{params[:id]}'").each
+  end
+
+  def create
+    RailsAdminContent::Client.insert(params[:table_name], params[:field])
+    flash[:success] = "成功添加#{params[:table_name]}一条数据。"
+  rescue Exception => e
+    flash[:errors] = e.message
+  ensure
+    redirect_to develop_manage_path(params[:table_name])
+  end
+
+  def update
+    RailsAdminContent::Client.update(params[:table_name], params[:id], params[:field])
+    flash[:success] = "更新#{params[:id]}内容成功。"
+  rescue Exception => e
+    flash[:errors] = e.message
+  ensure
+    redirect_to develop_manage_path(params[:table_name])
+  end
+
+
+  def update_field
+    RailsAdminContent::Client.conn.origin_query("UPDATE #{params[:table]} SET #{params[:field]} = REPLACE(REPLACE(REPLACE('#{params[:value]}', '&','&amp;'), '>', '&gt;'), '<', '&lt;') WHERE id = #{params[:id]}")
+    render text: 'success'
+  end
+
+  def destroy
+    RailsAdminContent::Client.delete(params[:id], params[:edit_id]) if params[:edit_id].present?
+    render json: params[:edit_id]
+  end
+
+  def modify_default_value
+    RailsAdminContent::Client.modify_table_column_default_value(params[:table], params[:field], params[:value], params[:field_type])
+    render json: params[:edit_id]
+  end
+
+  private
+
+  def find_params
+    @page, @per = (params[:page] || 1).to_i, (params[:per] || 100).to_i
+  end
 
 end

data/app/views/rails_admin_content/develop/manages/_form.html.slim

@@ -1,5 +1,5 @@
 = form_tag filter_develop_manages_path, method: :post
   #search_area
-    textarea rows="2" cols="140" id="search-textarea" style="height:100px" name="q" #{RailsAdminContent::Client.query_str||""}
+    textarea rows="2" cols="140" id="search-textarea" style="height:100px" name="q" #{session[:query_str]||""}
   .nav
     input  type="submit" value="Run" calss="btn btn-primary"

data/app/views/rails_admin_content/develop/manages/edit_column.html.slim

@@ -25,6 +25,9 @@ hr
             td
               = field["key"]
             td
-              = field["Default"]
+              span class="editable #{'edit_datepicker' if field["Type"] == 'datetime'}" data-field="#{field["Field"]}" data-table="#{params[:id]}" data-title="#{field["Default"]}" data-url="#{modify_default_value_develop_manages_path(field_type: field["Type"])}"
+                = field["Default"]
             td
-              = field["extra"]
+              = field["extra"]
+
+  textarea rows="2" cols="140" id="show-sql-textarea" #{@sql[0]["Create Table"]||""}

data/app/views/rails_admin_content/develop/manages/index.html.slim

@@ -1,2 +1,4 @@
-.span3
-  = "Version: #{@version[0]['version']}"
+
+h1
+	= "Version: #{@version[0]['version']}"
+hr

data/config/routes.rb

@@ -7,6 +7,7 @@ RailsAdminContent::Engine.routes.draw do
       put :update_field, on: :member
       get :edit_column, on: :member
       get :details, on: :member
+      put :modify_default_value, on: :collection
     end
   end
 end

data/lib/assets/stylesheets/common.css.sass

@@ -551,6 +551,7 @@ fieldset
 	.text,
 	input[type=text],
 	input[type=password],
+	input[type=number],
 	textarea,
 	select
 		background-color: #FFF

data/lib/rails_admin_content/client.rb

@@ -1,97 +1,107 @@
 class RailsAdminContent::Client < Mysql2::Client
 
-	Syntax = /limit\s+\d+,\d+|limit\s+\d+/
-	Syntax_table = /from\s+(\w+)/
-
-	cattr_accessor :query_str, :total_nums, :table_name
-
-	def self.select_field(type)
-		case type.gsub(/\(.*?\)/,'')
-		when "tinyint" then [['等于', '='], ['不等于', '≠']]
-		when "datetime" then [['等于', '='], ['不等于', '≠'], ['大于', '>'], ['小于','<']]
-		when "int" then [['等于', '='], ['不等于', '≠'], ['大于', '>'], ['小于','<'], ['含有', 'IN']]
-		else
-			[['等于', '='], ['不等于', '≠'], ['包含', 'LIKE']]
-		end
-	end
-
-	def self.conn
-		@client ||= new ActiveRecord::Base.connection_config
-	end
-
-	alias :origin_query :query
-
-	def self.query(query_sql, page=nil, stint=nil)
-		self.table_name = query_sql.downcase.match(Syntax_table)[1] if query_sql.downcase.match(Syntax_table)
-		self.total_nums = conn.origin_query(query_sql).size
-		query_sql = limit(query_sql, page, stint) if stint && page
-		query_sql = query_sql.gsub(/;/, '')
-		conn.origin_query(query_sql)
-	end
-
-	def self.limit(query_sql, page=1, stint)
-		page = page == 1 ? page = 0 : page.to_i*stint.to_i-stint.to_i
-		query_sql.downcase.match(Syntax).present? ? query_sql.downcase.gsub(Syntax, "LIMIT #{page},#{stint}") : "#{query_sql} LIMIT #{page},#{stint}"
-	end
-
-	def self.get_tables
-		@tables ? @tables : @tables = conn.origin_query('SHOW TABLES')
-	end
-
-	def self.compose(params)
-		"SELECT * FROM #{params[:id]} WHERE #{params["field"].inject([]){|a, (key,value)| a << compose_key(params["calc"][key],key, value); a }.join('and')}"
-	end
-
-	def self.compose_key(calc,key,value)
-		case calc
-		when '=', '>', '<'
-			" `#{key}` #{calc} '#{value}' "
-		when 'IN'
-			" `#{key}` IN (#{value}) "
-		when '≠'
-			" `#{key}`  != '#{value}' "
-		when 'LIKE'
-			" `#{key}` LIKE '%#{value}%' "
-		when '≥'
-			" `#{key}`  >= '#{value}' "
-		when '≤'
-			" `#{key}`  <= '#{value}' "
-		end
-	end
-
-
-	def self.delete(table_name, ids)
-		conn.origin_query("DELETE FROM #{table_name} WHERE id IN (#{ids.join(',')})") if ids.is_a?(Array)
-	end
-
-	def self.insert(table_name, field)
-		conn.origin_query("INSERT INTO #{table_name} (#{field.keys.join(',')}) VALUES ('#{field.values.join("','")}')")
-	end
-
-	def self.update(table_name, id, fields)
-		update_str = "UPDATE #{table_name} SET #{compose_update_sql(table_name, fields.to_a)}  WHERE id = #{id}"
-		conn.origin_query update_str
-	end
-
-	def self.compose_update_sql(table_name,fields)
-		columns = desc_table(table_name)
-		fields.inject([]) do |array, field|
-			columns.each do |column|
-				if field[0] == column["Field"]
-					array << (%w(int decimal tinyint).include?(column["Type"].gsub(/\(.*?\)/,'')) ? "#{field[0]} = #{field[1]}" : "#{field[0]} = REPLACE(REPLACE(REPLACE('#{field[1]}', '&','&amp;'), '>', '&gt;'), '<', '&lt;')")
-				end
-			end
-			array
-		end.join(',')
-	end
-
-	def self.desc_table(table_name)
-		conn.origin_query("DESC #{table_name}").each
-	end
-
-	def self.show_create_sql(table_name)
-		conn.origin_query("SHOW CREATE TABLE #{table_name}").each
-	end
-
-
-end
+  Syntax = /limit\s+\d+,\d+|limit\s+\d+/
+  Syntax_table = /from\s+(\w+)/
+
+  cattr_accessor :query_str, :total_nums, :table_name
+
+  def self.select_field(type)
+    case type.gsub(/\(.*?\)/,'')
+    when "tinyint" then [['等于', '='], ['不等于', '≠']]
+    when "datetime" then [['等于', '='], ['不等于', '≠'], ['大于', '>'], ['小于','<']]
+    when "int" then [['等于', '='], ['不等于', '≠'], ['大于', '>'], ['小于','<'], ['含有', 'IN']]
+    else
+      [['等于', '='], ['不等于', '≠'], ['包含', 'LIKE']]
+    end
+  end
+
+  def self.conn
+    @client ||= new ActiveRecord::Base.connection_config
+  end
+
+  alias :origin_query :query
+
+  def self.query(query_sql, page=nil, stint=nil)
+    self.table_name = query_sql.downcase.match(Syntax_table)[1] if query_sql.downcase.match(Syntax_table)
+    self.total_nums = conn.origin_query(query_sql).size
+    query_sql = limit(query_sql, page, stint) if stint && page
+    query_sql = query_sql.gsub(/;/, '')
+    conn.origin_query(query_sql)
+  end
+
+  def self.limit(query_sql, page=1, stint)
+    page = page == 1 ? page = 0 : page.to_i*stint.to_i-stint.to_i
+    query_sql.downcase.match(Syntax).present? ? query_sql.downcase.gsub(Syntax, "LIMIT #{page},#{stint}") : "#{query_sql} LIMIT #{page},#{stint}"
+  end
+
+  def self.get_tables
+    @tables ? @tables : @tables = conn.origin_query('SHOW TABLES')
+  end
+
+  def self.compose(params)
+    "SELECT * FROM #{params[:id]} WHERE #{params["field"].inject([]){|a, (key,value)| a << compose_key(params["calc"][key],key, value); a }.join('and')}"
+  end
+
+  def self.compose_key(calc,key,value)
+    case calc
+    when '=', '>', '<'
+      " `#{key}` #{calc} '#{value}' "
+    when 'IN'
+      " `#{key}` IN (#{value}) "
+    when '≠'
+      " `#{key}`  != '#{value}' "
+    when 'LIKE'
+      " `#{key}` LIKE '%#{value}%' "
+    when '≥'
+      " `#{key}`  >= '#{value}' "
+    when '≤'
+      " `#{key}`  <= '#{value}' "
+    end
+  end
+
+
+  def self.delete(table_name, ids)
+    conn.origin_query("DELETE FROM #{table_name} WHERE id IN (#{ids.join(',')})") if ids.is_a?(Array)
+  end
+
+  def self.insert(table_name, field)
+    conn.origin_query("INSERT INTO #{table_name} (#{field.keys.join(',')}) VALUES ('#{field.values.join("','")}')")
+  end
+
+  def self.update(table_name, id, fields)
+    update_str = "UPDATE #{table_name} SET #{compose_update_sql(table_name, fields.to_a)}  WHERE id = #{id}"
+    conn.origin_query update_str
+  end
+
+  def self.compose_update_sql(table_name,fields)
+    columns = desc_table(table_name)
+    fields.inject([]) do |array, field|
+      columns.each do |column|
+        if field[0] == column["Field"]
+          array << (%w(int decimal tinyint).include?(column["Type"].gsub(/\(.*?\)/,'')) ? "#{field[0]} = #{field[1]}" : "#{field[0]} = REPLACE(REPLACE(REPLACE('#{field[1]}', '&','&amp;'), '>', '&gt;'), '<', '&lt;')")
+        end
+      end
+      array
+    end.join(',')
+  end
+
+  def self.desc_table(table_name)
+    conn.origin_query("DESC #{table_name}").each
+  end
+
+  def self.show_create_sql(table_name)
+    conn.origin_query("SHOW CREATE TABLE #{table_name}").each
+  end
+
+  def self.modify_table_column_default_value(table_name, column, value, field_type)
+    default_value = case field_type.gsub(/\(.*?\)/,'')
+    when "tinyint" then value.present?
+    when "datetime" then value.to_time.to_s(:db)
+    when "int" then value.to_i
+    else
+      value.to_s
+    end
+    conn.origin_query("ALTER TABLE #{table_name} ALTER COLUMN #{column} SET DEFAULT '#{default_value}'")
+  end
+
+end

data/lib/rails_admin_content/engine.rb

@@ -6,7 +6,7 @@ require 'rails_admin_content/client'
 require 'rails_admin_content/helper'
 
 module RailsAdminContent
-	class Engine < ::Rails::Engine
-		isolate_namespace RailsAdminContent
-	end
+  class Engine < ::Rails::Engine
+    isolate_namespace RailsAdminContent
+  end
 end

data/lib/rails_admin_content/helper.rb

@@ -1,65 +1,65 @@
 module ActionView
-	module Helpers
-		module DateHelper
-			def custom_paginate(scope, options = {})
-				paginate = RailsAdminContent::Paginate.new(scope, options.update(per_page: options[:stint]))
-				paginate.to_s
-			end
+  module Helpers
+    module DateHelper
+      def custom_paginate(scope, options = {})
+        paginate = RailsAdminContent::Paginate.new(scope, options.update(per_page: options[:stint]))
+        paginate.to_s
+      end
 
-			def format(value, limit=10)
-				value = value.is_a?(String) && value.size > limit ? value.truncate(limit) : value
-				value = value.is_a?(Time) ? value.to_s(:db) : value
-				value ||= "null"
-			end
+      def format(value, limit=10)
+        value = value.is_a?(String) && value.size > limit ? value.truncate(limit) : value
+        value = value.is_a?(Time) ? value.to_s(:db) : value
+        value ||= "null"
+      end
 
-			def menu_value(value, icon)
-				raw <<-HTML
-				<i class="#{icon}"></i><span class="hidden-tablet">#{value}</span>
-				HTML
-			end
+      def menu_value(value, icon)
+        raw <<-HTML
+        <i class="#{icon}"></i><span class="hidden-tablet">#{value}</span>
+        HTML
+      end
 
-			def link_to_menu(*args, &block)
-				name         = menu_value(args[0], args[1])
-				options      = args[2] || {}
-				html_options = args[3]
+      def link_to_menu(*args, &block)
+        name         = menu_value(args[0], args[1])
+        options      = args[2] || {}
+        html_options = args[3]
 
-				html_options = convert_options_to_data_attributes(options, html_options)
-				url = url_for(options)
+        html_options = convert_options_to_data_attributes(options, html_options)
+        url = url_for(options)
 
-				href = html_options['href']
-				tag_options = tag_options(html_options)
-				href_attr = "href=\"#{ERB::Util.html_escape(url)}\"" unless href
-				"<a #{href_attr}#{tag_options}>#{ERB::Util.html_escape(name || url)}</a>".html_safe
-			end
+        href = html_options['href']
+        tag_options = tag_options(html_options)
+        href_attr = "href=\"#{ERB::Util.html_escape(url)}\"" unless href
+        "<a #{href_attr}#{tag_options}>#{ERB::Util.html_escape(name || url)}</a>".html_safe
+      end
 
-			def edited(key, value, str='')
-				str << 'editable' unless key == 'id'
-				str << ' edit_datepicker' if value.is_a?(Time)
-				str
-			end
+      def edited(key, value, str='')
+        str << 'editable' unless key == 'id'
+        str << ' edit_datepicker' if value.is_a?(Time)
+        str
+      end
 
-			def options_for_select_column_data(table, selected=nil)
-				options_for_select RailsAdminContent::Client.desc_table(table).map{|a| [ a["Field"],a["Field"], column_type: a["Type"].gsub(/\(.*?\)/,'') ]}, selected
-			end
+      def options_for_select_column_data(table, selected=nil)
+        options_for_select RailsAdminContent::Client.desc_table(table).map{|a| [ a["Field"],a["Field"], column_type: a["Type"].gsub(/\(.*?\)/,'') ]}, selected
+      end
 
-			def content_field(column, value=nil)
-				type = column["Type"].gsub(/\(.*?\)/,'')
-				column["Default"] = value if value
-				column["Field"] = "field[#{column["Field"]}]"
-				case type
-				when 'text'
-					text_area_tag column["Field"], column["Default"], :size => "25x6", 'data-field' => column["Field"], class: "#{type} span10"
-				when 'varchar'
-					text_field_tag column["Field"], column["Default"], 'data-field' => column["Field"],  class: "#{type} span10"
-				when 'int'
-					number_field_tag column["Field"], column["Default"], 'data-field' => column["Field"],  class: "#{type} span10"
-				when 'tinyint'
-					select_tag column["Field"], options_for_select([['Yes',1],['No',0]], column["Default"]), 'data-field' => column["Field"],  class: "#{type} span10"
-				else
-					text_field_tag column["Field"], column["Default"],  'data-field' => column["Field"], class: "#{type} span10"
-				end
-			end
+      def content_field(column, value=nil)
+        type = column["Type"].gsub(/\(.*?\)/,'')
+        column["Default"] = value if value
+        column["Field"] = "field[#{column["Field"]}]"
+        case type
+        when 'text'
+          text_area_tag column["Field"], column["Default"], :size => "25x6", 'data-field' => column["Field"], class: "#{type} span10"
+        when 'varchar'
+          text_field_tag column["Field"], column["Default"], 'data-field' => column["Field"],  class: "#{type} span10"
+        when 'int'
+          number_field_tag column["Field"], column["Default"], 'data-field' => column["Field"],  class: "#{type} span10"
+        when 'tinyint'
+          select_tag column["Field"], options_for_select([['Yes',1],['No',0]], column["Default"]), 'data-field' => column["Field"],  class: "#{type} span10"
+        else
+          text_field_tag column["Field"], column["Default"],  'data-field' => column["Field"], class: "#{type} span10"
+        end
+      end
 
-		end
-	end
+    end
+  end
 end

data/lib/rails_admin_content/mysql/adapters/client.rb

@@ -1,16 +1,18 @@
 module RailsAdminContent
-	module Mysql
-		module Adapters
-			class Client
-				def initialize
-					@client = client = Mysql2::Client.new ActiveRecord::Base.connection_config
-				end
+  module Mysql
+    module Adapters
+      class Client
+        def initialize
+          @client ||= Mysql2::Client.new ActiveRecord::Base.connection_config
+        end
 
-				
-				def query(sql)
-					@client.query(sql).each
-				end
-			end
-		end
-	end
-end
+        def query(sql)
+          @client.query(sql).each
+        rescue
+          []
+        end
+      end
+
+    end
+  end
+end

data/lib/rails_admin_content/paginate.rb

@@ -1,53 +1,53 @@
 module RailsAdminContent
-	class Paginate
+  class Paginate
 
-		def initialize(scope, options = {})
-			@scope, @options = scope, options
-		end
+    def initialize(scope, options = {})
+      @scope, @options = scope, options
+    end
 
-		def to_s
-			return "" unless @scope
-			current_page, total_pages = @options[:spage].to_i, RailsAdminContent::Client.total_nums / @options[:stint] + 1
-			# return "共#{RailsAdminContent::Client.total_nums}条数据" if total_pages <= 1
-			param_name = @options["param_name"] || "page"
-			url = @options["url"] || ""
-			helpers.content_tag :div, :class => "pagination" do
-				helpers.content_tag :ul do
-					result = ''
-					result += helpers.content_tag(:li, class: 'previous'){helpers.link_to("‹ 上一页","#{url}?#{param_name}=#{current_page-1}")} if current_page.to_i > 1
-					if total_pages > 8
-						1.upto(3) { |i| result << page_link(i, current_page) }
-						if current_page > 1 and current_page < total_pages
-							result << helpers.content_tag(:li, helpers.link_to("...",'#'), class: 'disabled') if current_page > 5
-							min = current_page > 4 ? current_page-1 : 4
-							max = current_page < total_pages-4 ? current_page+2 : total_pages-2
-							(min..max-1).each { |i| result << page_link(i, current_page) } if max >= min+1
-							result << helpers.content_tag(:li, helpers.link_to("...", "#"), class: 'disabled') if current_page < total_pages-4
-						else
-							result << helpers.content_tag(:li, helpers.link_to("...",'#'), class: 'disabled')
-						end
-						(total_pages-2..total_pages).each{ |i| result << page_link(i, current_page) }
-					else
-						(1..total_pages).each{ |i| result << page_link(i, current_page) }
-					end
-					result += helpers.content_tag(:li, class: "next"){helpers.link_to("下一页 ›", "#{url}?#{param_name}=#{current_page+1}")} if current_page < total_pages
-					result += helpers.content_tag(:li, class: 'disabled total_pages'){helpers.link_to "共#{RailsAdminContent::Client.total_nums}条数据", "#"}
-					result.html_safe
-				end
-			end
+    def to_s
+      return "" unless @scope
+      current_page, total_pages = @options[:spage].to_i, RailsAdminContent::Client.total_nums / @options[:stint] + 1
+      # return "共#{RailsAdminContent::Client.total_nums}条数据" if total_pages <= 1
+      param_name = @options["param_name"] || "page"
+      url = @options["url"] || ""
+      helpers.content_tag :div, :class => "pagination" do
+        helpers.content_tag :ul do
+          result = ''
+          result += helpers.content_tag(:li, class: 'previous'){helpers.link_to("‹ 上一页","#{url}?#{param_name}=#{current_page-1}")} if current_page.to_i > 1
+          if total_pages > 8
+            1.upto(3) { |i| result << page_link(i, current_page) }
+            if current_page > 1 and current_page < total_pages
+              result << helpers.content_tag(:li, helpers.link_to("...",'#'), class: 'disabled') if current_page > 5
+              min = current_page > 4 ? current_page-1 : 4
+              max = current_page < total_pages-4 ? current_page+2 : total_pages-2
+              (min..max-1).each { |i| result << page_link(i, current_page) } if max >= min+1
+              result << helpers.content_tag(:li, helpers.link_to("...", "#"), class: 'disabled') if current_page < total_pages-4
+            else
+              result << helpers.content_tag(:li, helpers.link_to("...",'#'), class: 'disabled')
+            end
+            (total_pages-2..total_pages).each{ |i| result << page_link(i, current_page) }
+          else
+            (1..total_pages).each{ |i| result << page_link(i, current_page) }
+          end
+          result += helpers.content_tag(:li, class: "next"){helpers.link_to("下一页 ›", "#{url}?#{param_name}=#{current_page+1}")} if current_page < total_pages
+          result += helpers.content_tag(:li, class: 'disabled total_pages'){helpers.link_to "共#{RailsAdminContent::Client.total_nums}条数据", "#"}
+          result.html_safe
+        end
+      end
 
-		end
+    end
 
-		private
-		def page_link(page, current_page)
-			param_name = @options["param_name"] || "page"
-			url = @options["url"] || ""
-			current_page == page ? helpers.content_tag(:li, page, :class => "active"){helpers.link_to page, '#'} : helpers.content_tag(:li, helpers.link_to("#{page}", "#{url}?#{param_name}=#{page}"))
-		end
+    private
+    def page_link(page, current_page)
+      param_name = @options["param_name"] || "page"
+      url = @options["url"] || ""
+      current_page == page ? helpers.content_tag(:li, page, :class => "active"){helpers.link_to page, '#'} : helpers.content_tag(:li, helpers.link_to("#{page}", "#{url}?#{param_name}=#{page}"))
+    end
 
-		def helpers
-			ActionController::Base.helpers
-		end   
+    def helpers
+      ActionController::Base.helpers
+    end   
 
-	end
+  end
 end

data/lib/rails_admin_content/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminContent
-	VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_content
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Terry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,16 +70,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.13
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement