editorial_logic 1.4.3 → 1.4.4

data/Gemfile

@@ -2,13 +2,12 @@ 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 'ckeditor'
 gem 'fastercsv'
 gem 'mongoid'
-gem 'rails'
-gem 'scaffold_logic'#, :path => '~/Documents/projects/scaffold_logic'
+gem 'rails', '3.0.10'
+gem 'scaffold_logic'
 gem 'stringex'
-gem 'SystemTimer'
 gem 'tanker'
 
 group :development do
@@ -22,8 +21,6 @@ group :test do
   gem 'faker'
   gem 'launchy'
   gem 'machinist_mongo', :require => 'machinist/mongoid'
-  gem 'metric_fu'
   gem 'mocha'
-  gem 'rcov'
   gem 'rspec-rails'
 end

data/Rakefile

@@ -1,10 +1,8 @@
-require 'metric_fu'
+require 'metric_fu' if Object.const_defined? 'MetricFu'
 require 'rubygems'
 require 'rake'
 require File.expand_path('../config/application', __FILE__)
-
 EditorialLogic::Application.load_tasks
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -15,17 +13,14 @@ begin
     gem.homepage = "http://github.com/ivanoblomov/editorial_logic"
     gem.authors = ["Bantik"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
-
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "editorial_logic #{version}"
   rdoc.rdoc_files.include('README*')

data/VERSION

@@ -1 +1 @@
-1.4.3
+1.4.4

data/app/models/managed_content.rb

@@ -55,8 +55,8 @@ class ManagedContent
     indexes :summary
   end
 
-  after_destroy :delete_tank_indexes
-  after_save :update_tank_indexes
+  after_destroy :delete_tank_indexes unless Rails.application.config.tanker_disabled
+  after_save :update_tank_indexes unless Rails.application.config.tanker_disabled
 
   # Validations ====================================================================================
   class ContentPresenceValidator < ActiveModel::EachValidator

data/config/environments/test.rb

@@ -7,7 +7,6 @@ EditorialLogic::Application.configure do
   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_pagination_backend = :kaminari
+  # custom
+  config.tanker_disabled = true
 end

data/config/initializers/metric_fu.rb

@@ -1,9 +1,9 @@
-if Rails.env.test?
+if Rails.env.test? && Object.const_defined?('MetricFu')
   require 'metric_fu'
   MetricFu::Configuration.run do |config|
     config.metrics  = [:churn, :saikuro, :stats, :flog, :flay]
     config.graphs   = [:flog, :flay, :stats]
     config.rcov[:test_files] = ['spec/**/*_spec.rb']
-    config.rcov[:rcov_opts] << '-Ispec' # Needed to find spec_helper
+    config.rcov[:rcov_opts] << '-Ispec'
   end
 end

data/config/mongoid.yml

@@ -1,17 +1,5 @@
 defaults: &defaults
   host: localhost
-  autocreate_indexes: false
-  allow_dynamic_fields: false
-  include_root_in_json: false
-  parameterize_keys: true
-  persist_in_safe_mode: false
-  raise_not_found_error: true
-  reconnect_time: 3
-  skip_version_check: true
-
-development:
-  <<: *defaults
-  database: editorial_logic_development
 
 test:
   <<: *defaults

data/editorial_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "editorial_logic"
-  s.version = "1.4.3"
+  s.version = "1.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bantik"]
-  s.date = "2011-11-02"
+  s.date = "2011-11-30"
   s.description = "An engine for enabling managed content, including articles, blogs, FAQs and glossaries."
   s.email = "corey@seologic.com"
   s.files = [
@@ -69,13 +69,10 @@ Gem::Specification.new do |s|
     "config/boot.rb",
     "config/cucumber.yml",
     "config/environment.rb",
-    "config/environments/development.rb",
-    "config/environments/production.rb",
     "config/environments/test.rb",
     "config/initializers/metric_fu.rb",
     "config/initializers/secret_token.rb",
     "config/initializers/session_store.rb",
-    "config/locales/en.yml",
     "config/mongoid.yml",
     "config/routes.rb",
     "editorial_logic.gemspec",
@@ -128,10 +125,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<ckeditor>, [">= 0"])
       s.add_runtime_dependency(%q<fastercsv>, [">= 0"])
       s.add_runtime_dependency(%q<mongoid>, [">= 0"])
-      s.add_runtime_dependency(%q<rails>, [">= 0"])
+      s.add_runtime_dependency(%q<rails>, ["= 3.0.10"])
       s.add_runtime_dependency(%q<scaffold_logic>, [">= 0"])
       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"])
@@ -141,10 +137,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ckeditor>, [">= 0"])
       s.add_dependency(%q<fastercsv>, [">= 0"])
       s.add_dependency(%q<mongoid>, [">= 0"])
