fume 0.6.7 → 0.7.0

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+
+
+## 0.7.0:
+  - add action_attr_accessor method
+  - depend rails_i18n
+  - rename simple\_theme to simple_nav and rewirte
+  - auto require config/application.*.rb

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.7.0

data/fume.gemspec

@@ -19,10 +19,13 @@ Gem::Specification.new do |s|
   
   # rails
   s.add_runtime_dependency "rails", "~> 3.0.10"
+  s.add_runtime_dependency "rails-i18n", "~> 0.1.6"
+  
+  # require library
+  s.add_runtime_dependency "hashie", "~> 1.1.0"
   
   # library
   s.add_runtime_dependency "timeliness", "~> 0.3.4"
-  s.add_runtime_dependency "hashie", "~> 1.1.0"
   s.add_runtime_dependency "addressable", "~> 2.2.6"
   
   # rails plugin

data/lib/fume/app_setting_loader.rb

@@ -0,0 +1,13 @@
+module Fume
+  
+  class AppSettingLoader
+
+    def self.try_enable(app)
+      %w[application.extra.rb application.local.rb].each do |config_filename|
+        path = Rails.root.join("config", config_filename)
+        require path if File.exists?(path)
+      end
+    end
+    
+  end
+end

data/lib/fume/authlogic.rb

@@ -1,6 +1,6 @@
 module Fume
   module Authlogic
-    def self.try_enable
+    def self.try_enable(app)
       if defined? ::Authlogic
         ActionController::Base.send :include, ControllerExtensions
       end

data/lib/fume/cancan.rb

@@ -1,6 +1,6 @@
 module Fume
   module Cancan
-    def self.try_enable
+    def self.try_enable(app)
       if defined? ::CanCan
         ActionController::Base.send :include, ControllerExtensions
       end

data/lib/fume/rails_ext.rb

@@ -1,6 +1,6 @@
 module Fume
   module RailsExt
-    def self.try_enable
+    def self.try_enable(app)
       if defined? ::ActionController
         ActionController::Base.send :include, ControllerExtensions
       end
@@ -13,6 +13,21 @@ module Fume
         helper_method :public_path, :public_url
       end
       
+      module ClassMethods
+        def action_attr_accessor(syms, options = {})
+          [ syms ].flatten.each do |sym|
+            class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+              def self.#{sym}(obj)
+                before_filter { |c| c.send(:#{sym}=, obj) }
+              end
+              
+              attr_accessor :#{sym}
+              helper_method :#{sym}, :#{sym}=
+            EOS
+          end
+        end
+      end
+      
       module InstanceMethods
         
         protected

data/lib/fume/railtie.rb

@@ -2,12 +2,12 @@ require "rails/railtie"
 
 module Fume
   class Railtie < ::Rails::Railtie
-    initializer 'fume.initialize', :after => :after_initialize do
+    initializer 'fume.initialize', :after => :after_initialize do |app|
       Fume.constants.each do |name|
         ext_module = Fume.const_get(name)
         
         if ext_module.respond_to?(:try_enable)
-          ext_module.try_enable
+          ext_module.try_enable(app)
         end
       end
     end

data/lib/fume/simple_nav.rb

@@ -0,0 +1,49 @@
+require "hashie"
+
+module Fume
+  module SimpleNav
+    
+    def self.try_enable(app)
+      ActionView::Base.send :include, HelperExtensions
+    end
+    
+    module HelperExtensions
+      
+      def simple_nav(attr_reader_name)
+        value = self.send(attr_reader_name)
+        tag = SimpleNavTag.new({
+          :helper => self,
+          :value => value,
+          :active_class => "active"
+        })
+
+        if block_given?
+          yield tag
+          return nil
+        else
+          return tag
+        end
+      end
+      
+      class SimpleNavTag < Hashie::Mash
+        
+        def li_tag(value, options = {}, &block)
+          self.content_tag(value, :li, options, &block)
+        end
+
+        def content_tag(value, tag_name, options = {}, &block)
+          if value == self.value
+            if options[:class]
+              options[:class] += " #{self.active_class}"
+            else
+              options[:class] = "#{self.active_class}"
+            end
+          end
+
+          helper.content_tag(tag_name, options, &block)
+        end
+      end
+  
+    end
+  end
+end

data/lib/fume.rb

@@ -13,5 +13,6 @@ module Fume
   autoload :Authlogic
   autoload :RailsExt
   autoload :Cancan
-  autoload :SimpleTheme
+  autoload :SimpleNav
+  autoload :AppSettingLoader
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fume
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000Z
+date: 2011-08-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70240664927880 !ruby/object:Gem::Requirement
+  requirement: &70181391275120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70240664927880
+  version_requirements: *70181391275120
 - !ruby/object:Gem::Dependency
-  name: timeliness
-  requirement: &70240664927240 !ruby/object:Gem::Requirement
+  name: rails-i18n
+  requirement: &70181391270320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70240664927240
+  version_requirements: *70181391270320
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70240664926660 !ruby/object:Gem::Requirement
+  requirement: &70181391269700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,21 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70240664926660
+  version_requirements: *70181391269700
+- !ruby/object:Gem::Dependency
+  name: timeliness
+  requirement: &70181391268960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *70181391268960
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70240664919760 !ruby/object:Gem::Requirement
+  requirement: &70181391268400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 2.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70240664919760
+  version_requirements: *70181391268400
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70240664919200 !ruby/object:Gem::Requirement
+  requirement: &70181391267740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70240664919200
+  version_requirements: *70181391267740
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &70240664918560 !ruby/object:Gem::Requirement
+  requirement: &70181391265980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70240664918560
+  version_requirements: *70181391265980
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70240664918020 !ruby/object:Gem::Requirement
+  requirement: &70181391265480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 1.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70240664918020
+  version_requirements: *70181391265480
 - !ruby/object:Gem::Dependency
   name: symbolize
-  requirement: &70240664917400 !ruby/object:Gem::Requirement
+  requirement: &70181391264680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70240664917400
+  version_requirements: *70181391264680
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70240664916860 !ruby/object:Gem::Requirement
+  requirement: &70181391264040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +120,10 @@ dependencies:
         version: 1.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70240664916860
+  version_requirements: *70181391264040
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70240664916160 !ruby/object:Gem::Requirement
+  requirement: &70181391263380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +131,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *70240664916160
+  version_requirements: *70181391263380
 - !ruby/object:Gem::Dependency
   name: version
-  requirement: &70240664915460 !ruby/object:Gem::Requirement
+  requirement: &70181391262860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240664915460
+  version_requirements: *70181391262860
 description: a simple rails scaffold.
 email:
 - Sunteya@gmail.com
@@ -140,17 +151,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - VERSION
 - fume.gemspec
 - lib/fume.rb
+- lib/fume/app_setting_loader.rb
 - lib/fume/authlogic.rb
 - lib/fume/cancan.rb
 - lib/fume/rails_ext.rb
 - lib/fume/railtie.rb
-- lib/fume/simple_theme.rb
+- lib/fume/simple_nav.rb
 - lib/generators/fume/simple_scaffold/USAGE
 - lib/generators/fume/simple_scaffold/simple_scaffold_generator.rb
 - lib/generators/fume/simple_scaffold/templates/_form.html.erb
@@ -162,41 +175,6 @@ files:
 - rails_generators/fume/rspec/rspec_gen.rb
 - rails_generators/fume/rspec/templates/spec/support/erb_macros.rb
 - rails_generators/fume/rspec/templates/spec/support/fume_controller_macros.rb
-- rails_generators/fume/simple_theme/simple_theme_gen.rb
-- rails_generators/fume/simple_theme/templates/public/stylesheets/reset.css
-- rails_generators/fume/simple_theme/templates/public/stylesheets/reset.less
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/demo.html
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/simple-theme-ie-patch.js
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/simple-theme.css
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/simple-theme.less
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/src/base.less
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/src/function.less
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/src/layout.less
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/src/reset.less
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/src/vendor/yui-3.0/base.css
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/src/vendor/yui-3.0/fonts.css
-- rails_generators/fume/simple_theme/templates/public/themes/simple_theme/src/vendor/yui-3.0/reset.css
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-1.4.2.js
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.js
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness.css
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-bg_flat_30_cccccc_40x100.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-bg_flat_50_5c5c5c_40x100.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-bg_glass_20_555555_1x400.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-bg_glass_40_0078a3_1x400.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-bg_glass_40_ffc73d_1x400.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-bg_gloss-wave_25_333333_500x100.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-bg_highlight-soft_80_eeeeee_1x100.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-bg_inset-soft_25_000000_1x100.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-bg_inset-soft_30_f58400_1x100.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-icons_222222_256x240.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-icons_4b8e0b_256x240.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-icons_a83300_256x240.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-icons_cccccc_256x240.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-1.8.ui-darkness/ui-icons_ffffff_256x240.png
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery-ui-i18n-1.8.js
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery.ba-bbq-1.2.1.js
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery.corner-2.09.js
-- rails_generators/fume/simple_theme/templates/public/themes/vendor/jquery.timepicker-0.2.1.js
 - spec/fume/cancan_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -214,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4138645098247265020
+      hash: -3149688421727667146
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -223,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4138645098247265020
+      hash: -3149688421727667146
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.7

data/lib/fume/simple_theme.rb

@@ -1,59 +0,0 @@
-module Fume
-  module SimpleTheme
-    
-    def self.try_enable
-      ActionController::Base.send :include, ControllerExtensions
-    end
-    
-    module ControllerExtensions
-      extend ActiveSupport::Concern
-      
-      included do
-        helper_method :sec_nav, :main_nav
-        helper RailsHelpers
-      end
-      
-      module ClassMethods
-        def sec_nav_highlight(name)
-          class_eval do 
-            before_filter { |c| c.instance_variable_set(:@sec_nav, name) }
-          end
-        end
-
-        def main_nav_highlight(name)
-          class_eval do 
-            before_filter { |c| c.instance_variable_set(:@main_nav, name) }
-          end
-        end
-      end
-      
-      module RailsHelpers
-        
-        def sec_nav(name, options = {}, &block)
-          if @sec_nav == name
-            if options[:class]
-              options[:class] += " active"
-            else
-              options[:class] = "active"
-            end
-          end
-          content = capture(&block)
-          content_tag(:li, content, options)
-        end
-
-        def main_nav(name, options = {}, &block)
-          if @main_nav == name
-            if options[:class]
-              options[:class] += " active"
-            else
-              options[:class] = "active"
-            end
-          end
-          content = capture(&block)
-          content_tag(:li, content, options)
-        end
-      end
-      
-    end
-  end
-end

data/rails_generators/fume/simple_theme/simple_theme_gen.rb

@@ -1,9 +0,0 @@
-class SimpleThemeGen < Fume::Gen::Base
-
-  def manifest
-    record do |m|
-      cp_files m, File.join("public", "themes", "**", "*")
-      cp_files m, File.join("public", "stylesheets", "*.css")
-    end
-  end
-end

data/rails_generators/fume/simple_theme/templates/public/stylesheets/reset.css

@@ -1,89 +0,0 @@
-html {
-  color: #000000;
-  background: #ffffff;
-}
-body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, textarea, p, blockquote, th, td {
-  margin: 0;
-  padding: 0;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-fieldset, img { border: 0; }
-address, caption, cite, code, dfn, em, strong, th, var {
-  font-style: normal;
-  font-weight: normal;
-}
-li { list-style: none; }
-caption, th { text-align: left; }
-h1, h2, h3, h4, h5, h6 {
-  font-size: 100%;
-  font-weight: normal;
-}
-q:before { content: ''; }
-q:after { content: ''; }
-abbr, acronym {
-  border: 0;
-  font-variant: normal;
-}
-sup { vertical-align: text-top; }
-sub { vertical-align: text-bottom; }
-input, textarea, select {
-  font-family: inherit;
-  font-size: inherit;
-  font-weight: inherit;
-}
-input, textarea, select { *font-size: 100%; }
-legend { color: #000000; }
-body {
-  font: 13px/1.231 arial, helvetica, clean, sans-serif;
-  *font-size: small;
-  *font: x-small;
-}
-select, input, button, textarea { font: 99% arial, helvetica, clean, sans-serif; }
-table {
-  font-size: inherit;
-  font: 100%;
-}
-pre, code, kbd, samp, tt {
-  font-family: monospace;
-  *font-size: 108%;
-  line-height: 100%;
-}
-h1 { font-size: 138.5%; }
-h2 { font-size: 123.1%; }
-h3 { font-size: 108%; }
-h1, h2, h3 { margin: 1em 0; }
-h1, h2, h3, h4, h5, h6, strong { font-weight: bold; }
-abbr, acronym {
-  border-bottom: 1px dotted #000000;
-  cursor: help;
-}
-em { font-style: italic; }
-blockquote, ul, ol, dl { margin: 1em; }
-ol, ul, dl { margin-left: 2em; }
-ol li { list-style: decimal outside; }
-ul li { list-style: disc outside; }
-dl dd { margin-left: 1em; }
-th, td {
-  border: 1px solid #000000;
-  padding: 0.5em;
-}
-th {
-  font-weight: bold;
-  text-align: center;
-}
-caption {
-  margin-bottom: 0.5em;
-  text-align: center;
-}
-p, fieldset, table, pre { margin-bottom: 1em; }
-input[type=text], input[type=password], textarea {
-  width: 12.25em;
-  *width: 11.9em;
-}
-ol li { list-style: none; }
-ul li { list-style: none; }
-th, td { border: none; }
-input[type=text], input[type=password], textarea { width: auto; }

data/rails_generators/fume/simple_theme/templates/public/stylesheets/reset.less

@@ -1 +0,0 @@
-@import "../themes/simple_theme/src/reset.less";