lolita 3.2.0.rc.17 → 3.2.1

data/spec/configuration/base_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../simple_spec_helper')
+require 'simple_spec_helper'
 
 describe Lolita::Configuration::Base do 
   let(:klass){Lolita::Configuration::Base}

data/spec/configuration/column_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Lolita::Configuration::Column do
   let(:dbi){Lolita::DBI::Base.create(Post)}

data/spec/configuration/columns_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Lolita::Configuration::Columns do
 

data/spec/configuration/core_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../simple_spec_helper')
+require 'simple_spec_helper'
 
 describe Lolita::Configuration::Core do
   let(:klass){Lolita::Configuration::Core}

data/spec/configuration/field_set_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Lolita::Configuration::FieldSet do
   before(:each) do

data/spec/configuration/field_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Lolita::Configuration::Field do
   before(:each) do

data/spec/configuration/filter_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe Lolita::Configuration::Filter do
 
@@ -135,4 +135,33 @@ describe Lolita::Configuration::Filter do
       list_conf.paginate(1,request).should have(2).items
     end
   end
+
+  describe "#resource" do
+    let(:filter){ Lolita::Configuration::Filter.new(dbi, :name ) }
+    let(:params){ {} }
+    subject do
+      tags = %w(Android Linux Windows).map{|name| Fabricate(:tag, :name => name )}
+      filter.resource(params)
+    end
+
+    context "reflections" do
+      let(:params){ {:post => {"tag_ids"=>["", Tag.where(:name => 'Android').first.id]}} }
+      let(:filter){ Lolita::Configuration::Filter.new(dbi, :tag ) }
+      it "recognizes" do
+	subject.tags.should have(1).item
+      end
+    end
+
+    context "simple attributes" do
+      let(:params){ {:post => {"title" => "MyName" }} }
+      let(:filter){ Lolita::Configuration::Filter.new(dbi, :title ) }
+      it "recognizes" do
+	subject.title.should eq("MyName")
+      end
+    end
+
+    it "should be persisted" do
+      subject.should be_persisted
+    end
+  end
 end

data/spec/configuration/list_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../simple_spec_helper')
+require 'simple_spec_helper'
 
 class SearchEngine
   def run(*args)
@@ -17,53 +17,53 @@ describe Lolita::Configuration::List do
     }.not_to raise_error
   end
 
-  it "should raise error when no dbp is given" do 
+  it "should raise error when no dbp is given" do
     expect{
       klass.new nil
     }.to raise_error(Lolita::UnknownDBPError)
   end
 
-  describe "lolita accessors" do 
-    it "should have lolita acessor for pagination_method" do 
+  describe "lolita accessors" do
+    it "should have lolita acessor for pagination_method" do
       list.should respond_to(:pagination_method)
       list.should respond_to(:pagination_method=)
     end
 
-    it "should have per_page acessor" do 
+    it "should have per_page acessor" do
       list.should respond_to(:per_page)
       list.should respond_to(:per_page=)
     end
 
-    it "should have actions accessor" do 
+    it "should have actions accessor" do
       list.should respond_to(:actions)
       list.should respond_to(:actions=)
     end
   end
 
-  it "should accept block and eval it" do 
+  it "should accept block and eval it" do
     block = Proc.new{}
     klass.any_instance.should_receive(:instance_eval).with(&block)
     klass.new(dbp,&block)
   end
 
-  it "should accept options and assign them as attributes" do 
+  it "should accept options and assign them as attributes" do
     klass.any_instance.should_receive(:test_title=).with("test_title")
     klass.new(dbp,:test_title => "test_title")
   end
 
-  it "should set default attributes values" do 
+  it "should set default attributes values" do
     list.actions.should_not be_empty
     list.per_page.should eq(10)
   end
 
-  it "should populate actions with two default ones" do 
+  it "should populate actions with two default ones" do
     list.actions.should have(2).items
   end
 
-  it "should initialize attribute and eval block after default attributes is initialized" do 
+  it "should initialize attribute and eval block after default attributes is initialized" do
     actions_before = nil
     per_page_before = nil
-    klass.new(dbp) do 
+    klass.new(dbp) do
       actions_before = actions.dup
       per_page_before = per_page
     end
@@ -71,7 +71,7 @@ describe Lolita::Configuration::List do
     actions_before.should be_empty
   end
 
-  it "should allow to add action with name, options and block" do 
+  it "should allow to add action with name, options and block" do
     action = stub(:name => :name)
     Lolita::Configuration::Action.stub(:new).and_return(action)
     block = Proc.new{}
@@ -81,24 +81,24 @@ describe Lolita::Configuration::List do
 
   describe "#list" do
     let(:nested_dbp){double("nested_dbp")}
-    before(:each) do 
+    before(:each) do
       dbp_klass.stub(:create).and_return(nested_dbp)
     end
 
-    it "should return @list when no args and/or block received" do 
+    it "should return @list when no args and/or block received" do
       dummy_list = stub
       list.instance_variable_set(:@list, dummy_list)
       list.list.should eq(dummy_list)
     end
 
-    it "should check for association and raise error when none is found" do 
+    it "should check for association and raise error when none is found" do
       dbp.stub(:associations).and_return({})
       expect{
         list.list :dummy_name
       }.to raise_error(Lolita::UnknownDBPError)
     end
 
-    it "should create new dbp object for found assocition class" do 
+    it "should create new dbp object for found assocition class" do
       dummy_association = double("dummy_association")
       dummy_association.stub(:klass).and_return(Object)
       dummy_association.stub(:name).and_return("name")
@@ -112,41 +112,41 @@ describe Lolita::Configuration::List do
 
   end
 
-  describe "#search" do 
+  describe "#search" do
     let(:dummy_search){double("search")}
-    before(:each) do 
+    before(:each) do
       dummy_search.stub(:update).and_return(true)
     end
 
-    it "should add search when args and/or block is given" do 
+    it "should add search when args and/or block is given" do
       block = Proc.new{}
       Lolita::Configuration::Search.should_receive(:new).with(dbp,:some_thing, &block).and_return(dummy_search)
       list.search :some_thing, &block
     end
 
-    it "should return @search when nothing is received" do 
+    it "should return @search when nothing is received" do
       Lolita::Configuration::Search.stub(:new).and_return(dummy_search)
       list.search :some_args
       list.search.should eq(dummy_search)
     end
   end
 
-  describe "#paginate" do 
-    it "should call dbp#paginate with arguments and #pagination_method" do 
+  describe "#paginate" do
+    it "should call dbp#paginate with arguments and #pagination_method" do
       request = double("request")
       list.pagination_method = :my_dummy_method
       dbp.should_receive(:paginate).with(1,list.per_page, :request => request, :pagination_method => :my_dummy_method).and_return([])
       list.paginate(1, request)
     end
 
-    it "should return pagination results" do 
+    it "should return pagination results" do
       page = double("page")
       dbp.should_receive(:paginate).and_return(page)
       list.paginate(1)
     end
 
     it "should notify observers with method name, self and request" do
-      request = double("request") 
+      request = double("request")
       dbp.stub(:paginate).and_return(nil)
       list.should_receive(:changed)
       list.should_receive(:notify_observers).with(:paginate,list,request)
@@ -154,14 +154,14 @@ describe Lolita::Configuration::List do
     end
   end
 
-  describe "#columns=" do 
-    it "should raise error when something else then Enumerable or Lolita::Configuration::Columns is givne" do 
+  describe "#columns=" do
+    it "should raise error when something else then Enumerable or Lolita::Configuration::Columns is givne" do
       expect{
         list.columns = Object.new
       }.to raise_error(ArgumentError,"Accepts only Enumerable or Lolita::Configuration::Columns.")
     end
 
-    it "should assign received values to @columns directly when they are kind of Lolita::Configuration::Columns" do 
+    it "should assign received values to @columns directly when they are kind of Lolita::Configuration::Columns" do
       columns = double("columns")
       columns.should_receive(:parent=).with(list)
       columns.stub(:is_a?).with(Lolita::Configuration::Columns).and_return(true)
@@ -169,14 +169,14 @@ describe Lolita::Configuration::List do
       list.columns.should eq(columns)
     end
 
-    it "should iterate through all possible columns and create column with each value" do 
+    it "should iterate through all possible columns and create column with each value" do
       list.should_receive(:column).exactly(3).times.and_return(stub())
       list.columns= [1,2,3]
     end
   end
 
-  describe "#columns" do 
-    it "should create columns with and/or args, block" do 
+  describe "#columns" do
+    it "should create columns with and/or args, block" do
       block = Proc.new{}
       columns = double("columns")
       columns.should_receive(:parent=).with(list)
@@ -185,14 +185,14 @@ describe Lolita::Configuration::List do
       list.columns(1,2,3,&block)
     end
 
-    it "should return columns when no arguments are given" do 
+    it "should return columns when no arguments are given" do
       columns = double("columns")
       list.instance_variable_set(:@columns,columns)
       list.columns.should eq(columns)
     end
   end
 
-  it "should create column with args and block" do 
+  it "should create column with args and block" do
     block = Proc.new{}
     columns = stub("columns")
     list.stub(:columns).and_return(columns)
@@ -200,7 +200,7 @@ describe Lolita::Configuration::List do
     list.column(1,2,3,&block)
   end
 
-  it "should determine if there is filter defined for list by checking class" do 
+  it "should determine if there is filter defined for list by checking class" do
     list.filter?.should_not be_true
     filter = double("filter")
     filter.stub(:is_a?).with(Lolita::Configuration::Filter).and_return(true)
@@ -208,41 +208,41 @@ describe Lolita::Configuration::List do
     list.filter?.should be_true
   end
 
-  describe "#filter" do 
+  describe "#filter" do
     let(:filter){double("filter")}
-    it "should create filter with arguments and/or block" do 
+    it "should create filter with arguments and/or block" do
       block = Proc.new{}
       list.stub(:add_observer).and_return(true)
       Lolita::Configuration::Filter.should_receive(:new).with(dbp,1,2,3,&block)
       list.filter(1,2,3,&block)
     end
 
-    it "should return @filter when no arguments is given" do 
+    it "should return @filter when no arguments is given" do
       list.stub(:add_observer).and_return(true)
       Lolita::Configuration::Filter.should_receive(:new).and_return(filter)
       list.filter(1,2,3)
       list.filter.should eq(filter)
     end
 
-    it "should add observer to filter" do 
+    it "should add observer to filter" do
       Lolita::Configuration::Filter.stub(:new).and_return(filter)
       list.should_receive(:add_observer).with(filter)
       list.filter 1,2
     end
   end
 
-  describe "#by_path" do 
-    it "should return self when path is empty" do 
+  describe "#by_path" do
+    it "should return self when path is empty" do
       list.by_path([]).should eq(list)
     end
 
-    it "should return object list when path starts with l" do 
+    it "should return object list when path starts with l" do
       nested_list = double("nested_list")
       list.stub(:list).and_return(nested_list)
       list.by_path(["l_some_list"]).should eq(nested_list)
     end
 
-    it "should return column with [column_name] list when c_column_name in path" do 
+    it "should return column with [column_name] list when c_column_name in path" do
       columns = double("columns")
       column = double("column_with_name")
       nested_list = double("nested_list")
@@ -252,7 +252,7 @@ describe Lolita::Configuration::List do
       list.by_path(["c_column_name"]).should eq(nested_list)
     end
 
-    it "should go through all path array until last object found" do 
+    it "should go through all path array until last object found" do
       path = ["l_some_list","c_column_name","l_other_list"]
       nested_list_1 = double("nested_list_1")
       nested_list_2 = double("nested_list_2")
@@ -270,105 +270,4 @@ describe Lolita::Configuration::List do
     end
   end
 
-
-  
-
-
-
-  # before(:each) do
-  #   @dbi=Lolita::DBI::Base.create(Post)
-  # end
-  
-  # after(:each) do
-  #   @recs||=[]
-  #   @recs.each{|r| r.destroy}
-  # end
-
-  # let(:list_class){Lolita::Configuration::List}
-
-  # it "should create new list with block" do
-  #   Lolita::Configuration::List.new(@dbi) do
-
-  #   end
-  # end
-
-  # it "should create new list without block" do
-  #   Lolita::Configuration::List.new(@dbi)
-  # end
-
-  # it "should generate columns if none is given" do
-  #   list=Lolita::Configuration::List.new(@dbi)
-  #   list.columns.should have(@dbi.fields.reject{|f| f.technical?}.size).items
-  #   list=Lolita::Configuration::List.new(@dbi){}
-  #   list.columns.should have(@dbi.fields.reject{|f| f.technical?}.size).items
-  # end
-
-  # it "should not generate columns if one or more is given" do
-  #   list=list_class.new(@dbi,:columns=>[{:name=>"C1"}])
-  #   list.columns.should have(1).item
-  #   list=list_class.new(@dbi) do
-  #     column :name=>"Col1"
-  #     column :name=>"col3"
-  #     column do
-  #       name "col2"
-  #       title "Column two"
-  #     end
-  #   end
-  #   list.columns.should have(3).items
-  # end
-
-  # it "should get records for list page" do
-  #   1.upto(5) { Fabricate(:post)}
-  #   list=list_class.new(@dbi,:per_page => 1)
-  #   list.paginate(1,Object.new).to_a.size.should == 1
-  # end
-
-  # it "should define columns when Symbols are given as args" do 
-  #   list = list_class.new(@dbi) do
-  #     columns :col1,:col2,:col3
-  #   end
-  #   list.columns.should have(3).items
-  # end
-
-  # describe "search" do
-  #   let(:list){ list_class.new(@dbi,:per_page => 10) }
-
-  #   it "should define default search by passing true" do
-  #     list.search true
-  #     list.search.class.to_s.should match(/Lolita::Configuration::Search/)
-  #   end
-
-  #   it "should define search with block" do
-  #     list.search do 
-  #       with SearchEngine.new
-  #     end
-  #     list.search.class.to_s.should match(/Lolita::Configuration::Search/)
-  #   end
-  # end
-
-  # describe "sublist" do
-
-  #   it "should allow to define sublist with association name" do
-  #     list_class.new(@dbi) do
-  #       list(:comments){}
-  #     end
-  #   end
-
-  #   it "should raise error when no DBI is given or found through association" do
-  #     expect{
-  #       list_class.new(@dbi) do
-  #         list{}
-  #       end
-  #     }.to raise_error(Lolita::UnknownDBPError)
-
-  #     expect{
-  #       list_class.new(@dbi) do
-  #         list(:title)
-  #       end
-  #     }.to raise_error(Lolita::UnknownDBPError)
-  #   end
-
-  #end
-
-end
-
+end