tbone 0.1.9 → 0.2.0

data/Gemfile

@@ -10,3 +10,21 @@ group :development do
   gem "bundler"
   gem "jeweler"
 end
+group :assets do
+  gem 'sass-rails'
+  gem 'coffee-rails'
+  gem 'twitter-bootstrap-rails'
+  gem 'uglifier'
+  gem 'therubyracer'
+  gem 'less-rails'
+  gem 'haml_coffee_assets'
+end
+gem 'i18n-js'
+gem 'kaminari'
+gem 'haml-rails'
+gem 'coffee-filter'
+gem 'rabl'
+gem 'jquery-rails'
+gem 'yajl-ruby'
+gem 'rails-backbone'
+gem 'requirejs-rails'

data/Gemfile.lock

@@ -1,21 +1,143 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.4)
+    coffee-filter (0.1.1)
+      coffee-script (>= 2.2.0)
+      haml (>= 3.0.18)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.4.0)
+    commonjs (0.2.6)
+    ejs (1.1.1)
+    erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
     git (1.2.5)
+    haml (3.1.7)
+    haml-rails (0.3.5)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (~> 3.1)
+      railties (>= 3.1, < 4.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)
+    i18n-js (2.1.2)
+      i18n
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
+    journey (1.0.4)
+    jquery-rails (2.1.3)
+      railties (>= 3.1.0, < 5.0)
+      thor (~> 0.14)
     json (1.7.3)
+    kaminari (0.14.1)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    less (2.2.2)
+      commonjs (~> 0.2.6)
+    less-rails (2.2.4)
+      actionpack (>= 3.1)
+      less (~> 2.2.0)
+    libv8 (3.3.10.4)
+    multi_json (1.3.6)
+    rabl (0.7.3)
+      activesupport (>= 2.3.14)
+      multi_json (~> 1.0)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rails-backbone (0.8.0)
+      coffee-script (~> 2.2.0)
+      ejs (~> 1.1.1)
+      jquery-rails (~> 2.1.3)
+      railties (>= 3.1.0)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    requirejs-rails (0.9.0)
+      railties (>= 3.1.1, < 3.3)
+    sass (3.2.1)
+    sass-rails (3.2.5)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    therubyracer (0.10.2)
+      libv8 (~> 3.3.10)
+    thor (0.16.0)
+    tilt (1.3.3)
+    twitter-bootstrap-rails (2.1.4)
+      actionpack (>= 3.1)
+      less-rails (~> 2.2.3)
+      railties (>= 3.1)
+      therubyracer (>= 0.10.2)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
+  coffee-filter
+  coffee-rails
+  haml-rails
+  haml_coffee_assets
+  i18n-js
   jeweler
+  jquery-rails
+  kaminari
+  less-rails
+  rabl
+  rails-backbone
   rdoc
+  requirejs-rails
+  sass-rails
+  therubyracer
+  twitter-bootstrap-rails
+  uglifier
+  yajl-ruby

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.2.0

data/app/assets/javascripts/tbone.js.coffee

@@ -3,6 +3,7 @@ define [
   'models/token'
   'views/tokens/show_view'
   'backbone-rails'
+  'hamlcoffee'
 ],
 
 ($, Token, TokensView) ->

data/app/assets/javascripts/templates/common/{alert_message.jst.hamljs → alert_message.hamlc}

@@ -1,4 +1,4 @@
-- className = 'alert-' + type
+- className = 'alert-' + @model.get('type')
 .alert.fade.in{class: className}
   %a.close{data-dismiss: "alert", href:"#"} ×
-  = message
+  = @model.get('message')

data/app/assets/javascripts/templates/common/pager.hamlc

@@ -0,0 +1,31 @@
+- pages = for i in [1..@pageInfo.pages]
+-   {
+-     url: @urlPrefix + i,
+-     num: i,
+-     class: if i == @pageInfo.page then 'active' else null 
+-   }
+-
+- makeArrow = (data, urlPrefix) ->
+-   if data == false
+-     {
+-       class: 'disabled',
+-       url: '#'
+-     }
+-   else
+-     {
+-       class: null,
+-       url: urlPrefix + data
+-     }
+-
+- prev = makeArrow(@pageInfo.prev, @urlPrefix)
+- next = makeArrow(@pageInfo.next, @urlPrefix)
+- if @pageInfo.pages > 1
+  .pagination
+    %ul
+      %li{class: prev['class']}
+        %a{href: prev['url']} «
+      - for page in pages
+        %li{class: page['class']}
+          %a{href: page['url']}= page['num']
+      %li{class: next['class']}
+        %a{href: next['url']} »

data/app/assets/javascripts/views/common/alert_message_view.js.coffee

@@ -6,15 +6,15 @@ define [
 ], ($, Backbone, App) ->
 
   class App.Views.Common.AlertMessageView extends Backbone.View
