fume 0.2.4 → 0.2.5

data/Rakefile

@@ -9,7 +9,6 @@ begin
     gem.email = "Sunteya@gmail.com"
     gem.homepage = "http://github.com/sunteya/fume"
     gem.authors = ["Sunteya"]
-    gem.add_development_dependency "authlogic"
   end
   
   Jeweler::GemcutterTasks.new

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 2
-:patch: 4
+:patch: 5
 :major: 0

data/fume.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fume}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sunteya"]
-  s.date = %q{2009-12-21}
+  s.date = %q{2009-12-24}
   s.email = %q{Sunteya@gmail.com}
   s.extra_rdoc_files = [
     "README"
@@ -56,9 +56,9 @@ Gem::Specification.new do |s|
      "generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/base.css",
      "generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/fonts.css",
      "generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/reset.css",
-     "init.rb",
      "lib/fume.rb",
      "lib/fume/authlogic.rb",
+     "lib/fume/formtastic.rb",
      "lib/fume/rails_ext.rb",
      "lib/fume/searchlogic.rb",
      "lib/fume/simple_theme.rb",
@@ -75,12 +75,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<authlogic>, [">= 0"])
     else
-      s.add_dependency(%q<authlogic>, [">= 0"])
     end
   else
-    s.add_dependency(%q<authlogic>, [">= 0"])
   end
 end
 

data/generators/fume/simple_theme/templates/public/stylesheets/simple-theme.css

@@ -617,7 +617,10 @@ body {
   display: block;
   padding-bottom: 0.2em;
 }
