smithycms 0.0.3 → 0.4.0

data/config/initializers/dragonfly.rb

@@ -1,48 +1,28 @@
-require 'uri'
 require 'dragonfly'
-begin
-  require 'rack/cache'
-rescue LoadError => e
-  puts "Couldn't find rack-cache - make sure you have it in your Gemfile:"
-  puts "  gem 'rack-cache', :require => 'rack/cache'"
-  puts " or configure dragonfly manually instead of using 'dragonfly/rails/images'"
-  raise e
-end
-
-## initialize Dragonfly ##
-app = Dragonfly[:files]
-app.configure_with(:rails)
-app.configure_with(:imagemagick)
 
-# set the cache lifetime
-app.cache_duration = 3600*24*365*3  # 3 years in seconds
+# Configure
+Dragonfly.app.configure do
+  plugin :imagemagick
 
-### Extend active record ###
-app.define_macro(ActiveRecord::Base, :image_accessor)
-app.define_macro(ActiveRecord::Base, :file_accessor)
+  protect_from_dos_attacks true
+  secret "7fb765cbc9f1d92d5d1a56a43193d34d4f9b54dced3e62cb4e42f25d2500dd0f"
 
-## configure it ##
-Dragonfly[:files].configure do |c|
-  # Convert absolute location needs to be specified
-  # to avoid issues with Phusion Passenger not using $PATH
-  c.convert_command  = `which convert`.strip.presence || "/usr/local/bin/convert"
-  c.identify_command = `which identify`.strip.presence || "/usr/local/bin/identify"
+  convert_command  = `which convert`.strip.presence || "/usr/local/bin/convert"
+  identify_command = `which identify`.strip.presence || "/usr/local/bin/identify"
 
-  c.allow_fetch_url  = true
-  c.allow_fetch_file = true
+  url_format '/uploads/assets/:job/:basename.:format'
 
-  c.url_format = '/uploads/assets/:job/:basename.:format'
+  datastore Smithy::Asset.dragonfly_datastore
 end
 
-app.datastore = Smithy::Asset.dragonfly_datastore
+# Logger
+Dragonfly.logger = Rails.logger
 
-# ### Insert the middleware ###
-rack_cache_already_inserted = Rails.application.config.action_controller.perform_caching && Rails.application.config.action_dispatch.rack_cache
+# Mount as middleware
+Rails.application.middleware.use Dragonfly::Middleware
 
-Rails.application.middleware.insert 0, Rack::Cache, {
-  :verbose     => true,
-  :metastore   => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/meta"), # URI encoded in case of spaces
-  :entitystore => URI.encode("file:#{Rails.root}/tmp/dragonfly/cache/body")
-} unless rack_cache_already_inserted
-
-Rails.application.middleware.insert_after Rack::Cache, Dragonfly::Middleware, :files
+# Add model functionality
+if defined?(ActiveRecord::Base)
+  ActiveRecord::Base.extend Dragonfly::Model
+  ActiveRecord::Base.extend Dragonfly::Model::Validations
+end

data/config/routes.rb

@@ -1,9 +1,9 @@
 Smithy::Engine.routes.draw do
   root :to => 'pages#show'
   scope "/smithy" do
-    match '/' => redirect('/smithy/pages')
-    match '/login'  => redirect('/'), :as => :login
-    match '/logout' => redirect('/'), :as => :logout, :via => :delete
+    get '/' => redirect('/smithy/pages')
+    get '/login'  => redirect('/'), :as => :login unless has_named_route?(:login)
+    delete '/logout' => redirect('/'), :as => :logout unless has_named_route?(:logout)
     # CMS admin
     resources :assets
     resources :content_blocks
@@ -12,7 +12,7 @@ Smithy::Engine.routes.draw do
       collection do
         get :order
       end
-      resources :contents, :controller => "PageContents", :except => [ :index ] do
+      resources :contents, :controller => "page_contents", :except => [ :index ] do
         member do
           get :preview
         end
@@ -31,8 +31,8 @@ Smithy::Engine.routes.draw do
     # end
   end
   # Sitemap
-  resource :sitemap, :controller => "Sitemap", :only => [ :show ]
-  match '/templates/javascripts/*javascript' => 'templates#javascript', :defaults => { :format => 'js' }
-  match '/templates/stylesheets/*stylesheet' => 'templates#stylesheet', :format => 'css'
-  match '*path' => 'pages#show'
+  resource :sitemap, :controller => "sitemap", :only => [ :show ]
+  get '/templates/javascripts/*javascript' => 'templates#javascript', :defaults => { :format => 'js' }
+  get '/templates/stylesheets/*stylesheet' => 'templates#stylesheet', :format => 'css'
+  get '*path' => 'pages#show'
 end

data/lib/smithy/content_blocks/registry.rb

@@ -20,7 +20,7 @@ module Smithy
           return unless ActiveRecord::Base.connection.table_exists?(content_block.table_name)
           content_block_name = content_block.to_s.demodulize
           @@content_blocks << content_block_name unless @@content_blocks.include?(content_block_name)
-          cb = Smithy::ContentBlock.find_or_initialize_by_name(content_block_name)
+          cb = Smithy::ContentBlock.find_or_initialize_by(name: content_block_name)
           cb.save
           @@content_blocks
         end

data/lib/smithy/dependencies.rb

@@ -16,4 +16,3 @@ require 'jquery/rails'
 require 'liquid'
 require 'sass-rails'
 require 'slodown'
-

data/lib/smithy/dragonfly/asset_helper.rb

@@ -1,3 +1,5 @@
+require 'dragonfly/s3_data_store'
+
 module Smithy
   module Dragonfly
     module AssetHelper
@@ -21,20 +23,18 @@ module Smithy
 
         def dragonfly_datastore
           if ENV['AWS_ACCESS_KEY_ID'].present? && ENV['AWS_SECRET_ACCESS_KEY'].present? && ENV['AWS_S3_BUCKET'].present?
-            datastore = ::Dragonfly::DataStorage::S3DataStore.new
-            datastore.configure do |c|
-              c.bucket_name = ENV['AWS_S3_BUCKET']
-              c.access_key_id = ENV['AWS_ACCESS_KEY_ID']
-              c.secret_access_key = ENV['AWS_SECRET_ACCESS_KEY']
-              # c.region = 'eu-west-1'                        # defaults to 'us-east-1'
-              # c.storage_headers = {'some' => 'thing'}       # defaults to {'x-amz-acl' => 'public-read'}
-              # c.url_scheme = 'https'                        # defaults to 'http'
-              # c.url_host = 'some.custom.host'               # defaults to "<bucket_name>.s3.amazonaws.com"
+            Dragonfly.app.configure do
+              # Allow amazon s3 urls to work
+              fetch_url_whitelist [
+                /s3\.amazonaws\.com\/#{ENV['AWS_S3_BUCKET']}/,
+                /#{ENV['AWS_S3_BUCKET']}\.s3\.amazonaws\.com/
+              ]
             end
+            ::Dragonfly::S3DataStore.new(bucket_name: ENV['AWS_S3_BUCKET'], access_key_id: ENV['AWS_ACCESS_KEY_ID'], secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'])
           else
-            datastore = ::Dragonfly::DataStorage::FileDataStore.new
+            Dragonfly.app.configure { fetch_url_whitelist [] }
+            ::Dragonfly::FileDataStore.new(root_path: Rails.root.join('public/system/dragonfly', Rails.env), server_root: Rails.root.join('public'))
           end
-          datastore
         end
 
         def dragonfly_remote_datastore

data/lib/smithy/dragonfly/remote_data_store.rb

@@ -3,19 +3,13 @@ module Smithy
   module Dragonfly
     module DataStorage
       class RemoteDataStore
-        include ::Dragonfly::Configurable
-
-        def store(temp_object, opts={})
+        def write(content, opts={})
           # raise "Sorry friend, this datastore is read-only."
         end
 
-        def retrieve(uid)
+        def read(uid)
           response = HTTParty.get uid, :timeout => 3
-          unless response.ok?
-            #raise Forbidden if response.code == 403
-            raise DataNotFound
-          end
-
+          raise DataNotFound unless response.ok?
           content = response.body
           extra_data = {}
           [

data/lib/smithy/dragonfly.rb

@@ -23,7 +23,7 @@ module Smithy
     end
 
     def self.app
-      ::Dragonfly[:files]
+      ::Dragonfly.app
     end
 
   end

data/lib/smithy/engine.rb

@@ -35,7 +35,8 @@ module Smithy
       # we need to require all our model files so that ContentBlocks
       # are registered with the engine
       Dir[Smithy::Engine.root.join('app', 'models', 'smithy', '*.rb')].each do |file|
-        require_dependency file if ActiveRecord::Base.connection.table_exists?(file.pluralize)
+        table_name = File.basename(file, '.rb').pluralize
+        require_dependency file if ActiveRecord::Base.connection.table_exists?(table_name)
       end
     end
 

data/lib/smithy/formatter.rb

@@ -13,11 +13,10 @@ module Smithy
       def sanitize_config
         {
           elements: %w(
-            p br a span sub sup strong em div hr abbr
-            ul ol li
-            blockquote pre code
-            h1 h2 h3 h4 h5 h6
-            img object param del
+            p div ul ol li blockquote pre h1 h2 h3 h4 h5 h6 object
+            hr param
+            a span sub sup strong em abbr code del small big
+            br img
           ),
           attributes: {
             :all     => ['class', 'style', 'title', 'id'],

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.0.3"
+  VERSION = "0.4.0"
 end