cuba-contrib 3.1.0.rc1 → 3.1.0.rc2

data/cuba-contrib.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "cuba-contrib"
-  s.version           = "3.1.0.rc1"
+  s.version           = "3.1.0.rc2"
   s.summary           = "Cuba plugins and utilities."
   s.description       = "Includes various helper tools for Cuba."
   s.authors           = ["Cyril David"]
@@ -13,11 +13,10 @@ Gem::Specification.new do |s|
     "rakefile",
     "lib/**/*.rb",
     "*.gemspec",
-    "test/*.*",
-    "views/*.mote"
+    "test/*.*"
   ]
 
-  s.add_dependency "cuba", "3.0.1.rc3"
+  s.add_dependency "cuba", "3.1.0.rc2"
   s.add_development_dependency "cutest"
   s.add_development_dependency "capybara"
 end

data/lib/cuba/contrib.rb

@@ -1,9 +1,6 @@
 class Cuba
-  CONTRIB_ROOT = File.expand_path("../../", File.dirname(__FILE__))
-
-  require "cuba/contrib/prelude"
-  require "cuba/contrib/mote"
-  require "cuba/contrib/text_helpers"
-  require "cuba/contrib/form_helpers"
-  require "cuba/contrib/with"
+  require "cuba/prelude"
+  require "cuba/mote"
+  require "cuba/text_helpers"
+  require "cuba/with"
 end

data/lib/cuba/{contrib/mote.rb → mote.rb}

@@ -30,6 +30,8 @@ class Cuba
       File.join(settings[:mote][:views], "#{template}.mote")
     end
 
+    # DEPRECATED: this will be removed in a future version. Use the
+    # `this` context variable instead.
     def mote_vars(content)
       { content: content }
     end

data/lib/cuba/{contrib/text_helpers.rb → text_helpers.rb}

@@ -1,9 +1,7 @@
 class Cuba
   module TextHelpers
     def markdown(str)
-      require "bluecloth"
-
-      BlueCloth.new(str).to_html
+      Markdown.new(str).to_html
     end
 
     def truncate(str, length, ellipses = "...")
@@ -20,16 +18,23 @@ class Cuba
       "#{unit} %.2f" % amount
     end
 
-    def titlecase(str)
-      str.to_s.tr("_", " ").gsub(/(^|\s)([a-z])/) { |char| char.upcase }
+    def delimit(number, delimiter = ",")
+      number.to_s.gsub(%r{(\d)(?=(\d\d\d)+(?!\d))}, "\\1#{delimiter}")
     end
 
-    def humanize(str)
-      titlecase(str.to_s.tr("_", " ").gsub(/_id$/, ""))
+    def titlecase(str)
+      res = str.to_s.dup
+      res.tr!("_", " ")
+      res.gsub!(/(^|\s)([a-z])/) { |char| char.upcase }
+      res
     end
 
     def underscore(str)
-      str.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').downcase
+      res = str.to_s.dup
+      res.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      res.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      res.downcase!
+      res
     end
   end
 end

data/lib/cuba/{contrib/with.rb → with.rb}

@@ -1,7 +1,7 @@
 class Cuba
   module With
     def with(dict = {})
-      old, env["cuba.vars"] = vars, dict
+      old, env["cuba.vars"] = vars, vars.merge(dict)
       yield
     ensure
       env["cuba.vars"] = old

data/test/text_helpers.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+
+require_relative "helper"
+
+setup do
+  obj = Object.new
+  obj.extend Cuba::TextHelpers
+end
+
+test "truncate" do |helper|
+  assert_equal "the q...", helper.truncate("the quick brown", 5)
+
+  assert_equal "same string", helper.truncate("same string", 11)
+end
+
+test "markdown" do |helper|
+  require "bluecloth"
+  assert_equal "<h1>Hola Mundo</h1>", helper.markdown("# Hola Mundo")
+end
+
+test "nl2br" do |helper|
+  assert_equal "Hi<br>there<br>Joe", helper.nl2br("Hi\nthere\r\nJoe")
+end
+
+test "currency" do |helper|
+  assert_equal "$ 2.22", helper.currency(2.221)
+  assert_equal "€ 2.22", helper.currency(2.221, "€")
+end
+
+test "delimit" do |helper|
+  assert_equal "2,000", helper.delimit(2000)
+  assert_equal "2.000", helper.delimit(2000, ".")
+  assert_equal "2,000,000", helper.delimit(2000000)
+  assert_equal "2,000,000.05", helper.delimit(2000000.05)
+end
+
+test "titlecase" do |helper|
+  assert_equal "Hello World", helper.titlecase("hello world")
+end
+
+test "underscore" do |helper|
+  assert_equal "foo_bar_baz", helper.underscore("FooBarBaz")
+  assert_equal "ohm_v1_foo", helper.underscore("OhmV1Foo")
+  assert_equal "ssl_error", helper.underscore("SSLError")
+  assert_equal "net_http", helper.underscore("NetHTTP")
+end

