tbone-devise 0.1.3 → 0.2.0

data/Gemfile

@@ -10,3 +10,5 @@ group :development do
   gem "bundler"
   gem "jeweler"
 end
+gem 'tbone', path: '../tbone'
+gem 'devise'

data/Gemfile.lock

@@ -1,21 +1,123 @@
+PATH
+  remote: ../tbone
+  specs:
+    tbone (0.2.0)
+      coffee-filter
+      haml-rails
+      i18n-js
+      jquery-rails
+      kaminari
+      rabl
+      rails-backbone
+      requirejs-rails
+      yajl-ruby
+
 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)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.4)
+    coffee-filter (0.1.1)
+      coffee-script (>= 2.2.0)
+      haml (>= 3.0.18)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.4.0)
+    devise (2.1.2)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
+    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)
+    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)
+    multi_json (1.3.6)
+    orm_adapter (0.4.0)
+    rabl (0.7.6)
+      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)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.16.0)
+    tilt (1.3.3)
+    warden (1.2.1)
+      rack (>= 1.0)
+    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
+  devise
   jeweler
   rdoc
+  tbone!

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/app/assets/javascripts/models/session.js.coffee

@@ -10,7 +10,7 @@ define ['backbone', 'bootstrap'], (Backbone, App) ->
       'delete': '/users/sign_out.json'
     }
     isNew: ->
-      @user.get('abilities').signin
+      not @user.get('signed_in')
 
     sync: (method, model, options) ->
       if model.methodUrl && model.methodUrl[method.toLowerCase()]

data/app/assets/javascripts/routers/sessions_router.js.coffee

@@ -92,6 +92,7 @@ define [
     destroy: ->
       @session.destroy(
         success: (session, response) =>
+          console.log(session)
           @user.set(@guest.attributes)
           AlertQueue.add({type: 'info', message: I18n.t('devise.sessions.signed_out')})
           window.location.hash = "/"

data/app/assets/javascripts/templates/sessions/{login_bar.jst.hamljs → login_bar.hamlc}

@@ -1,7 +1,7 @@
 %ul.nav.pull-right
-  :if abilities.signout == true
+  - if @signed_in
     %li 
       %a{href: "#/signout"}= I18n.t('sign_out')
-  :if abilities.signin == true
+  - else
     %li 
       %a{href: "#/signin"}= I18n.t('sign_in')

data/app/assets/javascripts/templates/sessions/{new.jst.hamljs → new.hamlc}

@@ -11,7 +11,7 @@
       .controls
         %input#password{name: "password", type: "password"}
 
-    :if $.inArray('rememberable', this.options.modules) != -1
+    - if $.inArray('rememberable', @options.modules) != -1
       .control-group
         %label.control-label{for: "remember_me"}= I18n.t('remember_me')
         .controls
@@ -20,14 +20,14 @@
     .form-actions
       %input#new-post.btn.btn-primary{type: "submit"}
 
-    :if $.inArray('registerable', this.options.modules) != -1
+    - if $.inArray('registerable', @options.modules) != -1
       %p
         %a{href: '#/signup'}= I18n.t('sign_up')
 
-    :if $.inArray('recoverable', this.options.modules) != -1
+    - if $.inArray('recoverable', @options.modules) != -1
       %p
         %a{href: '#/forgot'}= I18n.t('forgot_password') 
 
-    :if $.inArray('confirmable', this.options.modules) != -1
+    - if $.inArray('confirmable', @options.modules) != -1
       %p
         %a{href: '#/confirm'}= I18n.t('confirm')

data/app/assets/javascripts/views/confirmations/new_view.js.coffee

@@ -8,7 +8,7 @@ define [
 ], ($, Backbone, App, FormView) ->
 
   class App.Views.Confirmations.NewView extends FormView
-    template: JST["templates/confirmations/new"]
+    template: JST["confirmations/new"]
 
     success: (session) ->
       @addSuccessAlert(I18n.t('devise.confirmations.send_instructions'))

data/app/assets/javascripts/views/passwords/edit_view.js.coffee

@@ -8,7 +8,7 @@ define [
 ], ($, Backbone, App, FormView) ->
 
   class App.Views.Passwords.EditView extends FormView
-    template: JST["templates/passwords/edit"]
+    template: JST["passwords/edit"]
 
     success: (session) ->
       @addSuccessAlert(I18n.t('devise.passwords.updated'))

data/app/assets/javascripts/views/passwords/new_view.js.coffee

@@ -9,7 +9,7 @@ define [
 ], ($, Backbone, App, Password, FormView) ->
 
   class App.Views.Passwords.NewView extends FormView
-    template: JST["templates/passwords/new"]
+    template: JST["passwords/new"]
 
     success: (session) ->
       @addSuccessAlert(I18n.t('devise.passwords.send_instructions'))

data/app/assets/javascripts/views/registrations/new_view.js.coffee

@@ -9,7 +9,7 @@ define [
 ], ($, Backbone, App, Password, FormView) ->
 
   class App.Views.Passwords.NewView extends FormView
-    template: JST["templates/registrations/new"]
+    template: JST["registrations/new"]
 
     success: (session) ->
       @options.user.id = session.id

data/app/assets/javascripts/views/sessions/login_bar_view.js.coffee

@@ -7,7 +7,7 @@ define [
 ], ($, Backbone, App) ->
 
   class App.Views.Sessions.LoginBar extends Backbone.View
-    template: JST["templates/sessions/login_bar"]
+    template: JST["sessions/login_bar"]
 
     initialize: ->
       @model.on('change', @render, this)
@@ -15,4 +15,4 @@ define [
     render: ->
       return unless @model?
       $(@el).html(@template(@model.toJSON()))
-      return this
+      @

data/app/assets/javascripts/views/sessions/new_view.js.coffee

@@ -9,7 +9,7 @@ define [
 ], ($, Backbone, App, Session, FormView) ->
 
   class App.Views.Sessions.NewView extends FormView
-    template: JST["templates/sessions/new"]
+    template: JST["sessions/new"]
 
     success: (session) ->
       @options.user.id = session.id

data/app/views/users/show.json.rabl

@@ -0,0 +1,9 @@
+@user ||= locals[:object]
+object @user => :user
+attributes *@user.attributes.keys
+node :id do
+  @user.id
+end
+node :signed_in do
+  !@user.new_record?
+end

data/config/routes.rb

@@ -1,6 +1,4 @@
-Tbone::Engine.routes.draw do
-  resources :tokens
-  root :to => 'home#index'
+Tbone::Devise::Engine.routes.draw do
   devise_for :users
   resources :users
 end

data/lib/tbone/devise/engine.rb

@@ -5,8 +5,28 @@ module Tbone
       initializer "tbone-devise" do |app|
         Tbone.configure do |c|
           c.add_params devise_modules: User.devise_modules
+          app.middleware.use Middleware
         end
       end
     end
+    class Middleware
+      def initialize(app)
+        @app = app       
+      end                
+      def call(env)      
+        warden = env['warden']
+        return @app.call(env) if env['REQUEST_PATH'] =~ /^\/assets/
+        user = warden.authenticate
+        m = self
+        Tbone.configure do |c|
+          c.add_params currentUser: m.render_user(user || User.new)
+          c.add_params guestUser: m.render_user(User.new)
+        end
+        @app.call(env)
+      end
+      def render_user(user)
+        Rabl.render(user, 'users/show', view_path: 'app/views', format: :hash)
+      end
+    end
   end
 end

data/tbone-devise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tbone-devise}
-  s.version = "0.1.3"
+  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-07-08}
+  s.date = %q{2012-11-09}
   s.description = %q{Devise views for Tbone}
   s.email = %q{fazzzenda@mail.ru}
   s.extra_rdoc_files = [
@@ -36,12 +36,12 @@ Gem::Specification.new do |s|
     "app/assets/javascripts/routers/sessions_router.js.coffee",
     "app/assets/javascripts/tbone-devise.js.coffee",
     "app/assets/javascripts/templates/.gitkeep",
-    "app/assets/javascripts/templates/confirmations/new.jst.hamljs",
-    "app/assets/javascripts/templates/passwords/edit.jst.hamljs",
-    "app/assets/javascripts/templates/passwords/new.jst.hamljs",
-    "app/assets/javascripts/templates/registrations/new.jst.hamljs",
-    "app/assets/javascripts/templates/sessions/login_bar.jst.hamljs",
-    "app/assets/javascripts/templates/sessions/new.jst.hamljs",
+    "app/assets/javascripts/templates/confirmations/new.hamlc",
+    "app/assets/javascripts/templates/passwords/edit.hamlc",
+    "app/assets/javascripts/templates/passwords/new.hamlc",
+    "app/assets/javascripts/templates/registrations/new.hamlc",
+    "app/assets/javascripts/templates/sessions/login_bar.hamlc",
+    "app/assets/javascripts/templates/sessions/new.hamlc",
     "app/assets/javascripts/views/.gitkeep",
     "app/assets/javascripts/views/confirmations/new_view.js.coffee",
     "app/assets/javascripts/views/passwords/edit_view.js.coffee",
@@ -53,6 +53,7 @@ Gem::Specification.new do |s|
     "app/views/devise/mailer/confirmation_instructions.html.erb",
     "app/views/devise/mailer/reset_password_instructions.html.erb",
     "app/views/devise/mailer/unlock_instructions.html.erb",
+    "app/views/users/show.json.rabl",
     "config/locales/tbone-devise.en.yml",
     "config/routes.rb",
     "lib/tbone-devise.rb",
@@ -71,15 +72,21 @@ 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<tbone>, [">= 0"])
+      s.add_runtime_dependency(%q<devise>, [">= 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<tbone>, [">= 0"])
+      s.add_dependency(%q<devise>, [">= 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<tbone>, [">= 0"])
+    s.add_dependency(%q<devise>, [">= 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-devise
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: tbone
+  requirement: &70157694245540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70157694245540
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: &70157694244880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70157694244880
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70361528330060 !ruby/object:Gem::Requirement
+  requirement: &70157694244080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361528330060
+  version_requirements: *70157694244080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70361528329220 !ruby/object:Gem::Requirement
+  requirement: &70157694243460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361528329220
+  version_requirements: *70157694243460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70361528327780 !ruby/object:Gem::Requirement
+  requirement: &70157694242840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361528327780
+  version_requirements: *70157694242840
 description: Devise views for Tbone
 email: fazzzenda@mail.ru
 executables: []
@@ -71,12 +93,12 @@ files:
 - app/assets/javascripts/routers/sessions_router.js.coffee
 - app/assets/javascripts/tbone-devise.js.coffee
 - app/assets/javascripts/templates/.gitkeep
-- app/assets/javascripts/templates/confirmations/new.jst.hamljs
-- app/assets/javascripts/templates/passwords/edit.jst.hamljs
-- app/assets/javascripts/templates/passwords/new.jst.hamljs
-- app/assets/javascripts/templates/registrations/new.jst.hamljs
-- app/assets/javascripts/templates/sessions/login_bar.jst.hamljs
-- app/assets/javascripts/templates/sessions/new.jst.hamljs
+- app/assets/javascripts/templates/confirmations/new.hamlc
+- app/assets/javascripts/templates/passwords/edit.hamlc
+- app/assets/javascripts/templates/passwords/new.hamlc
+- app/assets/javascripts/templates/registrations/new.hamlc
+- app/assets/javascripts/templates/sessions/login_bar.hamlc
+- app/assets/javascripts/templates/sessions/new.hamlc
 - app/assets/javascripts/views/.gitkeep
 - app/assets/javascripts/views/confirmations/new_view.js.coffee
 - app/assets/javascripts/views/passwords/edit_view.js.coffee
@@ -88,6 +110,7 @@ files:
 - app/views/devise/mailer/confirmation_instructions.html.erb
 - app/views/devise/mailer/reset_password_instructions.html.erb
 - app/views/devise/mailer/unlock_instructions.html.erb
+- app/views/users/show.json.rabl
 - config/locales/tbone-devise.en.yml
 - config/routes.rb
 - lib/tbone-devise.rb
@@ -110,7 +133,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2102245750480204451
+      hash: -1955465905685037180
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: