puffer 0.0.25 → 0.0.26

data/VERSION

@@ -1 +1 @@
-0.0.25
+0.0.26

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

@@ -135,7 +135,10 @@ var Paginator = new Widget({
 
     this.$super('paginator', element).setOptions(options);
 
-    this.sliderValue = (this.options.current - 1) * 100 / (this.options.total - 1)
+
+    this.sliderValue = (this.options.current - 1) * 100 / (this.options.total - 1);
+    this.sliderValue |= 0;
+
     this.append(
       this.wrapper = new Element('div', {'class': 'rui-paginator-pages-wrapper'}).append(this.pages = new Paginator.Pages(this)),
       this.slider = new Slider({round: 1})

data/app/components/select_component.rb

@@ -3,9 +3,9 @@ class SelectComponent < BaseComponent
   def form
     @options = case field.options[:select]
       when Symbol then
-        parent_controller.send field.options[:select]
+        parent_controller.view_context.send field.options[:select]
       when Proc then
-        field.options[:select].bind(self).call
+        field.options[:select].bind(parent_controller).call
       else
         field.options[:select]
     end

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

@@ -24,8 +24,15 @@
                   <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 %>
+                      <p>
+                        <%= link_to t(:list, :target => resource.human), resource.collection_path %>
+                        <%= link_to t(:add, :target => resource.human), resource.new_path %>
+                      </p>
+                      <p>
+                        <% _collections.each do |collection| %>
+                          <%= link_to collection.label, resource.collection_path(:action => collection.action) if collection.display? && [:match, :get].include?(collection.method) %>
+                        <% end %>
+                      </p>
                     </dd>
                     <dt>Search</dt>
                     <dd>

data/lib/puffer/controller/actions.rb

@@ -1,35 +1,54 @@
 module Puffer
   module Controller
     class Actions < Array
+      attr_accessor :controller
+      attr_accessor :scope
+
+      def initialize scope
+        @scope = scope.to_s
+        super()
+      end
 
       %w(match get post put delete).each do |method|
-        define_method method do |*args|
-          push Action.new(args.unshift(method))
+        define_method method do |*route|
+          push action_class.new(controller, *route.unshift(method))
         end
       end
 
+      def action_class
+        "Puffer::Controller::#{scope.camelize}Action".constantize
+      end
+
     end
 
-    class Action < Array
+    class Action
+      attr_accessor :controller, :route
 
-      def initialize *args
-        super *args
-        options = extract_options!
+      def initialize controller, *route
+        @controller, @route = controller, route
+        options = route.extract_options!
         @display = options.key?(:display) ? options.delete(:display) : true
-        @label = options.delete(:label)
-        push options
+        route.push options
       end
 
       def method
-        first
+        @method ||= route.first.to_sym
       end
 
       def action
-        second
+        @action ||= route.second.to_sym
       end
 
       def label
-        @label || second
+        I18n.t(action, :scope => i18n_scope, :default => action.to_s.humanize)
+      end
+
+      def i18n_scope
+        [:puffer, controller.controller_path.gsub(/\//, '.'), action_scope]
+      end
+
+      def action_scope
+        :actions
       end
 
       def display?
@@ -38,5 +57,21 @@ module Puffer
 
     end
 
+    class MemberAction < Action
+
+      def action_scope
+        :members
+      end
+
+    end
+
+    class CollectionAction < Action
+
+      def action_scope
+        :collections
+      end
+
+    end
+
   end
 end

data/lib/puffer/controller/dsl.rb

@@ -5,9 +5,9 @@ module Puffer
 
       included do
         class_attribute :_members
-        self._members = Puffer::Controller::Actions.new
+        self._members = Puffer::Controller::Actions.new :member
         class_attribute :_collections
-        self._collections = Puffer::Controller::Actions.new
+        self._collections = Puffer::Controller::Actions.new :collection
         class_attribute :_fieldset_fallbacks
         self._fieldset_fallbacks = HashWithIndifferentAccess.new
 
@@ -30,10 +30,12 @@ module Puffer
         end
 
         def member &block
+          _members.controller = self
           block.bind(_members).call if block_given?
         end
 
         def collection &block
+          _collections.controller = self
           block.bind(_collections).call if block_given?
         end
 
@@ -50,9 +52,11 @@ module Puffer
 
             self.class.instance_eval do
               define_method action do |&block|
+                @_super_fields = send("_#{action}_fields")
                 @_fields = send("_#{action}_fields=", Puffer::FieldSet.new(action))
                 block.call if block
                 remove_instance_variable :@_fields
+                remove_instance_variable :@_super_fields
               end
 
               define_method "#{action}_fields" do
@@ -76,7 +80,10 @@ module Puffer
 
         def field name, options = {}, &block
           field = @_fields.field(name, model, options, &block) if @_fields
-          #generate_association_actions field if field.reflection
+        end
+
+        def super_fields
+          @_super_fields.copy_to @_fields, model if @_super_fields && @_fields
         end
 
       end

data/lib/puffer/extensions/mapper.rb

@@ -69,10 +69,10 @@ module Puffer
             collection do
               get  '/event/:fieldset/:field/:event(/:identifer)', options.merge(:action => :event, :as => :event)
               post :create, options
-              controller._collections.each do |args|
-                opts = args.extract_options!.dup
-                args.push options.reverse_merge(opts)
-                send *args
+              controller._collections.each do |action|
+                opts = action.route.extract_options!.dup
+                action.route.push options.reverse_merge(opts)
+                send *action.route
               end
             end
 
@@ -85,10 +85,10 @@ module Puffer
               get    :show, options
               put    :update, options
               delete :destroy, options
-              controller._members.each do |args|
-                opts = args.extract_options!.dup
-                args.push options.reverse_merge(opts)
-                send *args
+              controller._members.each do |action|
+                opts = action.route.extract_options!.dup
+                action.route.push options.reverse_merge(opts)
+                send *action.route
               end
             end
 
@@ -131,10 +131,10 @@ module Puffer
               get  :index, options
               get  '/event/:fieldset/:field/:event(/:identifer)', options.merge(:action => :event, :as => :event)
               post :create, options
-              controller._collections.each do |args|
-                opts = args.extract_options!.dup
-                args.push options.reverse_merge(opts)
-                send *args
+              controller._collections.each do |action|
+                opts = action.route.extract_options!.dup
+                action.route.push options.reverse_merge(opts)
+                send *action.route
               end
             end
 
@@ -147,10 +147,10 @@ module Puffer
               get    :show, options
               put    :update, options
               delete :destroy, options
-              controller._members.each do |args|
-                opts = args.extract_options!.dup
-                args.push options.reverse_merge(opts)
-                send *args
+              controller._members.each do |action|
+                opts = action.route.extract_options!.dup
+                action.route.push options.reverse_merge(opts)
+                send *action.route
               end
             end
           end

data/lib/puffer/field_set.rb

@@ -37,5 +37,12 @@ module Puffer
       end
     end
 
+    def copy_to fieldset, model
+      each do |f|
+        new_field = fieldset.field f.field_name, model, f.options
+        f.children.copy_to new_field.children, swallow_nil{new_field.reflection.klass}
+      end
+    end
+
   end
 end

data/lib/puffer.rb

@@ -31,4 +31,10 @@ module Puffer
     map_component :integer, :decimal, :to => :StringComponent
   end
 
+  module Controller
+    autoload :Action, 'puffer/controller/actions'
+    autoload :MemberAction, 'puffer/controller/actions'
+    autoload :CollectionAction, 'puffer/controller/actions'
+  end
+
 end

data/puffer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer}
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{pyromaniac}]
-  s.date = %q{2011-09-09}
+  s.date = %q{2011-09-10}
   s.description = %q{In Soviet Russia puffer admins you}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -137,6 +137,7 @@ Gem::Specification.new do |s|
     "spec/dummy/app/controllers/admin/posts_controller.rb",
     "spec/dummy/app/controllers/admin/profiles_controller.rb",
     "spec/dummy/app/controllers/admin/sessions_controller.rb",
+    "spec/dummy/app/controllers/admin/tagged_posts_controller.rb",
     "spec/dummy/app/controllers/admin/tags_controller.rb",
     "spec/dummy/app/controllers/admin/users_controller.rb",
     "spec/dummy/app/controllers/application_controller.rb",
@@ -148,6 +149,7 @@ Gem::Specification.new do |s|
     "spec/dummy/app/models/post_category.rb",
     "spec/dummy/app/models/profile.rb",
     "spec/dummy/app/models/tag.rb",
+    "spec/dummy/app/models/tagged_post.rb",
     "spec/dummy/app/models/tagging.rb",
     "spec/dummy/app/models/user.rb",
     "spec/dummy/app/views/layouts/application.html.erb",

data/spec/dummy/app/controllers/admin/posts_controller.rb

@@ -12,9 +12,7 @@ class Admin::PostsController < Puffer::Base
   end
 
   form do
-    field :user do
-      field :email
-    end
+    field :user
     field :status, :select => Post.statuses
     field :title
     field :body

data/spec/dummy/app/controllers/admin/tagged_posts_controller.rb

@@ -0,0 +1,8 @@
+class Admin::TaggedPostsController < Admin::PostsController
+
+  form do
+    super_fields
+    field :tags
+  end
+
+end

data/spec/dummy/app/controllers/admin/users_controller.rb

@@ -4,6 +4,14 @@ class Admin::UsersController < Puffer::Base
     group :users
   end
 
+  member do
+    get :hello
+  end
+
+  collection do
+    get :world
+  end
+
   index do
     field :email
     field :password, :type => :password

data/spec/dummy/app/models/post.rb

@@ -1,8 +1,6 @@
 class Post < ActiveRecord::Base
   has_many :post_categories
-  has_many :categories, :through => :post_categories
-  has_many :taggings, :as => :taggable
-  has_many :tags, :through => :taggings
+  has_many :categories, :through => :post_categoriess
   belongs_to :user
 
   def self.statuses

data/spec/dummy/app/models/tagged_post.rb

@@ -0,0 +1,4 @@
+class TaggedPost < Post
+  has_many :taggings, :as => :taggable
+  has_many :tags, :through => :taggings
+end

data/spec/dummy/config/routes.rb

@@ -17,6 +17,11 @@ Dummy::Application.routes.draw do
       resource :user
       resources :categories
     end
+    resources :tagged_posts do
+      resource :user
+      resources :categories
+      resources :tags
+    end
     resources :categories do
       resources :posts
     end

data/spec/dummy/db/migrate/20100930132656_create_posts.rb

@@ -7,6 +7,8 @@ class CreatePosts < ActiveRecord::Migration
       t.string :status
       t.string :filename
 
+      t.string :type
+
       t.timestamps
     end
   end

data/spec/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -51,6 +52,7 @@ ActiveRecord::Schema.define(:version => 20110301072545) do
     t.text     "body"
     t.string   "status"
     t.string   "filename"
+    t.string   "type"
     t.datetime "created_at"
     t.datetime "updated_at"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffer
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000Z
+date: 2011-09-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &22403120 !ruby/object:Gem::Requirement
+  requirement: &17946500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *22403120
+  version_requirements: *17946500
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &22402300 !ruby/object:Gem::Requirement
+  requirement: &17920780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22402300
+  version_requirements: *17920780
 - !ruby/object:Gem::Dependency
   name: apotomo
-  requirement: &22401520 !ruby/object:Gem::Requirement
+  requirement: &17919780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22401520
+  version_requirements: *17919780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &22400520 !ruby/object:Gem::Requirement
+  requirement: &17918520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22400520
+  version_requirements: *17918520
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &22399860 !ruby/object:Gem::Requirement
+  requirement: &17917020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22399860
+  version_requirements: *17917020
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &22398960 !ruby/object:Gem::Requirement
+  requirement: &17916140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22398960
+  version_requirements: *17916140
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &22372900 !ruby/object:Gem::Requirement
+  requirement: &17915220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22372900
+  version_requirements: *17915220
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &22371680 !ruby/object:Gem::Requirement
+  requirement: &17913940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22371680
+  version_requirements: *17913940
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &22370680 !ruby/object:Gem::Requirement
+  requirement: &17911100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22370680
+  version_requirements: *17911100
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &22369860 !ruby/object:Gem::Requirement
+  requirement: &17910260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22369860
+  version_requirements: *17910260
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &22368680 !ruby/object:Gem::Requirement
+  requirement: &17909240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22368680
+  version_requirements: *17909240
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &22367440 !ruby/object:Gem::Requirement
+  requirement: &17908440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22367440
+  version_requirements: *17908440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &22366340 !ruby/object:Gem::Requirement
+  requirement: &17907540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22366340
+  version_requirements: *17907540
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &22365440 !ruby/object:Gem::Requirement
+  requirement: &17906580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22365440
+  version_requirements: *17906580
 description: In Soviet Russia puffer admins you
 email: kinwizard@gmail.com
 executables: []
@@ -293,6 +293,7 @@ files:
 - spec/dummy/app/controllers/admin/posts_controller.rb
 - spec/dummy/app/controllers/admin/profiles_controller.rb
 - spec/dummy/app/controllers/admin/sessions_controller.rb
+- spec/dummy/app/controllers/admin/tagged_posts_controller.rb
 - spec/dummy/app/controllers/admin/tags_controller.rb
 - spec/dummy/app/controllers/admin/users_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
@@ -304,6 +305,7 @@ files:
 - spec/dummy/app/models/post_category.rb
 - spec/dummy/app/models/profile.rb
 - spec/dummy/app/models/tag.rb
+- spec/dummy/app/models/tagged_post.rb
 - spec/dummy/app/models/tagging.rb
 - spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
@@ -369,7 +371,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2583020713337993814
+      hash: -1489774044213861693
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: