blog_logic 1.4.5 → 1.4.6

data/Gemfile

@@ -2,32 +2,29 @@ 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 'kaminari'
+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'
 gem 'stringex'
 gem 'tanker'
 
 group :development do
   gem 'jeweler'
-  gem 'nokogiri'
 end
 
 group :test do
   gem 'be_valid_asset'
-  gem 'capybara'
   gem 'cucumber-rails'
   gem 'database_cleaner'
   gem 'faker'
-  gem 'gherkin'
   gem 'launchy'
   gem 'machinist_mongo', :require => 'machinist/mongoid'
   gem 'metric_fu'
   gem 'mocha'
-  gem 'rcov'
   gem 'rspec-rails'
   gem 'yard'
 end

data/Gemfile.local

@@ -2,32 +2,29 @@ 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 'kaminari'
+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', :path => '~/Documents/projects/scaffold_logic'
 gem 'stringex'
 gem 'tanker'
 
 group :development do
   gem 'jeweler'
-  gem 'nokogiri'
 end
 
 group :test do
   gem 'be_valid_asset'
-  gem 'capybara'
   gem 'cucumber-rails'
   gem 'database_cleaner'
   gem 'faker'
-  gem 'gherkin'
   gem 'launchy'
   gem 'machinist_mongo', :require => 'machinist/mongoid'
   gem 'metric_fu'
   gem 'mocha'
-  gem 'rcov'
   gem 'rspec-rails'
   gem 'yard'
 end

data/VERSION

@@ -1 +1 @@
-1.4.5
+1.4.6

data/app/models/ckeditor/asset.rb

@@ -1,99 +1,7 @@
-require 'mime/types'
-
 class Ckeditor::Asset
-  include Mongoid::Document
-  include Mongoid::Timestamps
-
-  field :data
-  field :data_file_name
-  field :data_content_type
-  field :data_file_size, :type => Integer
-  field :assetable_id, :type => String
-  field :assetable_type
-  field :kind
-  field :guid
-  field :locale, :default => 0, :type => Integer
-
-  mount_uploader :data, BlogImageUploader
-
-  before_validation :make_content_type
-  before_create :make_dimensions
-
-  def url(*args)
-    data.url(*args)
-  end
-
-  alias :public_filename :url
-
-  def filename
-    data_file_name
-  end
-
-  def content_type
-    data_content_type
-  end
-
-  def size
-    data_file_size
-  end
-
-  def path
-    data.path
-  end
-
-  def styles
-    data.styles
-  end
-
-  def format_created_at
-    I18n.l(self.created_at, :format=>"%d.%m.%Y %H:%M")
-  end
-
-  def to_xml(options = {})
-    builder = options[:builder] ||= Nokogiri::XML::Builder.new(options)
-
-    builder.send(self.type.to_s.downcase) do |xml|
-      xml.id_ self.id
-      xml.filename self.filename
-      xml.size self.size
-      xml.path self.url
-
-      xml.styles do
-        self.styles.each do |style|
-          xml.send(style.first, self.url(style.first))
-        end
-      end unless self.styles.empty?
-    end
-
-    builder.to_xml
-  end
-
-  def has_dimensions?
-    self.respond_to?(:width) && self.respond_to?(:height)
-  end
-
-  def image?
-    ["image/jpeg", "image/tiff", "image/png", "image/gif", "image/bmp"].include?(self.data_content_type)
-  end
-
-  def geometry
-    @geometry ||= Paperclip::Geometry.from_file(data.to_file)
-    @geometry
-  end
-
-  private
-
-    def make_dimensions
-      if image? && has_dimensions?
-        self.width = geometry.width
-        self.height = geometry.height
-      end
-    end
-
-    def make_content_type
-      if data_content_type == "application/octet-stream"
-        content_types = MIME::Types.type_for(filename)
-        self.data_content_type = content_types.first.to_s unless content_types.empty?
-      end
-    end
+  include Ckeditor::Orm::Mongoid::AssetBase
+              
+  delegate :url, :current_path, :size, :content_type, :filename, :to => :data
+  
+  validates_presence_of :data
 end

data/app/models/ckeditor/attachment_file.rb

@@ -1,35 +1,10 @@
 class Ckeditor::AttachmentFile < Ckeditor::Asset
-
-  def url(*args)
-    if [:thumb, :content].include?(args.first)
-      send("url_#{args.first}")
-    else
-      data.url(*args)
-    end
-  end
-
-  def url_content
-	  data.url
-	end
-
+  mount_uploader :data, CkeditorAttachmentFileUploader, :mount_on => :data_file_name
+	
 	def url_thumb
-	  extname = File.extname(filename)
-
-    case extname.to_s
-      when '.swf' then '/javascripts/ckeditor/images/swf.gif'
-      when '.pdf' then '/javascripts/ckeditor/images/pdf.gif'
-      when '.doc', '.txt' then '/javascripts/ckeditor/images/doc.gif'
-      when '.mp3' then '/javascripts/ckeditor/images/mp3.gif'
-      when '.rar', '.zip', '.tg' then '/javascripts/ckeditor/images/rar.gif'
-      when '.xls' then '/javascripts/ckeditor/images/xls.gif'
-      else '/javascripts/ckeditor/images/ckfnothumb.gif'
-    end
+	  @url_thumb ||= begin
+	    extname = File.extname(filename).gsub(/^\./, '')
+      "/javascripts/ckeditor/filebrowser/images/thumbs/#{extname}.gif"
+	  end
 	end
-
-	def to_json(options = {})
-	  options[:methods] ||= []
-	  options[:methods] << :url_content
-	  options[:methods] << :url_thumb
-	  super options
-  end
 end

data/app/models/ckeditor/picture.rb

@@ -1,17 +1,7 @@
 class Ckeditor::Picture < Ckeditor::Asset
-
+  mount_uploader :data, CkeditorPictureUploader, :mount_on => :data_file_name
+	
 	def url_content
 	  url(:content)
 	end
-
-	def url_thumb
-	  url(:thumb)
-	end
-
-	def to_json(options = {})
-	  options[:methods] ||= []
-	  options[:methods] << :url_content
-	  options[:methods] << :url_thumb
-	  super options
-  end
 end

data/app/uploaders/ckeditor_attachment_file_uploader.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+class CkeditorAttachmentFileUploader < CarrierWave::Uploader::Base
+  include Ckeditor::Backend::CarrierWave
+  
+  # Include RMagick or ImageScience support:
+  # include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+  # include CarrierWave::ImageScience
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "ckeditor_assets/attachments/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    Ckeditor.attachment_file_types
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+end

data/app/uploaders/ckeditor_picture_uploader.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+class CkeditorPictureUploader < CarrierWave::Uploader::Base
+  include Ckeditor::Backend::CarrierWave
+
+  # Include RMagick or ImageScience support:
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
+  # include CarrierWave::ImageScience
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "ckeditor_assets/pictures/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+  
+  process :read_dimensions
+
+  # Create different versions of your uploaded files:
+  version :thumb do
+    process :resize_to_fill => [118, 100]
+  end
+
+  version :content do
+    process :resize_to_limit => [800, 800]
+  end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    Ckeditor.image_file_types
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+end

data/blog_logic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "blog_logic"
-  s.version = "1.4.5"
+  s.version = "1.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bantik"]
-  s.date = "2011-11-22"
+  s.date = "2011-11-28"
   s.description = "An engine for search-engine-optimized blog management."
   s.email = "corey@seologic.com"
   s.extra_rdoc_files = [
@@ -36,6 +36,8 @@ Gem::Specification.new do |s|
     "app/models/ckeditor/picture.rb",
     "app/models/post.rb",
     "app/uploaders/blog_image_uploader.rb",
+    "app/uploaders/ckeditor_attachment_file_uploader.rb",
+    "app/uploaders/ckeditor_picture_uploader.rb",
     "app/views/admin/blog_categories/_blog_category.html.erb",
     "app/views/admin/blog_categories/_form.html.erb",
     "app/views/admin/blog_categories/edit.html.erb",
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     "config/environments/development.rb",
     "config/environments/production.rb",
     "config/environments/test.rb",
+    "config/initializers/ckeditor.rb",
     "config/initializers/formats.rb",
     "config/initializers/metric_fu.rb",
     "config/initializers/secret_token.rb",
@@ -123,6 +126,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<carrierwave-mongoid>, [">= 0"])
       s.add_runtime_dependency(%q<ckeditor>, [">= 0"])
       s.add_runtime_dependency(%q<kaminari>, [">= 0"])
