formie 0.6.6 → 0.7.1

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", '~> 3.2.1'
+gem "rails"
 gem 'jquery-rails'
 
 group :test do
@@ -12,4 +12,5 @@ group :development, :test do
   gem "sqlite3"
   gem 'watchr'
   gem 'spork'
+  gem 'slim'
 end

data/README.md

@@ -10,6 +10,9 @@ The form-bounded as well as the unbounded templates are supported.
 Still, the ActionView functionality (e.g. text_field) is kept untouched.
 In short, Formie is like a helper using the notation of a partial.
 
+Templates handlers are supported as in partials.
+
+
 ## Installation
 
 As usual:
@@ -29,6 +32,7 @@ Templates for Formie are hosted in:
 
 - app/formies/forms       (bounded to form)
 - app/formies/application (free standing)
+- app/formies/templates   (free standing)
 
 Inside a formie the following locals (as delivered by the
 controller) are available:
@@ -81,4 +85,4 @@ In directory app/formies :
       <%= form.text_field args.first %>
     </p>
 
-Copyright (c) 2009..2012 Dittmar Krall, released under the MIT license
+Copyright (c) 2009..2013 Dittmar Krall, released under the MIT license

data/lib/formie/version.rb

@@ -1,3 +1,3 @@
 module Formie
-  VERSION = '0.6.6'
+  VERSION = '0.7.1'
 end

data/lib/formie.rb

@@ -11,14 +11,14 @@ module Formie
     @last_update = now
   end
 
-  def self.define_formie(where, name, txt)
+  def self.define_formie(where, name, path)
     formiename = name
 
     where.send(:define_method, formiename, lambda {|*args, &block|
 #p "** called #{where} #{formiename}", args, block
       params = args.extract_options!
       options = {}
-      options[:inline] = txt
+      options[:file] = path
       options[:locals] = {}
       options[:locals].update params
       options[:locals].update :formiename => formiename,
@@ -36,21 +36,20 @@ module Formie
     dir = "#{::Rails.root.to_s}/#{dir}"
     return  unless File.exists?(dir)
     Dir.chdir(dir) {|current_dir|
-      Dir.glob('**/*.html.erb').each {|path|
+      hsh = {}
+      Dir.glob('**/**').sort.each { |path|
+	base = File.basename(path).split('.').first
+	hsh[base] = path  unless hsh[base]
+      }
+      hsh.each { |name, path|
 	next  if File.new(path).mtime < @last_update
 
-	name = File.basename(path, '.html.erb')
-	self.inject(where, name, File.open(path).read)
+	x = File.expand_path(File.dirname(path))
+	where.define_formie name, File.join(x, name)
       }
     }
   end
 
-  def self.inject(where, name, txt)
-#puts "** loading formie '#{where}' - '#{name}'"
-    txt = txt.force_encoding('UTF-8')  if txt.respond_to?(:force_encoding)
-    where.define_formie name, txt
-  end
-
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formie
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &80904440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80904440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &80920020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80920020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &80919070 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80919070
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &80917730 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80917730
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "    Formie implements low level template-based helpers. It injects\n
   \   the formies into the ActionView module. The form-bounded as well as\n    the
   unbounded templates are supported. Still, the ActionView\n    functionality (e.g.
@@ -85,9 +105,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -199405233
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -96,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Formie is like a helper, but uses the notation of a partial.