concen 0.2.8 → 0.2.9

data/Gemfile

@@ -5,13 +5,13 @@ gem "sass-rails", "~> 3.1.3"
 
 # gemspec.
 gem "mustache", "~> 0.99.4"
-gem "redcarpet", "2.1.1"
+gem "redcarpet", "~> 2.2.0"
 gem "mongoid", "~> 2.2"
 gem "mongo", "~> 1.3"
 gem "bson_ext", "~> 1.4.0"
 gem "mongo-rails-instrumentation", "~> 0.2.4"
 gem "rack-gridfs", "~> 0.4.1"
-gem "chronic", "~> 0.6.3"
+gem "chronic", "~> 0.6"
 gem "mime-types", "~> 1.16"
 gem "bcrypt-ruby", "~> 3.0.0"
 gem "domainatrix", "~> 0.0.10"

data/Gemfile.lock

@@ -46,7 +46,7 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    chronic (0.6.4)
+    chronic (0.8.0)
     database_cleaner (0.6.0)
     domainatrix (0.0.10)
       addressable
@@ -102,7 +102,7 @@ GEM
       thor (~> 0.14.6)
     rake (0.9.2)
     rdoc (3.9.4)
-    redcarpet (2.1.1)
+    redcarpet (2.2.1)
     rubyzip (0.9.4)
     sass (3.1.7)
     sass-rails (3.1.3)
@@ -138,7 +138,7 @@ DEPENDENCIES
   bcrypt-ruby (~> 3.0.0)
   bson_ext (~> 1.4.0)
   capybara (>= 0.4.0)
-  chronic (~> 0.6.3)
+  chronic (~> 0.6)
   database_cleaner (= 0.6.0)
   domainatrix (~> 0.0.10)
   fabrication (= 1.1.0)
@@ -149,6 +149,6 @@ DEPENDENCIES
   mustache (~> 0.99.4)
   rack-gridfs (~> 0.4.1)
   rails (>= 3.1.0)
-  redcarpet (= 2.1.1)
+  redcarpet (~> 2.2.0)
   sass-rails (~> 3.1.3)
   turn (= 0.8.3)

data/README.md

@@ -4,15 +4,15 @@ Concen is a Rails Engine for managing and monitoring a Rails application from a
 
 ## Requirements
 
-- **Rails 3.1**. Concen only supports Rails 3.1 application.
-- **MongoDB 2.0.x**. All data are stored in MongoDB database, including all of the files uploaded (stored in GridFS).
-- **Typekit** (optional). Concen uses [Proxima Nova](http://typekit.com/fonts/proxima-nova) font. This font can be easily obtained from Typekit.
+- **Rails 3.1 and above**. Concen uses Rails asset pipeline, which is only available starting from Rails 3.1.
+- **MongoDB 2.0 and above**. All data are stored in MongoDB database, including all of the files uploaded (stored in GridFS).
+- **Typekit** (optional). Concen uses [Proxima Nova](http://typekit.com/fonts/proxima-nova) font. This font can be obtained from Typekit.
 
 ## Installation
 
 Add the following to the Gemfile of a Rails application.
 
-    gem "concen", "~> 0.2.6"
+    gem "concen", "~> 0.2.9"
 
 Run the rake task to setup Concen.
 
@@ -126,6 +126,11 @@ If you have used Concen for any of your websites and would like to be listed her
 
 ## Versions
 
+- **0.2.9**:
+  - Handle special cases when mime-types gem fails to recognize
+  - Update Redcarpet version to "~> 2.2.0"
+  - Update Chronic version to "~> 0.6"
+
 - **0.2.8**:
   - Controller's classes are now inherited from Concen::ApplicationController
   - Update Redcarpet to version 2.1.1
@@ -206,7 +211,7 @@ If you have used Concen for any of your websites and would like to be listed her
 
 ## License
 
-Copyright © 2011 Steve Randy Tantra
+Copyright © Steve Randy Tantra
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/app/models/concen/grid_file.rb

@@ -50,7 +50,7 @@ module Concen
 
       original_filename = filename.dup
       file_extension = File.extname(original_filename).downcase
-      content_type = MIME::Types.type_for(original_filename).first.to_s
+      content_type = content_type_for original_filename
 
       # Pre generate ObjectId for the new GridFS file.
       grid_id = BSON::ObjectId.new
@@ -65,6 +65,16 @@ module Concen
       end
     end
 
+    def content_type_for(filename)
+      content_type = MIME::Types.type_for(filename).first.to_s
+
+      # Special cases when mime-types fails to recognize
+      content_type = "video/mp4" if filename.include?(".mp4")
+      content_type = "video/x-m4v" if filename.include?(".m4v")
+
+      return content_type
+    end
+
     protected
 
     def destroy_gridfs

data/concen.gemspec

@@ -22,12 +22,12 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("mustache", "~> 0.99.4")
-  s.add_dependency("redcarpet", "~> 2.1.1")
+  s.add_dependency("redcarpet", "~> 2.2.0")
   s.add_dependency("mongoid", "~> 2.2")
   s.add_dependency("bson_ext", "~> 1.3")
   s.add_dependency("mongo-rails-instrumentation", "~> 0.2.4")
   s.add_dependency("rack-gridfs", "~> 0.4.1")
-  s.add_dependency("chronic", "~> 0.6.3")
+  s.add_dependency("chronic", "~> 0.6")
   s.add_dependency("mime-types", "~> 1.16")
   s.add_dependency("bcrypt-ruby", "~> 3.0.0")
   s.add_dependency("domainatrix", "~> 0.0.10")

data/lib/concen/version.rb

@@ -1,3 +1,3 @@
 module Concen
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concen
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70101760306740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,31 @@ dependencies:
         version: 0.99.4
   type: :runtime
   prerelease: false
-  version_requirements: *70101760306740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.99.4
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70101760305980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70101760305980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70101760305040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70101760305040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70101751918040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70101751918040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mongo-rails-instrumentation
-  requirement: &70101751917580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70101751917580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: rack-gridfs
-  requirement: &70101751917120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,21 +101,31 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70101751917120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70101751916660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70101751916660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70101751916200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +133,15 @@ dependencies:
         version: '1.16'
   type: :runtime
   prerelease: false
-  version_requirements: *70101751916200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70101751915740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +149,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70101751915740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: domainatrix
-  requirement: &70101751915280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +165,12 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70101751915280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.10
 description: A Rails Engine to control and monitor Rails application from a web interface.
   It includes content capturing system, real-time traffic monitoring, and real-time
   performance monitoring. It is built to be flexible and customizable.
@@ -460,7 +510,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: concen
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Control and monitor Rails application.
@@ -516,3 +566,4 @@ test_files:
 - test/unit/grid_file_test.rb
 - test/unit/page_test.rb
 - test/unit/user_test.rb
+has_rdoc: