push_type_core 0.1.0.beta3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e5cfc57c3068c45c73376c6905e192f03321f06
-  data.tar.gz: 04013f98749da8c8a5be4902c7041fbae14c79d5
+  metadata.gz: 5c78eb41f1bdc82052b207a1e015c1eb0a03cbc6
+  data.tar.gz: 0bfac3128a8fbaab7007e912495eccfda36462c6
 SHA512:
-  metadata.gz: 291069e98b7024375031e14c0abfd2aec2d01e904c2e24ac9fbb1a011b5f1ca91a04a917c8e85c567f5d267e88599ed3e8d69c08a5fe369903938b3198776ab5
-  data.tar.gz: 7eb951c044e25becd8ce2764713aec11e669b43d4cc5a9308adae8c8ee23063cf3585f7f5c617379878cbeb0eab108c42e75a16268341c26b46a64437ad45fdc
+  metadata.gz: 3336cf790c4a8545de8e51965b092e202bf6b7f97a4cd639d5827bd08d9a8a3094799cf51dafdec57393dbfea23ac0c8331b3d5e29d209d03b16703387f1b512
+  data.tar.gz: 5095723274533fb6e50141db537051c003f00908a8b7d1aa9d9c2bf37ee547bb4ee3cb3c4e8075f2a89d306f896f32bde6e7421b51847f39fa587846dde15054

data/app/models/concerns/push_type/{field_store.rb → customizable.rb}

@@ -1,5 +1,5 @@
 module PushType
-  module FieldStore
+  module Customizable
     extend ActiveSupport::Concern
 
     def fields

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

@@ -0,0 +1,43 @@
+module PushType
+  module Publishable
+    extend ActiveSupport::Concern
+
+    included do
+      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]).
+          where(['push_type_nodes.published_to IS NULL OR push_type_nodes.published_to > ?', Time.zone.now])
+      }
+
+      after_initialize :set_default_status
+      before_save :set_published_at
+
+      def published?
+        super and !scheduled? and !expired?
+      end
+    end
+
+    def scheduled?
+      published_at? and published_at > Time.zone.now
+    end
+
+    def expired?
+      published_to? and published_to < Time.zone.now
+    end
+
+    private
+
+    def set_published_at
+      case status
+        when 'draft', self.class.statuses[:draft]         then self.published_at = nil
+        when 'published', self.class.statuses[:published] then self.published_at ||= Time.zone.now
+      end
+    end
+
+    def set_default_status
+      self.status ||= self.class.statuses[:draft]
+    end
+
+  end  
+end

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

@@ -3,28 +3,30 @@ module PushType
     extend ActiveSupport::Concern
 
     def template
-      self.class.template_name
+      self.class.template_path
     end
 
     def template_args
-      [template, self.class.template_opts.except!(:path, :template)]
+      [template, self.class.template_opts.except!(:path)]
     end
 
     module ClassMethods
 
       def template(name, opts = {})
-        @template_opts = opts.merge(template: name)
+        @template_name = name
+        @template_opts = opts
       end
 
       def template_name
-        File.join template_opts[:path], template_opts[:template]
+        @template_name || self.name.underscore
+      end
+
+      def template_path
+        File.join template_opts[:path], template_name
       end
 
       def template_opts
-        {
-          path:     'nodes',
-          template: self.name.underscore
-        }.merge(@template_opts || {})
+        { path: 'nodes' }.merge(@template_opts || {})
       end
 
     end

data/app/models/push_type/node.rb

@@ -1,57 +1,23 @@
 module PushType
   class Node < ActiveRecord::Base
 
-    include PushType::FieldStore
+    include PushType::Customizable
     include PushType::Nestable
     include PushType::Templatable
+    include PushType::Publishable
     include PushType::Trashable
 
     belongs_to :creator, class_name: 'PushType::User'
     belongs_to :updater, class_name: 'PushType::User'
 
-    enum status: [ :draft, :published ]
-
     acts_as_tree name_column: 'slug', order: 'sort_order'
 
     validates :title, presence: true
     validates :slug,  presence: true, uniqueness: { scope: :parent_id }
 
-    scope :published, -> {
-      not_trash.where(['push_type_nodes.status = ? AND push_type_nodes.published_at <= ?', Node.statuses[:published], Time.zone.now]).
-        where(['push_type_nodes.published_to IS NULL OR push_type_nodes.published_to > ?', Time.zone.now])
-    }
-
-    after_initialize :default_values
-    before_save :set_published_at
-
     def permalink
       @permalink ||= self_and_ancestors.map(&:slug).reverse.join('/')