-      s.add_dependency(%q<rails>, [">= 0"])
+      s.add_dependency(%q<rails>, ["= 3.0.10"])
       s.add_dependency(%q<scaffold_logic>, [">= 0"])
       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"])
@@ -155,10 +150,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<ckeditor>, [">= 0"])
     s.add_dependency(%q<fastercsv>, [">= 0"])
     s.add_dependency(%q<mongoid>, [">= 0"])
-    s.add_dependency(%q<rails>, [">= 0"])
+    s.add_dependency(%q<rails>, ["= 3.0.10"])
     s.add_dependency(%q<scaffold_logic>, [">= 0"])
     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/features/manage_articles_content.feature

@@ -3,14 +3,13 @@ Feature: Manage Articles Content
   As an admin
   I want to create, edit, and delete articles
 
-  @focus
   Scenario: Add Content to a Publication
     Given I have no publications
     Given I have a publication named "My Articles" with "Articles" content
     When I visit "My Articles"
     And I follow "Add Content"
     And I fill in "managed_content_headline" with "My Great Article"
-    And I fill in "managed_content_content_editor" with "Here it is."
+    And I fill in "managed_content_content" with "Here it is."
     And I press "Save"
     Then I should see "Publication Details"
     And I should see "My Great Article"
@@ -99,7 +98,7 @@ Feature: Manage Articles Content
     Then I should see "Article Sections"
     And I follow "Add a Section"
     And I fill in "section_headline" with "Introduction"
-    And I fill in "section_content_editor" with "This is my intro."
+    And I fill in "section_content" with "This is my intro."
     And I press "Save"
     Then I should see "Article Details"
     And I should see "Introduction"
@@ -115,7 +114,7 @@ Feature: Manage Articles Content
     Then I should see "Article Sections"
     And I follow "Add a Section"
     And I fill in "section_headline" with "Introduction"
-    And I fill in "section_content_editor" with "This is my intro."
+    And I fill in "section_content" with "This is my intro."
     And I press "Save"
     Then I should see "Article Details"
     And I should see "Introduction"

data/features/manage_faq_content.feature

@@ -9,7 +9,7 @@ Feature: Manage FAQ Content
     When I visit "FAQ"
     And I follow "Add Content"
     And I fill in "managed_content_headline" with "What is the answer?"
-    And I fill in "managed_content_content_editor" with "Here it is."
+    And I fill in "managed_content_content" with "Here it is."
     And I press "Save"
     Then I should see "Publication Details"
     And I should see "What is the answer?"

data/features/manage_glossary_content.feature

@@ -9,7 +9,7 @@ Feature: Manage Glossary Content
     When I visit "Glossary of Technical Terms"
     And I follow "Add Content"
     And I fill in "managed_content_headline" with "Foo"
-    And I fill in "managed_content_content_editor" with "Something arbitrary."
+    And I fill in "managed_content_content" with "Something arbitrary."
     And I press "Save"
     Then I should see "Publication Details"
     And I should see "Foo"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: editorial_logic
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 4
-  - 3
-  version: 1.4.3
+  - 4
+  version: 1.4.4
 platform: ruby
 authors: 
 - Bantik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-02 00:00:00 Z
+date: 2011-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -93,12 +93,14 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 10
+        version: 3.0.10
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -130,7 +132,7 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: SystemTimer
+  name: tanker
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -143,24 +145,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: tanker
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -170,11 +158,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -186,7 +174,7 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 description: An engine for enabling managed content, including articles, blogs, FAQs and glossaries.
 email: corey@seologic.com
 executables: []
@@ -252,13 +240,10 @@ files:
 - config/boot.rb
 - config/cucumber.yml
 - config/environment.rb
-- config/environments/development.rb
-- config/environments/production.rb
 - config/environments/test.rb
 - config/initializers/metric_fu.rb
 - config/initializers/secret_token.rb
 - config/initializers/session_store.rb
-- config/locales/en.yml
 - config/mongoid.yml
 - config/routes.rb
 - editorial_logic.gemspec

data/config/environments/development.rb

@@ -1,11 +0,0 @@
-EditorialLogic::Application.configure do
-  config.cache_classes = false
-  config.whiny_nils = true
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-  config.action_mailer.raise_delivery_errors = false
-  config.active_support.deprecation = :log
-  config.action_dispatch.best_standards_support = :builtin
-  # Custom settings
-  config.feature_results_path = "#{Rails.root}/tmp/feature_results.txt"
-end

data/config/environments/production.rb

@@ -1,9 +0,0 @@
-EditorialLogic::Application.configure do
-  config.cache_classes = true
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
-  config.serve_static_assets = false
-  config.i18n.fallbacks = true
-  config.active_support.deprecation = :notify
-end

data/config/locales/en.yml

@@ -1,5 +0,0 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
-en:
-  hello: "Hello world"