classiccms 0.4.2 → 0.5.0

data/classiccms.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "thin"
 
   #background processing
-  s.add_runtime_dependency "resque"
+  s.add_runtime_dependency "celluloid", "~> 0.11.1"
 
   #file upload
   s.add_runtime_dependency "dragonfly"

data/lib/classiccms/application.rb

@@ -11,8 +11,7 @@ require "sass"
 require "slim"
 require "coffee-script"
 require 'encryptor'
-require 'resque'
-require 'resque/server'
+require 'celluloid'
 require 'dragonfly'
 
 $app = Dragonfly[:image]
@@ -70,9 +69,9 @@ module Classiccms
 
     #from gem
     #require resque
-    redis_conf = YAML.load_file(File.join(Dir.pwd, 'config/redis.yml'))[ENV['RACK_ENV']]
-    Resque.redis = redis_conf['host']
-    Resque.redis.namespace = redis_conf['database']
+    #redis_conf = YAML.load_file(File.join(Dir.pwd, 'config/redis.yml'))[ENV['RACK_ENV']]
+    #Resque.redis = redis_conf['host']
+    #Resque.redis.namespace = redis_conf['database']
 
     #require helpers
     require File.join(File.dirname(__FILE__), 'helpers.rb')

data/lib/classiccms/cli.rb

@@ -29,11 +29,10 @@ module Classiccms
           f.puts mongoid
         end
 
-        #replace database name
-        redis = File.read(File.join(Dir.pwd, app_name, 'config/redis.yml')).gsub('$', app_name)
-        File.open(File.join(Dir.pwd, app_name, 'config/redis.yml'), 'w') do |f|
-          f.puts redis
-        end
+        gemfile = File.join(Dir.pwd, app_name, 'Gemfile')
+        gemfile_text = File.read(gemfile)
+        gemfile_text = gemfile_text.gsub(/VERSION/, VERSION)
+        File.open(gemfile, "w") {|file| file.puts gemfile_text}
 
         puts "#{app_name} created!"
       end

data/lib/classiccms/helpers.rb

@@ -19,6 +19,9 @@ module Classiccms
         show :logout, views: File.join(Classiccms::ROOT, 'views/cms')
       end
     end
+    def partial(file_name)
+      show :"#{file_name}", {views: ['app/views']}
+    end
 
     #generates url for a document
     def link(document, url)
@@ -51,6 +54,7 @@ module Classiccms
     def section(section_name, parent_id = nil)
       html = []
       parent_id = get_parent_id(parent_id)
+
       Base.where(:'connections.parent_id' => parent_id, :'connections.section' => section_name, :'connections.file'.ne => nil).each do |record|
         connection = record.connections.where(:parent_id => parent_id, :section => section_name, :file.ne => nil).first
 

data/lib/classiccms/scaffold/Gemfile

@@ -1,5 +1,5 @@
 source :rubygems
-gem 'classiccms', :require => 'classiccms/application'
+gem 'classiccms', '~>VERSION', :require => 'classiccms/application'
 
 group :test do
   gem 'rspec'

data/lib/classiccms/scaffold/Rakefile

@@ -6,4 +6,8 @@ require 'bundler'
 Bundler.require
 Classiccms.boot
 
-require 'resque/tasks'
+#task :cron do
+#  Plan.feed
+#  puts Plan.all.count
+#  puts "done."
+#end

data/lib/classiccms/scaffold/app/queue/mail.rb

@@ -1,8 +1,8 @@
-#To use: Resque.queue(Mail, variable, variable)
+#To use: use {method}! to perform asynchronously
 #
 #class Mail
-#  @queue = :mail
-#  def self.perform
+#  include Celluloid
+#  def send
 #    p 'hello world'
 #    Article.create
 #    puts 'hello world'

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/cli_spec.rb

@@ -86,7 +86,13 @@ describe :Base do
       $stdout.string.should == "you are so smart! I don't know what you mean! (try using new or server)\n"
     end
   end
-
+  it 'should set the right version in the gemfile' do 
+    capture_log do
+      app_name = 'test'
+      Classiccms::Cli.command ['new', app_name]
+      File.open(File.join(app_name, 'Gemfile')).read.include?(Classiccms::VERSION).should == true
+    end
+  end
   after :all do
     clear_tmp
   end

data/spec/queue_spec.rb

@@ -16,14 +16,13 @@ describe Classiccms do
 
     set_file "queue/test.rb", %Q(
       class Test
-        @queue = :mail
-        def self.perform
+        include Celluloid
+        def perform
           p 'hello world'
         end
       end
     )
-    app
-    Resque.inline = true
+    app 
   end
 
   it 'should have Mail class' do
@@ -32,7 +31,9 @@ describe Classiccms do
   end
   it 'should be able to run background task' do
     capture_log do
-      Resque.enqueue Test
+      t = Test.new 
+      t.perform!
+      sleep 1
       $stdout.string.should == "\"hello world\"\n"
     end
   end
@@ -43,7 +44,6 @@ describe Classiccms do
     File.exists?("#{Classiccms::ROOT}/scaffold/app/queue/mail.rb").should == true
   end
 
-
   after :all do
     clear_tmp
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classiccms
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -188,21 +188,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: celluloid
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -1154,7 +1154,6 @@ files:
 - lib/classiccms/scaffold/config/application.rb
 - lib/classiccms/scaffold/config/config.yml
 - lib/classiccms/scaffold/config/mongoid.yml
-- lib/classiccms/scaffold/config/redis.yml
 - lib/classiccms/scaffold/public/favicon.ico
 - lib/classiccms/scaffold/public/javascripts/index.coffee
 - lib/classiccms/scaffold/public/stylesheets/reset.sass

data/lib/classiccms/scaffold/config/redis.yml

@@ -1,9 +0,0 @@
-development:
-  host: localhost:6379
-  database: $_development
-test:
-  host: localhost:6379
-  database: $_test
-production:
-  host: localhost:6379
-  database: $