-    end
-
-    def published?
-      super and !scheduled? and !expired?
-    end
-
-    def scheduled?
-      published_at? and published_at > Time.zone.now
-    end
-
-    def expired?
-      published_to? and published_to < Time.zone.now
-    end
-
-    private
-
-    def default_values
-      self.status ||= Node.statuses[:draft]
-    end
-
-    def set_published_at
-      case status
-        when 'draft', Node.statuses[:draft]         then self.published_at = nil
-        when 'published', Node.statuses[:published] then self.published_at ||= Time.zone.now
-      end
-    end
+    end    
     
   end
 end

data/app/models/push_type/user.rb

@@ -1,7 +1,7 @@
 module PushType
   class User < ActiveRecord::Base
 
-    include PushType::FieldStore
+    include PushType::Customizable
 
     validates :name, presence: true
     validates :email, presence: true, uniqueness: true

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

@@ -33,7 +33,6 @@ module PushType
     def test_dummy_config
       template  'application.rb', "#{ dummy_path }/config/application.rb",  force: true
       copy_file 'boot.rb',        "#{ dummy_path }/config/boot.rb",         force: true
-      #copy_file 'page.rb',        "#{ dummy_path }/app/models/page.rb",     force: true
     end
 
     def clean_test_dummy

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

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

data/lib/push_type/core.rb

@@ -30,7 +30,7 @@ module PushType
             false
           end
         end
-      end
+      end.sort
     end
   end
 

data/lib/push_type/field_type.rb

@@ -3,13 +3,13 @@ module PushType
 
     attr_reader :name
 
-    def initialize(name, opts)
-      @name = name
+    def initialize(name, opts = {})
+      @name = name.to_s
       @opts = opts
     end
 
     def kind
-      self.class.name.demodulize.underscore.gsub(/_field$/, '')
+      self.class.name.demodulize.underscore.gsub(/_(field|type)$/, '')
     end
 
     def template
@@ -17,7 +17,7 @@ module PushType
     end
 
     def label
-      @opts[:label] || name.to_s.humanize
+      @opts[:label] || name.humanize
     end
 
     def html_options
@@ -28,6 +28,15 @@ module PushType
       @opts[:form_helper] || :text_field
     end
 
+    def column_class
+      case @opts[:colspan]
+        when 2 then 'medium-6'
+        when 3 then 'medium-4'
+        when 3 then 'medium-3'
+        else nil
+      end
+    end
+
     def to_json(val)
       val.to_s
     end

data/lib/push_type/testing/common_rake.rb

@@ -7,11 +7,11 @@ namespace :common do
   task :test_app, :lib_name, :base_path, :dummy_path do |t, args|
     args.with_defaults lib_name: 'push_type_core', base_path: './', dummy_path: 'test/dummy'
 
-    PushType::DummyGenerator.start ["--lib_name=#{ args[:lib_name] }", "--path=#{ args[:dummy_path] }", "--quiet"]
+    PushType::DummyGenerator.start ["--lib_name=#{ args[:lib_name] }", "--path=#{ args[:dummy_path] }", '--quiet']
 
     Dir.chdir File.join(args[:base_path], args[:dummy_path]) do
-      PushType::InstallGenerator.start ["--migrate=false", "--quiet"]
-      PushType::NodeGenerator.start ["page", "--quiet"]
+      PushType::InstallGenerator.start ['--migrate=false', '--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

@@ -3,7 +3,8 @@ require 'database_cleaner'
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-DatabaseCleaner.strategy = :truncation
+DatabaseCleaner.strategy = :transaction
+DatabaseCleaner.clean_with :truncation
 Dragonfly.app.use_datastore :memory
 
 class ActiveSupport::TestCase

data/lib/push_type/testing/support/test_page.rb

@@ -0,0 +1,2 @@
+class TestPage < PushType::Node
+end

data/test/dummy/config/secrets.yml

@@ -11,10 +11,10 @@
 # if you're sharing your code publicly.
 
 development:
-  secret_key_base: 3a0290ef14a6709a4ddf47900c48071388eeda0043cfa62d5c91bd7ca43b4c67b6d75e8581c2e8f59c8602bec6c02704f464bb595f03d40c41854c09cf750425
+  secret_key_base: 008a08469af29400dc99be0048b9a9ec9285d1b0f980103d94bc705f4c2caae79baa43cc22b32ac3ad095775cfec902a338a037157104ea45bfd3a0b1a597c70
 
 test:
-  secret_key_base: 67677cecd4f711470d4f4d987ce44bafe748709944949b14510c709115e2110a45ab5afdfd35eddc238bd36f5f181528d6923a1c099ac02d1699c2a808e25f51
+  secret_key_base: 05838fc140f2e78a6e755907d2518a78c7c826431bb4bb4552183478d798ec56053fa09f29ddb5c3eac83d073f6ee10b84c522cda9a7c6584c603aa254b988de
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.

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: 20141205213455) do
+ActiveRecord::Schema.define(version: 20150102204406) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"