cartoset 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cartoset (0.0.1)
+    cartoset (0.0.2)
       cartodb-rb-client (~> 0.3.0)
       oa-core (= 0.2.6)
       oa-oauth (= 0.2.6)

data/README.markdown

@@ -6,7 +6,7 @@ Requirements.
 
 The requirements you will need in order to run a Cartoset based project are:
 
- - valid Ruby interpreter (versions 1.8.7 and 1.9.2 supported)
+ - valid Ruby interpreter (versions >=1.9.2 supported)
  - [rubygems](http://rubygems.org/pages/download)
  - [git](http://git-scm.com/)
  - [PostgreSQL 9.0](http://www.postgresql.org/download/)
@@ -33,20 +33,12 @@ The requirements you will need in order to run a Cartoset based project are:
 Setting up a new Cartoset based project.
 ----------------------------------------
 
-1. First of all, download the source code clicking in the 'Downloads' button, in the Cartoset [github's repository](https://github.com/vizzuality/cartoset).
+1. Create a new rails project. Version should be equal or greater than 3.1
 
-2. Unzip the downloaded file into your desired folder, and then open a new terminal session. cd to the folder.
+2. Add the cartoset gem to the project Gemfile
 
-3. Install the [bundler](http://gembundler.com/) gem.
+4. Install all the gems in the Gemfile:
 
-4. Install Ruby 1.9.2:
-        
-	$ cd cartoset
-	$ rvm install 1.9.2
-	$ rvm use 1.9.2
-	$ rvm gemset create cartoset
-	$ rvm use 1.9.2@cartoset
-	$ gem install bundler
 	$ bundle install
 
 5. Start a new server session:
@@ -64,3 +56,5 @@ Setting up a new Cartoset based project.
 8. When you finish the setup proccess, you will have your cartoset project configured!
 
 9. Customize your cartoset project, adding some css styles and giving it some love!
+
+10. You can also add your own controllers, or override the existing ones.

data/app/controllers/admin/admin_controller.rb

@@ -1,4 +1,5 @@
 class Admin::AdminController < ApplicationController
+
   before_filter :user_valid?
 
   layout 'admin'

data/app/controllers/admin/dashboard_controller.rb

@@ -35,4 +35,4 @@ class Admin::DashboardController < Admin::AdminController
     where
   end
 
-end
+end

data/app/helpers/admin/admin_helper.rb

@@ -1,4 +1,25 @@
 module Admin::AdminHelper
+  def paginate(rows, current_page, total_count, per_page = 10, params = {})
+
+    if per_page.is_a?(Hash)
+      params = per_page
+      per_page = 10
+    end
+
+    window      = 2
+    total_pages = (total_count.to_f / per_page.to_f).ceil
+    last_page   = total_pages - 1
+
+    left  = (current_page - 1).downto(1).to_a.first(window).sort
+    right = (current_page + 1).upto(total_pages).to_a.first(window)
+
+    pages = 1.upto(current_page - 1).to_a.map{|p| left.include?(p) || p == 1 ? p : '...'}.uniq + [current_page] + (current_page + 1).upto(last_page).to_a.map{|p| right.include?(p) || p == last_page ? p : '...'}.uniq
+
+    content_tag :div, :class => 'pagination' do
+      raw pages.map{|page| page.eql?('...') ? content_tag(:span, page) : link_to(page, admin_path(params.merge({:page => page})), :class => page == current_page ? 'current' : nil)}.join(' ')
+    end
+  end
+
   def build_field_for_column(column, value = nil)
 
     case column[:type]
@@ -22,4 +43,4 @@ module Admin::AdminHelper
       text_field_tag column[:name], value, :id => column[:name], :class => column[:type]
     end
   end
-end
+end

data/app/helpers/application_helper.rb

@@ -1,11 +1,11 @@
 module ApplicationHelper
   def paginate(rows, current_page, total_count, per_page = 10, params = {})
-    
+
     if per_page.is_a?(Hash)
       params = per_page
       per_page = 10
     end
-    
+
     window      = 2
     total_pages = (total_count.to_f / per_page.to_f).ceil
     last_page   = total_pages - 1

data/lib/cartoset/version.rb

@@ -1,3 +1,3 @@
 module Cartoset
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cartoset
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -279,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -947405638182029535
+      hash: -1985439045041671426
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -288,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -947405638182029535
+      hash: -1985439045041671426
 requirements: []
 rubyforge_project: cartoset
 rubygems_version: 1.8.24