rack-r 0.1.1 → 0.2.0

data/README.md

@@ -34,16 +34,32 @@ other path given.
 Install in Rails
 ----------------
 
-Put the following in your Gemfile and run `bundle install` or let
-[Guard](https://github.com/guard/guard-bundler) kick in.
+Put the following in your Gemfile and run `bundle`
 
-    gem 'rack-r', :require => 'rack_r'
+    gem 'rack-r'
 
-In Rails 3.2 you will have to put this somewhere
 
-    require 'rack_r/railtie'
+Use the TemplateHandler
+-----------------------
 
+You can create partials with the extension `.rackr` which will
+automatically be picked up by the middleware.
 
+    # render the file `_partial_with_r_code_inside.html.rackr`
+    render :partial => 'partial_with_r_code_inside'
+
+
+Combine R with HAML
+-------------------
+
+In HAML you can combine R and Ruby via the erb filter
+
+    :erb
+      sql = '<%= SomeModel.select(:value).to_sql %>'
+      data = dbGetQuery(connect(), sql)
+      boxplot(data$value)
+
+1
 Using RackR outside of Rails
 ----------------------------
 
@@ -86,11 +102,15 @@ Alternatively to `dbi` you can use the `rodbc` package.
 
     apt-get install r-cran-rodbc 
 
+Install additional packages from CRAN. Note: Only the latest version
+is available. Check CRAN for the latest version.
+
 ### YAML
 
     wget http://cran.r-project.org/src/contrib/yaml_2.1.4.tar.gz
     R CMD INSTALL yaml_2.1.4.tar.gz
 
+
 ### SQLite
 
     wget http://cran.r-project.org/src/contrib/RSQLite_0.11.1.tar.gz

data/lib/rack-r.rb

@@ -0,0 +1 @@
+require File.expand_path(File.join(%w(.. rack_r)), __FILE__)

data/lib/rack_r/middleware.rb

@@ -9,6 +9,8 @@ module RackR
 
     def call(env)
       @env = env
+      # reload config per request
+      @config = nil unless config.reload
       return call_app unless config.enabled
       return call_app if config.skip_pattern &&
         path_info.match(config.skip_pattern)
@@ -151,30 +153,35 @@ __END__
 # without a restart of your app
 #
 enabled:     true
+reload:      false
 url_scope:   /rack-r
 public_path: public/system/rack-r
 public_url:  /system/rack-r
+r_file:      script.R
 temp:
   dir:       /tmp
   prefix:    rr_
-r_file:      script.R
+
 r_header: |
   # modify this header in rack-r config file
   library(yaml)
   library(DBI)
-  root <- '/home/phil/src/controlling'
+
+  root <- '<%= Dir.pwd %>'
   dbconf <- yaml.load_file(paste(root, '/config/database.yml', sep=''))$development
+
   connect <- function() {
     if(dbconf$adapter=='sqlite3') {
       library(RSQLite)
       dbfile <- paste(root, '/', dbconf$database, sep='')
       drv <- dbDriver("SQLite")
       return(dbConnect(drv, dbname=dbfile))
-    } else if (dbconf$adapter=='mysql') {
+    } else if (dbconf$adapter=='mysql2') {
       library(RMySQL)
       return(dbConnect(MySQL(), user=dbconf$username, dbname=dbconf$database))
     }
   }
+
   getPapertrail <- function(model, id) {
     sql <- paste("SELECT object FROM versions WHERE ",
                  "item_type='", model, "' AND item_id='",
@@ -184,19 +191,22 @@ r_header: |
     rows <- fetch(result)
     lapply(rows$object, yaml.load)
   }
+
 ajaxer: |
   <div class='rack_r' id='<%= key %>'>Processing R...</div>
   <script type='text/javascript'>
     var url = '<%= config.url_scope %>/<%= key %>';
     $.ajax(url, { success: function(data) { $('#<%= key %>').html(data); } });
   </script>
+
 templates:
   - pattern: .svg$
     process: |
       svg = File.read(src)
     template: |
       <%= svg %>
-  - pattern: .(jpg|jpeg|png)$
+
+  - pattern: .(jpe?g|png)$
     process: |
       # TODO build dst with key, otherwise may lead to undesired results
       dst = File.join(public_path, file)
@@ -204,6 +214,7 @@ templates:
       url = "#{config.public_url}/#{file}"
     template: |
       <img src='<%= url %>' />
+
   - pattern: .download.csv$
     process: |
       # TODO build dst with key, otherwise may lead to undesired results
@@ -212,6 +223,7 @@ templates:
       url = "#{config.public_url}/#{file}"
     template: |
       <a href='<%= url %>'><%= file %></a>
+
   - pattern: .table.csv$
     process: |
       table = CSV.read(src)
@@ -225,16 +237,19 @@ templates:
           </tr>
         <% end %>
       </table>
-  - pattern: .lazy.csv$
+
+  - pattern: .js.csv$
     process: |
       table = CSV.read(src)
     template: |
-      <pre class="lazycsv"><%= table %></pre>
+      <pre class="jscsv"><%= table %></pre>
+
   - pattern: .Rout$
     process: |
       rout = File.read(src)
     template: |
       <pre><%= rout %></pre>
+
 node_regex: <script\s+type=['"]text/r['"]\s*>(.*?)</script>
 node_stanza:
   prefix: <script type='text/r'>
@@ -242,7 +257,8 @@ node_stanza:
 html:
   prefix: <div class='rack_r_out'>
   suffix: </div>
-#
+# skip_pattern: "^/data"
+
 # uncomment the following two lines, if your project
 # doesn't use jquery already
 # javascripts:

data/lib/rack_r/version.rb

@@ -1,3 +1,3 @@
 module RackR
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Phil Hofmann
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-20 00:00:00 +02:00
+date: 2013-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - RECEIPES.md
 - Rakefile
 - TODO
+- lib/rack-r.rb
 - lib/rack_r.rb
 - lib/rack_r/middleware.rb
 - lib/rack_r/railtie.rb