lolita 3.2.0.rc.17 → 3.2.1

data/lib/lolita/support/formatter/rails.rb

@@ -1,57 +1,57 @@
-module Lolita
-  module Support
-    class Formatter
-
-      # Formater for work with rails, it localize Date and Time.
-      # Also
-      class Rails < Lolita::Support::Formatter
-
-
-        private
-
-        def use_format_for(value,*optional_values)
-          if @format && (value.is_a?(Time) || value.is_a?(Date))
-            localize_time_with_format(value,*optional_values)
-          else
-            use_default_format(value,*optional_values)
-          end
-        end
-
-        def localize_time_with_format(value,*optional_values)
-          if defined?(::I18n)
-            ::I18n.localize(value, :format => @format)
-          else
-            use_default_format(value,*optional_values)
-          end
-        end
-
-        def use_default_format(value,*optional_values)
-          if value
-            if value.is_a?(String)
-              @format ? (@format % value) : value
-            elsif value.is_a?(Numeric)
-              @format ? (@format % value) : value
-            elsif value.is_a?(Date)
-              if defined?(::I18n)
-                ::I18n.localize(value, :format => :long)
-              else
-                value.strftime("%Y/%m%/%d")
-              end
-            elsif value.is_a?(Time)
-              if defined?(::I18n)
-                ::I18n.localize(value, :format => :long)
-              else
-                value.strftime("%Y/%m/%d %H:%M:%S")
-              end
-            else
-              value.to_s
-            end
-          else
-            ""
-          end
-        end
-      end
-
-    end
-  end
+module Lolita
+  module Support
+    class Formatter
+
+      # Formater for work with rails, it localize Date and Time.
+      # Also
+      class Rails < Lolita::Support::Formatter
+
+
+        private
+
+        def use_format_for(value,*optional_values)
+          if @format && (value.is_a?(Time) || value.is_a?(Date))
+            localize_time_with_format(value,*optional_values)
+          else
+            use_default_format(value,*optional_values)
+          end
+        end
+
+        def localize_time_with_format(value,*optional_values)
+          if defined?(::I18n)
+            ::I18n.localize(value, :format => @format)
+          else
+            use_default_format(value,*optional_values)
+          end
+        end
+
+        def use_default_format(value,*optional_values)
+          if value
+            if value.is_a?(String)
+              @format ? (@format % value) : value
+            elsif value.is_a?(Numeric)
+              @format ? (@format % value) : value
+            elsif value.is_a?(Date)
+              if defined?(::I18n)
+                ::I18n.localize(value, :format => :long)
+              else
+                value.strftime("%Y/%m%/%d")
+              end
+            elsif value.is_a?(Time)
+              if defined?(::I18n)
+                ::I18n.localize(value, :format => :long)
+              else
+                value.strftime("%Y/%m/%d %H:%M:%S")
+              end
+            else
+              value.to_s
+            end
+          else
+            ""
+          end
+        end
+      end
+
+    end
+  end
 end

data/lib/lolita/test/matchers.rb

@@ -1,77 +1,77 @@
-module Lolita
-  module Test
-    # Matchers that make easier to test Lolita and Lolita addons
-    module Matchers
-
-      class BeRoutable
-      
-        def matches?(actual)
-          @actual=actual
-          collect_routes
-          set_method_and_url
-          result=@routes.detect{|route| 
-            method_match(route) && @url.to_s.match(route[:path_info])
-          }
-          !!result
-        end
-
-        def failure_message
-          "expected #{@url.inspect}#{@method ? " with method #{@method.inspect}" : ""} to be routable"
-        end
-        def negative_failure_message
-          "expected #{@url.inspect}#{@method ? " with method #{@method.inspect}" : ""}  to not be routable"
-        end
-
-        private
-
-        def method_match(route)
-          if route[:request_method]
-            if @method
-              @method.to_s.upcase.match(route[:request_method])
-            else
-              false
-            end
-          else
-            true
-          end
-        end
-
-        def set_method_and_url
-          if @actual.is_a?(Hash)
-            @method,@url=@actual.keys.first,@actual.values.first
-          elsif @actual.is_a?(Array)
-            if @actual.size>=2
-              @method,@url=@actual[0],@actual[1]
-            elsif
-              @url=@actual.first
-            end
-          else
-            @url=@actual.to_s
-          end
-        end
-
-        def collect_routes
-          @routes=[]
-          all_applications.each do |application|
-            @routes+=application.routes.routes.map(&:conditions)
-          end
-        end
-
-        def all_applications
-          if defined?(Rails) && defined?(Rails::Application)
-            ObjectSpace.each_object(Rails::Application).select { |klass|
-             klass.class < Rails::Application 
-            }.map(&:class)
-          else
-            []
-          end
-        end
-      end
-
-       def be_routable
-        BeRoutable.new
-      end
-    end
-  end
-end
-
+module Lolita
+  module Test
+    # Matchers that make easier to test Lolita and Lolita addons
+    module Matchers
+
+      class BeRoutable
+      
+        def matches?(actual)
+          @actual=actual
+          collect_routes
+          set_method_and_url
+          result=@routes.detect{|route| 
+            method_match(route) && @url.to_s.match(route[:path_info])
+          }
+          !!result
+        end
+
+        def failure_message
+          "expected #{@url.inspect}#{@method ? " with method #{@method.inspect}" : ""} to be routable"
+        end
+        def negative_failure_message
+          "expected #{@url.inspect}#{@method ? " with method #{@method.inspect}" : ""}  to not be routable"
+        end
+
+        private
+
+        def method_match(route)
+          if route[:request_method]
+            if @method
+              @method.to_s.upcase.match(route[:request_method])
+            else
+              false
+            end
+          else
+            true
+          end
+        end
+
+        def set_method_and_url
+          if @actual.is_a?(Hash)
+            @method,@url=@actual.keys.first,@actual.values.first
+          elsif @actual.is_a?(Array)
+            if @actual.size>=2
+              @method,@url=@actual[0],@actual[1]
+            elsif
+              @url=@actual.first
+            end
+          else
+            @url=@actual.to_s
+          end
+        end
+
+        def collect_routes
+          @routes=[]
+          all_applications.each do |application|
+            @routes+=application.routes.routes.map(&:conditions)
+          end
+        end
+
+        def all_applications
+          if defined?(Rails) && defined?(Rails::Application)
+            ObjectSpace.each_object(Rails::Application).select { |klass|
+             klass.class < Rails::Application 
+            }.map(&:class)
+          else
+            []
+          end
+        end
+      end
+
+       def be_routable
+        BeRoutable.new
+      end
+    end
+  end
+end
+

data/lib/lolita/version.rb

@@ -2,8 +2,8 @@ module Lolita
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 0
-    BUILD = 'rc.17'
+    PATCH = 1
+    BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
 

data/spec/adapter/common_helper_spec.rb

@@ -0,0 +1,96 @@
+require 'simple_spec_helper'
+
+describe Lolita::Adapter::CommonHelper do
+  describe Lolita::Adapter::CommonHelper::Record do
+    let(:orm_record){ double('orm_record') }
+    let(:adapter){ double('adapter', fields: []) }
+    subject(:record){ Lolita::Adapter::CommonHelper::Record.new adapter, orm_record }
+
+    describe '#title' do
+      context "record has title" do
+        let(:orm_record){ double('orm_record', title: 'some title') }
+        its(:title){ should eq('some title') }
+      end
+
+      context "record has name" do
+        let(:orm_record){ double('orm_record', name: 'some name') }
+        its(:title){ should eq('some name') }
+      end
+
+      context "record has content field" do
+        let(:adapter){ double('adapter', fields: [double(type: 'int', name: 'id'), double(type: 'string', name: 'first_name')]) }
+        let(:orm_record){ double('orm_record', first_name: 'Max') }
+        its(:title){ should eq('Max') }
+      end
+
+      context "else, return klass name with id" do
+        let(:orm_record){ double('orm_record', id: 9, class: double(lolita_model_name: double(human: 'Foo'))) }
+        its(:title){ should eq('Foo 9') }
+      end
+    end
+  end
+
+  describe Lolita::Adapter::CommonHelper::PaginationBuilder do
+    let(:unscoped){ double('unscoped') }
+    let(:klass){ double('klass', unscoped: unscoped) }
+    let(:adapter){ double('adapter', klass: klass) }
+    let(:page){ 1 }
+    let(:per){ 5 }
+    let(:request){ double('request', headers: {}) }
+    let(:options){ {request: request} }
+
+    subject(:builder){ Lolita::Adapter::CommonHelper::PaginationBuilder.new(adapter, page, per, options) }
+    describe '#params' do
+      context "with params" do
+        let(:request){ double('request', params: {a: 1}) }
+        its(:params){ should eq({a: 1})}
+      end
+
+      context "without params" do
+        its(:params){ should eq({})}
+      end
+    end
+
+    describe '#request' do
+      its(:request){ should eq(request) }
+    end
+
+    describe '#nested_criteria' do
+      context "with nested params" do
+        let(:request){ double('request', params: {nested: {category_id: 3}})}
+        it "filters by nested data" do
+          klass.should_receive(:where).with({category_id: 3})
+          subject.nested_criteria
+        end
+      end
+      context "without nested params" do
+        its(:nested_criteria){ should eq(unscoped) }
+      end
+    end
+
+    describe '#ability_criteria' do
+      context "without" do
+        its(:ability_criteria){ should eq(unscoped) }
+      end
+
+      context "with abilities" do
+        let(:klass){ double('klass', accessible_by: double)}
+        it "return accessible_by scope" do
+          klass.should_receive(:accessible_by)
+          subject.ability_criteria
+       end
+      end
+    end
+
+    describe '#sorting' do
+      context "with sort params" do
+        let(:request){ double('request', params: {s: 'name|surname,asc'}) }
+        its(:sorting){ should eq('name,surname asc')}
+      end
+
+      context "without params" do
+        its(:sorting){ should be_nil }
+      end
+    end
+  end
+end

data/spec/adapter_helper.rb

@@ -7,7 +7,6 @@ if ADAPTER=='mongoid'
     config.slaves = [
       Mongo::Connection.new(host, 27017, :slave_ok => true).db(name)
     ]
-    #config.use_object_ids = true
     config.persist_in_safe_mode = false
   end
 else
@@ -24,7 +23,7 @@ else
       t.string :name
     end
   end
-  
+
   class Comment < ActiveRecord::Base
     belongs_to :test_class1, :class_name=>"Post"
   end
@@ -32,13 +31,13 @@ else
   class Post < ActiveRecord::Base
     has_many :pages
     include Lolita::Configuration
-    lolita 
+    lolita
   end
 
   class Profile < ActiveRecord::Base
     include Lolita::Configuration
     lolita do
-      
+
     end
   end
 end

data/spec/builder_spec.rb

@@ -1,121 +1,121 @@
-require File.expand_path(File.dirname(__FILE__) + '/simple_spec_helper')
-
-class SimpleObject 
-  include Lolita::Builder
-end
-
-describe Lolita::Builder::Custom do
-  let(:object){SimpleObject.new}
-  let(:builder){Lolita::Builder::Custom.new(object,{})}
-  let(:klass){Lolita::Builder::Custom}
-
-  it "should create new Custom builder" do
-    builder = Lolita::Builder::Custom.new(object,{})
-  end
-
-  it "should set name and state" do
-    builder = Lolita::Builder::Custom.new(object,{:name => "name", :state=>"state"})
-    builder.instance_variable_get(:"@name").should == "name"
-    builder.instance_variable_get(:"@state").should == "state"
-  end
-
-  it "should set default attributes" do
-    builder = Lolita::Builder::Custom.new(object,{:name => "name"})
-    builder.instance_variable_get(:"@state").should == :display
-  end
-
-  describe "build attributes" do
-    it "should set through #with" do
-      builder.with("name","state").build_attributes.should == {:name => "name", :state => "state"}
-      builder.with({:name=>"name",:state=>"state"}).build_attributes.should == {:name => "name", :state=>"state"}
-      builder.with("name",:state=>"state").build_attributes.should == {:name=>"name",:state=>"state"}
-    end
-  end
-
-  it "should return default state when no build attributes given" do
-    builder.state.should == :display
-  end
-
-  it "should return build attributes state when given" do
-    builder.with(:state=>"state").state.should == :"state"
-  end
-
-  it "should return default name when no build name given" do
-    builder.name.should == :"/simple_object"
-  end
-
-  it "should return build name when given" do
-    builder.with(:name => "name").name.should == :"/simple_object/name"
-    builder.with(:name => "/name").name.should == :"/name"
-  end
-
-  describe "#build" do
-    it "should return array with name,state and options" do
-      builder.build.should == [:"/simple_object",:"display",{}]
-      builder.with({:display_value => 1}).build.should == [:"/simple_object",:display,{:display_value=>1}]
-    end
-  end
-
-  describe "conditions" do
-    it "should use given over default when there's no conditions" do
-      builder = klass.new(object,:name => "/custom", :state => "special")
-      builder.build.should == [:"/custom",:"special",{}]
-    end
-
-    it "should use given over default when conditions met" do
-      builder = klass.new(object, :name => "/custom", :state=>"special", :unless=>{:state=>"display"})
-      builder.build.should == [:"/simple_object",:"display",{}]
-      builder.class_eval do
-        def default_state
-          :other
-        end
-      end
-      builder.build.should == [:"/custom",:special,{}]
-    end
-
-    it "should use given over build given when conditions met" do
-      builder = klass.new(object,:name => "/custom", :"state" => "special", :if=>{:state=>"default"})
-      builder.with(:state => "other").build.should == [:"/simple_object",:other,{}]
-      builder.with(:state => :default).build.should == [:"/custom",:special,{}]
-    end
-  end
-end
-
-describe Lolita::Builder do
-
-  let(:object){SimpleObject.new}
-
-  describe "#build" do
-
-    describe "default path" do
-
-      it "should be /:class_name/display" do
-        info=object.build
-        info.first.should == :"/simple_object"
-        info[1].should == :display
-      end
-
-      it "should use given name when it starts with /" do
-        object.builder = {:name =>"/custom"}
-        info = object.build
-        info.first.should == :"/custom"
-        info[1].should == :display
-      end
-
-      it "should make name /:class_name/:custom_name when it doesn't start with /" do
-        object.builder = {:name => "custom"}
-        info = object.build
-        info.first.should == :"/simple_object/custom"
-        info[1].should == :display
-      end
-    
-    end
-
-    it "should use received name" do
-      object.builder = {:name=>"/custom"}
-      info = object.build("/other_custom")
-      info.first.should == :"/other_custom"
-    end
-
-  end
+require File.expand_path(File.dirname(__FILE__) + '/simple_spec_helper')
+
+class SimpleObject 
+  include Lolita::Builder
+end
+
+describe Lolita::Builder::Custom do
+  let(:object){SimpleObject.new}
+  let(:builder){Lolita::Builder::Custom.new(object,{})}
+  let(:klass){Lolita::Builder::Custom}
+
+  it "should create new Custom builder" do
+    builder = Lolita::Builder::Custom.new(object,{})
+  end
+
+  it "should set name and state" do
+    builder = Lolita::Builder::Custom.new(object,{:name => "name", :state=>"state"})
+    builder.instance_variable_get(:"@name").should == "name"
+    builder.instance_variable_get(:"@state").should == "state"
+  end
+
+  it "should set default attributes" do
+    builder = Lolita::Builder::Custom.new(object,{:name => "name"})
+    builder.instance_variable_get(:"@state").should == :display
+  end
+
+  describe "build attributes" do
+    it "should set through #with" do
+      builder.with("name","state").build_attributes.should == {:name => "name", :state => "state"}
+      builder.with({:name=>"name",:state=>"state"}).build_attributes.should == {:name => "name", :state=>"state"}
+      builder.with("name",:state=>"state").build_attributes.should == {:name=>"name",:state=>"state"}
+    end
+  end
+
+  it "should return default state when no build attributes given" do
+    builder.state.should == :display
+  end
+
+  it "should return build attributes state when given" do
+    builder.with(:state=>"state").state.should == :"state"
+  end
+
+  it "should return default name when no build name given" do
+    builder.name.should == :"/simple_object"
+  end
+
+  it "should return build name when given" do
+    builder.with(:name => "name").name.should == :"/simple_object/name"
+    builder.with(:name => "/name").name.should == :"/name"
+  end
+
+  describe "#build" do
+    it "should return array with name,state and options" do
+      builder.build.should == [:"/simple_object",:"display",{}]
+      builder.with({:display_value => 1}).build.should == [:"/simple_object",:display,{:display_value=>1}]
+    end
+  end
+
+  describe "conditions" do
+    it "should use given over default when there's no conditions" do
+      builder = klass.new(object,:name => "/custom", :state => "special")
+      builder.build.should == [:"/custom",:"special",{}]
+    end
+
+    it "should use given over default when conditions met" do
+      builder = klass.new(object, :name => "/custom", :state=>"special", :unless=>{:state=>"display"})
+      builder.build.should == [:"/simple_object",:"display",{}]
+      builder.class_eval do
+        def default_state
+          :other
+        end
+      end
+      builder.build.should == [:"/custom",:special,{}]
+    end
+
+    it "should use given over build given when conditions met" do
+      builder = klass.new(object,:name => "/custom", :"state" => "special", :if=>{:state=>"default"})
+      builder.with(:state => "other").build.should == [:"/simple_object",:other,{}]
+      builder.with(:state => :default).build.should == [:"/custom",:special,{}]
+    end
+  end
+end
+
+describe Lolita::Builder do
+
+  let(:object){SimpleObject.new}
+
+  describe "#build" do
+
+    describe "default path" do
+
+      it "should be /:class_name/display" do
+        info=object.build
+        info.first.should == :"/simple_object"
+        info[1].should == :display
+      end
+
+      it "should use given name when it starts with /" do
+        object.builder = {:name =>"/custom"}
+        info = object.build
+        info.first.should == :"/custom"
+        info[1].should == :display
+      end
+
+      it "should make name /:class_name/:custom_name when it doesn't start with /" do
+        object.builder = {:name => "custom"}
+        info = object.build
+        info.first.should == :"/simple_object/custom"
+        info[1].should == :display
+      end
+    
+    end
+
+    it "should use received name" do
+      object.builder = {:name=>"/custom"}
+      info = object.build("/other_custom")
+      info.first.should == :"/other_custom"
+    end
+
+  end
 end