data/test/with.rb

@@ -0,0 +1,45 @@
+require_relative "helper"
+
+Cuba.plugin Cuba::With
+
+test do
+  class UserPhotos < Cuba
+    define do
+      on root do
+        res.write "uid: %d" % vars[:user_id]
+        res.write "site: %s" % vars[:site]
+      end
+    end
+  end
+
+  class Photos < Cuba
+    define do
+      on ":id/photos" do |id|
+        with user_id: id do
+          _, _, body = UserPhotos.call(req.env)
+
+          body.each do |line|
+            res.write line
+          end
+        end
+
+        res.write vars.inspect
+      end
+    end
+  end
+
+  Cuba.define do
+    on "users" do
+      with user_id: "default", site: "main" do
+        run Photos
+      end
+    end
+  end
+
+  _, _, body = Cuba.call({ "PATH_INFO" => "/users/1001/photos",
+                           "SCRIPT_NAME" => "" })
+
+
+  assert_response body, ["uid: 1001", "site: main",
+                         '{:user_id=>"default", :site=>"main"}']
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cuba-contrib
 version: !ruby/object:Gem::Version
-  version: 3.1.0.rc1
+  version: 3.1.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1.rc3
+        version: 3.1.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1.rc3
+        version: 3.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: cutest
   requirement: !ruby/object:Gem::Requirement
@@ -69,24 +69,16 @@ files:
 - LICENSE
 - README.markdown
 - rakefile
-- lib/cuba/contrib/form_helpers.rb
-- lib/cuba/contrib/mote.rb
-- lib/cuba/contrib/prelude.rb
-- lib/cuba/contrib/text_helpers.rb
-- lib/cuba/contrib/with.rb
 - lib/cuba/contrib.rb
+- lib/cuba/mote.rb
+- lib/cuba/prelude.rb
+- lib/cuba/text_helpers.rb
+- lib/cuba/with.rb
 - cuba-contrib.gemspec
 - test/helper.rb
 - test/mote.rb
-- test/text_helper.rb
-- test/vars.rb
-- views/field.mote
-- views/file.mote
-- views/option.mote
-- views/password.mote
-- views/select.mote
-- views/textarea.mote
-- views/textfield.mote
+- test/text_helpers.rb
+- test/with.rb
 homepage: http://github.com/cyx/cuba-contrib
 licenses: []
 post_install_message: 

data/lib/cuba/contrib/form_helpers.rb

