xhive 1.0.7.pre → 1.0.8.pre

data/README.md

@@ -204,14 +204,27 @@ Create a new mapper record for the posts resources
 mapper = Xhive::Mapper.create(:resource => 'posts', :action => 'index', :page => posts_page)
 ```
 
+Create a new mapper record for some specific post
+
+```
+mapper = Xhive::Mapper.create(:resource => 'posts', :action => 'show', :key => '1', :page => posts_page)
+```
+
 From your posts controller, render the posts page
 
 ```
 class PostsController < ApplicationController
+  # This will render the page associated with the index action
   def index
     @posts = Post.limit(10)
     render_page_with :posts => @posts
   end
+
+  # This will render the page associated with the specific post
+  def show
+    @post = Post.find(params[:id])
+    render_page_with @post.id, :post => @post
+  end
 end
 ```
 
@@ -220,7 +233,6 @@ Using this feature you can let the designers implement the HTML/CSS to display t
 TODO
 ====
 
-* Implement the Image model
 * Remove as many dependencies as possible
 * Improve test coverage
 

data/app/controllers/xhive/images_controller.rb

@@ -0,0 +1,11 @@
+require_dependency "xhive/application_controller"
+
+module Xhive
+  class ImagesController < ApplicationController
+    def show
+      @image = current_site.images.where(:image => "#{params[:id]}.#{params[:format]}").first
+      fail ActiveRecord::RecordNotFound unless @image.present?
+      redirect_to @image.image_url, :status => 301
+    end
+  end
+end

data/app/helpers/xhive/application_helper.rb

@@ -8,8 +8,8 @@ module Xhive
       "<link href='#{xhive.stylesheets_path}' media='all' rel='stylesheet' type='text/css'/>".html_safe
     end
 
-    def render_page_with(options={})
-      page = current_site.mappers.page_for(controller_path, action_name)
+    def render_page_with(key = nil, options={})
+      page = current_site.mappers.page_for(controller_path, action_name, key)
       render :inline => page.presenter.render_content(options), :layout => true
     rescue
       render

data/app/models/xhive/image.rb

@@ -0,0 +1,19 @@
+require 'carrierwave'
+require 'carrierwave/orm/activerecord'
+
+module Xhive
+  class Image < ActiveRecord::Base
+    belongs_to :site
+
+    attr_accessible :image, :site_id, :title
+
+    validates :image, :presence => true
+    validates :site, :presence => true
+
+    mount_uploader :image, ImageUploader
+
+    def basename
+      File.basename(image.to_s)
+    end
+  end
+end

data/app/models/xhive/mapper.rb

@@ -10,8 +10,10 @@ module Xhive
     validates :site, :presence => true
     validates :page, :presence => true
 
-    def self.page_for(resource, action)
-      page = where(:resource => resource).where(:action => action).first.try(:page)
+    def self.page_for(resource, action, key = nil)
+      mapper = where(:resource => resource).where(:action => action)
+      mapper = mapper.where(:key => key) if key.present?
+      page   = mapper.first.try(:page)
       fail ActiveRecord::RecordNotFound unless page.present?
       page
     end

data/app/models/xhive/site.rb

@@ -5,6 +5,7 @@ module Xhive
     has_many :pages
     has_many :mappers
     has_many :stylesheets
+    has_many :images
 
     belongs_to :home_page, :class_name => 'Page'
 

data/app/uploaders/xhive/image_uploader.rb

@@ -0,0 +1,35 @@
+require 'carrierwave'
+
+module Xhive
+  class ImageUploader < ::CarrierWave::Uploader::Base
+    include ::CarrierWave::MiniMagick
+
+    include ::Sprockets::Helpers::RailsHelper
+    include ::Sprockets::Helpers::IsolatedHelper
+
+    def store_dir
+      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    end
+
+    def default_url
+      asset_path "fallback/" + [version_name, "default.png"].compact.join('_')
+    end
+
+    def url
+      super.gsub('+', '%2B')
+    end
+
+    version :thumb do
+      process :resize_to_limit => [144, 94]
+    end
+
+    def extension_white_list
+      %w(jpg jpeg gif png)
+    end
+
+    # For heroku read-only filesystem
+    def cache_dir
+      "#{Rails.root}/tmp/uploads"
+    end
+  end
+end

data/config/routes.rb

@@ -6,6 +6,7 @@ Xhive::Engine.routes.draw do
   get 'stylesheets/custom.css', :to => 'stylesheets#index', :as => :stylesheets, :format => :css
 
   resources :stylesheets, :only => :show, :format => :css
+  resources :images, :only => :show
 
   get 'widgets/*widget', :to => 'widgets#show'
 

data/db/migrate/20121031192552_add_key_to_xhive_mappers.rb

@@ -0,0 +1,6 @@
+class AddKeyToXhiveMappers < ActiveRecord::Migration
+  def change
+    add_column :xhive_mappers, :key, :string
+    add_index :xhive_mappers, [:site_id, :resource, :action, :key]
+  end
+end

data/db/migrate/20121101124925_create_xhive_images.rb

@@ -0,0 +1,12 @@
+class CreateXhiveImages < ActiveRecord::Migration
+  def change
+    create_table :xhive_images do |t|
+      t.string  :image
+      t.string  :title
+      t.integer :site_id
+
+      t.timestamps
+    end
+    add_index :xhive_images, [:site_id, :image]
+  end
+end

data/lib/xhive/version.rb

@@ -1,3 +1,3 @@
 module Xhive
-  VERSION = "1.0.7.pre"
+  VERSION = "1.0.8.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhive
 version: !ruby/object:Gem::Version
-  version: 1.0.7.pre
+  version: 1.0.8.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -107,6 +107,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.3
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +187,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Rails AJAX CMS
 email:
 - marcelo@frozeek.com
@@ -162,17 +210,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/images/xhive/default.png
 - app/assets/javascripts/xhive/application.js
 - app/assets/javascripts/xhive/loader.js.coffee
 - app/assets/javascripts/xhive/pages.js
 - app/assets/stylesheets/xhive/application.css
 - app/assets/stylesheets/xhive/pages.css
 - app/controllers/xhive/application_controller.rb
+- app/controllers/xhive/images_controller.rb
 - app/controllers/xhive/pages_controller.rb
 - app/controllers/xhive/stylesheets_controller.rb
 - app/controllers/xhive/widgets_controller.rb
 - app/helpers/xhive/application_helper.rb
 - app/models/xhive/anonymous_user.rb
+- app/models/xhive/image.rb
 - app/models/xhive/mapper.rb
 - app/models/xhive/page.rb
 - app/models/xhive/site.rb
@@ -181,6 +232,7 @@ files:
 - app/presenters/xhive/page_presenter.rb
 - app/presenters/xhive/stylesheet_presenter.rb
 - app/presenters/xhive/user_presenter.rb
+- app/uploaders/xhive/image_uploader.rb
 - app/views/layouts/xhive/application.html.erb
 - app/views/xhive/pages/show.html.erb
 - config/routes.rb
@@ -191,6 +243,8 @@ files:
 - db/migrate/20121016224054_create_xhive_stylesheets.rb
 - db/migrate/20121016224326_add_slug_index_to_pages.rb
 - db/migrate/20121019185702_create_xhive_mappers.rb
+- db/migrate/20121031192552_add_key_to_xhive_mappers.rb
+- db/migrate/20121101124925_create_xhive_images.rb
 - lib/tasks/xhive_tasks.rake
 - lib/xhive/base_tag.rb
 - lib/xhive/controller.rb
@@ -223,7 +277,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 230345765792334857
+      hash: -363105832108409294
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: