puffer 0.0.29 → 0.0.30

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ ENV["RAILS_ENV"] ||= "test"
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
+require "ammeter/init"
 
 Bundler.require(:default, ENV["RAILS_ENV"])
 
@@ -37,8 +38,8 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = false
   
   config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner[:active_record].strategy = :transaction
+    DatabaseCleaner[:mongoid].strategy = :truncation
   end
 
   config.before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffer
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2011-10-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &13086640 !ruby/object:Gem::Requirement
+  requirement: &14454820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *13086640
+  version_requirements: *14454820
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &13086020 !ruby/object:Gem::Requirement
+  requirement: &14453080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13086020
+  version_requirements: *14453080
 - !ruby/object:Gem::Dependency
   name: orm_adapter
-  requirement: &13085220 !ruby/object:Gem::Requirement
+  requirement: &14451680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13085220
+  version_requirements: *14451680
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &13084320 !ruby/object:Gem::Requirement
+  requirement: &14450200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13084320
+  version_requirements: *14450200
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &13083160 !ruby/object:Gem::Requirement
+  requirement: &14448980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13083160
+  version_requirements: *14448980
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &13081880 !ruby/object:Gem::Requirement
+  requirement: &14447800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13081880
+  version_requirements: *14447800
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &13077780 !ruby/object:Gem::Requirement
+  requirement: &14446280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13077780
+  version_requirements: *14446280
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &13076740 !ruby/object:Gem::Requirement
+  requirement: &14445160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13076740
+  version_requirements: *14445160
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &13075980 !ruby/object:Gem::Requirement
+  requirement: &14443920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13075980
+  version_requirements: *14443920
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &13075140 !ruby/object:Gem::Requirement
+  requirement: &14442480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13075140
+  version_requirements: *14442480
+- !ruby/object:Gem::Dependency
+  name: ammeter
+  requirement: &14440700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *14440700
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &13074380 !ruby/object:Gem::Requirement
+  requirement: &14439300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13074380
+  version_requirements: *14439300
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &13073500 !ruby/object:Gem::Requirement
+  requirement: &14438020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13073500
+  version_requirements: *14438020
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &13072780 !ruby/object:Gem::Requirement
+  requirement: &14436280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13072780
+  version_requirements: *14436280
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &13072080 !ruby/object:Gem::Requirement
+  requirement: &14435000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13072080
+  version_requirements: *14435000
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &13071220 !ruby/object:Gem::Requirement
+  requirement: &14431000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13071220
+  version_requirements: *14431000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13070440 !ruby/object:Gem::Requirement
+  requirement: &14429780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13070440
+  version_requirements: *14429780
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &13067140 !ruby/object:Gem::Requirement
+  requirement: &14428220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +208,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13067140
+  version_requirements: *14428220
 description: In Soviet Russia puffer admins you
 email: kinwizard@gmail.com
 executables: []
@@ -243,10 +254,12 @@ files:
 - app/components/password/form.html.erb
 - app/components/password_component.rb
 - app/components/references_many/form.html.erb
+- app/components/references_many/index.html.erb
 - app/components/references_many_component.rb
 - app/components/references_one/choose.html.erb
 - app/components/references_one/form.html.erb
 - app/components/references_one_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
@@ -270,7 +283,6 @@ files:
 - 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/_form.html.erb
 - app/views/puffer/base/_table.html.erb
 - app/views/puffer/base/edit.html.erb
 - app/views/puffer/base/index.html.erb
@@ -287,7 +299,6 @@ files:
 - lib/generators/puffer/component/USAGE
 - lib/generators/puffer/component/component_generator.rb
 - lib/generators/puffer/component/templates/component.rb
-- lib/generators/puffer/component/templates/component_spec.rb
 - lib/generators/puffer/controller/USAGE
 - lib/generators/puffer/controller/controller_generator.rb
 - lib/generators/puffer/controller/templates/controller.rb
@@ -301,17 +312,20 @@ files:
 - lib/puffer/engine.rb
 - lib/puffer/extensions/controller.rb
 - 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/orm_adapter/active_record.rb
 - lib/puffer/orm_adapter/base.rb
 - lib/puffer/orm_adapter/mongoid.rb
 - lib/puffer/resource.rb
+- lib/puffer/resource/node.rb
 - lib/puffer/resource/routing.rb
-- lib/puffer/resource/scoping.rb
+- lib/puffer/resource/tree.rb
 - puffer.gemspec
 - spec/app/components/base_component_spec.rb
 - spec/app/components/boolean_component_spec.rb
@@ -337,11 +351,15 @@ files:
 - spec/dummy/app/controllers/admin/tags_controller.rb
 - spec/dummy/app/controllers/admin/users_controller.rb
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/orms/mongoid_tests_controller.rb
+- 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/models/active_record_orm.rb
+- spec/dummy/app/models/active_record_orm/primal.rb
 - spec/dummy/app/models/category.rb
 - spec/dummy/app/models/friendship.rb
-- spec/dummy/app/models/mongoid_test.rb
+- spec/dummy/app/models/mongoid_orm.rb
+- spec/dummy/app/models/mongoid_orm/primal.rb
 - spec/dummy/app/models/news.rb
 - spec/dummy/app/models/post.rb
 - spec/dummy/app/models/post_category.rb
@@ -380,6 +398,7 @@ files:
 - spec/dummy/db/migrate/20110107082706_create_friendships.rb
 - 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/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/public/404.html
@@ -388,18 +407,27 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/robots.txt
 - spec/dummy/script/rails
+- spec/fabricators/active_record_orm/primal.rb
 - spec/fabricators/categories_fabricator.rb
+- spec/fabricators/mongoid_orm/primal.rb
 - spec/fabricators/news_fabricator.rb
 - spec/fabricators/posts_fabricator.rb
 - spec/fabricators/profiles_fabricator.rb
 - spec/fabricators/tags_fabricator.rb
 - spec/fabricators/users_fabricator.rb
+- spec/generators/puffer/component/component_generator_spec.rb
+- spec/generators/puffer/controller/controller_generator_spec.rb
+- spec/helpers/puffer_helper_spec.rb
 - spec/integration/navigation_spec.rb
 - spec/lib/component_spec.rb
 - spec/lib/extensions/core_spec.rb
 - spec/lib/fields_spec.rb
-- spec/lib/params_spec.rb
+- spec/lib/filters_spec.rb
+- spec/lib/orm_adapter/active_record_spec.rb
+- spec/lib/orm_adapter/base_shared.rb
+- spec/lib/orm_adapter/mongoid_spec.rb
 - spec/lib/resource/routing_spec.rb
+- spec/lib/resource/tree_spec.rb
 - spec/lib/resource_spec.rb
 - spec/puffer_spec.rb
 - spec/spec_helper.rb
@@ -417,7 +445,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2115184078820805402
+      hash: 3977491622632345508
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/views/puffer/base/_form.html.erb

@@ -1,11 +0,0 @@
-<ul class="form">
-<% (action == 'new' ? create_fields : update_fields).each do |field| -%>
-  <li><%= f.puffer_field field %></li>
-<% end -%>
-</ul>
-
-<div class="buttons">
-  <%= f.submit t('puffer.save') %>
-  <%= f.submit t('puffer.save_and_exit') %>
-  <%= link_to 'cancel', (request.referer || resource.collectin_path) %>
-</div>

data/lib/generators/puffer/component/templates/component_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe <%= @name.camelize %>Component do
-
-  include RSpec::Rails::RequestExampleGroup
-
-  context 'index' do
-
-    it 'should render index component'
-
-  end
-
-  context 'form' do
-
-    it 'should render form component'
-
-  end
-
-end

data/lib/puffer/resource/scoping.rb

@@ -1,19 +0,0 @@
-module Puffer
-  class Resource
-    module Scoping
-
-      def includes
-        controller_class.index_fields.includes
-      end
-
-      def order
-
-      end
-
-      def searches query
-        controller_class.index_fields.searches query
-      end
-
-    end
-  end
-end

data/spec/dummy/app/controllers/orms/mongoid_tests_controller.rb

@@ -1,19 +0,0 @@
-class Orms::MongoidTestsController < Puffer::Base
-
-  setup do
-    group :mongoid
-  end
-
-  index do
-    field :string_field
-    field :integer_field
-    field :array_field
-  end
-
-  form do
-    field :string_field
-    field :integer_field
-    field :array_field
-  end
-
-end

data/spec/lib/params_spec.rb

@@ -1,120 +0,0 @@
-require 'spec_helper'
-
-describe "Params" do
-
-  include RSpec::Rails::RoutingExampleGroup
-
-=begin
-  params_examples = [
-    [:admin_users_url, true, [], [:profile, :posts]]
-  ]
-
-  params_examples.each do |(url, plural, ancestors, children)|
-    describe "GET #{url}" do
-      it "should set proper params" do
-        get send(url)
-
-        request.params[:plural].should == plural
-        request.params[:ancestors].should == ancestors
-        request.params[:children].should == children
-      end
-    end
-  end
-=end
-
-  describe "GET /admin/users" do
-    it "should set proper params" do
-      assert_recognizes({"ancestors"=>[],
-        "action"=>"index",
-        "plural"=>true,
-        "controller"=>"admin/users",
-        "children"=>[:profile, :posts]}, '/admin/users')
-    end
-  end
-
-  describe "GET /admin/users/1/profile" do
-    it "should set proper params" do
-      assert_recognizes({"ancestors"=>[:users],
-        "action"=>"show",
-        "user_id"=>"1",
-        "plural"=>false,
-        "controller"=>"admin/profiles",
-        "children"=>[:tags]}, '/admin/users/1/profile')
-    end
-  end
-
-  describe "get /admin/users/1/posts" do
-    it "should set proper params" do
-      assert_recognizes({"ancestors"=>[:users],
-        "action"=>"index",
-        "user_id"=>"1",
-        "plural"=>true,
-        "controller"=>"admin/posts",
-        "children"=>[:categories, :tags]}, '/admin/users/1/posts')
-    end
-  end
-
-  describe "GET /admin/users/1/posts/1/categories" do
-    it "should set proper params" do
-      assert_recognizes({"ancestors"=>[:users, :posts],
-        "action"=>"index",
-        "post_id"=>"1",
-        "user_id"=>"1",
-        "plural"=>true,
-        "controller"=>"admin/categories",
-        "children"=>[]}, '/admin/users/1/posts/1/categories')
-    end
-  end
-
-  describe "GET /admin/profiles" do
-    it "should set proper params" do
-      assert_recognizes({"ancestors"=>[],
-        "action"=>"index",
-        "plural"=>true,
-        "controller"=>"admin/profiles",
-        "children"=>[:tags]}, '/admin/profiles')
-    end
-  end
-
-  describe "GET /admin/posts" do
-    it "should set proper params" do
-      assert_recognizes({"ancestors"=>[],
-        "action"=>"index",
-        "plural"=>true,
-        "controller"=>"admin/posts",
-        "children"=>[:user, :categories]}, '/admin/posts')
-    end
-  end
-
-  describe "GET /admin/posts/1/categories" do
-    it "should set proper params" do
-      assert_recognizes({"ancestors"=>[:posts],
-        "action"=>"index",
-        "post_id"=>"1",
-        "plural"=>true,
-        "controller"=>"admin/categories",
-        "children"=>[]}, '/admin/posts/1/categories')
-    end
-  end
-
-  describe "GET /admin/categories" do
-    it "should set proper params" do
-      assert_recognizes({"ancestors"=>[],
-        "action"=>"index",
-        "plural"=>true,
-        "controller"=>"admin/categories",
-        "children"=>[:posts]}, '/admin/categories')
-    end
-  end
-
-  describe "GET /admin/categories/1/posts" do
-    it "should set proper params" do
-      assert_recognizes({"ancestors"=>[:categories],
-        "action"=>"index",
-        "category_id"=>"1",
-        "plural"=>true,
-        "controller"=>"admin/posts",
-        "children"=>[]}, '/admin/categories/1/posts')
-    end
-  end
-end