brainsome_typus 4.0.0.beta3 → 4.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a349d8ac4f8a8bb510f5ce48d59e5fa3524b066
-  data.tar.gz: bdcf33001a2d2feabef14837307f0f5b464556ef
+  metadata.gz: 37404f04cfdf44383447781df7bd908d88d625c6
+  data.tar.gz: a23deeae8569236e7b32bc45d05b13c1c2e41f61
 SHA512:
-  metadata.gz: be931b4e79886344cf33a88804910c9784c0e39a89e6c6223a549986d8d64d6d5f0ae732122977d18e36be2de3e631e651a6b4197a14a787fd63cd60c8a8b474
-  data.tar.gz: be8304350674ad2934deda1377d8e7beda5c43f7aa0219fb106bd9e48efce23a9db3e9c1580ff3cf3b9d2933f325ca2ae8369e9d23fa298519e5234055fb2146
+  metadata.gz: 69a8aac32aa2feb9102e26b83870600627fd82170c8a3b0c13fc33f8ebe30c6c1216ed1dc6ef8395fd589f868683edc5f9c5a67aac5be5f88666236228030cdc
+  data.tar.gz: c1566221377fa01376ec3a4f2cc50a3da3420e600b43e5cf512e04039f81fd53a079e8b96d039c0b8161d1cc2a259c8f561673e2d3bd88dd9669b07c512e7232

data/lib/typus/engine.rb

@@ -13,5 +13,55 @@ module Admin
       Rails.application.config.assets.precompile << %r{^img/.+}
       Rails.application.config.assets.precompile += %w( glyphicons-halflings.png glyphicons-halflings-white.png)
     end
+
+    # Moved from config/routes.rb to this initializer. This was done to prevent
+    # Rails::Application::RoutesReloader#reload! from loading them twice.
+    initializer :add_routing_paths do |app|
+      app.routes.append do
+        routes_block = lambda do
+
+          dashboard = Typus.subdomain ? "/dashboard" : "/admin/dashboard"
+
+          get "/" => redirect(dashboard)
+          get "dashboard" => "dashboard#index", :as => "dashboard_index"
+          get "dashboard/:application" => "dashboard#show", :as => "dashboard"
+
+          if Typus.authentication == :session
+            resource :session, :only => [:new, :create], :controller => :session do
+              delete :destroy, :as => "destroy"
+            end
+
+            resources :account, :only => [:new, :create, :show] do
+              collection do
+                get :forgot_password
+                post :send_password
+              end
+            end
+          end
+
+          Typus.models.map(&:to_resource).each do |_resource|
+            get "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
+            post "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
+            patch "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
+            delete "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
+          end
+
+          Typus.resources.map(&:underscore).each do |_resource|
+            get "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
+            post "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
+          end
+
+        end
+
+        if Typus.subdomain
+          constraints :subdomain => Typus.subdomain do
+            namespace :admin, :path => "", &routes_block
+          end
+        else
+          scope "admin", {:module => :admin, :as => "admin"}, &routes_block
+        end
+      end
+    end
+
   end
 end

data/lib/typus/version.rb

@@ -3,7 +3,7 @@ module Typus
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainsome_typus
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta3
+  version: 4.0.0.beta4
 platform: ruby
 authors:
 - Francesc Esplugas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -222,7 +222,6 @@ files:
 - config/locales/typus.ru.yml
 - config/locales/typus.zh-CN.models.yml
 - config/locales/typus.zh-CN.yml
-- config/routes.rb
 - lib/generators/templates/config/initializers/typus.rb
 - lib/generators/templates/config/initializers/typus_authentication.rb
 - lib/generators/templates/config/initializers/typus_resources.rb
@@ -321,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Effortless backend interface for Ruby on Rails applications. (Admin scaffold

data/config/routes.rb

@@ -1,46 +0,0 @@
-Rails.application.routes.append do
-
-  routes_block = lambda do
-
-    dashboard = Typus.subdomain ? "/dashboard" : "/admin/dashboard"
-
-    get "/" => redirect(dashboard)
-    get "dashboard" => "dashboard#index", :as => "dashboard_index"
-    get "dashboard/:application" => "dashboard#show", :as => "dashboard"
-
-    if Typus.authentication == :session
-      resource :session, :only => [:new, :create], :controller => :session do
-        delete :destroy, :as => "destroy"
-      end
-
-      resources :account, :only => [:new, :create, :show] do
-        collection do
-          get :forgot_password
-          post :send_password
-        end
-      end
-    end
-
-    Typus.models.map(&:to_resource).each do |_resource|
-      get "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
-      post "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
-      patch "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
-      delete "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
-    end
-
-    Typus.resources.map(&:underscore).each do |_resource|
-      get "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
-      post "#{_resource}(/:action(/:id))(.:format)", :controller => _resource
-    end
-
-  end
-
-  if Typus.subdomain
-    constraints :subdomain => Typus.subdomain do
-      namespace :admin, :path => "", &routes_block
-    end
-  else
-    scope "admin", {:module => :admin, :as => "admin"}, &routes_block
-  end
-
-end