lolita 3.4.2 → 3.4.3

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

@@ -1,30 +1,30 @@
-module Lolita
-  module Version
-    MAJOR = 3
-    MINOR = 4
-    PATCH = 2
-    BUILD = nil
-
-    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
-
-    def self.to_s
-      STRING
-    end
-
-    def self.major
-      MAJOR
-    end
-
-    def self.minor
-      MINOR
-    end
-
-    def self.patch
-      PATCH
-    end
-
-    def self.build
-      BUILD
-    end
-  end
-end
+module Lolita
+  module Version
+    MAJOR = 3
+    MINOR = 4
+    PATCH = 3
+    BUILD = nil
+
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
+
+    def self.to_s
+      STRING
+    end
+
+    def self.major
+      MAJOR
+    end
+
+    def self.minor
+      MINOR
+    end
+
+    def self.patch
+      PATCH
+    end
+
+    def self.build
+      BUILD
+    end
+  end
+end

data/lib/tasks/tinymce-assets.rake

@@ -1,7 +1,7 @@
-Rake::Task['assets:precompile:primary'].enhance do
-  assets = File.expand_path(File.dirname(__FILE__) + "/../../vendor/assets/javascripts/tinymce")
-  target = File.join(Rails.public_path, Rails.application.config.assets.prefix)
-
-  mkdir_p target
-  cp_r assets, target
+Rake::Task['assets:precompile:primary'].enhance do
+  assets = File.expand_path(File.dirname(__FILE__) + "/../../vendor/assets/javascripts/tinymce")
+  target = File.join(Rails.public_path, Rails.application.config.assets.prefix)
+
+  mkdir_p target
+  cp_r assets, target
 end

data/lolita.gemspec

@@ -1,34 +1,34 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "lolita/version"
-
-Gem::Specification.new do |s|
-  s.name        = "lolita"
-  s.version     = Lolita::Version.to_s
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = ["ITHouse (Latvia) and Arturs Meisters"]
-  s.email       = "support@ithouse.lv"
-  s.homepage    = "http://github.com/ithouse/lolita"
-  s.summary     = %q{Great web resources management tool}
-  s.description = %q{Manage Rails, application backend with ease.}
-
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.licenses = ["MIT"]
-
-  s.add_runtime_dependency(%q<kaminari>, ["~> 0.13"])
-  s.add_runtime_dependency(%q<abstract>, ["~> 1"])
-  s.add_runtime_dependency(%q<haml>, ["< 5.0", "> 3.0"])
-  s.add_runtime_dependency(%q<activesupport>,["~> 3.2.0"])
-  s.add_runtime_dependency(%q<actionpack>,["~> 3.2.0"])
-  s.add_runtime_dependency(%q<jquery-rails>, [">= 2.1", "< 3.0"])
-  s.add_runtime_dependency(%q<tinymce-rails>, ["~> 3.5.8"])
-  s.add_runtime_dependency(%q<tinymce-rails-config-manager>,[">= 0.1"])
-
-  s.files = `git ls-files`.split($/)
-  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  s.test_files = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-end
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "lolita/version"
+
+Gem::Specification.new do |s|
+  s.name        = "lolita"
+  s.version     = Lolita::Version.to_s
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["ITHouse (Latvia) and Arturs Meisters"]
+  s.email       = "support@ithouse.lv"
+  s.homepage    = "http://github.com/ithouse/lolita"
+  s.summary     = %q{Great web resources management tool}
+  s.description = %q{Manage Rails, application backend with ease.}
+
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.md"
+  ]
+  s.licenses = ["MIT"]
+
+  s.add_runtime_dependency(%q<kaminari>, ["~> 0.13"])
+  s.add_runtime_dependency(%q<abstract>, ["~> 1"])
+  s.add_runtime_dependency(%q<haml>, ["< 5.0", "> 3.0"])
+  s.add_runtime_dependency(%q<activesupport>,["~> 3.2.0"])
+  s.add_runtime_dependency(%q<actionpack>,["~> 3.2.0"])
+  s.add_runtime_dependency(%q<jquery-rails>, [">= 2.1", "< 3.0"])
+  s.add_runtime_dependency(%q<tinymce-rails>, ["~> 3.5.8"])
+  s.add_runtime_dependency(%q<tinymce-rails-config-manager>,[">= 0.1"])
+
+  s.files = `git ls-files`.split($/)
+  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files = s.files.grep(%r{^(test|spec|features)/})
+  s.require_paths = ["lib"]
+end

data/spec/adapter/common_helper_spec.rb

@@ -1,96 +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 be_nil }
-      end
-    end
-
-    describe '#ability_criteria' do
-      context "without" do
-        its(:ability_criteria){ should be_nil }
-      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
+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 be_nil }
+      end
+    end
+
+    describe '#ability_criteria' do
+      context "without" do
+        its(:ability_criteria){ should be_nil }
+      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