@@ -1,107 +0,0 @@
-class Cuba
-  module FormHelpers
-    include Cuba::Prelude
-
-    def cuba_contrib_partial(template, locals = {})
-      partial(cuba_contrib_path("%s.mote" % template), locals)
-    end
-
-    def cuba_contrib_path(*args)
-      File.join(Cuba::CONTRIB_ROOT, "views", *args)
-    end
-
-    def cuba_contrib_form(record)
-      view(cuba_contrib_path("form"), model: record)
-    end
-
-    def select_options(pairs, selected = nil, prompt = nil)
-      "".tap do |ret|
-        ret << option_tag(prompt, "") if prompt
-
-        pairs.each do |label, value|
-          ret << option_tag(label, value, selected)
-        end
-      end
-    end
-
-    def option_tag(label, value, selected = nil)
-      cuba_contrib_partial("option", selected: selected, value: value, label: label)
-    end
-
-    def datefield(model, field, hint = nil)
-      input(model, field, hint) do
-        cuba_contrib_partial("textfield",
-          name: field_name(model, field),
-          value: model.send(field),
-          class: "date"
-        )
-      end
-    end
-
-    def textfield(model, field, hint = nil)
-      input(model, field, hint) do
-        cuba_contrib_partial("textfield",
-          name: field_name(model, field),
-          value: model.send(field)
-        )
-      end
-    end
-
-    def password_field(model, field, hint = nil)
-      input(model, field, hint) do
-        cuba_contrib_partial("password",
-          name: field_name(model, field)
-        )
-      end
-    end
-
-    def filefield(model, field, hint = nil)
-      input(model, field, hint) do
-        cuba_contrib_partial("file",
-          name: field_name(model, field)
-        )
-      end
-    end
-
-    def textarea(model, field, hint = nil)
-      input(model, field, hint) do
-        cuba_contrib_partial("textarea",
-          name: field_name(model, field),
-          value: model.send(field)
-        )
-      end
-    end
-
-    def dropdown(model, field, options, hint = nil)
-      input(model, field, hint) do
-        cuba_contrib_partial("select",
-          name: field_name(model, field),
-          options: select_options(options, model.send(field))
-        )
-      end
-    end
-
-    def input(model, field, hint)
-      cuba_contrib_partial("field",
-        label: humanize(field),
-        input: yield,
-        hint: hint,
-        error: localize_errors(model, field).join(", ")
-      )
-    end
-
-    def localize_errors(model, field)
-      model.errors[field].map do |err|
-        unless settings.localized_errors[err]
-          raise "No localized error defined for: #{err}"
-        end
-
-        settings.localized_errors[err] % { field: humanize(field) }
-      end
-    end
-
-    def field_name(model, field)
-      "#{underscore(model.class.name)}[#{field}]"
-    end
-  end
-end

data/test/text_helper.rb

@@ -1,27 +0,0 @@
-# encoding: utf-8
-
-require_relative "helper"
-
-setup do
-  obj = Object.new
-  obj.extend Cuba::TextHelpers
-end
-
-test "truncate" do |helper|
-  assert_equal "the q...", helper.truncate("the quick brown", 5)
-
-  assert_equal "same string", helper.truncate("same string", 11)
-end
-
-test "markdown" do |helper|
-  assert_equal "<h1>Hola Mundo</h1>", helper.markdown("# Hola Mundo")
-end
-
-test "nl2br" do |helper|
-  assert_equal "Hi<br>there<br>Joe", helper.nl2br("Hi\nthere\r\nJoe")
-end
-
-test "currency" do |helper|
-  assert_equal "$ 2.22", helper.currency(2.221)
-  assert_equal "€ 2.22", helper.currency(2.221, "€")
-end

data/test/vars.rb

@@ -1,32 +0,0 @@
-require_relative "helper"
-
-Cuba.plugin Cuba::With
-
-class UserPhotos < Cuba
-  define do
-    on root do
-      res.write "uid: %d" % vars[:user_id]
-    end
-  end
-end
-
-test do
-  Cuba.define do
-    on "users/:id/photos" do |id|
-      with user_id: id do
-        _, _, body = UserPhotos.call(req.env)
-
-        body.each do |line|
-          res.write line
-        end
-      end
-
-      res.write vars.inspect
-    end
-  end
-
-  _, _, body = Cuba.call({ "PATH_INFO" => "/users/1001/photos",
-                           "SCRIPT_NAME" => "" })
-
-  assert_response body, ["uid: 1001", "{}"]
-end

data/views/field.mote

@@ -1,13 +0,0 @@
-<label>
-  <span>{{ label }}</span>
-
-  {{ input }}
-
-  % if hint
-    <em class="hint">{{ hint }}</em>
-  % end
-
-  % if not error.to_s.empty?
-    <span class="error"><em>{{ error}}</em></span>
-  % end
-</label>

data/views/file.mote

@@ -1 +0,0 @@
-<input type="file" name="{{ name }}">

data/views/option.mote

@@ -1 +0,0 @@
-<option {{ 'selected="selected"' if selected == value }} value="{{ h(value) }}">{{ h(label) }}</option>

data/views/password.mote

@@ -1 +0,0 @@
-<input type="password" name="{{ name }}" value="">

data/views/select.mote

@@ -1,3 +0,0 @@
-<select name="{{ name }}">
-  {{ options }}
-</select>

data/views/textarea.mote

@@ -1 +0,0 @@
-<textarea rows=10 cols=50 name="{{ name }}">{{ value }}</textarea>

data/views/textfield.mote

@@ -1 +0,0 @@
-<input type="text" {{ 'class="%s"' % params[:class] if params[:class] }} name="{{ name }}" value="{{ value }}">