lolita 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d0bf149b77902829b5affa625a55dc0292a4889
-  data.tar.gz: 1b6dfaa21383b9c7325d7bdc43a855b9b7a8b1a8
+  metadata.gz: 2eb473bc7ecc5d3f8479d25b0afeb9d57a0fd5fa
+  data.tar.gz: a536d5c8f2d53b6e0e11ebd2a2efa74f858e2314
 SHA512:
-  metadata.gz: f37023830f2c2eac49bcc1a9797b24a7842b9859d78fd9c9e04f9c77daf8584f123ce326541e482d9bdba5122c80f067311d42ff7499c4284e737f06ffb4bf87
-  data.tar.gz: 71634b76ed81447172cab01f052bb0523bbb6cc717ee2af1e3ec5962ed58d20e6b0951a78eccb6b7fa2f55de4435fd701fd7a3b481a2905904ad4f81d5508a0c
+  metadata.gz: bee0d825101882719f5ffc50bbf513bf88599d417545b4bb77a09388f986be9a5c7f6ff0975b6c645be2e14a0b7197e2b16b8972bc597f3bcfad1ede04561d3b
+  data.tar.gz: 0543bfadce138033eb0cd3d4de38173f5f17219867178f037b2bb9f14ef61f7fd60c2fe1717749f8934ed5ed41bb42beae5b35c526bfe91095229bfc6029fb53

data/README.md

@@ -1,20 +1,19 @@
 #Lolita
 
 Great Rails CMS, that turns your business logic into good-looking, fully functional workspace.
-Works with Rails 3.2
+Works with Rails 3.2, 4.0, 4.1
 
 [![Build Status](https://travis-ci.org/ithouse/lolita.png)](https://travis-ci.org/ithouse/lolita) [![Code Climate](https://codeclimate.com/github/ithouse/lolita.png)](https://codeclimate.com/github/ithouse/lolita)
 
-##Demo
-See the demo page at [Demo](http://lolita-demo.ithouse.lv/lolita)
-email: lolita@ithouse.lv
-password: lolita
+## How it looks
 
-##Installation
+![Lolita new document](http://i.imgur.com/coRVhJH.png)
+
+## Installation
 
 First add Lolita gem to your Gemfile
 
-    gem 'lolita', '~> 3.4.0'
+    gem 'lolita', '~> 4.0.1'
 
 Then go to your rails project and
 
@@ -30,7 +29,7 @@ gem "lolita-file-upload"
 ```
 
 It will also call *lolita_file_upload:install*.
-##Usage
+## Usage
 
 To make your model use Lolita do like this
 
@@ -52,7 +51,7 @@ or open `/lolita` and it will redirect to first available resource list view.
 
 For more detailed usage read [Usage](https://github.com/ithouse/lolita/wiki/Usage) at wiki.
 
-###Add authorization to Lolita
+### Add authorization to Lolita
 
 Easiest way to add authentication is with Devise. First install Devise as gem, than add it to your project.
 Make Devise model, lets say, *User*. After that add these lines in */config/initializers/lolita.rb*
@@ -73,10 +72,10 @@ config.authentication = :authenticate_admin
 And than put this method for common use in *ApplicationController* or in some other place that is accessable
 to all controllers.
 
-###Using hooks
+### Using hooks
 
 Lolita define hooks for RestController and for components.
-####RestController hooks
+#### RestController hooks
 
 There are two kind of hooks for all actions - *before_[action name]* and *after_[action name]*.
 Define callbacks for those hooks outside of controller. This will call User#log_action each time when #destroy
@@ -103,7 +102,7 @@ class PostController < Lolita::RestController
 end
 ```
 
-####Component hooks
+#### Component hooks
 
 Components have three hooks - *before*, *after* and *around*.
 Component hooks are different from controller hooks with names. Each component has it's own name, that is used to
@@ -136,12 +135,12 @@ Lolita::Hooks.component(:"/lolita/configuration/list/display").around do
 end
 ```
 
-##Tests
+## Tests
 To run all specs run rake, it will run all specs for all supported ORM's.
 
     $ rake
     
 
-##License
+## License
 
 Lolita is under MIT license. See [LICENSE.txt](https://github.com/ithouse/lolita/blob/master/LICENSE.txt)

data/lib/lolita/rails/routes.rb

@@ -34,8 +34,6 @@ module ActionDispatch::Routing
     #     lolita_for :galleries
     #     # lolita_for try to call :lolita_gallery in Mapper class
     def lolita_for *resources
-
-      return if migrating? || generating?
       options = resources.extract_options!
 
       options[:as]          ||= @scope[:as]     if @scope[:as].present?
@@ -85,6 +83,10 @@ module ActionDispatch::Routing
       Lolita.common_routes(all_resource_classes).each do |route_name|
         send(:"lolita_#{route_name}_route")
       end
+      # rescues sql exception when migration for new model is executed
+    rescue ActiveRecord::StatementInvalid
+      Rails.logger.debug "Executing lolita_for got an error: #{$!}"
+      nil
     end
 
     protected
@@ -110,22 +112,6 @@ module ActionDispatch::Routing
 
     private
 
-    def migrating?
-      if Lolita.application.skip_routes.respond_to?(:call)
-        Lolita.application.skip_routes.call
-      else
-        File.basename($0).match(/^rake/) && (ARGV.detect{|arg| arg.to_s.match(/db|apartment/)})
-      end
-    end
-
-    def generating?
-      if Lolita.application.skip_routes.respond_to?(:call)
-        Lolita.application.skip_routes.call
-      else
-        Lolita.application.skip_routes || File.basename($0).match(/^rails/) && generator_detected?
-      end
-    end
-
     def generator_detected?
       defined?(Rails::Generators)
     end

data/lib/lolita/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - ITHouse (Latvia) and Arturs Meisters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari