puffer 0.0.32 → 0.1.0

data/spec/lib/fields_spec.rb

@@ -18,15 +18,6 @@ describe "Field" do
     field.name.should == 'name'
   end
 
-  it "#query_column" do
-    field = Puffer::Field.new 'user.profile.name', Post
-    field.query_column.should == 'profiles.name'
-    field = Puffer::Field.new 'user.email', Post
-    field.query_column.should == 'users.email'
-    field = Puffer::Field.new 'user.full_name', Post
-    field.query_column.should == nil
-  end
-
   it "#column" do
     field = Puffer::Field.new 'user.profile.name', Post
     field.name.should == 'name'

data/spec/lib/filters_spec.rb

@@ -4,16 +4,12 @@ describe Puffer::Filters do
 
   describe 'controller filters class generation' do
 
-    it 'should generate class with proper name' do
-      Puffer::Filters.controller_filters(Admin::UsersController).should == Admin::UsersControllerFilters
-    end
-
-    it 'should return Puffer::Filters subclass' do
-      Puffer::Filters.controller_filters(Admin::UsersController).superclass.should == Puffer::Filters
+    it 'should set proper attributes' do
+      Puffer::Filters.new(Admin::PostsController.filter_fields).attributes.keys.should == %w(user.email status title body puffer_search puffer_order)
     end
 
-    it 'should set proper attributes' do
-      Puffer::Filters.controller_filters(Admin::PostsController).new.attributes.keys.should == %w(user.email status title body puffer_search puffer_order)
+    it 'should set proper query' do
+      Puffer::Filters.new(Admin::PostsController.filter_fields).query.keys.should == []
     end
 
   end

data/spec/lib/orm_adapter/base_shared.rb

@@ -94,4 +94,26 @@ shared_examples "an adapter" do
 
   end
 
+  context 'diapazones' do
+    Timecop.freeze Time.now do
+      before do
+        5.times { |i|
+          Fabricate fabric, :datetime_field => Time.now + i.hours
+        }
+      end
+
+      it 'should return from till' do
+        filter(:conditions => {'datetime_field' => Puffer::Filters::Diapason.new(Time.now + 0.9.hour, Time.now + 3.1.hours)}).should == nth(1, 2, 3)
+      end
+
+      it 'should return from' do
+        filter(:conditions => {'datetime_field' => Puffer::Filters::Diapason.new(Time.now + 0.9.hour)}).should == nth(1, 2, 3, 4)
+      end
+
+      it 'should return till' do
+        filter(:conditions => {'datetime_field' => Puffer::Filters::Diapason.new(nil, Time.now + 3.1.hours)}).should == nth(0, 1, 2, 3)
+      end
+    end
+  end
+
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require "rails/test_help"
 require "rspec/rails"
 require "ammeter/init"
 
-Bundler.require(:default, ENV["RAILS_ENV"])
+Bundler.require :development
 
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffer
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
+date: 2011-11-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &11358240 !ruby/object:Gem::Requirement
+  requirement: &11729560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *11358240
+  version_requirements: *11729560
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &11356380 !ruby/object:Gem::Requirement
+  requirement: &11729000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11356380
+  version_requirements: *11729000
 - !ruby/object:Gem::Dependency
   name: orm_adapter
-  requirement: &11355160 !ruby/object:Gem::Requirement
+  requirement: &11728520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11355160
+  version_requirements: *11728520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &11353460 !ruby/object:Gem::Requirement
+  requirement: &11728040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11353460
+  version_requirements: *11728040
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &11352400 !ruby/object:Gem::Requirement
+  requirement: &11727340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11352400
+  version_requirements: *11727340
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &11351240 !ruby/object:Gem::Requirement
+  requirement: &11726840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11351240
+  version_requirements: *11726840
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &11349800 !ruby/object:Gem::Requirement
+  requirement: &11726360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11349800
+  version_requirements: *11726360
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &11348540 !ruby/object:Gem::Requirement
+  requirement: &11725880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11348540
+  version_requirements: *11725880
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &11347340 !ruby/object:Gem::Requirement
+  requirement: &11725400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11347340
+  version_requirements: *11725400
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &11345980 !ruby/object:Gem::Requirement
+  requirement: &11724920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11345980
+  version_requirements: *11724920
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &11344060 !ruby/object:Gem::Requirement
+  requirement: &11724440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11344060
+  version_requirements: *11724440
 - !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &11342940 !ruby/object:Gem::Requirement
+  name: timecop
+  requirement: &11723960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11342940
+  version_requirements: *11723960
 - !ruby/object:Gem::Dependency
-  name: libnotify
-  requirement: &11341300 !ruby/object:Gem::Requirement
+  name: guard
+  requirement: &11716220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11341300
+  version_requirements: *11716220
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &11339980 !ruby/object:Gem::Requirement
+  name: libnotify
+  requirement: &11715740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11339980
+  version_requirements: *11715740
 - !ruby/object:Gem::Dependency
-  name: forgery
-  requirement: &11338400 !ruby/object:Gem::Requirement
+  name: guard-rspec
+  requirement: &11715260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11338400
+  version_requirements: *11715260
 - !ruby/object:Gem::Dependency
-  name: fabrication
-  requirement: &11334380 !ruby/object:Gem::Requirement
+  name: forgery
+  requirement: &11714780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11334380
+  version_requirements: *11714780
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &11333160 !ruby/object:Gem::Requirement
+  name: fabrication
+  requirement: &11714300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11333160
+  version_requirements: *11714300
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &11331600 !ruby/object:Gem::Requirement
+  requirement: &11713820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,14 +208,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11331600
-description: In Soviet Russia puffer admins you
-email: kinwizard@gmail.com
+  version_requirements: *11713820
+description: Admin interface builder
+email:
+- kinwizard@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
+- .gitignore
 - .rspec
 - .rvmrc
 - Gemfile
@@ -226,13 +227,18 @@ files:
 - Rakefile
 - VERSION
 - app/assets/javascripts/puffer/application.js
-- app/assets/javascripts/puffer/paginator.js
+- app/assets/javascripts/puffer/associations.js
 - app/assets/javascripts/puffer/puffer.js
 - app/assets/javascripts/puffer/rails.js
 - app/assets/javascripts/puffer/right-autocompleter-src.js
 - app/assets/javascripts/puffer/right-calendar-src.js
 - app/assets/javascripts/puffer/right-dialog-src.js
+- app/assets/javascripts/puffer/right-dnd-src.js
+- app/assets/javascripts/puffer/right-in-edit-src.js
+- app/assets/javascripts/puffer/right-keys-src.js
+- app/assets/javascripts/puffer/right-paginator-src.js
 - app/assets/javascripts/puffer/right-slider-src.js
+- app/assets/javascripts/puffer/right-sortable-src.js
 - app/assets/javascripts/puffer/right-src.js
 - app/assets/stylesheets/puffer/application.css
 - app/assets/stylesheets/puffer/paginator.css
@@ -245,12 +251,17 @@ files:
 - app/components/boolean/form.html.erb
 - app/components/boolean/index.html.erb
 - app/components/boolean_component.rb
+- app/components/date_time/filter.html.erb
 - app/components/date_time/form.html.erb
 - app/components/date_time_component.rb
 - app/components/file/form.html.erb
 - app/components/file_component.rb
 - app/components/hidden/form.html.erb
 - app/components/hidden_component.rb
+- app/components/nested_attributes_many/form.html.erb
+- app/components/nested_attributes_many_component.rb
+- app/components/nested_attributes_one/form.html.erb
+- app/components/nested_attributes_one_component.rb
 - app/components/password/form.html.erb
 - app/components/password_component.rb
 - app/components/references_many/form.html.erb
@@ -259,10 +270,10 @@ files:
 - app/components/references_one/choose.html.erb
 - app/components/references_one/form.html.erb
 - app/components/references_one_component.rb
+- app/components/render_component.rb
 - app/components/select/filter.html.erb
 - app/components/select/form.html.erb
 - app/components/select_component.rb
