caboose-cms 0.5.28 → 0.5.30

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.28'
+  VERSION = '0.5.30'
 end

data/lib/tasks/caboose.rake

@@ -1,6 +1,11 @@
 require "caboose/version"
 
-namespace :caboose do  
+namespace :caboose do
+
+  desc "Run rspec tests on Caboose"
+  task :test => :environment do    
+    system("rspec #{Caboose::root}/spec")    
+  end
     
   desc "Creates/verifies that all database tables and fields are correctly added."
   task :db => :environment do
@@ -30,27 +35,6 @@ namespace :caboose do
     admin_user.password = Digest::SHA1.hexdigest(Caboose::salt + 'caboose')
     admin_user.save    
   end
-
-  desc "Sync production db to development"
-  task :sync_dev_db, :app_name, :dump_dir do |t, args|  
-    app_name = args[:app_name] ? " --app #{args[:app_name]}" : ''
-    dump_dir = args[:dump_dir] ? args[:dump_dir] : "#{Rails.root}/db/backups"
-    `mkdir -p #{dump_dir}` if !File.exists?(dump_dir)
-    
-    # Get the db conf
-    ddb = Rails.application.config.database_configuration['development']
-    pdb = Rails.application.config.database_configuration['production']            
-    dump_file = "#{dump_dir}/#{pdb['database']}_#{DateTime.now.strftime('%FT%T')}.dump"    
-        
-    puts "Capturing production database..."
-    `heroku pgbackups:capture --expire#{app_name}`
-    
-    puts "Downloading production database dump file..."
-    `curl -o #{dump_file} \`heroku pgbackups:url#{app_name}\``
-    
-    puts "Restoring development database from dump file..."
-    `pg_restore --verbose --clean --no-acl --no-owner -h #{ddb['host']} -U #{ddb['username']} -d #{ddb['database']} #{dump_file}`
-  end
                  
   desc "Clears sessions older than the length specified in the caboose config from the sessions table"
   task :clear_old_sessions => :environment do

data/lib/tasks/caboose_sync.rake

@@ -0,0 +1,112 @@
+
+namespace :caboose do
+
+  desc "Create YAML test fixtures from data in the development database."
+  task :fixtures => :environment do
+    sql  = "SELECT * FROM %s"
+    skip_tables = ["schema_migrations"]
+    ActiveRecord::Base.establish_connection(Rails.env)
+    (ActiveRecord::Base.connection.tables - skip_tables).each do |table_name|
+      
+      count = ActiveRecord::Base.connection.select_value("select count(*) from #{table_name}")
+      count = count.to_i
+      data = ''
+      if count > 0
+        i = 1
+        pad_count = Math.log(count, 10).ceil
+        rows = ActiveRecord::Base.connection.select_all(sql % table_name)
+        h = {}
+        rows.each do |row| 
+          h["#{table_name}_#{i.to_s.rjust(pad_count, '0')}"] = row
+          i = i + 1
+        end
+        data = h.to_yaml.gsub(/<%([^%])/, '<%%\1')
+
+        #data = rowsdata.inject({}) { |hash, record|
+        #  hash["#{table_name}_#{i.succ!}"] = record
+        #  hash
+        #}.to_yaml.gsub(/<%([^%])/, '<%%\1')
+      end
+          
+      File.open("#{Rails.root}/test/fixtures/#{table_name}.yml", 'w') do |file|          
+        file.write data            
+      end      
+    end
+
+    ## Now escape any erb code in there
+    #Dir["#{Rails.root}/test/fixtures/*.yml"].each do |fname|      
+    #  file = File.open(fname, "rb")      
+    #  str = file.read
+    #  str2 = str.gsub(/<%([^%])/, '<%%\1')
+    #  if str2 != str
+    #    File.open(fname, 'w') { |file| file.write(str2) }
+    #  end                  
+    #end    
+  end  
+
+  namespace :sync do  
+      
+    desc "Sync production database to development database"
+    task :production_to_development do |t, args|
+      sync_db('production', 'development')      
+    end
+    
+    desc "Sync development database to test database"
+    task :development_to_test do |t, args|
+      sync_db('development', 'test')      
+    end
+    
+    desc "Sync production database to development database"
+    task :p2d do |t, args|
+      sync_db('production', 'development')      
+    end
+    
+    desc "Sync development database to test database"
+    task :d2t do |t, args|
+      sync_db('development', 'test')      
+    end
+  
+    def sync_db(from_db, to_db)
+      # Get the app name
+      app_name = `grep "git@heroku.com" "#{Rails.root}/.git/config"`      
+      app_name = app_name.strip.gsub(/^url = git@heroku.com\:(.*?).git$/, '\1')      
+                
+      # Get the db confs    
+      from_conf = Rails.application.config.database_configuration[from_db]
+      to_conf   = Rails.application.config.database_configuration[to_db]
+      
+      dump_dir = "#{Rails.root}/db/backups"
+      `mkdir -p #{dump_dir}` if !File.exists?(dump_dir)    
+      dump_file = "#{dump_dir}/#{app_name}_#{from_db}_#{DateTime.now.strftime('%Y%m%d%H%M')}.dump"
+
+      if from_db == 'production'
+        
+        puts "Capturing production database..."
+        `heroku pgbackups:capture --expire --app #{app_name}`
+        
+        puts "Downloading production database dump file..."
+        `curl -o #{dump_file} \`heroku pgbackups:url --app #{app_name}\``
+        
+      elsif from_db == 'development'
+        
+        puts "Dumping development database..."
+        host = from_conf['host'] ? from_conf['host'] : 'localhost'
+        `pg_dump -Fc --no-acl --no-owner -h #{host} -U #{from_conf['username']} #{from_conf['database']} > #{dump_file}`      
+        
+      end
+      
+      if to_db == 'development' || to_db == 'test'
+      
+        puts "Restoring database to #{to_db} from dump file..."
+        host = to_conf['host'] ? to_conf['host'] : 'localhost'        
+        `pg_restore --verbose --clean --no-acl --no-owner -h #{host} -U #{to_conf['username']} -d #{to_conf['database']} #{dump_file}`
+        
+      elsif to_db == 'production'
+        
+        puts "Syncing to production database is not supported."
+        
+      end
+    end
+           
+  end
+end

data/spec/factories/caboose_blocks.rb

@@ -0,0 +1,20 @@
+require 'faker'
+
+FactoryGirl.define do
+  factory :caboose_block, :class => Caboose::Block do |f|
+    f.page_id             { nil }
+    f.parent_id           { nil }
+    f.block_type_id       { nil }
+    f.sort_order          { rand(0..10) }
+    f.name                { Faker::Internet.user_name }
+    f.value               { Faker::Lorem.sentence }
+    f.file_file_name      { "#{Faker::Lorem.word}.#{['pdf','xls','csv'].sample}" }
+    f.file_content_type   { ['application/pdf','application/xls'].sample }
+    f.file_file_size      { rand(100..100000) }
+    f.file_updated_at     { Faker::Time.between(1.month.ago, Time.now, :all) }
+    f.image_file_name     { "#{Faker::Lorem.word}.#{['gif','jpg','png'].sample}" }
+    f.image_content_type  { ['image/gif','image/jpeg','image/png'].sample }
+    f.image_file_size     { rand(100..100000) }
+    f.image_updated_at    { Faker::Time.between(1.month.ago, Time.now, :all) }        
+  end
+end

data/spec/factories/caboose_users.rb

@@ -0,0 +1,19 @@
+require 'faker'
+
+FactoryGirl.define do
+  factory :caboose_user, :class => Caboose::User do |f|
+    f.first_name           { Faker::Name.first_name }
+    f.last_name            { Faker::Name.last_name }
+    f.username             { Faker::Internet.user_name }
+    f.email                { Faker::Internet.email }
+    f.address              { Faker::Address.street_address }
+    f.address2             { Faker::Address.secondary_address }
+    f.city                 { Faker::Address.city }
+    f.state                { Faker::Address.state }
+    f.zip                  { Faker::Address.zip }
+    f.phone                { Faker::PhoneNumber.phone_number }
+    f.fax                  { Faker::PhoneNumber.phone_number }            
+    f.password             { Faker::Internet.password(20) }    
+    f.date_created         { Faker::Time.between(1.year.ago, Time.now, :all) }
+  end
+end

data/spec/models/block_spec.rb

