push_type_core 0.7.0 → 0.8.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9157c07fb81b39a6edec686caa23945b733d9676
-  data.tar.gz: 6eaba2fdcccd35b7f2c2c270205cc395c98a263d
+  metadata.gz: 736fd951736c5f385dab1cc64436cc1ee814803d
+  data.tar.gz: d1f4e9137d3be16efb3ab35ace1e2ded80a3e014
 SHA512:
-  metadata.gz: 320537d485fcc3523b1283ef0a376c0c7f5eee7a0f1667595490b1be25705374dc84bb65edbc98e38e5f760c030dfbbd7c045c14a9f38f93c664c7e4f38e83e4
-  data.tar.gz: cb7dc8dc5f7e9d7c12910f8b7f51f217f81c0ceeccc2539a9c2c0d597c3c937f5d3d1b04de9b7639c94cadb9898870bf59aa60d097ff4a427f6c36eebb44491c
+  metadata.gz: 38b1f4ad6d34d5dbe7aec1ea6803bfa5e82cc6eecadc637a35f1a0d9bba24b40098415a5f4b6e489aa88b1d97bc2779da7aa1ef2601d2748eb72b55580c9e72b
+  data.tar.gz: dc61b1b66d2166be460287c81c9ed4e80c9b21441b98d848acc86330fc7417e256b7051f26fff3c3814a19e331eb98a9e889dde7df97d0947e144b1e6c07be0c

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

@@ -3,8 +3,7 @@ module PushType
     extend ActiveSupport::Concern
 
     FILTERS = [
-      :before_node_load_filters, :before_node_action_filters, :after_node_action_filters,
-      :before_taxonomy_load_filters, :before_taxonomy_action_filters, :after_taxonomy_action_filters
+      :before_node_load_filters, :before_node_action_filters, :after_node_action_filters
     ]
 
     included do

data/app/controllers/front_end_controller.rb

@@ -2,6 +2,13 @@ class FrontEndController < ApplicationController
 
   include PushType::Filterable
 
+  before_action :load_node, only: :show
+  hooks_for :node, only: :show
+
+  def show
+    render *@node.template_args
+  end
+
   private
 
   def root_path?
@@ -16,4 +23,13 @@ class FrontEndController < ApplicationController
     end
   end
 
+  def load_node
+    @node = PushType::Node.exposed.published.find_by_path permalink_path
+    if @node
+      instance_variable_set "@#{ @node.type.underscore }", @node.present!(view_context)
+    else
+      raise_404
+    end
+  end
+
 end

data/app/fields/push_type/wysiwyg_field.rb

@@ -0,0 +1,19 @@
+module PushType
+  class WysiwygField < PushType::FieldType
+
+    options template: 'wysiwyg', toolbar: 'full'
+
+    def form_helper
+      :text_area
+    end
+
+    def toolbar
+      @opts[:toolbar]
+    end
+
+    def html_options
+      super.merge(:'v-froala' => true, :'froala-toolbar' => toolbar)
+    end
+    
+  end
+end

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

@@ -28,8 +28,7 @@ module PushType
 
       def unexposure_method
         case _ct.base_class.name.demodulize
-          when 'Node'     then :unexposed_nodes
-          when 'Taxonomy' then :unexposed_taxonomies
+          when 'Node' then :unexposed_nodes
         end
       end
 

data/db/migrate/20160201150228_drop_legacy_push_type_taxonomies.rb

@@ -0,0 +1,13 @@
+class DropLegacyPushTypeTaxonomies < ActiveRecord::Migration
+  def up
+    if ActiveRecord::Base.connection.table_exists? :push_type_taxonomies
+      drop_table :push_type_taxonomies
+    end
+    if ActiveRecord::Base.connection.table_exists? :push_type_taxonomy_hierarchies
+      drop_table :push_type_taxonomy_hierarchies
+    end
+    if ActiveRecord::Base.connection.column_exists? :push_type_assets, :tags
+      remove_column :push_type_assets, :tags
+    end
+  end
+end

data/lib/push_type/config.rb

@@ -18,10 +18,6 @@ module PushType
     mattr_accessor :unexposed_nodes
     @@unexposed_nodes = []
 
-    # Taxonomy types that are not exposed to the front end
-    mattr_accessor :unexposed_taxonomies
-    @@unexposed_taxonomies = []
-
     # Hash of geometry strings used for resizing images
     mattr_accessor :media_styles
     @@media_styles = {

data/lib/push_type/core.rb

@@ -27,10 +27,6 @@ module PushType
       subclasses_from_list(:node, config.unexposed_nodes)
     end
 
-    def unexposed_taxonomies
-      subclasses_from_list(:taxonomy, config.unexposed_taxonomies)
-    end
-
     def subclasses_from_list(scope, types = nil)
       return [] unless types
       descendants = "push_type/#{ scope }".camelcase.constantize.descendants.map { |c| c.name.underscore }

data/lib/push_type/rails/routes.rb

@@ -6,8 +6,7 @@ module ActionDispatch::Routing
         path:   '/push_type',
         home:   PushType.config.home_slug,
         actions: {
-          node:     'nodes_front_end#show',
-          taxonomy: 'taxonomies_front_end#show',
+          node: 'front_end#show'
         }
       }.deep_merge!(options)
 
@@ -21,11 +20,6 @@ module ActionDispatch::Routing
         asset.media params[:style]
       }, as: 'media'
 
-      # Taxonomies
-      get ":taxonomy/*permalink" => opts[:actions][:taxonomy], as: 'taxonomy', constraints: ->(params, req) {
-        PushType::Taxonomy.descendants(exposed: true).map(&:base_slug).include? params[:taxonomy]
-      }
-
       # A catch-all root for the nodes
       get '*permalink' => opts[:actions][:node], as: 'node'
       root to: opts[:actions][:node], permalink: opts[:home]

data/lib/push_type/testing/common_rake.rb

@@ -1,7 +1,6 @@
 require 'generators/push_type/dummy/dummy_generator'
 require 'generators/push_type/install/install_generator'
 require 'generators/push_type/node/node_generator'
-require 'generators/push_type/taxonomy/taxonomy_generator'
 require 'generators/push_type/structure/structure_generator'
 
 namespace :common do
@@ -18,7 +17,6 @@ namespace :common do
       system 'bundle exec rake db:drop db:create'
       PushType::InstallGenerator.start ['--quiet']
       PushType::NodeGenerator.start ['page', '--quiet']
-      PushType::TaxonomyGenerator.start ['category', '--quiet']
       PushType::StructureGenerator.start ['location', '--quiet']
     end
   end

data/lib/push_type/testing/factories.rb

@@ -42,10 +42,5 @@ FactoryGirl.define do
       file  { Rack::Test::UploadedFile.new(PushType::Core::Engine.root.join('test', 'files/document.pdf')) }
     end
   end
-
-  factory :taxonomy, class: 'PushType::Taxonomy' do
-    title   { generate :title }
-    slug    { generate :slug }
-  end
   
 end

data/lib/push_type/testing/setup.rb

@@ -14,7 +14,7 @@ Dragonfly.app.use_datastore :memory
 
 class ActiveSupport::TestCase
   # Due to test weirdness / dodgy code need to reference some classes
-  Page && Category && Location
+  Page && Location
 
   before :each do
     DatabaseCleaner.start

data/lib/push_type/version.rb

@@ -1,3 +1,3 @@
 module PushType
-  VERSION = '0.7.0'
+  VERSION = '0.8.0.beta.1'
 end

data/test/controllers/{nodes_front_end_controller_test.rb → front_end_controller_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class NodesFrontEndControllerTest < ActionController::TestCase
+class FrontEndControllerTest < ActionController::TestCase
   
   before { @routes = Rails.application.routes }
   

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 = '271df62782ac8231fd83d982acbbaf45552ecd92777925f7f664a6cee3ba9738'
+  # config.dragonfly_secret = 'cddb3d46c0d8274b6211613824e13c3240acf6b873554e91622c5c3dc9b71479'
 
 end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 8f3024409a00bb714abf072147d19aeac045966e9c5df452fb6f4d2fb637338131a8558bd629e3b585db96a43d285663ed2c81e220e16c89d33c441971037b9d
+  secret_key_base: d149cd01c6eee217b8287d12912221801883ca082c1ba1c3511b1a5081338da74422e2b029ef2019336ffc4786be44e6b1cf6b6c7452d8ccdd62a1a5416682e6
 
 test:
-  secret_key_base: 5531a988ccefaee0fd9df7e0203712ad461e87af88e408d27ebe39e6c33569cda48b9d57676d8070dafb69d090060fffc16f8d470081dd64d3c80293cad6738d
+  secret_key_base: 599444d947e59bb318b4083a4b8dcdfa6a214b3b677e99dd4354558de92c3d0ddbe8870375b729b874a82d1bc1dc7e80cb17acbc0db4e62ffe542f78ed94fb90
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

data/test/dummy/db/migrate/20160206155139_drop_legacy_push_type_taxonomies.push_type.rb

@@ -0,0 +1,14 @@
+# This migration comes from push_type (originally 20160201150228)
+class DropLegacyPushTypeTaxonomies < ActiveRecord::Migration
+  def up
+    if ActiveRecord::Base.connection.table_exists? :push_type_taxonomies
+      drop_table :push_type_taxonomies
+    end
+    if ActiveRecord::Base.connection.table_exists? :push_type_taxonomy_hierarchies
+      drop_table :push_type_taxonomy_hierarchies
+    end
+    if ActiveRecord::Base.connection.column_exists? :push_type_assets, :tags
+      remove_column :push_type_assets, :tags
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160122151530) do
+ActiveRecord::Schema.define(version: 20160206155139) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -28,7 +28,6 @@ ActiveRecord::Schema.define(version: 20160122151530) do
     t.datetime "created_at",  null: false
     t.datetime "updated_at",  null: false
     t.datetime "deleted_at"
-    t.string   "tags",                     array: true
   end
 
   create_table "push_type_node_hierarchies", id: false, force: :cascade do |t|
@@ -57,25 +56,6 @@ ActiveRecord::Schema.define(version: 20160122151530) do
     t.datetime "deleted_at"
   end
 
-  create_table "push_type_taxonomies", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
-    t.string   "type"
-    t.string   "title"
-    t.string   "slug"
-    t.uuid     "parent_id"
-    t.integer  "sort_order"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
-  create_table "push_type_taxonomy_hierarchies", id: false, force: :cascade do |t|
-    t.uuid    "ancestor_id",   null: false
-    t.uuid    "descendant_id", null: false
-    t.integer "generations",   null: false
-  end
-
-  add_index "push_type_taxonomy_hierarchies", ["ancestor_id", "descendant_id", "generations"], name: "taxonomy_anc_desc_idx", unique: true, using: :btree
-  add_index "push_type_taxonomy_hierarchies", ["descendant_id"], name: "taxonomy_desc_idx", using: :btree
-
   create_table "push_type_users", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
     t.string   "name"
     t.string   "email"