puffer 0.0.26 → 0.0.28

data/Gemfile

@@ -2,10 +2,13 @@ source "http://rubygems.org"
 
 gem 'rails', '~> 3.1.0'
 gem 'kaminari'
-gem 'apotomo'
+gem 'orm_adapter'
 
 group :development, :test do
   gem "sqlite3"
+  gem "mongoid"
+  gem "bson_ext"
+
 
   gem "rspec-rails"
   gem "capybara"

data/Gemfile.lock

@@ -30,12 +30,10 @@ GEM
       activesupport (= 3.1.0)
     activesupport (3.1.0)
       multi_json (~> 1.0)
-    apotomo (1.1.2)
-      cells (>= 3.5.6)
-      hooks (~> 0.1.3)
-      onfire (~> 0.2.0)
     arel (2.2.1)
     bcrypt-ruby (3.0.0)
+    bson (1.3.1)
+    bson_ext (1.3.1)
     builder (3.0.0)
     capybara (1.1.1)
       mime-types (>= 1.16)
@@ -44,9 +42,6 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    cells (3.6.5)
-      actionpack (~> 3.0)
-      railties (~> 3.0)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
     database_cleaner (0.6.7)
@@ -62,7 +57,6 @@ GEM
     guard-rspec (0.4.4)
       guard (>= 0.4.0)
     hike (1.2.1)
-    hooks (0.1.4)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -78,12 +72,18 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongoid (2.2.0)
+      activemodel (~> 3.0)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
     multi_json (1.0.3)
     nested_set (1.6.8)
       activerecord (>= 3.0.0)
       railties (>= 3.0.0)
     nokogiri (1.5.0)
-    onfire (0.2.0)
+    orm_adapter (0.0.5)
     polyglot (0.3.2)
     rack (1.3.2)
     rack-cache (1.0.3)
@@ -149,7 +149,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  apotomo
+  bson_ext
   capybara
   database_cleaner
   fabrication
@@ -159,7 +159,9 @@ DEPENDENCIES
   jeweler
   kaminari
   libnotify
+  mongoid
   nested_set
+  orm_adapter
   rails (~> 3.1.0)
   rspec-rails
   sqlite3

data/VERSION

@@ -1 +1 @@
-0.0.26
+0.0.28

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

@@ -1,22 +1,4 @@
 <% content_for :input do %>
-  <% value = [
-            swallow_nil{opts[:form].object.send(field.name)[field.reflection.primary_key_column.name.to_sym]},
-            swallow_nil{opts[:form].object.send(field.name).to_title}
-          ].compact.join(' - ')
-  %>
-
-  <div class="association">
-    <%= text_field_tag field, value, field.input_options.merge(
-        :autocomplete => :off,
-        :disabled => (true if opts[:form].object.send(field.name)),
-        'data-autocompleter' => "{url: '#{event_path :choose}', onDone: association_done}"
-      ) %>
-    <div class="association_clear">×</div>
-    <%= opts[:form].hidden_field field.reflection.foreign_key %>
-  </div>
-<% end %>
-
-<% clean_content_for :input do %>
   <% link_to "Choose", '#', :"data-dialog-uri" => event_path(:choose) %>
 <% end %>
 

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

@@ -42,7 +42,7 @@
 
                         <% if false %>
                         <% if resource_session[:search].present? %>
-                          <%= link_to 'clear', resource.collection_path(:search => '') %>
+                          <%= link_to 'clear', resource.collection_path %>
                         <% end %>
                         <% end %>
                       <% end %>

data/lib/puffer/component.rb

@@ -12,6 +12,8 @@ module Puffer
     # handling and component state changing
     class Base < AbstractController::Base
 
+      abstract!
+
       module ComponentHelper
         def component_wrap name = :span, options = {}, &block
           content_tag name, options.merge(:id => component_id), &block
@@ -28,21 +30,19 @@ module Puffer
         end
       end
 
-      module SingletonMethods
+      module ClassMethods
         def render_component parent_controller, field, context, *args
           klass = "#{field.type}_component".camelize.constantize rescue StringComponent
           component = klass.new field
           component.process parent_controller, context, *args
         end
-      end
 
-      module ClassMethods
         def controller_path
           @controller_path ||= name.sub(/Component$/, '').underscore unless anonymous?
         end
       end
 
-      abstract!
+      extend ClassMethods
 
       include AbstractController::Rendering
       include AbstractController::Helpers
@@ -54,9 +54,6 @@ module Puffer
       include ActionController::UrlFor
       include Rails.application.routes.url_helpers
 
-      extend SingletonMethods
-      extend ClassMethods
-
       helper ComponentHelper, PufferHelper
 
       attr_accessor :parent_controller, :field, :opts, :identifer

data/lib/puffer/controller/config.rb

@@ -1,18 +1,14 @@
 module Puffer
   module Controller
     module Config
+      extend ActiveSupport::Concern
 
-      def self.included base
-        base.class_eval do
-          extend ClassMethods
-          include InstanceMethods
+      included do
+        puffer_class_attribute :group
+        puffer_class_attribute :model_name
+        puffer_class_attribute :destroy, true
 
-          puffer_class_attribute :group
-          puffer_class_attribute :model_name
-          puffer_class_attribute :destroy, true
-
-          helper_method :configuration
-        end
+        helper_method :configuration
       end
 
       module InstanceMethods

data/lib/puffer/controller/mutate.rb

@@ -1,26 +1,27 @@
 module Puffer
   module Controller
     module Mutate
+      extend ActiveSupport::Concern
 
-      def self.included base
-        base.class_eval do
-          extend ClassMethods
-          include InstanceMethods
-
-          layout 'puffer'
-          helper :puffer
-          helper_method :puffer?, :namespace
-        end
+      included do
+        layout 'puffer'
+        helper :puffer
+        delegate :namespace, :model, :model_name, :to => 'self.class'
+        helper_method :namespace, :resource, :record, :records
       end
 
       module InstanceMethods
 
-        def puffer?
-          self.class.puffer?
+        def resource
+          @resource ||= Puffer::Resource.new params, self
         end
 
-        def namespace
-          self.class.namespace
+        def record
+          @record || instance_variable_get("@#{resource.model_name}")
+        end
+
+        def records
+          @records || instance_variable_get("@#{resource.model_name.pluralize}")
         end
 
       end

data/lib/puffer/extensions/controller.rb

@@ -5,30 +5,22 @@ module Puffer
         extend ActiveSupport::Concern
 
         included do
-          extend ClassMethods
-
-          helper_method :puffer?, :render_component
+          delegate :puffer?, :to => 'self.class'
+          helper_method :puffer?
         end
 
         module ClassMethods
-          def puffer?; false; end
+          def puffer?
+            false
+          end
 
           def pufferize!
             include Puffer::Controller::Mutate
-            include Puffer::Controller::Helpers
             include Puffer::Controller::Dsl
             include Puffer::Controller::Config
           end
         end
 
-        module InstanceMethods
-          def puffer?; false; end
-
-          def render_component *args
-            Puffer::Component::Base.render_component self, *args
-          end
-        end
-
       end
     end
   end

data/lib/puffer/extensions/core.rb

@@ -1,6 +1,12 @@
 module Puffer
   module Extensions
 
+    module Object
+      def call_chain chain
+        swallow_nil{instance_eval(chain.to_s)}
+      end
+    end
+
     module String
       def singular?
         self.singularize == self
@@ -37,6 +43,7 @@ module Puffer
   end
 end
 
+Object.send :include, Puffer::Extensions::Object
 String.send :include, Puffer::Extensions::String
 Symbol.send :include, Puffer::Extensions::Symbol
 Array.send :include, Puffer::Extensions::Array

data/lib/puffer/extensions/mapper.rb

@@ -1,13 +1,11 @@
 module Puffer
   module Extensions
     module Mapper
+      extend ActiveSupport::Concern
 
-      def self.included base
-        base.class_eval do
-          include InstanceMethods
-          alias_method_chain :resource, :puffer
-          alias_method_chain :resources, :puffer
-        end
+      included do
+        alias_method_chain :resource, :puffer
+        alias_method_chain :resources, :puffer
       end
 
       module InstanceMethods

data/lib/puffer/field.rb

@@ -83,11 +83,11 @@ module Puffer
     end
 
     def column
-      @column ||= model && model.columns_hash[name]
+      @column ||= model && model.to_adapter.columns_hash[name]
     end
 
     def column_type
-      column.type if column
+      column[:type] if column
     end
 
     def query_column

data/lib/puffer/field_set.rb

@@ -14,7 +14,7 @@ module Puffer
     end
 
     def searchable
-      @searchable ||= map { |f| f if f.column && [:text, :string, :integer, :decimal, :float].include?(f.column.type) }.compact
+      @searchable ||= map { |f| f if f.column && [:text, :string, :integer, :decimal, :float].include?(f.column_type) }.compact
     end
 
     def searches query

data/lib/puffer/orm_adapter/active_record.rb

@@ -0,0 +1,15 @@
+module Puffer
+  module OrmAdapter
+    module ActiveRecord
+
+      def columns_hash
+        klass.columns_hash.inject({}) do |result, (name, object)|
+          result.merge name => {:type => object.type}
+        end
+      end
+
+    end
+  end
+end
+
+ActiveRecord::Base::OrmAdapter.send :include, Puffer::OrmAdapter::ActiveRecord

data/lib/puffer/orm_adapter/base.rb

@@ -0,0 +1,13 @@
+module Puffer
+  module OrmAdapter
+    module Base
+
+      def columns_hash
+        raise NotSupportedError
+      end
+
+    end
+  end
+end
+
+OrmAdapter::Base.send :include, Puffer::OrmAdapter::Base

data/lib/puffer/orm_adapter/mongoid.rb

@@ -0,0 +1,15 @@
+module Puffer
+  module OrmAdapter
+    module Mongoid
+
+      def columns_hash
+        klass.fields.inject({}) do |result, (name, object)|
+          result.merge name => {:type => object.type.to_s.underscore.to_sym}
+        end
+      end
+
+    end
+  end
+end
+
+Mongoid::Document::OrmAdapter.send :include, Puffer::OrmAdapter::Mongoid

data/lib/puffer/resource/routing.rb

@@ -10,7 +10,7 @@ module Puffer
       end
 
       def member_url *args
-        suggest = args.shift if args.first.is_a? ActiveRecord::Base
+        suggest = args.shift if args.first.respond_to? :to_key
         polymorphic_url *route_args(route_member(suggest), *args)
       end
 
@@ -19,7 +19,7 @@ module Puffer
       end
 
       def edit_url *args
-        suggest = args.shift if args.first.is_a? ActiveRecord::Base
+        suggest = args.shift if args.first.respond_to? :to_key
         edit_polymorphic_url *route_args(route_member(suggest), *args)
       end
 

data/lib/puffer/resource.rb

@@ -106,12 +106,12 @@ module Puffer
     def member
       if parent
         if plural?
-          parent.member.send(model_name.pluralize).find params[:id]
+          parent.member.send(model_name.pluralize).find params[:id] if params[:id]
         else
           parent.member.send(model_name)
         end
       else
-        model.find params[:id]
+        model.find params[:id] if params[:id]
       end
     end
 

data/lib/puffer.rb

@@ -1,6 +1,12 @@
 require 'kaminari'
 
-require 'puffer/extensions/activerecord'
+require 'orm_adapter'
+require 'puffer/orm_adapter/base'
+require 'puffer/orm_adapter/active_record' if defined?(ActiveRecord::Base::OrmAdapter)
+require 'puffer/orm_adapter/mongoid' if defined?(Mongoid::Document::OrmAdapter)
+#require 'puffer/orm_adapter/data_mapper' if defined?(DataMapper::Resource::OrmAdapter)
+#require 'puffer/orm_adapter/mongo_mapper' if defined?(MongoMapper::Document::OrmAdapter)
+
 require 'puffer/extensions/controller'
 require 'puffer/extensions/core'
 require 'puffer/extensions/mapper'
@@ -9,6 +15,12 @@ require 'puffer/extensions/engine'
 require 'puffer/engine'
 
 module Puffer
+
+  module Controller
+    autoload :Action, 'puffer/controller/actions'
+    autoload :MemberAction, 'puffer/controller/actions'
+    autoload :CollectionAction, 'puffer/controller/actions'
+  end
   
   module Component
     autoload :Base, 'puffer/component'
@@ -29,12 +41,7 @@ module Puffer
     map_component :has_many, :has_and_belongs_to_many, :to => :ReferencesManyComponent
     map_component :date, :time, :datetime, :timestamp, :to => :DateTimeComponent
     map_component :integer, :decimal, :to => :StringComponent
-  end
-
-  module Controller
-    autoload :Action, 'puffer/controller/actions'
-    autoload :MemberAction, 'puffer/controller/actions'
-    autoload :CollectionAction, 'puffer/controller/actions'
+    map_component :array, :decimal, :to => :StringComponent
   end
 
 end