@@ -0,0 +1,114 @@
+
+describe Caboose::Block do
+  it "has a valid factory" do
+    expect(FactoryGirl.create(:caboose_block)).to be_valid
+  end
+  
+  def reload_blocks
+    @b0.reload
+    @b1.reload
+    @b2.reload
+    @b3.reload
+    @b4.reload
+  end
+  
+  def print_blocks
+    puts "------------------------------"    
+    puts "#{@b0.id} #{@b0.sort_order}"
+    puts "#{@b1.id} #{@b1.sort_order}"
+    puts "#{@b2.id} #{@b2.sort_order}"
+    puts "#{@b3.id} #{@b3.sort_order}"
+    puts "#{@b4.id} #{@b4.sort_order}"
+    puts "------------------------------"
+  end
+      
+  describe "sorts correctly" do
+    before(:all) do
+      @b0 = FactoryGirl.create(:caboose_block, :parent_id => 1, :sort_order => 0)
+      @b1 = FactoryGirl.create(:caboose_block, :parent_id => 1, :sort_order => 1)
+      @b2 = FactoryGirl.create(:caboose_block, :parent_id => 1, :sort_order => 2)
+      @b3 = FactoryGirl.create(:caboose_block, :parent_id => 1, :sort_order => 3)
+      @b4 = FactoryGirl.create(:caboose_block, :parent_id => 1, :sort_order => 4)
+    end
+    before(:each) do
+      @b0.update_attribute(:sort_order, 0)
+      @b1.update_attribute(:sort_order, 1)
+      @b2.update_attribute(:sort_order, 2)
+      @b3.update_attribute(:sort_order, 3)
+      @b4.update_attribute(:sort_order, 4)
+      reload_blocks      
+    end
+    
+    it "moves up when not at the top" do        
+      @b2.move_up
+      reload_blocks          
+      expect(@b0.sort_order).to eql(0)
+      expect(@b1.sort_order).to eql(2)
+      expect(@b2.sort_order).to eql(1)
+      expect(@b3.sort_order).to eql(3)
+      expect(@b4.sort_order).to eql(4)
+    end
+    
+    it "doesn't move up when already at the top" do      
+      @b0.move_up
+      reload_blocks      
+      expect(@b0.sort_order).to eql(0)
+      expect(@b1.sort_order).to eql(1)
+      expect(@b2.sort_order).to eql(2)
+      expect(@b3.sort_order).to eql(3)
+      expect(@b4.sort_order).to eql(4)
+    end
+        
+    it "moves down when not at the bottom" do
+      @b2.move_down
+      reload_blocks          
+      expect(@b0.sort_order).to eql(0)
+      expect(@b1.sort_order).to eql(1)
+      expect(@b2.sort_order).to eql(3)
+      expect(@b3.sort_order).to eql(2)
+      expect(@b4.sort_order).to eql(4)
+    end
+    
+    it "doesn't move down when already at the bottom" do
+      @b4.move_down
+      reload_blocks          
+      expect(@b0.sort_order).to eql(0)
+      expect(@b1.sort_order).to eql(1)
+      expect(@b2.sort_order).to eql(2)
+      expect(@b3.sort_order).to eql(3)
+      expect(@b4.sort_order).to eql(4)
+    end
+    
+    it "resets the sort order when sort order is not continuous" do
+      @b0.update_attribute(:sort_order, 0)
+      @b1.update_attribute(:sort_order, 1)
+      @b2.update_attribute(:sort_order, 17)
+      @b3.update_attribute(:sort_order, 18)
+      @b4.update_attribute(:sort_order, 19)
+      reload_blocks      
+      @b2.move_up
+      reload_blocks          
+      expect(@b0.sort_order).to eql(0)
+      expect(@b1.sort_order).to eql(2)
+      expect(@b2.sort_order).to eql(1)
+      expect(@b3.sort_order).to eql(3)
+      expect(@b4.sort_order).to eql(4)
+      
+      @b0.update_attribute(:sort_order, 0)
+      @b1.update_attribute(:sort_order, 1)
+      @b2.update_attribute(:sort_order, 17)
+      @b3.update_attribute(:sort_order, 18)
+      @b4.update_attribute(:sort_order, 19)
+      reload_blocks      
+      @b2.move_down
+      reload_blocks          
+      expect(@b0.sort_order).to eql(0)
+      expect(@b1.sort_order).to eql(1)
+      expect(@b2.sort_order).to eql(3)
+      expect(@b3.sort_order).to eql(2)
+      expect(@b4.sort_order).to eql(4)
+    end
+    
+  end
+
+end

data/spec/models/user_spec.rb

@@ -0,0 +1,9 @@
+
+describe Caboose::User do
+  it "has a valid factory" do
+    expect(FactoryGirl.create(:caboose_user)).to be_valid
+  end  
+  it "is invalid without an email" do
+    expect(FactoryGirl.build(:caboose_user, :email => nil)).to_not be_valid
+  end    
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.28
+  version: 0.5.30
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +248,90 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: factory_girl_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: CMS built on rails with love.
 email:
 - william@nine.is
@@ -741,39 +839,11 @@ files:
 - lib/sample_files/config/tinymce.yml
 - lib/sample_files/timezone_abbreviations.csv
 - lib/tasks/caboose.rake
-- test/caboose_test.rb
-- test/dummy/README.rdoc
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/script/rails
-- test/integration/navigation_test.rb
-- test/test_helper.rb
+- lib/tasks/caboose_sync.rake
+- spec/factories/caboose_blocks.rb
+- spec/factories/caboose_users.rb
+- spec/models/block_spec.rb
+- spec/models/user_spec.rb
 homepage: http://github.com/williambarry007/caboose-cms
 licenses: []
 metadata: {}
@@ -798,36 +868,7 @@ signing_key:
 specification_version: 4
 summary: CMS built on rails.
 test_files:
-- test/caboose_test.rb
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/test.sqlite3
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/script/rails
-- test/integration/navigation_test.rb
-- test/test_helper.rb
+- spec/factories/caboose_blocks.rb
+- spec/factories/caboose_users.rb
+- spec/models/block_spec.rb
+- spec/models/user_spec.rb