push_type_core 0.1.1 → 0.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e192ab0dcb5e4d4ed0517d1dd79e01f954902ae6
-  data.tar.gz: c5f2e5aed3186190e880e060d0a7047d6c47dcd9
+  metadata.gz: 913da9e49a877e4f10781017676afbf8f87356a9
+  data.tar.gz: 5d277256f7eb5ca7b6f744dbfb203b6169f39f23
 SHA512:
-  metadata.gz: d994bf328a8add0afb268c7042e0339099edfd3c47f445e17453505c6878744a2e76ec1f0af44384f17d9680881d72af66e3732395f22877f662449d3ca6fd3f
-  data.tar.gz: a67f19c8ffef5c55d2f9c7376a4a2f7e3ea4ae96bf80d1b1b729b39fa05d2cc9ff47e83231c8065ddab7a599a07210e8b014c68f0b90f4ba94d5e94fa143b80f
+  metadata.gz: e9dede54e2d4e68d5ffe2a552abe6d9f6e0066c754d260a9af0055afc50128ea212fecee691fc748e4d43305655a41be47122ba3dd6d278b5ea251daef56d4fa
+  data.tar.gz: e204e54912e6538c9350c6aad38cc8522b55d7bf341cf88679c78427380126f790e6bc7ebfccffdfca4dc4979689ef34eee928bea99df140918a964ceb44be47

data/app/controllers/front_end_controller.rb

@@ -9,9 +9,13 @@ class FrontEndController < ApplicationController
   private
 
   def load_node
-    @node = PushType::Node.published.find_by_path params[:permalink].split('/')
+    @node = PushType::Node.published.find_by_path permalink_parts
     raise ActiveRecord::RecordNotFound unless @node
     instance_variable_set "@#{ @node.type.underscore }", @node
   end
+
+  def permalink_parts
+    params[:permalink].split('/')
+  end
   
 end

data/app/fields/push_type/array_field.rb

@@ -0,0 +1,15 @@
+module PushType
+  class ArrayField < PushType::FieldType
+    def param
+      { name.to_sym => [] }
+    end
+
+    def to_json(val)
+      Array(val)
+    end
+
+    def from_json(val)
+      Array(val)
+    end
+  end
+end

data/app/fields/push_type/tag_list_field.rb

@@ -0,0 +1,29 @@
+require 'push_type/tag_list_query'
+
+module PushType
+  class TagListField < ArrayField
+
+    def template
+      @opts[:template] || 'tag_list'
+    end
+
+    def html_options
+      { multiple: true, placeholder: 'Tags...' }.merge(super).merge(class: 'tagsinput')
+    end
+
+    def to_json(val)
+      super.reject(&:blank?)
+    end
+
+    def from_json(val)
+      super.reject(&:blank?)
+    end
+
+    initialized_on_node do |object, field|
+      object.define_singleton_method "all_#{ field.name }".to_sym do |*args|
+        TagListQuery.new(field.name, object.name.underscore.to_sym).all *args
+      end
+    end
+
+  end
+end

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

@@ -6,6 +6,10 @@ module PushType
       self.class.fields
     end
 
+    def field_params
+      fields.map { |k, field| field.param }
+    end
+
     module ClassMethods
 
       attr_reader :fields
@@ -26,8 +30,12 @@ module PushType
         store_accessor :field_store, name
 
         validates name, opts[:validates] if opts[:validates]
-        
+
         override_accessor fields[name]
+
+        if block = field_factory(kind).initialized_blk
+          block.call(self, fields[name])
+        end
       end
 
       protected
@@ -42,12 +50,10 @@ module PushType
 
       def override_accessor(f)
         define_method "#{f.name}=".to_sym do |val|
-          return unless val
           super f.to_json(val)
         end
         define_method f.name do
-          return unless val = super()
-          f.from_json val
+          f.from_json super()
         end
       end
 

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

@@ -2,19 +2,43 @@ module PushType
   module Nestable
     extend ActiveSupport::Concern
 
-    def child_node_types
-      self.class.child_node_types
+    def child_nodes
+      self.class.child_nodes
+    end
+
+    def custom_child_order?
+      self.class.child_order.present?
+    end
+
+    def sortable?
+      !custom_child_order?
+    end
+
+    def children
+      return super() unless custom_child_order?
+      super.reorder(self.class.child_order)
     end
 
     module ClassMethods
 
-      def child_node_types
-        types = @child_node_types || PushType.config.root_node_types
+      attr_reader :child_order
+
+      def child_nodes
+        types = @child_nodes || PushType.config.root_nodes
         PushType.node_types_from_list(types)
       end
 
       def has_child_nodes(*args)
-        @child_node_types = args
+        if args.last.is_a? Hash
+          opts = args.pop
+          @child_order = case opts[:order]
+            when :blog then ['published_at DESC', 'created_at DESC']
+            else opts[:order]
+          end
+        else
+          @child_order = nil
+        end
+        @child_nodes = args
       end
 
     end

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

@@ -6,7 +6,8 @@ module PushType
       enum status: [ :draft, :published ]
 
       scope :published, -> {
-        not_trash.where(['push_type_nodes.status = ? AND push_type_nodes.published_at <= ?', self.statuses[:published], Time.zone.now]).
+        not_trash.exposed.
+          where(['push_type_nodes.status = ? AND push_type_nodes.published_at <= ?', self.statuses[:published], Time.zone.now]).
           where(['push_type_nodes.published_to IS NULL OR push_type_nodes.published_to > ?', Time.zone.now])
       }
 
@@ -36,7 +37,7 @@ module PushType
     end
 
     def set_default_status
-      self.status ||= self.class.statuses[:draft]
+      self.status     ||= self.class.statuses[:draft]
     end
 
   end  

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

@@ -0,0 +1,29 @@
+module PushType
+  module Unexposable
+    extend ActiveSupport::Concern
+
+    included do
+      scope :exposed, -> {
+        node_types = PushType.unexposed_nodes
+        node_types.present? ? where(['push_type_nodes.type NOT IN (?)', node_types]) : all
+      }
+    end
+
+    def exposed?
+      self.class.exposed?
+    end
+
+    module ClassMethods
+
+      def unexpose!
+        PushType.config.unexposed_nodes.push(self.name.underscore.to_sym).uniq!
+      end
+
+      def exposed?
+        !PushType.unexposed_nodes.include?(self.name)
+      end
+
+    end
+
+  end
+end

data/app/models/push_type/asset.rb

@@ -11,6 +11,9 @@ module PushType
 
     default_scope { order(created_at: :desc) }
 
+    scope :image,     -> { where(['mime_type LIKE ?', 'image/%']) }
+    scope :not_image, -> { where(['mime_type NOT LIKE ?', 'image/%']) }
+
     before_create :set_mime_type
     after_destroy :destroy_file!
 
@@ -33,26 +36,29 @@ module PushType
     end
 
     def media(style = nil)
-      if image? && !style.blank? && style.to_sym != :original
-        size = PushType.config.media_styles[style.to_sym] || style
+      return file if !image? || style.blank?
+
+      case style.to_sym
+        when :original        then file
+        when :push_type_thumb then preview_thumb
+        else
+          size = PushType.config.media_styles[style.to_sym] || style
+          file.thumb(size)
       end
-      size ? file.thumb(size) : file
     end
 
-    def preview_thumb_url(size = '300x300#')
-      return nil unless file_stored?
-      if image?
-        media(size).url
+    def preview_thumb(size = '300x300')
+      return unless image?
+
+      width, height = size.split('x').map(&:to_i)
+
+      if file.width >= width && file.height >= height
+        file.thumb("#{ size }#")
       else
-        "push_type/icon-file-#{ kind }.png"
+        file.convert("-background white -gravity center -extent #{ size }")
       end
     end
 
-    def as_json(options = nil)
-      options = { only: [:id, :file_name, :file_size, :mime_type, :created_at], methods: [:new_record?, :image?, :description_or_file_name, :preview_thumb_url] } if options.empty?
-      super(options)
-    end
-
     private
 
     def set_mime_type

data/app/models/push_type/node.rb

@@ -4,6 +4,7 @@ module PushType
     include PushType::Customizable
     include PushType::Nestable
     include PushType::Templatable
+    include PushType::Unexposable
     include PushType::Publishable
     include PushType::Trashable
 

data/db/migrate/20141117170533_create_push_type_users.rb

@@ -4,7 +4,7 @@ class CreatePushTypeUsers < ActiveRecord::Migration
     create_table :push_type_users, id: :uuid, default: 'uuid_generate_v4()' do |t|
       t.string    :name
       t.string    :email
-      t.json      :field_store
+      t.jsonb     :field_store
       
       t.timestamps
     end

data/db/migrate/20141117204630_create_push_type_nodes.rb

@@ -5,7 +5,7 @@ class CreatePushTypeNodes < ActiveRecord::Migration
       t.string    :type
       t.string    :title
       t.string    :slug
-      t.json      :field_store
+      t.jsonb     :field_store
 
       t.uuid      :parent_id
       t.integer   :sort_order

data/lib/generators/push_type/dummy/dummy_generator.rb

@@ -23,7 +23,7 @@ module PushType
       opts[:skip_gemfile]   = true
       opts[:skip_bundle]    = true
 
-      puts "Generating dummy Rails application... (#{options[:lib_name]})"
+      say "Generating dummy Rails application... (#{options[:lib_name]})"
       invoke Rails::Generators::AppGenerator, [ File.expand_path(dummy_path, destination_root) ], opts
     end
 

data/lib/generators/push_type/dummy/templates/page.rb

@@ -1,6 +1,6 @@
 class Page < PushType::Node
 
   field :description
-  field :body, :rich_text, validates: { presence: true }
+  field :body, :text, validates: { presence: true }
 
 end

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

@@ -15,14 +15,14 @@ module PushType
     end
 
     def install_migrations
-      say_status :copying, 'migrations'
-      quietly { rake 'railties:install:migrations' }
+      say '- Copying migrations'
+      rake 'railties:install:migrations'
     end
 
     def run_migrations
       if options[:migrate]
-        say_status :running, 'migrations'
-        quietly { rake 'db:migrate' }
+        say '- Running migrations'
+        rake 'db:migrate'
       end
     end
 

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

@@ -1,5 +1,15 @@
 PushType.setup do |config|
 
-  config.root_node_types = :all
+  #config.root_nodes = :all
+
+  #config.home_slug = 'home'
+
+  #config.unexposed_nodes = []
+
+  #config.media_styles = {
+  #  large:    '1024x1024>',
+  #  medium:   '512x512>',
+  #  small:    '256x256>'
+  #}
 
 end

data/lib/push_type/core/engine.rb

@@ -4,9 +4,11 @@ module PushType
       isolate_namespace PushType
       engine_name 'push_type'
 
-      config.root_node_types = :all
+      config.root_nodes = :all
 
