push_type_core 0.9.5 → 0.10.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 053777bf9510e9b7e3d009c78883a59500478224
-  data.tar.gz: 601ee69538c95a7db0fd5a74bebf39e5bfb6c695
+  metadata.gz: 6fd6cd0064cd63d1dd950087f1ac29d726f4c008
+  data.tar.gz: 7f4324b860c06b86ca5544bbe74483228e9109ce
 SHA512:
-  metadata.gz: f2ba8be4b5e2753a3ac55cafc1359cd871f2e2f6863e2cc02a8dfa3848c95f83b016045be050d9cadc89b85ceb64ded8f3df25fa125ec8e814fa70638891c8c2
-  data.tar.gz: 8aa1dc8d68d1035c203ce94f5fcd5738830dd5d1b684a1625271eadcc88a3ae94a3c886f731be0335b91c0609def18c9d12b0cb531d6fe2a49f52de6083be21d
+  metadata.gz: 4d6b466d5f153fd3175aaa49d8730a4dd72e4d9936d69ceef3da9283570859f57d26dec1e801a0870ae28698efd0c49a9d7f9baff867364f19c5b781f78ce451
+  data.tar.gz: fce3f8f57b3a02994a556a3dae73b6ecaec3c9206ca314ff1f12d013bc9e49a7e9e71c5e252d0b26204187c526681d01554e5ec96714ca0930062a292107004c

data/LICENSE.md

@@ -1,6 +1,6 @@
 # PushType License
 
-Copyright 2014 Push Code Ltd
+Copyright 2014-2016 Push Code Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/controllers/concerns/push_type/filterable.rb

@@ -4,32 +4,20 @@ module PushType
 
     private
 
-    def filter_scope
-      self.class.filter_scope
-    end
-
-    def filter_obj
-      instance_variable_get "@#{ filter_scope }"
-    end
-
-    def filter_obj_type
-      filter_obj.type.underscore.to_sym
-    end
-
     def before_load_filters
-      filters = self.send("before_#{ filter_scope }_load_filters")
-      filters.each { |f| run_node_hook(*f) } unless filters.blank?
+      filters = self.send("before_node_load_filters")
+      filters.each { |f| run_node_filter(*f) } unless filters.blank?
     end
 
     def around_action_filters
-      before_filters = self.send("before_#{ filter_scope }_action_filters")
-      before_filters.each { |f| run_node_hook(*f) } unless before_filters.blank?
+      before_filters = self.send("before_node_action_filters")
+      before_filters.each { |f| run_node_filter(*f) } unless before_filters.blank?
       yield
-      after_filters = self.send("after_#{ filter_scope }_action_filters")
-      after_filters.each { |f| run_node_hook(*f) } unless after_filters.blank?
+      after_filters = self.send("after_node_action_filters")
+      after_filters.each { |f| run_node_filter(*f) } unless after_filters.blank?
     end
 
-    def run_node_hook(*args)
+    def run_node_filter(*args)
       methods_or_proc, opts = case args.last
         when Proc then args.first.is_a?(Hash) ? [ args.last, args.first ] : [ args.last, {} ]
         when Hash then [ args[0..-2], args.last ]
@@ -46,21 +34,18 @@ module PushType
     end
 
     def filter_obj_in(types)
-      types && filter_obj && Array(types).include?(filter_obj_type)
+      types && @node && Array(types).include?(@node.type.underscore.to_sym)
     end
 
     def filter_obj_not_in(types)
-      types && filter_obj && !Array(types).include?(filter_obj_type)
+      types && @node && !Array(types).include?(@node.type.underscore.to_sym)
     end
 
     module ClassMethods
 
-      attr_reader :filter_scope
-
-      def hooks_for(sym, opts)
-        @filter_scope = sym
-        prepend_before_action :before_load_filters, opts
-        around_action :around_action_filters, opts
+      def node_filters
+        prepend_before_action :before_load_filters
+        around_action :around_action_filters
       end
 
     end

data/app/controllers/front_end_controller.rb

@@ -3,7 +3,7 @@ class FrontEndController < ApplicationController
   include PushType::Filterable
 
   before_action :load_node, only: :show
-  hooks_for :node, only: :show
+  node_filters
 
   def show
     render *@node.template_args
@@ -17,7 +17,7 @@ class FrontEndController < ApplicationController
 
   def raise_404
     if root_path?
-      render template: 'push_type/setup', layout: false, status: 404
+      render template: 'push_type/setup', layout: nil, status: 404
     else
       raise ActiveRecord::RecordNotFound
     end
@@ -32,4 +32,4 @@ class FrontEndController < ApplicationController
     end
   end
 
-end
+end

data/app/helpers/push_type/media_url_helper.rb

@@ -0,0 +1,25 @@
+module PushType
+  module MediaUrlHelper
+
+    URI_REGEXP = %r{^https?://}i
+
+    def media_path(source, options = {})
+      file_uid  = source.try(:file_uid) || source
+      path      = main_app.media_path(file_uid, options)
+
+      if host = compute_asset_host(path, options)
+        url = File.join(host, path)
+      else
+        path
+      end
+    end
+
+    def media_url(source, options = {})
+      file_uid  = source.try(:file_uid) || source
+      path      = media_path(source)
+      return path if path =~ URI_REGEXP
+      main_app.media_url(file_uid, options)
+    end
+
+  end
+end

data/app/helpers/push_type/node_url_helper.rb

@@ -0,0 +1,15 @@
+module PushType
+  module NodeUrlHelper
+
+    def node_path(source, options = {})
+      permalink = source.try(:permalink) || source
+      main_app.node_path(permalink, options)
+    end
+
+    def node_url(source, options = {})
+      permalink = source.try(:permalink) || source
+      main_app.node_url(permalink, options)
+    end
+
+  end
+end

data/app/models/concerns/push_type/nestable.rb

@@ -2,6 +2,10 @@ module PushType
   module Nestable
     extend ActiveSupport::Concern
 
+    included do
+      validate :parent_accepts_child
+    end
+
     def child_nodes
       self.class.child_nodes
     end
@@ -23,6 +27,16 @@ module PushType
       super.reorder(self.class.child_order)
     end
 
+    private
+
+    def parent_accepts_child
+      if parent_id.present?
+        unless parent.child_nodes.include?(self.class.name.underscore)
+          errors.add :parent_id, 'does not accept this child'
+        end
+      end
+    end
+
     module ClassMethods
 
       attr_reader :child_order

data/app/views/push_type/setup.html.erb

@@ -116,14 +116,12 @@
         <% end %>
         <li>
           <span class="label text">And log in:</span>
-          <div><%= link_to push_type.root_url, push_type.root_path %></div>
+          <div><%= link_to push_type_admin.root_url, push_type_admin.root_path %></div>
         </li>
       </ol>
 
     </div>
   </div>
 
-  
-  
 </body>
 </html>

data/lib/generators/push_type/install/install_generator.rb

@@ -11,7 +11,7 @@ module PushType
     end
 
     def inject_push_type_routes
-      inject_into_file 'config/routes.rb', "\n\n  mount_push_type\n", after: 'Rails.application.routes.draw do', verbose: true
+      inject_into_file 'config/routes.rb', "\n\n#{ mount_heredoc }", after: 'Rails.application.routes.draw do', verbose: true
     end
 
     def install_migrations
@@ -26,5 +26,23 @@ module PushType
       end
     end
 
+    private
+
+    def mount_heredoc
+      <<-EOF.gsub /^\s+/, '  '
+        # Mount all the registered PushType Rails Engines. This should be placed
+        # at the end of your routes.rb file to ensure your application routes are
+        # not overidden by PushType.
+        #
+        # Overide the default mount points by passing a hash of options.
+        # Example:
+        #
+        #   mount_push_type admin: 'cms', front_end: 'blog'
+        #
+        mount_push_type
+
+      EOF
+    end
+
   end
 end

data/lib/push_type/core/engine.rb

@@ -25,13 +25,24 @@ module PushType
       end
 
       initializer 'push_type.application_controller' do
-        ActiveSupport.on_load(:action_controller) do
+        ActiveSupport.on_load :action_controller do
           include PushType::ApplicationControllerMethods
         end
       end
 
+      initializer 'push_type.url_helpers' do
+        ActiveSupport.on_load :action_controller do
+          helper PushType::MediaUrlHelper
+          helper PushType::NodeUrlHelper
+        end
+        ActiveSupport.on_load :action_view do
+          include PushType::MediaUrlHelper
+          include PushType::NodeUrlHelper
+        end
+      end
+
       initializer 'push_type.menu_helpers' do
-        ActiveSupport.on_load(:action_view) do
+        ActiveSupport.on_load :action_view do
           include PushType::MenuBuilder::Helpers
         end
       end

data/lib/push_type/core.rb

@@ -52,10 +52,24 @@ module PushType
       PushType::MenuBuilder.select(key, &block)
     end
 
+    def register_engine(mod, opts = {})
+      opts[:load_hook] ||= mod.to_s.underscore.gsub(/\//, '_').to_sym
+
+      if opts[:mount]
+        rails_engines[opts[:load_hook]] = [mod, opts[:mount]]
+      end
+      
+      ActiveSupport.run_load_hooks(opts[:load_hook], PushType)
+    end
+
+    def rails_engines
+      @rails_engines ||= {}
+    end
+
   end
 
   module Core
-    ActiveSupport.run_load_hooks(:push_type_core, PushType)
+    PushType.register_engine self
   end
 
 end

data/lib/push_type/rails/routes.rb

@@ -1,28 +1,35 @@
 module ActionDispatch::Routing
   class Mapper
 
-    def mount_push_type(options = {})
-      opts = {
-        path:   '/push_type',
-        home:   PushType.config.home_slug,
-        actions: {
-          node: 'front_end#show'
-        }
-      }.deep_merge!(options)
+    def mount_push_type(opts = {})
+      # Mount the registered PushType engines at the specified path.
+      PushType.rails_engines.each do |k, (mod, default_path)|
+        key  = push_type_engine_keys[k] || k
+        path = opts[key] || default_path
+        mount mod::Engine => path
+      end
 
-      # Mount the PushType engine at the specified path.
-      mount PushType::Core::Engine => opts[:path]
+      scope path: opts[:front_end] do
+        # Use a Dragonfly endpoint to provide better URLs for accessing assets
+        get 'media/*file_uid' => Dragonfly.app.endpoint { |params, app|
+          file_name = [ params[:file_uid], params[:format] ].join('.')
+          asset = PushType::Asset.find_by_file_uid! file_name
+          asset.media params[:style]
+        }, as: 'media'
 
-      # Use a Dragonfly endpoint to provide better URLs for accessing assets
-      get 'media/*file_uid' => Dragonfly.app.endpoint { |params, app|
-        file_name = [ params[:file_uid], params[:format] ].join('.')
-        asset = PushType::Asset.find_by_file_uid! file_name
-        asset.media params[:style]
-      }, as: 'media'
+        # A catch-all root for the nodes
+        get '*permalink' => 'front_end#show', as: 'node'
+        get '/' => 'front_end#show', as: 'home', permalink: PushType.config.home_slug if PushType.config.home_slug.present?
+      end
+    end
+
+    private
 
-      # A catch-all root for the nodes
-      get '*permalink' => opts[:actions][:node], as: 'node'
-      root to: opts[:actions][:node], permalink: opts[:home]
+    def push_type_engine_keys
+      {
+        push_type_api:    :api,
+        push_type_admin:  :admin
+      }
     end
     
   end

data/lib/push_type/testing/setup.rb

@@ -30,10 +30,6 @@ class ActiveSupport::TestCase
 end
 
 class ActionController::TestCase
-  before :each do
-    @routes = PushType::Core::Engine.routes
-  end
-
   if Rails.version.to_f >= 5
     require 'rails-controller-testing'
     include ::Rails::Controller::Testing::TestProcess

data/lib/push_type/version.rb

@@ -1,3 +1,3 @@
 module PushType
-  VERSION = '0.9.5'
+  VERSION = '0.10.0.beta.3'
 end

data/test/controllers/front_end_controller_test.rb

@@ -1,9 +1,9 @@
 require 'test_helper'
 
 class FrontEndControllerTest < ActionController::TestCase
-  
+
   before { @routes = Rails.application.routes }
-  
+
   describe 'GET #show' do
     let(:page)      { Page.create attributes }
     let(:permalink) { page.permalink }
@@ -28,6 +28,7 @@ class FrontEndControllerTest < ActionController::TestCase
   end
 
   describe 'node filters' do
+    
     ApplicationController.module_eval do
       before_node_load { @foo = {} }
       before_node_action { @foo[:node_action] = true }
@@ -44,6 +45,7 @@ class FrontEndControllerTest < ActionController::TestCase
         @foo[:test_2] = true
       end
     end
+
     let(:page) { FactoryGirl.create :published_node, type: 'Page' }
     before { get :show, params: { permalink: page.permalink } }
     it { assigns[:foo].must_be_instance_of Hash }

data/test/dummy/config/initializers/push_type.rb

@@ -45,6 +45,6 @@ PushType.setup do |config|
   #   secret_access_key:  ENV['SECRET_ACCESS_KEY_ID']
   # }
 
-  # config.dragonfly_secret = '2cf91ca0f14f3fd6c006852a10612a7ebc8c1b48b0191864e7350f8c568f9901'
+  # config.dragonfly_secret = 'db0e7c33e8b359951d22f8e750068f5c5896b6adfa07cbb839b895550378c153'
 
 end

data/test/dummy/config/routes.rb

@@ -1,6 +1,15 @@
 Rails.application.routes.draw do
 
+  # Mount all the registered PushType Rails Engines. This should be placed
+  # at the end of your routes.rb file to ensure your application routes are
+  # not overidden by PushType.
+  #
+  # Overide the default mount points by passing a hash of options.
+  # Example:
+  #
+  #   mount_push_type admin: 'cms', front_end: 'blog'
+  #
   mount_push_type
-
+  
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 1b826fae92f4e2aeb3ba38ff2e0410a3bed49aa0712507e12c4c5aa558619b5ea11a2032c859cad729a03625e301ff65e31f1ccc4d232cc591213aaf41e89600
+  secret_key_base: a3f3c85b457a43f7bc749ac36a23dfbe8c276f37e549629681d926ddc777a60b1de8b51423b7eeb88d83cf12899d57df2874e8764ff2658f1b4c25ef71d1e5c2
 
 test:
-  secret_key_base: 52d6b344e013351d9118d4924cbeccdb2df206c71ef8835ecb42fc513c99b2bee80e4212817a5817b425b4b71d2ce028bc368eb67a165e39ab01a4354a0f5e2f
+  secret_key_base: 733f6bf04272401ea3a441bf8371d6075c2a60649e4b9360bdd7c6130bc0d262b40adf47d0176794d8404c08badc03339b814841f132c92e06285db7583746c9
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20161024153925) do
+ActiveRecord::Schema.define(version: 20161116222806) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"