puffer 0.1.0 → 0.1.1

data/lib/puffer/filters.rb

@@ -22,7 +22,7 @@ module Puffer
     delegate :model_name, :special_attributes, :to => 'self.class'
 
     def self.special_attributes
-      %w(puffer_search puffer_order)
+      %w(puffer_search puffer_order puffer_per_page)
     end
 
     special_attributes.each do |attribute|
@@ -59,7 +59,7 @@ module Puffer
     end
 
     def any?
-      attributes.values.any?
+      attributes.except(:puffer_per_page).values.any?
     end
 
     def attributes
@@ -94,18 +94,26 @@ module Puffer
     end
 
     def conditions
-      fieldset.map(&:field_name).reduce(ActiveSupport::HashWithIndifferentAccess.new()) do |res, attribute|
+      fieldset.reduce(ActiveSupport::HashWithIndifferentAccess.new()) do |res, field|
+        attribute = field.field_name
         value = send(attribute)
 
         unless value.blank?
+          if field.column_type == :boolean
+            value = true if Puffer::TRUE_VALUES.include?(value)
+            value = false if Puffer::FALSE_VALUES.include?(value)
+          end
+
           value = case value
           when 'puffer_nil' then nil
           when 'puffer_blank' then ''
           else value
           end
+          
           res[attribute] = value
         end
 
+
         res
       end
     end
@@ -118,6 +126,10 @@ module Puffer
       puffer_order.to_s.split(' ').map(&:to_sym)
     end
 
+    def per_page
+      puffer_per_page.to_i
+    end
+
     def query
       (fieldset.map(&:field_name) + special_attributes).reduce(ActiveSupport::HashWithIndifferentAccess.new()) do |res, attribute|
         value = send(attribute)

data/lib/puffer/orm_adapter/active_record.rb

@@ -13,7 +13,9 @@ module Puffer
         Reflection.new(
           :klass => reflection.klass,
           :macro => reflection.macro,
-          :through? => !!reflection.through_reflection
+          :through? => !!reflection.through_reflection,
+          :accessor => accessor_for(reflection),
+          :primary_key => :id
         ) if reflection
       end
 
@@ -24,7 +26,7 @@ module Puffer
 
         conditions_fields = fields.select {|f| f.column && conditions.keys.include?(f.field_name)}.to_fieldset
         search_fields = fields.select {|f| f.column && !conditions_fields.include?(f) && search_types.include?(f.column_type)}
-        all_fields = conditions_fields + search_fields        
+        all_fields = conditions_fields + search_fields
 
         scope = scope.includes(includes(all_fields)).includes(reflection_includes(fields)).where(searches(search_fields, options[:search])).order(order)
 
@@ -70,6 +72,17 @@ module Puffer
         field.options[:order] || query_column(field)
       end
 
+      def accessor_for reflection
+        case reflection.macro
+        when :belongs_to then
+          reflection.foreign_key
+        when :has_one then
+          "#{reflection.name}_id"
+        when :has_many, :has_and_belong_to_many then
+          "#{reflection.name.to_s.singularize}_ids"
+        end
+      end
+
     end
   end
 end

data/lib/puffer/orm_adapter/base.rb

@@ -6,6 +6,10 @@ module Puffer
         raise NotSupportedError
       end
 
+      def reflection name
+        raise NotSupportedError
+      end
+
       def filter scope, fields, options = {}
         raise NotSupportedError
       end

data/lib/puffer/orm_adapter/mongoid.rb

@@ -13,7 +13,9 @@ module Puffer
         Reflection.new(
           :klass => reflection.klass,
           :macro => reflection.macro,
-          :through? => false
+          :through? => false,
+          :accessor => accessor_for(reflection),
+          :primary_key => :_id
         ) if reflection
       end
 
@@ -25,7 +27,7 @@ module Puffer
         conditions_fields = fields.select {|f| f.column && conditions.keys.include?(f.field_name)}.to_fieldset
         search_fields = fields.select {|f| f.column && !conditions_fields.include?(f) && search_types.include?(f.column_type)}
         all_fields = conditions_fields + search_fields
-        
+
         scope = scope.any_of(searches(search_fields, options[:search])) if options[:search].present?
         scope = scope.order_by(order)
 
@@ -60,6 +62,17 @@ module Puffer
         field.options[:order] || field.name
       end
 
+      def accessor_for reflection
+        case reflection.macro
+        when :referenced_in, :belongs_to then
+          reflection.foreign_key
+        when :references_one, :has_one then
+          "#{reflection.name}_id"
+        when :references_many, :references_and_referenced_in_many, :has_many, :has_and_belong_to_many then
+          "#{reflection.name.to_s.singularize}_ids"
+        end
+      end
+
     end
   end
 end

data/lib/puffer/resource.rb

@@ -19,7 +19,7 @@ module Puffer
       params = ActiveSupport::HashWithIndifferentAccess.new.deep_merge params
 
       @resource_node = params[:puffer]
-      @scope = swallow_nil{@resource_node.scope} || params[:puffer_scope]
+      @scope = swallow_nil{@resource_node.scope} || controller_instance.puffer_namespace
       @params = params
       @controller_instance = controller_instance
     end

data/lib/puffer/version.rb

@@ -1,3 +1,3 @@
 module Puffer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/puffer.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Puffer::VERSION
   s.authors     = ["pyromaniac"]
   s.email       = ["kinwizard@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "http://github.com/puffer/puffer"
   s.summary     = %q{In Soviet Russia puffer admins you}
   s.description = %q{Admin interface builder}
 
@@ -19,23 +19,29 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
-  s.add_runtime_dependency(%q<rails>, ["~> 3.1.0"])
+  s.add_runtime_dependency(%q<rails>, ["~> 3.1"])
   s.add_runtime_dependency(%q<kaminari>, [">= 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<devise>, [">= 0"])
   s.add_development_dependency(%q<rspec-rails>, [">= 0"])
   s.add_development_dependency(%q<capybara>, [">= 0"])
   s.add_development_dependency(%q<database_cleaner>, [">= 0"])
   s.add_development_dependency(%q<ammeter>, [">= 0"])
   s.add_development_dependency(%q<timecop>, [">= 0"])
   s.add_development_dependency(%q<guard>, [">= 0"])
-  s.add_development_dependency(%q<libnotify>, [">= 0"])
   s.add_development_dependency(%q<guard-rspec>, [">= 0"])
+  s.add_development_dependency(%q<rb-inotify>, [">= 0"])
+  s.add_development_dependency(%q<libnotify>, [">= 0"])
   s.add_development_dependency(%q<forgery>, [">= 0"])
   s.add_development_dependency(%q<fabrication>, [">= 0"])
   s.add_development_dependency(%q<nested_set>, [">= 0"])
+
+  s.add_development_dependency(%q<devise>, [">= 0"])
+  s.add_development_dependency(%q<clearance>, [">= 0"])
+
+  s.add_development_dependency(%q<carrierwave>, [">= 0"])
+  s.add_development_dependency(%q<mini_magick>, [">= 0"])
 end

data/spec/controllers/sessions/base_shared.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+shared_examples "a session controller" do
+
+  controller do
+    def send_action method_name, *args
+      params[:puffer] = Puffer::Resource::Node.new(nil, :name => :anonymous, :controller => self.class, :singular => false)
+      send method_name, *args
+    end
+  end
+
+  describe "GET new" do
+    it "assigns @record" do
+      get :new
+      assigns(:record).should be_a_new controller.model
+    end
+
+    it "renders the new template" do
+      pending 'some strange rspec behavior'
+      get :new
+      response.should render_template
+    end
+  end
+
+  describe "POST create" do
+    it "with invalid data" do
+      post :create, param_key => {:email => user.email, :password => '111'}
+      response.should render_template 'new'
+    end
+
+    it "assigns @record with invalid data" do
+      post :create, param_key => {:email => user.email, :password => '111'}
+      assigns(:record).should be_a_new controller.model
+    end
+
+    it "with valid data" do
+      post :create, param_key => {:email => user.email, :password => '123456'}
+      response.should redirect_to '/admin'
+    end
+
+    it "with valid data and return_to" do
+      return_to = "/hello/world"
+
+      post :create, param_key => {:email => user.email, :password => '123456'}, :return_to => return_to
+      response.should redirect_to return_to
+    end
+
+    it "current_puffer_user shoul be set" do
+      post :create, param_key => {:email => user.email, :password => '123456'}
+      controller.current_puffer_user.should == user
+    end
+  end
+
+  describe "DELETE destroy" do
+    it "current_puffer_user shoul be nil" do
+      delete :destroy, :id => 42
+      controller.current_puffer_user.should be_nil
+    end
+
+    it "should redirect" do
+      delete :destroy, :id => 42
+      response.should redirect_to '/admin/session/new'
+    end
+  end
+
+end

data/spec/controllers/sessions/clearance_spec.rb

@@ -0,0 +1,21 @@
+require 'clearance/testing'
+require 'controllers/sessions/base_shared'
+
+describe Puffer::Sessions::Clearance do
+  controller do
+    include Clearance::Authentication
+
+    setup do
+      model_name :clearance_user
+    end
+
+    def current_puffer_user
+      current_user
+    end
+  end
+
+  it_behaves_like "a session controller" do
+    let(:user) {Fabricate :clearance_user}
+    let(:param_key) {:clearance_user}
+  end
+end

data/spec/controllers/sessions/simple_spec.rb

@@ -0,0 +1,14 @@
+require 'controllers/sessions/base_shared'
+
+describe Puffer::Sessions::Simple do
+  controller do
+    def current_puffer_user
+      model.to_adapter.get(session[:puffer_user_id])
+    end
+  end
+
+  it_behaves_like "a session controller" do
+    let(:user) {Fabricate :puffer_user}
+    let(:param_key) {:puffer_user}
+  end
+end

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

@@ -8,7 +8,7 @@ class Admin::NewsController < Puffer::Base
     field :title
     field :body
     field :renderable, :render => lambda { @record.title }
-    field :renderable2, :render => :render_title
+    #field :renderable2, :render => :render_title
   end
 
   form do

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

@@ -1,4 +1,4 @@
-class Admin::ProfilesController < Puffer::Base
+class Admin::ProfilesController < Puffer::GridBase
 
   setup do
     group :users
@@ -8,6 +8,7 @@ class Admin::ProfilesController < Puffer::Base
     field 'user.email'
     field :name
     field :surname
+    field :avatar
     field :birth_date, :format => :long
   end
 
@@ -18,6 +19,7 @@ class Admin::ProfilesController < Puffer::Base
     end
     field :name
     field :surname
+    field :avatar
     field :birth_date
     field :created_at
   end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,6 +1,11 @@
 class ApplicationController < ActionController::Base
+  include Clearance::Authentication
   protect_from_forgery
 
+  def current_puffer_user
+    nil
+  end
+
   def has_puffer_access? namespace
     true
   end

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

@@ -23,6 +23,22 @@ class Orms::MongoidOrmPrimalsController < Puffer::Base
   end
 
   form do
+    field :has_one_reference do
+      field :name
+    end
+
+    field :has_many_references do
+      field :name
+    end
+
+    field :embeds_one_reference do
+      field :name
+    end
+
+    field :embeds_many_references do
+      field :name
+    end
+    
     field :string_field
     field :symbol_field
     field :select_field, :select => (1..5).map {|i| "option #{i}"}

data/spec/dummy/app/helpers/news_helper.rb

@@ -3,5 +3,5 @@ module NewsHelper
   def render_title
     @record.title
   end
-  
+
 end

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

@@ -0,0 +1,3 @@
+class ClearanceUser < ActiveRecord::Base
+  include Clearance::User
+end

data/spec/dummy/app/models/mongoid_orm/embeds_many_reference.rb

@@ -0,0 +1,9 @@
+class MongoidOrm::EmbedsManyReference
+  include Mongoid::Document
+
+  field :name
+
+  embedded_in :primal, :class_name => 'MongoidOrm::Primal'
+
+  validates :name, :presence => true
+end

data/spec/dummy/app/models/mongoid_orm/embeds_one_reference.rb

@@ -0,0 +1,9 @@
+class MongoidOrm::EmbedsOneReference
+  include Mongoid::Document
+
+  field :name
+
+  embedded_in :primal, :class_name => 'MongoidOrm::Primal'
+
+  validates :name, :presence => true
+end

data/spec/dummy/app/models/mongoid_orm/has_many_reference.rb

@@ -0,0 +1,9 @@
+class MongoidOrm::HasManyReference
+  include Mongoid::Document
+
+  field :name
+
+  belongs_to :primal, :class_name => 'MongoidOrm::Primal'
+
+  validates :name, :presence => true
+end

data/spec/dummy/app/models/mongoid_orm/has_one_reference.rb

@@ -0,0 +1,9 @@
+class MongoidOrm::HasOneReference
+  include Mongoid::Document
+
+  field :name
+
+  belongs_to :primal, :class_name => 'MongoidOrm::Primal'
+
+  validates :name, :presence => true
+end