Permalink
Browse files

Updated tableling to 0.0.9. Version bump to 0.0.4.

  • Loading branch information...
1 parent 856e74a commit fe3f19249846d658ad6657987383b0ccf498a263 @AlphaHydrae committed Oct 17, 2012
View
@@ -20,9 +20,6 @@ gem 'gemcutter'
gem 'haml'
gem 'sass'
-gem 'jquery-rails'
-gem 'backbone-on-rails'
-gem 'marionette-rails'
gem 'haml_coffee_assets'
gem 'execjs'
View
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- tableling (0.0.3)
+ tableling-rails (0.0.3)
rails (~> 3.2.8)
GEM
@@ -36,12 +36,7 @@ GEM
multi_json (~> 1.0)
addressable (2.3.2)
arel (3.0.2)
- backbone-on-rails (0.9.2.1)
- eco (~> 1.0.0)
- ejs (~> 1.0.0)
- jquery-rails
- railties (>= 3.1)
- builder (3.0.3)
+ builder (3.0.4)
capybara (1.1.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -56,14 +51,8 @@ GEM
execjs
coffee-script-source (1.3.3)
daemons (1.1.9)
- database_cleaner (0.8.0)
+ database_cleaner (0.9.1)
diff-lcs (1.1.3)
- eco (1.0.0)
- coffee-script
- eco-source
- execjs
- eco-source (1.1.0.rc.1)
- ejs (1.0.0)
erubis (2.7.0)
eventmachine (1.0.0)
execjs (1.4.0)
@@ -74,25 +63,20 @@ GEM
gem-release (0.4.1)
gemcutter (0.7.1)
haml (3.1.7)
- haml_coffee_assets (1.5.1)
+ haml_coffee_assets (1.6.0)
coffee-script (>= 1.0.0)
sprockets (>= 2.0.3)
tilt (>= 1.3.3)
hike (1.2.1)
i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.1.3)
- railties (>= 3.1.0, < 5.0)
- thor (~> 0.14)
json (1.7.5)
libwebsocket (0.1.5)
addressable
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- marionette-rails (0.10.2)
- rails (>= 3.1.0)
mime-types (1.19)
multi_json (1.3.6)
nokogiri (1.5.5)
@@ -134,7 +118,7 @@ GEM
rspec-expectations (2.11.3)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.3)
- rspec-rails (2.11.0)
+ rspec-rails (2.11.4)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
@@ -158,7 +142,7 @@ GEM
rack (>= 1.0.0)
thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.11)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
@@ -169,7 +153,6 @@ PLATFORMS
ruby
DEPENDENCIES
- backbone-on-rails
capybara
database_cleaner
execjs
@@ -178,13 +161,11 @@ DEPENDENCIES
gemcutter
haml
haml_coffee_assets
- jquery-rails
- marionette-rails
quiet_assets
rake-version
rspec-rails
sass
sqlite3
- tableling!
+ tableling-rails!
test-unit
thin
View
@@ -1 +1 @@
-0.0.3
+0.0.4
@@ -10,15 +10,10 @@
// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
// GO AFTER THE REQUIRES BELOW.
//
-//= require jquery
+//= require tableling.world
//= require jquery_ujs
-//= require underscore
-//= require backbone
-//= require backbone.marionette
//= require ./bootstrap
//= require hamlcoffee
//= require_tree ../templates
-//= require tableling
-//= require tableling/bootstrap
//= require ./books
//= require_tree .
@@ -46,7 +46,7 @@ var BooksTableView = Tableling.Bootstrap.TableView.extend({
}
});
-var BooksTable = Tableling.Bootstrap.extend({
+var BooksTable = Tableling.Bootstrap.Table.extend({
tableView : BooksTableView,
tableViewOptions : {
@@ -60,11 +60,9 @@ var BooksTable = Tableling.Bootstrap.extend({
$(function() {
var table = new BooksTable({
- tableling: {
- pageSize: 5,
- request: {
- type: 'POST'
- }
+ pageSize: 5,
+ fetchOptions: {
+ type: 'POST'
}
});
View
@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
s.authors = ["Simon Oulevay"]
s.email = ["hydrae.alpha@gmail.com"]
s.homepage = "https://github.com/AlphaHydrae/tableling-rails"
- s.summary = "Table plugin based on Backbone Marionette."
- s.description = "Provides modular table views based on Backbone Collections and Backbone Marionette Layouts and Event Aggregators."
+ s.summary = "Tableling gem for Ruby on Rails."
+ s.description = "Provides javascript assets for the latest Tableling release and active record extensions to easily generate table data."
s.files = Dir["{app,config,db,lib,vendor}/**/*"] + ["LICENSE.txt", "Rakefile", "README.md"]
s.test_files = Dir["spec/**/*"]
Oops, something went wrong.

0 comments on commit fe3f192

Please sign in to comment.