-.formtastic ol .string input { display: inline; }
+.formtastic ol .string input {
+  display: inline;
+  padding: 0.1em 0.2em;
+}
 .formtastic ol .string .inline-hints {
   margin: 0 0 0 1em;
   font-style: italic;
@@ -630,7 +633,10 @@ body {
   display: block;
   padding-bottom: 0.2em;
 }
-.formtastic ol .select input { display: inline; }
+.formtastic ol .select input {
+  display: inline;
+  padding: 0.1em 0.2em;
+}
 .formtastic ol .select .inline-hints {
   margin: 0 0 0 1em;
   font-style: italic;
@@ -643,7 +649,10 @@ body {
   display: block;
   padding-bottom: 0.2em;
 }
-.formtastic ol .text input { display: inline; }
+.formtastic ol .text input {
+  display: inline;
+  padding: 0.1em 0.2em;
+}
 .formtastic ol .text .inline-hints {
   margin: 0 0 0 1em;
   font-style: italic;
@@ -656,7 +665,10 @@ body {
   display: block;
   padding-bottom: 0.2em;
 }
-.formtastic ol .numeric input { display: inline; }
+.formtastic ol .numeric input {
+  display: inline;
+  padding: 0.1em 0.2em;
+}
 .formtastic ol .numeric .inline-hints {
   margin: 0 0 0 1em;
   font-style: italic;
@@ -669,7 +681,10 @@ body {
   display: block;
   padding-bottom: 0.2em;
 }
-.formtastic ol .file input { display: inline; }
+.formtastic ol .file input {
+  display: inline;
+  padding: 0.1em 0.2em;
+}
 .formtastic ol .file .inline-hints {
   margin: 0 0 0 1em;
   font-style: italic;
@@ -682,13 +697,33 @@ body {
   display: block;
   padding-bottom: 0.2em;
 }
-.formtastic ol .password input { display: inline; }
+.formtastic ol .password input {
+  display: inline;
+  padding: 0.1em 0.2em;
+}
 .formtastic ol .password .inline-hints {
   margin: 0 0 0 1em;
   font-style: italic;
   display: inline;
   color: #888888;
 }
+.formtastic ol .boolean label {
+  font-size: 1.2em;
+  color: #666666;
+  display: block;
+  padding-bottom: 0.2em;
+}
+.formtastic ol .boolean input {
+  display: inline;
+  padding: 0.1em 0.2em;
+}
+.formtastic ol .boolean .inline-hints {
+  margin: 0 0 0 1em;
+  font-style: italic;
+  display: inline;
+  color: #888888;
+}
+.formtastic ol .boolean label input { margin-right: 0.5em; }
 .formtastic ol .check_boxes fieldset .label label { font-size: 1.2em; }
 .formtastic ol .check_boxes fieldset ol li {
   float: left;
@@ -727,6 +762,25 @@ body {
 }
 .formtastic fieldset.buttons ol .commit input:hover { border: 1px solid #666666; }
 .formtastic fieldset.buttons ol .cancel a { color: #cc0000; }
+.sidebar-block .formtastic { margin-right: 1em; }
+.sidebar-block .formtastic .string input { width: 100%; }
+.sidebar-block .formtastic .select input { width: 100%; }
+.sidebar-block .formtastic .text input { width: 100%; }
+.sidebar-block .formtastic .numeric input { width: 100%; }
+.sidebar-block .formtastic .file input { width: 100%; }
+.sidebar-block .formtastic .password input { width: 100%; }
+.sidebar-block .formtastic .boolean input { width: 100%; }
+.sidebar-block .formtastic fieldset.inputs {
+  border: none;
+  padding: 0;
+  margin: 0;
+}
+.sidebar-block .formtastic fieldset.buttons {
+  border: none;
+  padding: 0;
+  margin: 0;
+}
+.sidebar-block .formtastic fieldset.buttons li { margin-bottom: 0; }
 .form label.label { color: #666666; }
 .form input.text_field { border: 1px solid #cfcfcf; }
 .form textarea.text_area { border: 1px solid #cfcfcf; }

data/generators/fume/simple_theme/templates/public/stylesheets/simple-theme.less

@@ -303,7 +303,7 @@ body {
 		}
 
 		
-		.string, .select, .text, .numeric, .file, .password {
+		.string, .select, .text, .numeric, .file, .password, .boolean {
 			
 			label {
 				font-size: 1.2em;
@@ -314,6 +314,7 @@ body {
 			
 			input {
 				display: inline;
+				padding: 0.1em 0.2em;
 			}
 			
 			.inline-hints {
@@ -324,6 +325,14 @@ body {
 			}
 		}
 		
+		.boolean {
+			label {
+				input {
+					margin-right: 0.5em;
+				}
+			}
+		}
+		
 		.check_boxes {
 			fieldset {
 				.label label {
@@ -391,6 +400,33 @@ body {
 	}
 }
 
+.sidebar-block .formtastic {
+	margin-right: 1em;
+	
+	.string, .select, .text, .numeric, .file, .password, .boolean {
+		input {
+			width: 100%;
+		}
+	}
+	
+	fieldset.inputs {
+		border: none;
+		padding: 0;
+		margin: 0;
+	}
+	
+	fieldset.buttons {
+		border: none;
+		padding: 0;
+		margin: 0;
+		
+		li {
+			margin-bottom: 0;
+		}
+	}
+}
+
+
 /* forms */
 .form {
 	label.label {

data/lib/fume/authlogic.rb

@@ -1,8 +1,10 @@
 module Fume
   module Authlogic
     def self.enable
-      ActionController::Base.send :include, ControllerExtensions::InstanceMethods
-      ActionController::Base.send :helper_method, :current_user_session, :current_user
+      if defined? ::Authlogic
+        ActionController::Base.send :include, ControllerExtensions::InstanceMethods
+        ActionController::Base.send :helper_method, :current_user_session, :current_user
+      end
     end
     
     module ControllerExtensions
@@ -25,4 +27,6 @@ module Fume
       end
     end
   end
-end
+end
+
+

data/lib/fume/formtastic.rb

@@ -0,0 +1,22 @@
+module Fume
+  module Formtastic
+    
+    def self.enable
+      return unless defined? ::Formtastic
+      
+      ::Formtastic::SemanticFormBuilder.class_exec do
+        alias_method :humanized_attribute_name_without_instance, :humanized_attribute_name
+        
+        def humanized_attribute_name(method)
+          if @object && @object.respond_to?(:human_attribute_name)
+            @object.human_attribute_name(method.to_s)
+          else
+            humanized_attribute_name_without_instance(method)
+          end
+        end
+      end
+
+    end
+  end
+end
+

data/lib/fume/rails_ext.rb

@@ -19,4 +19,3 @@ module Fume
   end
 end
 
-

data/lib/fume/searchlogic.rb

@@ -2,15 +2,29 @@ module Fume
   module Searchlogic
 
     def self.enable
-      ActionController::Base.send :helper, RailsHelpers
-      ::Searchlogic::Search.send :include, SearchExtensions::InstanceMethods
+      if defined? ::Searchlogic
+        ActionController::Base.send :helper, RailsHelpers
+        ::Searchlogic::Search.send :include, SearchExtensions::InstanceMethods
+      end
     end
 
     module SearchExtensions
+      module ClassMethods
+        def human_name
+          "Search"
+        end
+      end
+      
       module InstanceMethods
+        extend ClassMethods
+        
         def human_attribute_name(name)
           klass.human_attribute_name(name)
         end
+        
+        def new_record?
+          true
+        end
       end
     end
 
@@ -22,4 +36,5 @@ module Fume
       end
     end
   end
-end
+end
+

data/lib/fume.rb

@@ -2,23 +2,10 @@ require 'fume/authlogic'
 require 'fume/searchlogic'
 require 'fume/simple_theme'
 require 'fume/rails_ext'
-
-Fume::Authlogic.enable
-Fume::Searchlogic.enable
-Fume::SimpleTheme.enable
-Fume::RailsExt.enable
+require 'fume/formtastic'
 
 module Fume
   def self.root
     @root ||= Pathname.new(File.dirname(__FILE__)).join("..")
   end
 end
-
-# if Object.const_defined? "Rake"
-#   unless Rake::Task.task_defined? "fume"
-#     rake_files = File.join(File.dirname(__FILE__), '..', 'tasks', '*.rake')
-#     Dir[rake_files].each do |rake_file|
-#       load rake_file
-#     end
-#   end
-# end

data/rails/init.rb

@@ -1 +1,8 @@
-require "fume"
+require File.join(File.dirname(__FILE__), *%w[.. lib fume])
+
+::Fume.constants.each do |module_name|
+  module_class = Fume.const_get(module_name)
+  if module_class.respond_to? :enable
+    module_class.enable
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fume
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Sunteya
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +08:00
+date: 2009-12-24 00:00:00 +08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: authlogic
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: 
 email: Sunteya@gmail.com
 executables: []
@@ -72,9 +63,9 @@ files:
 - generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/base.css
 - generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/fonts.css
 - generators/fume/simple_theme/templates/public/stylesheets/src/vendor/yui-3.0/reset.css
-- init.rb
 - lib/fume.rb
 - lib/fume/authlogic.rb
+- lib/fume/formtastic.rb
 - lib/fume/rails_ext.rb
 - lib/fume/searchlogic.rb
 - lib/fume/simple_theme.rb

data/init.rb

@@ -1,2 +0,0 @@
-require File.dirname(__FILE__) + "/rails/init.rb"
-