-    template: JST["templates/common/alert_message"]
+    template: JST["common/alert_message"]
 
     events: ->
       'click .close': 'destroy'
 
     render: ->
-      $(@el).html(@template(@model.toJSON()))
+      $(@el).html(@template @)
       @model.set('shown', true)
-      return this
+      @
 
     destroy: ->
       @model.destroy()

data/app/assets/javascripts/views/common/confirm_view.js.coffee

@@ -6,7 +6,7 @@ define [
 ], ($, Backbone, App) ->
 
   class App.Views.Common.ConfirmView extends Backbone.View
-    template: JST["templates/common/confirm"]
+    template: JST["common/confirm"]
 
     events:
       "click .yes":   "accept"

data/app/assets/javascripts/views/common/form_view.js.coffee

@@ -57,15 +57,15 @@ define [
           @addErrorAlert(@errors.error)
           @renderAlerts()
         @markErrorField(name, error) for name, error of @errors
-      return this
+      @
 
     render: ->
-      $(@el).html(@template(@model.toJSON() ))
+      $(@el).html(@template(@))
       @renderAlerts()
       @trigger('databind')
       @form = $(@el)
       @form.backboneLink(@model)
-      return this
+      @
 
     back: ->
       window.history.back()

data/app/assets/javascripts/views/common/pager_view.js.coffee

@@ -7,13 +7,16 @@ define [
 ], ($, Backbone, App, AlertView) ->
 
   class App.Views.Common.PagerView extends AlertView
-    template: JST["templates/common/pager"]
+    template: JST["common/pager"]
 
     initialize: ->
       @collection.on('add', @render, this)
       @collection.on('remove', @render, this)
 
+    stub: (e) ->
+      e.preventDefault()
+
     render: ->
       super
       $(@el).html(@template({pageInfo: @collection.toJSON().pageInfo, urlPrefix: @options.urlPrefix}))
-      return this
+      @

data/app/controllers/home_controller.rb

@@ -8,4 +8,11 @@ class HomeController < ApplicationController
       end
     end
   end
+  def render_bootstrap_data(template)
+    old_format = lookup_context.rendered_format
+    lookup_context.rendered_format = :json
+    data = Rabl.render(nil, template, :view_path => 'app/views', :format => :hash, :scope => self.view_context)
+    lookup_context.rendered_format = old_format
+    data
+  end
 end

data/app/helpers/tbone_helper.rb

@@ -1,5 +1,5 @@
 module TboneHelper
   def tbone_include_tag(name)
-    javascript_tag("var __params = #{ Tbone.config.params.to_json }")
+    requirejs_include_tag(name) + javascript_tag("var __params = #{ Tbone.config.params.to_json }")
   end
 end

data/lib/generators/tbone/backbone_model/backbone_model_generator.rb

@@ -4,7 +4,7 @@ module Tbone
   module Generators
     class BackboneModelGenerator < ::Rails::Generators::NamedBase
       source_root File.expand_path("../templates", __FILE__)
-      desc "This generator generates simple T-bone generator"
+      desc "This generator generates simple T-bone model"
       def create_controller
         template "model.coffee.erb", "app/assets/javascripts/models/#{single_name}.js.coffee"  
         template "collection.coffee.erb", "app/assets/javascripts/collections/#{plural_name}.js.coffee"  

data/tbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tbone}
-  s.version = "0.1.9"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Pavel Tatarsky}]
-  s.date = %q{2012-10-01}
+  s.date = %q{2012-11-09}
   s.description = %q{Library for mixing together requirejs backbone and twitter bootstrap}
   s.email = %q{fazzzenda@mail.ru}
   s.extra_rdoc_files = [
@@ -34,9 +34,9 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/tbone.js.coffee",
     "app/assets/javascripts/tbone_backbone_datalink.js.coffee",
     "app/assets/javascripts/templates/.gitkeep",
-    "app/assets/javascripts/templates/common/alert_message.jst.hamljs",
-    "app/assets/javascripts/templates/common/confirm.jst.hamljs",
-    "app/assets/javascripts/templates/common/pager.jst.hamljs",
+    "app/assets/javascripts/templates/common/alert_message.hamlc",
+    "app/assets/javascripts/templates/common/confirm.hamlc",
+    "app/assets/javascripts/templates/common/pager.hamlc",
     "app/assets/javascripts/views/.gitkeep",
     "app/assets/javascripts/views/common/alert_message_view.js.coffee",
     "app/assets/javascripts/views/common/alert_view.js.coffee",
@@ -91,15 +91,42 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<i18n-js>, [">= 0"])
+      s.add_runtime_dependency(%q<kaminari>, [">= 0"])
+      s.add_runtime_dependency(%q<haml-rails>, [">= 0"])
+      s.add_runtime_dependency(%q<coffee-filter>, [">= 0"])
+      s.add_runtime_dependency(%q<rabl>, [">= 0"])
+      s.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
+      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<rails-backbone>, [">= 0"])
+      s.add_runtime_dependency(%q<requirejs-rails>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
+      s.add_dependency(%q<i18n-js>, [">= 0"])
+      s.add_dependency(%q<kaminari>, [">= 0"])
+      s.add_dependency(%q<haml-rails>, [">= 0"])
+      s.add_dependency(%q<coffee-filter>, [">= 0"])
+      s.add_dependency(%q<rabl>, [">= 0"])
+      s.add_dependency(%q<jquery-rails>, [">= 0"])
+      s.add_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_dependency(%q<rails-backbone>, [">= 0"])
+      s.add_dependency(%q<requirejs-rails>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
+    s.add_dependency(%q<i18n-js>, [">= 0"])
+    s.add_dependency(%q<kaminari>, [">= 0"])
+    s.add_dependency(%q<haml-rails>, [">= 0"])
+    s.add_dependency(%q<coffee-filter>, [">= 0"])
+    s.add_dependency(%q<rabl>, [">= 0"])
+    s.add_dependency(%q<jquery-rails>, [">= 0"])
+    s.add_dependency(%q<yajl-ruby>, [">= 0"])
+    s.add_dependency(%q<rails-backbone>, [">= 0"])
+    s.add_dependency(%q<requirejs-rails>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tbone
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,110 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n-js
+  requirement: &70191079091780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70191079091780
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: &70191079089800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70191079089800
+- !ruby/object:Gem::Dependency
+  name: haml-rails
+  requirement: &70191079103900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70191079103900
+- !ruby/object:Gem::Dependency
+  name: coffee-filter
+  requirement: &70191079101960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70191079101960
+- !ruby/object:Gem::Dependency
+  name: rabl
+  requirement: &70191079099800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70191079099800
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: &70191079098360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70191079098360
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70191079097480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70191079097480
+- !ruby/object:Gem::Dependency
+  name: rails-backbone
+  requirement: &70191079114320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70191079114320
+- !ruby/object:Gem::Dependency
+  name: requirejs-rails
+  requirement: &70191079113060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70191079113060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70128924335140 !ruby/object:Gem::Requirement
+  requirement: &70191079129480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128924335140
+  version_requirements: *70191079129480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70128924334600 !ruby/object:Gem::Requirement
+  requirement: &70191079127320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128924334600
+  version_requirements: *70191079127320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70128924334100 !ruby/object:Gem::Requirement
+  requirement: &70191079142520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70128924334100
+  version_requirements: *70191079142520
 description: Library for mixing together requirejs backbone and twitter bootstrap
 email: fazzzenda@mail.ru
 executables: []
@@ -69,9 +168,9 @@ files:
 - app/assets/javascripts/tbone.js.coffee
 - app/assets/javascripts/tbone_backbone_datalink.js.coffee
 - app/assets/javascripts/templates/.gitkeep
-- app/assets/javascripts/templates/common/alert_message.jst.hamljs
-- app/assets/javascripts/templates/common/confirm.jst.hamljs
-- app/assets/javascripts/templates/common/pager.jst.hamljs
+- app/assets/javascripts/templates/common/alert_message.hamlc
+- app/assets/javascripts/templates/common/confirm.hamlc
+- app/assets/javascripts/templates/common/pager.hamlc
 - app/assets/javascripts/views/.gitkeep
 - app/assets/javascripts/views/common/alert_message_view.js.coffee
 - app/assets/javascripts/views/common/alert_view.js.coffee
@@ -130,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2019851828257661572
+      hash: 4460083678279688216
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/assets/javascripts/templates/common/pager.jst.hamljs

@@ -1,32 +0,0 @@
-- var pages = []; 
-- for(var i = 1; i <= pageInfo.pages; i++) {
--   var page = {}
--   page['url'] = urlPrefix + i
--   page['num'] = i
--   page['class'] = null
--   if(i == pageInfo.page) page['class'] = 'active'
--   pages.push(page)
-- }
-- function makeArrow(data, urlPrefix) {
--   var res = {}
--   if(data == false) {
--     res['class'] = 'disabled'
--     res['url'] = '#'
--   } else {
--     res['class'] = null
--     res['url'] = urlPrefix + data
--   }
--   return res
-- }
-- var prev = makeArrow(pageInfo.prev, urlPrefix)
-- var next = makeArrow(pageInfo.next, urlPrefix)
-:if pageInfo.pages > 1
-  .pagination
-    %ul
-      %li{class: prev['class']}
-        %a{href: prev['url']} «
-      :each page in pages
-        %li{class: page['class']}
-          %a{href: page['url']}= page['num']
-      %li{class: next['class']}
-        %a{href: next['url']} »