-- app/components/string/form.html.erb
 - app/components/string_component.rb
 - app/components/text/form.html.erb
 - app/components/text_component.rb
@@ -272,24 +283,31 @@ files:
 - app/controllers/puffer/base.rb
 - app/controllers/puffer/dashboard_base.rb
 - app/controllers/puffer/puffer_users_base.rb
-- app/controllers/puffer/sessions_base.rb
-- app/controllers/puffer/sessions_devise_base.rb
+- app/controllers/puffer/sessions/base.rb
+- app/controllers/puffer/sessions/clearance.rb
+- app/controllers/puffer/sessions/devise.rb
+- app/controllers/puffer/sessions/simple.rb
 - app/controllers/puffer/tree_base.rb
-- app/helpers/puffer_helper.rb
-- app/helpers/puffer_tree_helper.rb
 - app/models/puffer/puffer_user.rb
 - app/models/puffer_user.rb
 - app/views/layouts/puffer.html.erb
 - app/views/layouts/puffer_base.html.erb
 - app/views/layouts/puffer_dashboard.html.erb
 - app/views/layouts/puffer_sessions.html.erb
+- app/views/puffer/base/_edit.html.erb
+- app/views/puffer/base/_index.html.erb
+- app/views/puffer/base/_show.html.erb
 - app/views/puffer/base/_table.html.erb
 - app/views/puffer/base/edit.html.erb
+- app/views/puffer/base/edit.js.erb
 - app/views/puffer/base/index.html.erb
+- app/views/puffer/base/index.js.erb
 - app/views/puffer/base/new.html.erb
 - app/views/puffer/base/show.html.erb
+- app/views/puffer/base/show.js.erb
+- app/views/puffer/base/update.js.erb
 - app/views/puffer/dashboard_base/index.html.erb
-- app/views/puffer/sessions_base/new.html.erb
+- app/views/puffer/sessions/base/new.html.erb
 - app/views/puffer/tree_base/_record.html.erb
 - app/views/puffer/tree_base/toggle.js.erb
 - app/views/puffer/tree_base/tree.html.erb
@@ -314,11 +332,13 @@ files:
 - lib/puffer/extensions/core.rb
 - lib/puffer/extensions/directive_processor.rb
 - lib/puffer/extensions/engine.rb
-- lib/puffer/extensions/form.rb
 - lib/puffer/extensions/mapper.rb
 - lib/puffer/field.rb
 - lib/puffer/field_set.rb
 - lib/puffer/filters.rb
+- lib/puffer/helpers/component_helper.rb
+- lib/puffer/helpers/puffer_helper.rb
+- lib/puffer/helpers/puffer_tree_helper.rb
 - lib/puffer/orm_adapter/active_record.rb
 - lib/puffer/orm_adapter/base.rb
 - lib/puffer/orm_adapter/mongoid.rb
@@ -326,6 +346,7 @@ files:
 - lib/puffer/resource/node.rb
 - lib/puffer/resource/routing.rb
 - lib/puffer/resource/tree.rb
+- lib/puffer/version.rb
 - puffer.gemspec
 - spec/app/components/base_component_spec.rb
 - spec/app/components/boolean_component_spec.rb
@@ -354,7 +375,10 @@ files:
 - spec/dummy/app/controllers/orms/active_record_orm_primals_controller.rb
 - spec/dummy/app/controllers/orms/mongoid_orm_primals_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/helpers/news_helper.rb
 - spec/dummy/app/models/active_record_orm.rb
+- spec/dummy/app/models/active_record_orm/has_many_reference.rb
+- spec/dummy/app/models/active_record_orm/has_one_reference.rb
 - spec/dummy/app/models/active_record_orm/primal.rb
 - spec/dummy/app/models/category.rb
 - spec/dummy/app/models/friendship.rb
@@ -399,6 +423,8 @@ files:
 - spec/dummy/db/migrate/20110301072545_create_news.rb
 - spec/dummy/db/migrate/20110912114129_create_puffer_users.rb
 - spec/dummy/db/migrate/20110930183902_create_active_record_orm_primals.rb
+- spec/dummy/db/migrate/20111120144025_create_active_record_orm_has_one_references.rb
+- spec/dummy/db/migrate/20111122203304_create_active_record_orm_has_many_references.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/public/404.html
@@ -431,7 +457,7 @@ files:
 - spec/lib/resource_spec.rb
 - spec/puffer_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/puffer/puffer
+homepage: ''
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -445,17 +471,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2358292258674130920
+      hash: 3241070126251260077
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3241070126251260077
 requirements: []
-rubyforge_project: 
+rubyforge_project: puffer
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Admin interface builder
+summary: In Soviet Russia puffer admins you
 test_files: []

data/app/components/string/form.html.erb

@@ -1,5 +0,0 @@
-<% content_for :input do %>
-  <%= opts[:form].text_field field, field.input_options %>
-<% end %>
-
-<%= render :file => 'base/form' %>

data/app/helpers/puffer_helper.rb

@@ -1,51 +0,0 @@
-module PufferHelper
-
-  def puffer_scopes_navigation
-    Rails.application.routes.resources_tree.map(&:scope).uniq.each do |scope|
-      yield scope, send("#{scope}_root_path"), scope == puffer_namespace
-    end
-  end
-
-  def puffer_groups_navigation namespace = puffer_namespace
-    Rails.application.routes.resources_tree.roots.select {|node| node.controller.model && node.scope == namespace}.uniq_by(&:group).each do |resource_node|
-      path = send("#{resource_node.url_string}_path")
-      current = resource.resource_node ? resource.root.resource_node.group == resource_node.group : false
-
-      yield resource_node.group, path, current
-    end
-  end
-
-  def puffer_resources_navigation namespace = puffer_namespace, group = configuration.group
-    Rails.application.routes.resources_tree.roots.select {|node| node.controller.model && node.scope == namespace && node.group == group}.each do |resource_node|
-      title = resource_node.controller.model.model_name.human
-      path = send("#{resource_node.url_string}_path")
-      current = resource.resource_node ? resource.root.resource_node == resource_node : false
-
-      yield title, path, current
-    end
-  end
-
-  def render_head field
-    field.human
-  end
-
-  def render_field field, record
-    if field.options[:render]
-      case field.options[:render]
-      when Symbol then
-        res = send(field.options[:render], record)
-      when Proc then
-        res = field.options[:render].bind(self).call(record)
-      else ''
-      end
-    else
-      res = record.call_chain(field.to_s)
-    end
-    unless field.native?
-      url = edit_polymorphic_path [resource.scope, record.call_chain(field.path)] rescue nil
-      res = link_to res, url if url
-    end
-    res
-  end
-
-end

data/app/helpers/puffer_tree_helper.rb

@@ -1,15 +0,0 @@
-module PufferTreeHelper
-
-  def puffer_tree hash, options = {}, &block
-    content_tag :ul, options do
-      puffer_tree_node hash, &block
-    end if hash.present?
-  end
-
-  def puffer_tree_node hash, &block
-    hash.keys.each do |node|
-      block.call node, render_tree(hash[node], &block)
-    end if hash.present?
-  end
-
-end

data/app/views/puffer/sessions_base/new.html.erb

@@ -1,11 +0,0 @@
-<%= form_for record, :url => admin_session_path, :method => :post do |f| %>
-  <ul class="form">
-  <% create_fields.each do |field| -%>
-    <li><%= f.puffer_field field %></li>
-  <% end -%>
-  </ul>
-
-  <div class="buttons">
-    <%= f.submit 'Login' %>
-  </div>
-<% end %>

data/lib/puffer/extensions/form.rb

@@ -1,16 +0,0 @@
-module Puffer
-  module Extensions
-    module FormBuilder
-
-      def puffer_field *args
-        field = args.first.is_a?(Puffer::Field) ? args.first : Puffer::Field.new(*args)
-        field.resource = object.class
-        template = instance_variable_get :@template
-        field.render template.controller, :form, :form => self, :record => object
-      end
-
-    end
-  end
-end
-
-ActionView::Helpers::FormBuilder.send :include, Puffer::Extensions::FormBuilder