-      config.home_node = 'home'
+      config.home_slug = 'home'
+
+      config.unexposed_nodes = []
 
       config.media_styles = {
         large:    '1024x1024>',

data/lib/push_type/core.rb

@@ -13,8 +13,12 @@ module PushType
       yield config if block
     end
 
-    def root_node_types
-      node_types_from_list(config.root_node_types)
+    def root_nodes
+      node_types_from_list(config.root_nodes)
+    end
+
+    def unexposed_nodes
+      node_types_from_list(config.unexposed_nodes).map(&:camelcase)
     end
 
     def node_types_from_list(types = nil)
@@ -41,5 +45,3 @@ end
 require 'push_type/core/engine'
 require 'push_type/rails/routes'
 require 'push_type/field_type'
-
-

data/lib/push_type/field_type.rb

@@ -3,11 +3,22 @@ module PushType
 
     attr_reader :name
 
+    class << self
+      attr_reader :initialized_blk
+      def initialized_on_node(&block)
+        @initialized_blk = block
+      end
+    end
+
     def initialize(name, opts = {})
       @name = name.to_s
       @opts = opts
     end
 
+    def param
+      name.to_sym
+    end
+
     def kind
       self.class.name.demodulize.underscore.gsub(/_(field|type)$/, '')
     end
@@ -38,11 +49,11 @@ module PushType
     end
 
     def to_json(val)
-      val.to_s
+      val
     end
 
     def from_json(val)
-      val.to_s
+      val
     end
 
   end

data/lib/push_type/rails/routes.rb

@@ -4,7 +4,7 @@ module ActionDispatch::Routing
     def mount_push_type(options = {})
       opts = {
         path:   '/push_type',
-        home:   PushType.config.home_node,
+        home:   PushType.config.home_slug,
         actions: {
           node: 'front_end#node'
         }

data/lib/push_type/tag_list_query.rb

@@ -0,0 +1,38 @@
+module PushType
+  class TagListQuery
+
+    def initialize(name, type)
+      @name = name
+      @type = type
+    end
+
+    def all(opts = {})
+      @opts = { type: @type }.merge(opts)
+      connection.select_all(query).rows.flatten
+    end
+
+    def node_types
+      PushType.node_types_from_list(@opts[:type]).map { |n| "'#{ n.camelcase }'" }
+    end
+
+    private
+
+    def connection
+      PushType::Node.connection
+    end
+
+    def query
+      [
+        "SELECT DISTINCT jsonb_array_elements_text(field_store->'#{ @name }') AS _tag",
+        "FROM push_type_nodes",
+        where_sql,
+        "ORDER BY _tag"
+      ].compact.join(' ')
+    end
+
+    def where_sql
+      "WHERE push_type_nodes.type IN (#{ node_types.join(', ') })" unless @opts[:type] == :all || node_types.blank?
+    end
+
+  end
+end

data/lib/push_type/testing/common_rake.rb

@@ -13,9 +13,9 @@ namespace :common do
     PushType::DummyGenerator.start opts
 
     Dir.chdir File.join(args[:base_path], args[:dummy_path]) do
-      PushType::InstallGenerator.start ['--migrate=false', '--quiet']
+      system 'bundle exec rake db:drop db:create'
+      PushType::InstallGenerator.start ['--quiet']
       PushType::NodeGenerator.start ['page', '--quiet']
-      system 'bundle exec rake db:drop db:create db:migrate'
     end
   end
 

data/lib/push_type/testing/setup.rb

@@ -1,5 +1,9 @@
 require 'database_cleaner'
 
+# Filter out Minitest backtrace while allowing backtrace from other libraries
+# to be shown.
+Minitest.backtrace_filter = Minitest::BacktraceFilter.new
+
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
@@ -8,10 +12,10 @@ DatabaseCleaner.clean_with :truncation
 Dragonfly.app.use_datastore :memory
 
 class ActiveSupport::TestCase
-  ActiveRecord::Migration.check_pending!
-
   before :each do
     DatabaseCleaner.start
+    PushType.config.root_nodes = :all
+    PushType.config.unexposed_nodes = []
   end
 
   after :each do

data/test/dummy/app/assets/stylesheets/application.css

@@ -3,7 +3,7 @@
  * listed below.
  *
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
  *
  * You're free to add application-wide styles to this file and they'll appear at the bottom of the
  * compiled file so the styles you add here take precedence over styles defined in any styles

data/test/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'

data/test/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end

data/test/dummy/config/environments/development.rb

@@ -27,6 +27,10 @@ Rails.application.configure do
   # number of complex assets.
   config.assets.debug = true
 
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.

data/test/dummy/config/environments/production.rb

@@ -16,11 +16,13 @@ Rails.application.configure do
 
   # Enable Rack::Cache to put a simple HTTP cache in front of your application
   # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
   # config.action_dispatch.rack_cache = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -29,20 +31,22 @@ Rails.application.configure do
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs.
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
   # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
 
   # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
@@ -54,7 +58,7 @@ Rails.application.configure do
   # config.cache_store = :mem_cache_store
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
@@ -67,9 +71,6 @@ Rails.application.configure do
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 

data/test/dummy/config/environments/test.rb

@@ -12,8 +12,8 @@ Rails.application.configure do
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
@@ -31,6 +31,9 @@ Rails.application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
+
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 

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

@@ -3,6 +3,9 @@
 # Version of your assets, change this if you want to expire all your assets.
 Rails.application.config.assets.version = '1.0'
 
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )