xhive 1.0.3.pre → 1.0.4.pre

data/README.md

@@ -3,6 +3,9 @@ XHIVE
 
 xhive is a gem built for turning your Rails application into an AJAXified CMS.
 
+[![Build Status](https://secure.travis-ci.org/frozeek/xhive.png)](http://travis-ci.org/frozeek/xhive)
+[![Code Quality](https://codeclimate.com/badge.png)](https://codeclimate.com/github/frozeek/xhive)
+
 # How it works
 
 xhive converts your controller actions or [cells](https://github.com/apotonick/cells) into AJAX widgets.
@@ -36,6 +39,10 @@ rake xhive:install:migrations
 rake db:migrate
 ```
 
+Include the xhive javascript in your head tag.
+
+`<%= javascript_include_tag "xhive/application" %>`
+
 Include the custom stylesheets in your head tag.
 
 `<%= include_custom_stylesheets %>`
@@ -194,7 +201,7 @@ stylesheet = Xhive::Stylesheet.create(:name => 'Posts',
 Create a new mapper record for the posts resources
 
 ```
-mapper = Xhive::Mapper.create(:resource => 'Post', :action => 'index', :page => posts_page)
+mapper = Xhive::Mapper.create(:resource => 'posts', :action => 'index', :page => posts_page)
 ```
 
 From your posts controller, render the posts page
@@ -202,8 +209,8 @@ From your posts controller, render the posts page
 ```
 class PostsController < ApplicationController
   def index
-    @posts = Post.all.limit(10)
-    render_page_for 'Post', 'index', :posts => @posts
+    @posts = Post.limit(10)
+    render_page_with :posts => @posts
   end
 end
 ```

data/app/controllers/xhive/widgets_controller.rb

@@ -4,13 +4,42 @@ module Xhive
   class WidgetsController < ApplicationController
     def show
       # Looks for a route matching the request path
-      route = Xhive::Router::Route.find(request.path)
-      # Gets the parameters from the request path and the query string
-      parameters = route.params_from(request.path).merge(params).with_indifferent_access
-      # Renders the corresponding cell#action
-      render :text => render_cell(route.klass.underscore.to_sym, route.action.to_sym, parameters), :status => 200
+      route = extract_route
+      parameters = extract_parameters(route)
+      render :text => rendered_cell_content(route, parameters), :status => 200
     rescue => e
       render :text => 'Not found', :status => 404
     end
+
+  private
+
+    # Private: finds the requested route in the internal route map.
+    #
+    # Returns: a route object.
+    #
+    def extract_route
+      Xhive::Router::Route.find(request.path)
+    end
+
+    # Private: extracts the parameters from the request path and the query string.
+    #
+    # route - The Route object obtained from the request.
+    #
+    # Returns: a hash containing the request parameters.
+    #
+    def extract_parameters(route)
+      route.params_from(request.path).merge(params).with_indifferent_access
+    end
+
+    # Private: renders the corresponding cell#action.
+    #
+    # route      - The Route object obtained from the request.
+    # parameters - The Hash containing the request parameters.
+    #
+    # Returns: the rendered content.
+    #
+    def rendered_cell_content(route, parameters)
+      render_cell(route.klass.underscore.to_sym, route.action.to_sym, parameters)
+    end
   end
 end

data/lib/xhive/router/base.rb

@@ -24,7 +24,7 @@ module Xhive
         url = url.gsub('(.:format)', '')
         url
       rescue
-        fail Error, "#{controller}##{action}"
+        Rails.logger.error "#{Error.class.name}:#{controller}##{action}"
       end
 
     private

data/lib/xhive/version.rb

@@ -1,3 +1,3 @@
 module Xhive
-  VERSION = "1.0.3.pre"
+  VERSION = "1.0.4.pre"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xhive
 version: !ruby/object:Gem::Version
-  version: 1.0.3.pre
+  version: 1.0.4.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -223,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3877875978952443496
+      hash: 2240109890561741587
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: