puffer 0.0.19 → 0.0.20

data/.rvmrc

@@ -0,0 +1 @@
+rvm use --create 1.9.2@puffer

data/Gemfile

@@ -1,18 +1,21 @@
 source "http://rubygems.org"
 
-gem 'rails', '~> 3.0.4'
-gem 'will_paginate', '~> 3.0.pre2'
-gem 'cells', '~> 3.4.4'
+gem 'rails', '>= 3.1.0.rc4'
+gem 'kaminari'
+gem 'apotomo'
 
 group :development, :test do
-  gem "capybara", ">= 0.4.0"
-  gem "sqlite3-ruby", :require => "sqlite3"
+  gem "sqlite3"
 
   gem "rspec-rails"
-  gem "autotest"
+  gem "capybara"
+  gem 'database_cleaner'
+
+  gem 'guard'
+  gem 'libnotify'
+  gem 'guard-rspec'
+
   gem 'forgery'
   gem 'fabrication'
   gem "jeweler"
-  gem "mongrel"
 end
-

data/Gemfile.lock

@@ -1,145 +1,159 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.4.2)
-    abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
-      mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
-    arel (2.0.8)
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
-    builder (2.1.2)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    actionmailer (3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      mail (~> 2.3.0)
+    actionpack (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.0)
+      rack-cache (~> 1.0.1)
+      rack-mount (~> 0.8.1)
+      rack-test (~> 0.6.0)
+      sprockets (~> 2.0.0.beta.10)
+      tzinfo (~> 0.3.27)
+    activemodel (3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      arel (~> 2.1.1)
+      tzinfo (~> 0.3.27)
+    activeresource (3.1.0.rc4)
+      activemodel (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+    activesupport (3.1.0.rc4)
+      multi_json (~> 1.0)
+    apotomo (1.1.2)
+      cells (>= 3.5.6)
+      hooks (~> 0.1.3)
+      onfire (~> 0.2.0)
+    arel (2.1.3)
+    bcrypt-ruby (2.1.4)
+    builder (3.0.0)
+    capybara (1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.8)
-    cells (3.4.4)
-    cgi_multipart_eof_fix (2.5.0)
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
-    culerity (0.2.15)
-    daemons (1.1.0)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
+    cells (3.6.4)
+      actionpack (~> 3.0)
+      railties (~> 3.0)
+    childprocess (0.2.0)
+      ffi (~> 1.0.6)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    fabrication (0.9.5)
-    fastthread (1.0.7)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    forgery (0.3.7)
+    erubis (2.7.0)
+    fabrication (1.0.1)
+    ffi (1.0.9)
+    forgery (0.3.12)
       nokogiri (~> 1.4)
-    gem_plugin (0.2.3)
     git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    guard (0.5.1)
+      thor (~> 0.14.6)
+    guard-rspec (0.4.0)
+      guard (>= 0.4.0)
+    hike (1.2.0)
+    hooks (0.1.4)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json_pure (1.5.1)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
+    json_pure (1.5.3)
+    kaminari (0.12.4)
+      rails (>= 3.0.0)
+    libnotify (0.5.7)
+    mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mongrel (1.1.5)
-      cgi_multipart_eof_fix (>= 2.4)
-      daemons (>= 1.0.3)
-      fastthread (>= 1.0.1)
-      gem_plugin (>= 0.2.3)
-    nokogiri (1.4.4)
+    multi_json (1.0.3)
+    nokogiri (1.5.0)
+    onfire (0.2.0)
     polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.3.1)
+    rack-cache (1.0.2)
+      rack (>= 0.4)
+    rack-mount (0.8.1)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.0)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.1.0.rc4)
+      actionmailer (= 3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      activerecord (= 3.1.0.rc4)
+      activeresource (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.1.0.rc4)
+    railties (3.1.0.rc4)
+      actionpack (= 3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2)
+    rdoc (3.8)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.1.3)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
+      ffi (>= 1.0.7)
       json_pure
       rubyzip
+    sprockets (2.0.0.beta.10)
+      hike (~> 1.0)
+      rack (~> 1.0)
+      tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
     thor (0.14.6)
+    tilt (1.3.2)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    will_paginate (3.0.pre2)
-    xpath (0.1.3)
+    tzinfo (0.3.29)
+    xpath (0.1.4)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  autotest
-  capybara (>= 0.4.0)
-  cells (~> 3.4.4)
+  apotomo
+  capybara
+  database_cleaner
   fabrication
   forgery
+  guard
+  guard-rspec
   jeweler
-  mongrel
-  rails (~> 3.0.4)
+  kaminari
+  libnotify
+  rails (>= 3.1.0.rc4)
   rspec-rails
-  sqlite3-ruby
-  will_paginate (~> 3.0.pre2)
+  sqlite3

data/Guardfile

@@ -0,0 +1,20 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})                           { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('spec/spec_helper.rb')                        { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+end

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/app/assets/javascripts/puffer/application.js

@@ -0,0 +1,5 @@
+//= require puffer/right
+//= require puffer/right-calendar
+//= require puffer/right-autocompleter
+//= require puffer/rails
+//= require puffer/puffer

data/app/assets/stylesheets/puffer/application.css

@@ -0,0 +1,4 @@
+/*
+ *= require puffer/reset
+ *= require puffer/puffer
+ */

data/{lib/generators/puffer/install/templates/puffer/stylesheets → app/assets/stylesheets/puffer}/puffer.css

@@ -434,8 +434,9 @@ select
 .association .association_clear
 {
     position: absolute;
-    top: 4px;
+    top: 0;
     left: 9px;
+    line-height: 22pt;
     cursor: pointer;
     display: none;
 }

data/app/controllers/puffer/dashboard.rb

@@ -0,0 +1,12 @@
+class Puffer::Dashboard < ApplicationController
+  unloadable
+
+  pufferize!
+
+  layout 'puffer_dashboard'
+
+  def index
+
+  end
+
+end

data/app/controllers/puffer/{sessions_base.rb → sessions.rb}

@@ -1,8 +1,7 @@
-class Puffer::SessionsBase < ApplicationController
+class Puffer::Sessions < ApplicationController
   unloadable
 
   pufferize!
-  view_paths_fallbacks :puffer_sessions
   define_fields :create
 
   layout 'puffer_sessions'

data/app/helpers/puffer_helper.rb

@@ -28,16 +28,8 @@ module PufferHelper
     end
   end
 
-  def puffer_stylesheets
-    stylesheet_link_tag *Puffer.stylesheets.map {|path| "/puffer/stylesheets/#{path}"}.uniq.compact
-  end
-
-  def puffer_javascripts
-    javascript_include_tag *Puffer.javascripts.map {|path| "/puffer/javascripts/#{path}"}.uniq.compact
-  end
-
   def render_head field
-    field.label
+    field.human
   end
 
   def render_field field, record
@@ -50,7 +42,7 @@ module PufferHelper
       else ''
       end
     else
-      res = record.call_chain(field.field)
+      res = record.call_chain(field.to_s)
     end
     unless field.native?
       url = edit_polymorphic_path [resource.namespace, record.call_chain(field.path)] rescue nil

data/app/views/layouts/puffer.html.erb

@@ -4,16 +4,16 @@
     <title><%= [@title, 'Puffer'].compact.join(' - ') %></title>
     <meta http-equiv="content-type" content="text/html;charset=utf-8" />
     <%= csrf_meta_tag %>
-    <%= puffer_stylesheets %>
+    <%= stylesheet_link_tag    "puffer/application" %>
+    <%= javascript_include_tag "puffer/application" %>
     <%= yield :stylesheets %>
-    <%= puffer_javascripts %>
     <%= yield :javascripts %>
   </head>
   <body>
     <div class="body">
       <div class="header">
         <div class="logo">
-          <%= link_to Puffer.logo, puffer_root_path %>
+          <%= link_to t('puffer.logo'), puffer_root_path %>
         </div>
         <ul class="namespaces">
           <% puffer_namespaces do |title, path, current| %>
@@ -36,9 +36,28 @@
               <% sidebar_puffer_navigation do |title, path, current| %>
                 <li<%= raw(current ? ' class="selected"' : '') %>>
                   <%= link_to title, path %>
-                  <% if current && (additional = render_cell('puffer/base', 'additional')).present? %>
+                  <% if current %>
                     <div class="additional">
-                      <%= additional %>
+                      <dl>
+                        <dt>Links</dt>
+                        <dd>
+                          <%= link_to t(:list, :target => resource.human), resource.collection_path %>
+                          <%= link_to t(:add, :target => resource.human), resource.new_path %>
+                        </dd>
+                        <dt>Search</dt>
+                        <dd>
+                          <%= form_tag resource.collection_path, {:method => :get} do %>
+                            <%= text_field_tag :search, params[:search] %>
+                            <%= submit_tag 'Search' %>
+
+                            <% if false %>
+                            <% if resource_session[:search].present? %>
+                              <%= link_to 'clear', resource.collection_path(:search => '') %>
+                            <% end %>
+                            <% end %>
+                          <% end %>
+                        </dd>
+                      </dl>
                     </div>
                   <% end %>
                 </li>