+      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"])
@@ -130,13 +134,13 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<stringex>, [">= 0"])
       s.add_runtime_dependency(%q<tanker>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<nokogiri>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
       s.add_dependency(%q<bson_ext>, [">= 0"])
       s.add_dependency(%q<carrierwave-mongoid>, [">= 0"])
       s.add_dependency(%q<ckeditor>, [">= 0"])
       s.add_dependency(%q<kaminari>, [">= 0"])
+      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"])
@@ -144,7 +148,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<stringex>, [">= 0"])
       s.add_dependency(%q<tanker>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
@@ -152,6 +155,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<carrierwave-mongoid>, [">= 0"])
     s.add_dependency(%q<ckeditor>, [">= 0"])
     s.add_dependency(%q<kaminari>, [">= 0"])
+    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"])
@@ -159,7 +163,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<stringex>, [">= 0"])
     s.add_dependency(%q<tanker>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/config/initializers/ckeditor.rb

@@ -0,0 +1,6 @@
+if Object.const_defined?('Ckeditor')
+  Ckeditor.setup do |config|
+    require 'ckeditor/orm/mongoid'
+    config.path = 'public/javascripts'
+  end
+end

data/features/post_to_blog.feature

@@ -30,7 +30,7 @@ Feature: Post to blog
     Then I should see "Create a New Post"
     And I fill in "post_title" with "My First Post"
     And I select "Draft" from "post_state"
-    And I fill in "content_field" with "Blah blah blah"
+    And I fill in "post_content" with "Blah blah blah"
     And I press "Save"
     Then I should see "About This Post"
     And I should see "My First Post"
@@ -73,4 +73,4 @@ Feature: Post to blog
     And I follow "Manage Posts"
     And I press "" within "[@class='crud_links']"
     Then I should see "Blog Posts"
-    And I should not see "Foo"
+    And I should not see "Foo"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: blog_logic
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 4
-  - 5
-  version: 1.4.5
+  - 6
+  version: 1.4.6
 platform: ruby
 authors: 
 - Bantik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 Z
+date: 2011-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bson_ext
@@ -74,7 +74,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mongoid-tree
+  name: mini_magick
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,53 +88,53 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: mongoid-tree
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
-        - 3
         - 0
-        - 10
-        version: 3.0.10
+        version: "0"
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rmagick
+  name: rails
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 19
         segments: 
-        - 2
-        - 12
-        - 2
-        version: 2.12.2
+        - 3
+        - 0
+        - 10
+        version: 3.0.10
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: scaffold_logic
+  name: rmagick
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 59
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 12
+        - 2
+        version: 2.12.2
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: stringex
+  name: scaffold_logic
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -148,7 +148,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: tanker
+  name: stringex
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -162,7 +162,7 @@ dependencies:
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: tanker
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -173,10 +173,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
+  name: jeweler
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -234,6 +234,8 @@ files:
 - app/models/ckeditor/picture.rb
 - app/models/post.rb
 - app/uploaders/blog_image_uploader.rb
+- app/uploaders/ckeditor_attachment_file_uploader.rb
+- app/uploaders/ckeditor_picture_uploader.rb
 - app/views/admin/blog_categories/_blog_category.html.erb
 - app/views/admin/blog_categories/_form.html.erb
 - app/views/admin/blog_categories/edit.html.erb
@@ -270,6 +272,7 @@ files:
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
+- config/initializers/ckeditor.rb
 - config/initializers/formats.rb
 - config/initializers/metric_fu.rb
 - config/initializers/secret_token.rb