site_logic 1.9.5 → 1.9.6

data/Gemfile

@@ -2,14 +2,13 @@ source 'http://rubygems.org'
 
 gem 'bson_ext'
 gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
-gem 'ckeditor', :git => 'git://github.com/Bantik/rails-ckeditor.git', :branch => 'rails3_mongoid'
-gem 'mongoid', '>= 2.0.0.beta.17'
+gem 'ckeditor'
+gem 'mini_magick'
 gem 'mongoid-tree', :require => 'mongoid/tree'
 gem 'rails', '3.0.10'
-gem 'rmagick', '2.12.2' # version compatible with heroku
+gem 'rmagick', '2.12.2'# version compatible with heroku
 gem 'scaffold_logic', '>= 1.0.3'
 gem 'stringex'
-gem 'SystemTimer'
 gem 'tanker'
 
 group :development do
@@ -18,15 +17,11 @@ end
 
 group :test do
   gem 'be_valid_asset'
-  gem 'capybara'
   gem 'cucumber-rails'
   gem 'database_cleaner'
   gem 'faker'
   gem 'launchy'
   gem 'machinist_mongo', :require => 'machinist/mongoid'
-  gem 'metric_fu'
   gem 'mocha'
-  gem 'nokogiri'
-  gem 'rcov'
   gem 'rspec-rails'
 end

data/Rakefile

@@ -1,4 +1,4 @@
-require 'metric_fu'
+require 'metric_fu' if Object.const_defined?('MetricFu')
 require 'rubygems'
 require 'rake'
 require File.expand_path('../config/application', __FILE__)

data/VERSION

@@ -1 +1 @@
-1.9.5
+1.9.6

data/app/models/nav_item.rb

@@ -20,13 +20,8 @@ class NavItem
   scope :footer,    :where => {:kind => 'Footer'}
 
   # Behavior =======================================================================================
-  attr_accessor :status
-  attr_accessor :creating_page
-
-  # Validations ====================================================================================
-  validates_presence_of :link_text
-  validates_presence_of :link_title
-  validates_presence_of :url
+  attr_accessor :status, :creating_page
+  validates_presence_of :kind, :link_text, :link_title, :url
 
   # Instance methods ===============================================================================
   def children

data/app/models/page.rb

@@ -48,7 +48,7 @@ class Page
     indexes :page_title
   end
 
-  after_destroy :delete_tank_indexes
+  after_destroy :delete_tank_indexes unless Rails.application.config.tanker_disabled
   after_save :update_tank_indexes unless Rails.application.config.tanker_disabled
 
   # Instance methods ===============================================================================

data/config/environments/test.rb

@@ -1,14 +1,12 @@
 SiteLogic::Application.configure do
   config.cache_classes = true
   config.whiny_nils = true
-  config.consider_all_requests_local       = true
+  config.consider_all_requests_local = true
   config.action_controller.perform_caching = false
   config.action_dispatch.show_exceptions = false
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
   config.action_mailer.delivery_method = :test
   config.active_support.deprecation = :stderr
   # tanker gem
-  config.index_tank_url = 'http://:PctyyJitroN8iv@82wog.api.indextank.com'
   config.tanker_disabled = true
-  config.tanker_pagination_backend = :kaminari
 end

data/config/initializers/metric_fu.rb

@@ -1,4 +1,4 @@
-if Rails.env.test?
+if Rails.env.test? && Object.const_defined?('MetricFu')
   require 'metric_fu'
 
   MetricFu::Configuration.run do |config|

data/site_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "site_logic"
-  s.version = "1.9.5"
+  s.version = "1.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bantik"]
-  s.date = "2011-11-09"
+  s.date = "2011-11-30"
   s.description = "An engine for search-engine-optimized content management."
   s.email = "corey@seologic.com"
   s.files = [
@@ -168,13 +168,12 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bson_ext>, [">= 0"])
       s.add_runtime_dependency(%q<carrierwave-mongoid>, [">= 0"])
       s.add_runtime_dependency(%q<ckeditor>, [">= 0"])
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.17"])
+      s.add_runtime_dependency(%q<mini_magick>, [">= 0"])
       s.add_runtime_dependency(%q<mongoid-tree>, [">= 0"])
       s.add_runtime_dependency(%q<rails>, ["= 3.0.10"])
       s.add_runtime_dependency(%q<rmagick>, ["= 2.12.2"])
       s.add_runtime_dependency(%q<scaffold_logic>, [">= 1.0.3"])
       s.add_runtime_dependency(%q<stringex>, [">= 0"])
-      s.add_runtime_dependency(%q<SystemTimer>, [">= 0"])
       s.add_runtime_dependency(%q<tanker>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
@@ -182,13 +181,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<carrierwave-mongoid>, [">= 0"])
       s.add_dependency(%q<ckeditor>, [">= 0"])
-      s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.17"])
+      s.add_dependency(%q<mini_magick>, [">= 0"])
       s.add_dependency(%q<mongoid-tree>, [">= 0"])
       s.add_dependency(%q<rails>, ["= 3.0.10"])
       s.add_dependency(%q<rmagick>, ["= 2.12.2"])
       s.add_dependency(%q<scaffold_logic>, [">= 1.0.3"])
       s.add_dependency(%q<stringex>, [">= 0"])
-      s.add_dependency(%q<SystemTimer>, [">= 0"])
       s.add_dependency(%q<tanker>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
@@ -197,13 +195,12 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bson_ext>, [">= 0"])
     s.add_dependency(%q<carrierwave-mongoid>, [">= 0"])
     s.add_dependency(%q<ckeditor>, [">= 0"])
-    s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.17"])
+    s.add_dependency(%q<mini_magick>, [">= 0"])
     s.add_dependency(%q<mongoid-tree>, [">= 0"])
     s.add_dependency(%q<rails>, ["= 3.0.10"])
     s.add_dependency(%q<rmagick>, ["= 2.12.2"])
     s.add_dependency(%q<scaffold_logic>, [">= 1.0.3"])
     s.add_dependency(%q<stringex>, [">= 0"])
-    s.add_dependency(%q<SystemTimer>, [">= 0"])
     s.add_dependency(%q<tanker>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])

data/spec/controllers/admin/pages_controller_spec.rb

@@ -45,7 +45,7 @@ describe Admin::PagesController do
   end
 
   it "destroy action should destroy model and redirect to index action" do
-    delete :destroy, :id => @page.id, :site_id => @site.id.to_s
+    delete :destroy, :id => @page.id.to_s, :site_id => @site.id.to_s
     response.should redirect_to(admin_site_pages_url(@site))
     @site.pages.include?(@page.id).should be_false
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: site_logic
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 1
   - 9
-  - 5
-  version: 1.9.5
+  - 6
+  version: 1.9.6
 platform: ruby
 authors: 
 - Bantik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-09 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -60,21 +60,17 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mongoid
+  name: mini_magick
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196417
+        hash: 3
         segments: 
-        - 2
         - 0
-        - 0
-        - beta
-        - 17
-        version: 2.0.0.beta.17
+        version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -154,7 +150,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: SystemTimer
+  name: tanker
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -167,24 +163,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: tanker
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -194,11 +176,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -210,7 +192,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id013
+  version_requirements: *id012
 description: An engine for search-engine-optimized content management.
 email: corey@seologic.com
 executables: []