data/puffer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer}
-  s.version = "0.0.26"
+  s.version = "0.0.28"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{pyromaniac}]
-  s.date = %q{2011-09-10}
+  s.date = %q{2011-09-11}
   s.description = %q{In Soviet Russia puffer admins you}
   s.email = %q{kinwizard@gmail.com}
   s.extra_rdoc_files = [
@@ -101,10 +101,8 @@ Gem::Specification.new do |s|
     "lib/puffer/controller/actions.rb",
     "lib/puffer/controller/config.rb",
     "lib/puffer/controller/dsl.rb",
-    "lib/puffer/controller/helpers.rb",
     "lib/puffer/controller/mutate.rb",
     "lib/puffer/engine.rb",
-    "lib/puffer/extensions/activerecord.rb",
     "lib/puffer/extensions/controller.rb",
     "lib/puffer/extensions/core.rb",
     "lib/puffer/extensions/engine.rb",
@@ -112,6 +110,9 @@ Gem::Specification.new do |s|
     "lib/puffer/extensions/mapper.rb",
     "lib/puffer/field.rb",
     "lib/puffer/field_set.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/routing.rb",
     "lib/puffer/resource/scoping.rb",
@@ -141,9 +142,11 @@ Gem::Specification.new do |s|
     "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/helpers/application_helper.rb",
     "spec/dummy/app/models/category.rb",
     "spec/dummy/app/models/friendship.rb",
+    "spec/dummy/app/models/mongoid_test.rb",
     "spec/dummy/app/models/news.rb",
     "spec/dummy/app/models/post.rb",
     "spec/dummy/app/models/post_category.rb",
@@ -168,6 +171,7 @@ Gem::Specification.new do |s|
     "spec/dummy/config/initializers/session_store.rb",
     "spec/dummy/config/initializers/wrap_parameters.rb",
     "spec/dummy/config/locales/en.yml",
+    "spec/dummy/config/mongoid.yml",
     "spec/dummy/config/routes.rb",
     "spec/dummy/db/migrate/20100930132559_create_users.rb",
     "spec/dummy/db/migrate/20100930132656_create_posts.rb",
@@ -213,8 +217,10 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_runtime_dependency(%q<kaminari>, [">= 0"])
-      s.add_runtime_dependency(%q<apotomo>, [">= 0"])
+      s.add_runtime_dependency(%q<orm_adapter>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<mongoid>, [">= 0"])
+      s.add_development_dependency(%q<bson_ext>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
@@ -228,8 +234,10 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_dependency(%q<kaminari>, [">= 0"])
-      s.add_dependency(%q<apotomo>, [">= 0"])
+      s.add_dependency(%q<orm_adapter>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<mongoid>, [">= 0"])
+      s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
       s.add_dependency(%q<database_cleaner>, [">= 0"])
@@ -244,8 +252,10 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rails>, ["~> 3.1.0"])
     s.add_dependency(%q<kaminari>, [">= 0"])
-    s.add_dependency(%q<apotomo>, [">= 0"])
+    s.add_dependency(%q<orm_adapter>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<mongoid>, [">= 0"])
+    s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
     s.add_dependency(%q<database_cleaner>, [">= 0"])

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

@@ -0,0 +1,19 @@
+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/dummy/app/models/mongoid_test.rb

@@ -0,0 +1,13 @@
+class MongoidTest
+  include Mongoid::Document
+
+  field :string_field, :type => String
+  field :integer_field, :type => Integer, :default => 0
+  field :array_field, :type => Array
+
+  def array_field= value
+    value = value.split(',').map(&:strip).map(&:presence) if value.is_a? String
+    write_attribute :array_field, value
+  end
+
+end

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

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

data/spec/dummy/config/mongoid.yml

@@ -0,0 +1,11 @@
+development:
+  host: localhost
+  database: puffer_development
+
+test:
+  host: localhost
+  database: puffer_test
+
+production:
+  host: localhost
+  database: puffer_development

data/spec/dummy/config/routes.rb

@@ -28,4 +28,8 @@ Dummy::Application.routes.draw do
     resources :news
   end
 
+  namespace :orms do
+    resources :mongoid_tests
+  end
+
 end

data/spec/lib/fields_spec.rb

@@ -29,7 +29,7 @@ describe "Field" do
 
   it "#column" do
     field = Puffer::Field.new 'user.profile.name', Post
-    field.column.name.should == 'name'
+    field.name.should == 'name'
     field = Puffer::Field.new 'user.full_name', Post
     field.column.should == nil
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puffer
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.28
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-10 00:00:00.000000000Z
+date: 2011-09-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &17946500 !ruby/object:Gem::Requirement
+  requirement: &10916560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *17946500
+  version_requirements: *10916560
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &17920780 !ruby/object:Gem::Requirement
+  requirement: &10916000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17920780
+  version_requirements: *10916000
 - !ruby/object:Gem::Dependency
-  name: apotomo
-  requirement: &17919780 !ruby/object:Gem::Requirement
+  name: orm_adapter
+  requirement: &10915480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17919780
+  version_requirements: *10915480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &17918520 !ruby/object:Gem::Requirement
+  requirement: &10914960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17918520
+  version_requirements: *10914960
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: &10914380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10914380
+- !ruby/object:Gem::Dependency
+  name: bson_ext
+  requirement: &10913880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10913880
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &17917020 !ruby/object:Gem::Requirement
+  requirement: &10913380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17917020
+  version_requirements: *10913380
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &17916140 !ruby/object:Gem::Requirement
+  requirement: &10912880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17916140
+  version_requirements: *10912880
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &17915220 !ruby/object:Gem::Requirement
+  requirement: &10912260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17915220
+  version_requirements: *10912260
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &17913940 !ruby/object:Gem::Requirement
+  requirement: &10911680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17913940
+  version_requirements: *10911680
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &17911100 !ruby/object:Gem::Requirement
+  requirement: &10911140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17911100
+  version_requirements: *10911140
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &17910260 !ruby/object:Gem::Requirement
+  requirement: &10910620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17910260
+  version_requirements: *10910620
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &17909240 !ruby/object:Gem::Requirement
+  requirement: &10910100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17909240
+  version_requirements: *10910100
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &17908440 !ruby/object:Gem::Requirement
+  requirement: &10909540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17908440
+  version_requirements: *10909540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &17907540 !ruby/object:Gem::Requirement
+  requirement: &10908960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17907540
+  version_requirements: *10908960
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &17906580 !ruby/object:Gem::Requirement
+  requirement: &10908460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +186,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17906580
+  version_requirements: *10908460
 description: In Soviet Russia puffer admins you
 email: kinwizard@gmail.com
 executables: []
@@ -257,10 +279,8 @@ files:
 - lib/puffer/controller/actions.rb
 - lib/puffer/controller/config.rb
 - lib/puffer/controller/dsl.rb
-- lib/puffer/controller/helpers.rb
 - lib/puffer/controller/mutate.rb
 - lib/puffer/engine.rb
-- lib/puffer/extensions/activerecord.rb
 - lib/puffer/extensions/controller.rb
 - lib/puffer/extensions/core.rb
 - lib/puffer/extensions/engine.rb
@@ -268,6 +288,9 @@ files:
 - lib/puffer/extensions/mapper.rb
 - lib/puffer/field.rb
 - lib/puffer/field_set.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/routing.rb
 - lib/puffer/resource/scoping.rb
@@ -297,9 +320,11 @@ 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/helpers/application_helper.rb
 - spec/dummy/app/models/category.rb
 - spec/dummy/app/models/friendship.rb
+- spec/dummy/app/models/mongoid_test.rb
 - spec/dummy/app/models/news.rb
 - spec/dummy/app/models/post.rb
 - spec/dummy/app/models/post_category.rb
@@ -324,6 +349,7 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20100930132559_create_users.rb
 - spec/dummy/db/migrate/20100930132656_create_posts.rb
@@ -371,7 +397,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1489774044213861693
+      hash: 2497691897434957664
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/puffer/controller/helpers.rb

@@ -1,31 +0,0 @@
-module Puffer
-  module Controller
-    module Helpers
-
-      def self.included base
-        base.class_eval do
-          include InstanceMethods
-
-          helper_method :resource_session, :resource, :record, :records
-        end
-      end
-
-      module InstanceMethods
-
-        def resource
-          @resource ||= Puffer::Resource.new params, self
-        end
-
-        def record
-          @record || instance_variable_get("@#{resource.model_name}")
-        end
-
-        def records
-          @records || instance_variable_get("@#{resource.model_name.pluralize}")
-        end
-
-      end
-
-    end
-  end
-end

data/lib/puffer/extensions/activerecord.rb

@@ -1,23 +0,0 @@
-module Puffer
-  module Extensions
-    module ActiveRecord
-      module Base
-
-        def call_chain chain
-          swallow_nil{instance_eval(chain.to_s)}
-        end
-
-        def to_title
-          send title_method
-        end
-
-        def title_method
-          self.class.column_names.detect {|c| c =~ /name|title/} || self.class.column_names[1].to_sym
-        end
-
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, Puffer::Extensions::ActiveRecord::Base